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
5e87b43e
Commit
5e87b43e
authored
4 years ago
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
mainview: hide qr code generation button for sip account
Change-Id: I4a63c5d719dfbaf4d4d8b3c276e5cafe749ffcf0
parent
e5bafb54
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mainview/components/AccountComboBox.qml
+10
-4
10 additions, 4 deletions
src/mainview/components/AccountComboBox.qml
src/mainview/components/WelcomePageQrDialog.qml
+2
-1
2 additions, 1 deletion
src/mainview/components/WelcomePageQrDialog.qml
with
12 additions
and
5 deletions
src/mainview/components/AccountComboBox.qml
+
10
−
4
View file @
5e87b43e
...
@@ -161,16 +161,19 @@ ComboBox {
...
@@ -161,16 +161,19 @@ ComboBox {
buttonImageHeight
:
height
-
8
buttonImageHeight
:
height
-
8
buttonImageWidth
:
width
-
8
buttonImageWidth
:
width
-
8
radius
:
height
/
2
radius
:
height
/
2
width
:
24
width
:
24
height
:
24
height
:
24
visible
:
AccountAdapter
.
currentAccountType
===
Profile
.
Type
.
RING
toolTipText
:
JamiStrings
.
displayQRCode
toolTipText
:
JamiStrings
.
displayQRCode
hoverEnabled
:
true
hoverEnabled
:
true
source
:
"
qrc:/images/qrcode.png
"
source
:
"
qrc:/images/qrcode.png
"
backgroundColor
:
"
white
"
backgroundColor
:
"
white
"
onClicked
:
{
onClicked
:
{
qrDialog
.
open
()
if
(
visible
)
qrDialog
.
open
()
}
}
}
}
...
@@ -187,9 +190,12 @@ ComboBox {
...
@@ -187,9 +190,12 @@ ComboBox {
width
:
25
width
:
25
height
:
25
height
:
25
source
:
!
mainViewWindow
.
inSettingsView
?
"
qrc:/images/icons/round-settings-24px.svg
"
:
source
:
!
mainViewWindow
.
inSettingsView
?
"
qrc:/images/icons/round-close-24px.svg
"
"
qrc:/images/icons/round-settings-24px.svg
"
:
toolTipText
:
!
mainViewWindow
.
inSettingsView
?
JamiStrings
.
openSettings
:
JamiStrings
.
closeSettings
"
qrc:/images/icons/round-close-24px.svg
"
toolTipText
:
!
mainViewWindow
.
inSettingsView
?
JamiStrings
.
openSettings
:
JamiStrings
.
closeSettings
hoverEnabled
:
true
hoverEnabled
:
true
backgroundColor
:
"
white
"
backgroundColor
:
"
white
"
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/WelcomePageQrDialog.qml
+
2
−
1
View file @
5e87b43e
...
@@ -43,7 +43,8 @@ Dialog {
...
@@ -43,7 +43,8 @@ Dialog {
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
source
:
{
source
:
{
if
(
AccountAdapter
.
currentAccountId
)
if
(
AccountAdapter
.
currentAccountId
&&
AccountAdapter
.
currentAccountType
===
Profile
.
Type
.
RING
)
return
"
image://qrImage/account_
"
+
AccountAdapter
.
currentAccountId
return
"
image://qrImage/account_
"
+
AccountAdapter
.
currentAccountId
return
""
return
""
}
}
...
...
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