From aa5fc97ec2c7a87bdd505d704a473f6462a179f5 Mon Sep 17 00:00:00 2001 From: Martin Straka Date: Tue, 2 Jan 2018 13:20:09 +0100 Subject: [PATCH 1/2] Fixed account counters update --- qml/pages/PageMessageList.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qml/pages/PageMessageList.qml b/qml/pages/PageMessageList.qml index 8c538f5c..ee5ea56b 100644 --- a/qml/pages/PageMessageList.qml +++ b/qml/pages/PageMessageList.qml @@ -62,6 +62,11 @@ Component { } } + Component.onDestruction: { + accounts.updateNewMessageCounter(accountModel, userName) + statusBar.visible = false + } + MessageListModel { id: messageModel @@ -87,8 +92,6 @@ Component { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - accounts.updateNewMessageCounter(accountModel, userName) - statusBar.visible = false pageView.pop() } } -- GitLab From 2e6dad02e1928b5e377a12b65caae229da421c60 Mon Sep 17 00:00:00 2001 From: Martin Straka Date: Tue, 2 Jan 2018 15:10:58 +0100 Subject: [PATCH 2/2] Added onDestruction action into some pages where is needed --- qml/pages/PageAccountDetail.qml | 5 ++++- qml/pages/PageContactList.qml | 6 +++++- qml/pages/PageDataboxSearch.qml | 6 +++++- qml/pages/PageMessageSearch.qml | 7 ++++++- qml/pages/PageSendMessage.qml | 5 ++++- qml/pages/PageSettingsAccount.qml | 1 + qml/pages/PageSettingsGeneral.qml | 6 +++++- qml/pages/PageSettingsStorage.qml | 12 ++++++++---- qml/pages/PageSettingsSync.qml | 6 +++++- 9 files changed, 43 insertions(+), 11 deletions(-) diff --git a/qml/pages/PageAccountDetail.qml b/qml/pages/PageAccountDetail.qml index 14b739b6..3bcf1936 100644 --- a/qml/pages/PageAccountDetail.qml +++ b/qml/pages/PageAccountDetail.qml @@ -46,6 +46,10 @@ Component { setAccountDetailInfo(userName) } + Component.onDestruction: { + statusBar.visible = false + } + PageHeader { id: headerBar title: qsTr("Account info") @@ -55,7 +59,6 @@ Component { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - statusBar.visible = false pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageContactList.qml b/qml/pages/PageContactList.qml index 9b202d76..ee28ae39 100644 --- a/qml/pages/PageContactList.qml +++ b/qml/pages/PageContactList.qml @@ -53,6 +53,11 @@ Item { } proxyDataboxModel.setSourceModel(foundBoxModel) } + + Component.onDestruction: { + statusBar.visible = false + } + DataboxListModel { id: foundBoxModel Component.onCompleted: { @@ -74,7 +79,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - statusBar.visible = false pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageDataboxSearch.qml b/qml/pages/PageDataboxSearch.qml index f4de77aa..11362c94 100644 --- a/qml/pages/PageDataboxSearch.qml +++ b/qml/pages/PageDataboxSearch.qml @@ -57,6 +57,11 @@ Item { searchPhraseText.forceActiveFocus() proxyDataboxModel.setSourceModel(foundBoxModel) } + + Component.onDestruction: { + statusBar.visible = false + } + DataboxListModel { id: foundBoxModel Component.onCompleted: { @@ -79,7 +84,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - statusBar.visible = false pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageMessageSearch.qml b/qml/pages/PageMessageSearch.qml index 44fc518d..82ef99a7 100644 --- a/qml/pages/PageMessageSearch.qml +++ b/qml/pages/PageMessageSearch.qml @@ -41,9 +41,15 @@ Item { property var statusBar property int soughtMsgType: MessageType.TYPE_RECEIVED | MessageType.TYPE_SENT + Component.onCompleted: { searchPhraseText.forceActiveFocus() } + + Component.onDestruction: { + statusBar.visible = false + } + MessageListModel { id: messageModel Component.onCompleted: { @@ -58,7 +64,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - statusBar.visible = false pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageSendMessage.qml b/qml/pages/PageSendMessage.qml index 66d5c846..26ec4e07 100644 --- a/qml/pages/PageSendMessage.qml +++ b/qml/pages/PageSendMessage.qml @@ -144,6 +144,10 @@ Item { } } + Component.onDestruction: { + statusBar.visible = false + } + /* File dialog for choose of files from the storage */ FileDialogue { id: fileDialogue @@ -193,7 +197,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - statusBar.visible = false pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageSettingsAccount.qml b/qml/pages/PageSettingsAccount.qml index f8d3ec67..122abde1 100644 --- a/qml/pages/PageSettingsAccount.qml +++ b/qml/pages/PageSettingsAccount.qml @@ -39,6 +39,7 @@ Item { property bool isNewAccount: (userName == "") property string sLoginMethod: "pwd" + Component.onCompleted: { if (!isNewAccount) { accounts.getAccountData(userName) diff --git a/qml/pages/PageSettingsGeneral.qml b/qml/pages/PageSettingsGeneral.qml index c1d857ca..46760be3 100644 --- a/qml/pages/PageSettingsGeneral.qml +++ b/qml/pages/PageSettingsGeneral.qml @@ -45,6 +45,11 @@ Item { languageComboBoxId.currentIndex = langugeComboBoxIndex fontSizeSpinBox.setVal(settings.fontSize()) } + + Component.onDestruction: { + settings.saveAllSettings(accountModel) + } + PageHeader { id: headerBar title: qsTr("General settings") @@ -54,7 +59,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - settings.saveAllSettings(accountModel) pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageSettingsStorage.qml b/qml/pages/PageSettingsStorage.qml index 84663f36..0103518d 100644 --- a/qml/pages/PageSettingsStorage.qml +++ b/qml/pages/PageSettingsStorage.qml @@ -49,6 +49,14 @@ Item { zfoDbSizeSpinBox.value = currentZfoSize dbPathText.text = settings.dbPath() } + + Component.onDestruction: { + settings.saveAllSettings(accountModel) + if (currentZfoSize > zfoDbSizeSpinBox.value) { + zfo.reduceZfoDbSize(currentZfoSize-zfoDbSizeSpinBox.value); + } + } + PageHeader { id: headerBar title: qsTr("Storage settings") @@ -58,10 +66,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - settings.saveAllSettings(accountModel) - if (currentZfoSize > zfoDbSizeSpinBox.value) { - zfo.reduceZfoDbSize(currentZfoSize-zfoDbSizeSpinBox.value); - } pageView.pop(StackView.Immediate) } } diff --git a/qml/pages/PageSettingsSync.qml b/qml/pages/PageSettingsSync.qml index 4cc01f28..59d3839c 100644 --- a/qml/pages/PageSettingsSync.qml +++ b/qml/pages/PageSettingsSync.qml @@ -38,6 +38,11 @@ Item { downloadOnlyNewMsgs.checked = settings.downloadOnlyNewMsgs() downloadCompleteMsgs.checked = settings.downloadCompleteMsgs() } + + Component.onDestruction: { + settings.saveAllSettings(accountModel) + } + PageHeader { id: headerBar title: qsTr("Synchronization settings") @@ -47,7 +52,6 @@ Item { anchors.bottom: parent.bottom width: parent.width * backMouseAreaRatio onClicked: { - settings.saveAllSettings(accountModel) pageView.pop(StackView.Immediate) } } -- GitLab