mainview: fix account selection
- avoid duplicate call of LRC's setTopAccount()
- welcome view displays always the first account on the list, so passing the index is not necessary
- conversationsadapter and messagesadapter no longer listen to currentAccountChanged signal since there is a specific function for the setup
Gitlab: #12
Change-Id: Iac932d2596bf59c7528d83be799342ccefeea6b0
diff --git a/src/mainview/components/WelcomePageQrDialog.qml b/src/mainview/components/WelcomePageQrDialog.qml
index 45c8ff2..ccadf0f 100644
--- a/src/mainview/components/WelcomePageQrDialog.qml
+++ b/src/mainview/components/WelcomePageQrDialog.qml
@@ -21,22 +21,21 @@
import QtQuick.Layouts 1.14
import net.jami.Models 1.0
+
Dialog {
id: userQrImageDialog
- property int currentAccountIndex: 0
+ property string accountIdStr: ClientWrapper.utilsAdaptor.getCurrAccId()
+ function updateQrDialog() {
+ accountIdStr = ClientWrapper.utilsAdaptor.getCurrAccId()
+ }
- /*
- * When dialog is opened, trigger mainViewWindow overlay which is defined in overlay.model.
- * (model : true is necessary)
- */
+ // When dialog is opened, trigger mainViewWindow overlay which is defined in overlay.model.
+ // (model : true is necessary)
modal: true
-
- /*
- * Content height + margin.
- */
+ //Content height + margin.
contentHeight: userQrImage.height + 30
Image {
@@ -48,7 +47,7 @@
height: 250
fillMode: Image.PreserveAspectFit
- source: "image://qrImage/account_" + currentAccountIndex
+ source: "image://qrImage/account_" + accountIdStr
sourceSize.width: 260
sourceSize.height: 260
mipmap: true