From 4b0dcb95bf32796947bff3ac0d7dc766cc7cd9ea Mon Sep 17 00:00:00 2001 From: selsta Date: Sat, 25 Apr 2020 21:10:25 +0200 Subject: [PATCH] StandardDialog: reset button text on close --- components/StandardDialog.qml | 4 ++++ main.qml | 1 - pages/settings/SettingsInfo.qml | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 38f0d369..df1aa2f4 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -90,6 +90,10 @@ Rectangle { function close() { root.visible = false; + // reset button text + okButton.text = qsTr("OK") + cancelButton.text = qsTr("Cancel") + closeCallback(); } diff --git a/main.qml b/main.qml index bb68008d..c5913f5f 100644 --- a/main.qml +++ b/main.qml @@ -1481,7 +1481,6 @@ ApplicationWindow { confirmationDialog.text += qsTr("Note: lmdb folder not found. A new folder will be created.") + "\n\n" confirmationDialog.icon = StandardIcon.Question - confirmationDialog.cancelText = qsTr("Cancel") // Continue confirmationDialog.onAcceptedCallback = function() { diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml index 84d066e7..23346e77 100644 --- a/pages/settings/SettingsInfo.qml +++ b/pages/settings/SettingsInfo.qml @@ -212,7 +212,6 @@ Rectangle { + "The old wallet cache file will be renamed and can be restored later.\n" ); confirmationDialog.icon = StandardIcon.Question - confirmationDialog.cancelText = qsTr("Cancel") confirmationDialog.onAcceptedCallback = function() { appWindow.closeWallet(function() { walletManager.clearWalletCache(persistentSettings.wallet_path);