Mirror/jami-client-qt
1
0
Fork 0
mirror of https://github.com/savoirfairelinux/jami-client-qt.git synced 2025-12-19 01:52:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

mainview: hide qr code generation button for sip account

Browse Source 
Change-Id: I4a63c5d719dfbaf4d4d8b3c276e5cafe749ffcf0
This commit is contained in:
Ming Rui Zhang
2020-09-14 13:32:03 -04:00
parent e5bafb5472
commit 5e87b43e78
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mainview/components/AccountComboBox.qml
View File

@@ -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 {
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"

3
src/mainview/components/WelcomePageQrDialog.qml
View File

@@ -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 ""
} }