Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add ellipsis

Browse Source 
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.
This commit is contained in:
Josh Soref 2017-07-16 15:35:23 -04:00 committed by Janek Bevendorff
parent c0f668c4bb
commit f71d0c0da8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/format/KeePass2Reader.cpp
View File

@ -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;

16
src/gui/MainWindow.ui
View File

@ -309,7 +309,7 @@
</action>
<action name="actionDatabaseOpen">
<property name="text">
<string>&amp;Open database</string>
<string>&amp;Open database...</string>
</property>
</action>
<action name="actionDatabaseSave">
@ -391,7 +391,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>Sa&amp;ve database as</string>
<string>Sa&amp;ve database as...</string>
</property>
</action>
<action name="actionChangeMasterKey">
@ -399,7 +399,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>Change &amp;master key</string>
<string>Change &amp;master key...</string>
</property>
</action>
<action name="actionChangeDatabaseSettings">
@ -517,22 +517,22 @@
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Export to CSV file</string>
<string>&amp;Export to CSV file...</string>
</property>
</action>
<action name="actionImportKeePass1">
<property name="text">
<string>Import KeePass 1 database</string>
<string>Import KeePass 1 database...</string>
</property>
</action>
<action name="actionImportCsv">
<property name="text">
<string>Import CSV file</string>
<string>Import CSV file...</string>
</property>
</action>
<action name="actionRepairDatabase">
<property name="text">
<string>Re&amp;pair database</string>
<string>Re&amp;pair database...</string>
</property>
</action>
<action name="actionEntryTotp">
@ -542,7 +542,7 @@
</action>
<action name="actionEntrySetupTotp">
<property name="text">
<string>Set up TOTP</string>
<string>Set up TOTP...</string>
</property>
</action>
<action name="actionEntryCopyTotp">