Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
83070899
Commit
83070899
authored
1 year ago
by
Mathéo Joseph
Committed by
Mathéo Joseph
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
jamiid: change look of jami id to be more compact
Change-Id: I5f39b5f28d4447cdd5b10f37ad2d8780260d5ed8
parent
2916b4c5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/commoncomponents/JamiIdentifier.qml
+23
-8
23 additions, 8 deletions
src/app/commoncomponents/JamiIdentifier.qml
src/app/settingsview/components/ManageAccountPage.qml
+1
-0
1 addition, 0 deletions
src/app/settingsview/components/ManageAccountPage.qml
with
24 additions
and
8 deletions
src/app/commoncomponents/JamiIdentifier.qml
+
23
−
8
View file @
83070899
...
...
@@ -27,6 +27,7 @@ Item {
property
bool
slimDisplay
:
true
property
color
backgroundColor
:
JamiTheme
.
welcomeBlockColor
property
color
contentColor
:
JamiTheme
.
tintedBlue
property
bool
centered
:
true
height
:
getHeight
()
function
getHeight
()
{
...
...
@@ -44,12 +45,15 @@ Item {
RowLayout
{
id
:
outerRow
width
:
parent
.
width
anchors.horizontalCenter
:
jamiId
.
centered
?
parent
.
horizontalCenter
:
undefined
anchors.left
:
jamiId
.
centered
?
undefined
:
parent
.
left
spacing
:
2
RoundedBorderRectangle
{
id
:
leftRect
fillColor
:
jamiId
.
backgroundColor
Layout.fillWidth
:
true
Layout.preferredWidth
:
childrenRect
.
width
Layout.maximumWidth
:
jamiId
.
width
-
rightRect
.
width
Layout.preferredHeight
:
childrenRect
.
height
radius
:
{
"
tl
"
:
5
,
...
...
@@ -59,7 +63,6 @@ Item {
}
RowLayout
{
width
:
parent
.
width
anchors.verticalCenter
:
parent
.
verticalCenter
ResponsiveImage
{
...
...
@@ -74,11 +77,11 @@ Item {
UsernameTextEdit
{
id
:
usernameTextEdit
Layout.fillWidth
:
true
visible
:
!
readOnly
Layout.preferredHeight
:
40
Layout.alignment
:
Qt
.
AlignVCenter
textColor
:
jamiId
.
contentColor
fontPixelSize
:
staticText
.
length
>
16
?
JamiTheme
.
jamiIdSmallFontSize
:
JamiTheme
.
jamiId
FontSize
fontPixelSize
:
staticText
.
length
>
16
||
dynamicText
.
length
>
16
?
JamiTheme
.
jamiIdSmallFontSize
:
JamiTheme
.
big
FontSize
editMode
:
false
isPersistent
:
false
readOnly
:
true
...
...
@@ -96,6 +99,17 @@ Item {
});
}
}
Label
{
id
:
usernameLabel
visible
:
usernameTextEdit
.
readOnly
Layout.alignment
:
Qt
.
AlignVCenter
Layout.rightMargin
:
JamiTheme
.
pushButtonMargins
color
:
jamiId
.
contentColor
font.pixelSize
:
text
.
length
>
16
?
JamiTheme
.
jamiIdSmallFontSize
:
JamiTheme
.
bigFontSize
property
string
registeredName
:
CurrentAccount
.
registeredName
property
string
infohash
:
CurrentAccount
.
uri
text
:
registeredName
?
registeredName
:
infohash
}
}
}
...
...
@@ -178,10 +192,12 @@ Item {
toolTipText
:
JamiStrings
.
identifierURI
onClicked
:
{
if
(
clicked
)
{
usernameTextEdit
.
staticText
=
CurrentAccount
.
uri
;
usernameLabel
.
text
=
Qt
.
binding
(
function
()
{
return
CurrentAccount
.
uri
}
);
usernameTextEdit
.
staticText
=
Qt
.
binding
(
function
()
{
return
CurrentAccount
.
uri
}
);
btnId
.
toolTipText
=
JamiStrings
.
identifierRegisterName
;
}
else
{
usernameTextEdit
.
staticText
=
CurrentAccount
.
registeredName
;
usernameLabel
.
text
=
Qt
.
binding
(
function
()
{
return
CurrentAccount
.
registeredName
}
);
usernameTextEdit
.
staticText
=
Qt
.
binding
(
function
()
{
return
CurrentAccount
.
registeredName
}
);
btnId
.
toolTipText
=
JamiStrings
.
identifierURI
;
}
clicked
=
!
clicked
;
...
...
@@ -196,7 +212,6 @@ Item {
preferredSize
:
30
radius
:
5
normalColor
:
JamiTheme
.
transparentColor
//hoveredColor: JamiTheme.hoveredButtonColorWizard
imageContainerWidth
:
JamiTheme
.
pushButtonSize
imageContainerHeight
:
JamiTheme
.
pushButtonSize
border.color
:
jamiId
.
contentColor
...
...
This diff is collapsed.
Click to expand it.
src/app/settingsview/components/ManageAccountPage.qml
+
1
−
0
View file @
83070899
...
...
@@ -141,6 +141,7 @@ SettingsPageBase {
Layout.topMargin
:
10
Layout.preferredWidth
:
Math
.
min
(
500
,
manageAccountColumnLayout
.
width
-
JamiTheme
.
preferredSettingsMarginSize
)
backgroundColor
:
JamiTheme
.
jamiIdColor
centered
:
false
}
Text
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment