diff --git a/qml/pages/PageAccountDetail.qml b/qml/pages/PageAccountDetail.qml index 14b739b642ecc8246b7138a563e5ec846f4237b7..3bcf1936f3fd737ab121d8dade1f56e456a6ced3 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 9b202d76495e720b188f94e7103528e49df70265..ee28ae395268a65feafeb7270108b2d93e86fc02 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 f4de77aa6559fa60b0a62467a755e5c0b634777d..11362c94949c4a89ac8737b62b5643a1707c87be 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/PageMessageList.qml b/qml/pages/PageMessageList.qml index 8c538f5cd99a1650b877967672b101ceab7b71d5..ee5ea56b2d76b06f1495b97f3b46ec412bcb3910 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() } } diff --git a/qml/pages/PageMessageSearch.qml b/qml/pages/PageMessageSearch.qml index 44fc518d5c4a97cd12e2354e28cec96e1d457ab4..82ef99a708178bb360ea8c1f797c70faba9c944f 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 66d5c8462c0226e0bc07f311052d3776e5aa4d8a..26ec4e0715ab6dff25695d76dd021814e634d4df 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 f8d3ec6752858739bbc1264b757b70f0253891c2..122abde1ecde1520e40af48230a870911719a5d6 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 c1d857ca48835da005da7a4dcd71316a4609a6b8..46760be351cd64797aeeea2eaa8629473756d75f 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 84663f360779799f1e5c30b18ee70eb2e168ff70..0103518dfbc1835c88b8d0fa38a3ba986c6a5945 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 4cc01f2882a9b07e5881f9e331732de9485df098..59d3839c105d086962d9ab9b452a66883fcb6291 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) } }