From f71d0c0da8ce64fd3fb2ee54c5bc040add4ca975 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Sun, 16 Jul 2017 15:35:23 -0400 Subject: [PATCH] Add ellipsis The rule for ellipsis is simple: If the described action requires interruption (typically by a dialog) which requires user input, then ellipsis should be used to indicate that triggering the menu will not immediately trigger the desired action. Examples: "Save" does not need an ellipsis in general (when the file name is known) "Open..." needs an ellipsis, as one must select a file to open. "Save as..." needs an ellipsis, as in order to save the file as something, one must select a file name. "About" does not need an ellipsis, while it may open a dialog, that dialog is the desired result. --- src/format/KeePass2Reader.cpp | 2 +- src/gui/MainWindow.ui | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index b0d780724..bb737beda 100644 --- a/src/format/KeePass2Reader.cpp +++ b/src/format/KeePass2Reader.cpp @@ -73,7 +73,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke quint32 signature2 = Endian::readUInt32(m_headerStream, KeePass2::BYTEORDER, &ok); if (ok && signature2 == KeePass1::SIGNATURE_2) { raiseError(tr("The selected file is an old KeePass 1 database (.kdb).\n\n" - "You can import it by clicking on Database > 'Import KeePass 1 database'.\n" + "You can import it by clicking on Database > 'Import KeePass 1 database...'.\n" "This is a one-way migration. You won't be able to open the imported " "database with the old KeePassX 0.4 version.")); return nullptr; diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui index f53b7d0cf..5991077f5 100644 --- a/src/gui/MainWindow.ui +++ b/src/gui/MainWindow.ui @@ -309,7 +309,7 @@ - &Open database + &Open database... @@ -391,7 +391,7 @@ false - Sa&ve database as + Sa&ve database as... @@ -399,7 +399,7 @@ false - Change &master key + Change &master key... @@ -517,22 +517,22 @@ false - &Export to CSV file + &Export to CSV file... - Import KeePass 1 database + Import KeePass 1 database... - Import CSV file + Import CSV file... - Re&pair database + Re&pair database... @@ -542,7 +542,7 @@ - Set up TOTP + Set up TOTP...