From 864d1297e7b9939c33a014588e33ab0eecdf8ae8 Mon Sep 17 00:00:00 2001 From: Dubslow Date: Tue, 3 Feb 2015 18:22:05 -0600 Subject: [PATCH] More descriptive dialog text --- src/coreencryption.cpp | 4 +++- src/widget/widget.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/coreencryption.cpp b/src/coreencryption.cpp index 163a86fba..e5c401552 100644 --- a/src/coreencryption.cpp +++ b/src/coreencryption.cpp @@ -225,6 +225,7 @@ void Core::checkEncryptedHistory() QString a(tr("Please enter the password for the chat history for the %1 profile.", "used in load() when no hist pw set").arg(Settings::getInstance().getCurrentProfile())); QString b(tr("The previous password is incorrect; please try again:", "used on retries in load()")); + QString c(tr("Disabling chat history now will leave the encrypted history intact (but not usable); if you later remember the password, you may re-enable encryption from the Privacy tab with the correct password to use the history.", "part of history password dialog")); QString dialogtxt; if (pwsaltedkeys[ptHistory]) @@ -235,6 +236,7 @@ void Core::checkEncryptedHistory() } else dialogtxt = a; + dialogtxt += "\n" + c; if (pwsaltedkeys[ptMain]) { @@ -264,7 +266,7 @@ void Core::checkEncryptedHistory() setPassword(pw, ptHistory, reinterpret_cast(salt.data())); error = exists && !HistoryKeeper::checkPassword(); - dialogtxt = a + "\n" + b; + dialogtxt = a + "\n" + c + "\n" + b; } while (error); } diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 62f4b2db1..71e4a042b 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -1313,6 +1313,7 @@ QString Widget::passwordDialog(const QString& cancel, const QString& body) if (!ret.isEmpty()) return ret; } + dialog.setTextValue(""); dialog.setLabelText(body + "\n" + tr("You must enter a non-empty password.")); } }