From a1ed91ea969677f757e5d06a45d6aff025ff6b40 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 17 May 2015 12:44:35 +0200 Subject: [PATCH] Fixed issue #2507: Support keyboard shortcuts in yes/no prompts Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 44 +++++++++++++++++++++++++-------------- src/Changelog.txt | 1 + src/Resources/TortoiseMergeENG.rc | 4 ++-- src/Resources/TortoiseProcENG.rc | 16 +++++++------- src/Utils/MiscUI/MessageBox.cpp | 24 ++++++++++----------- 5 files changed, 51 insertions(+), 38 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 6659ef4e5..2d78af1dc 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -298,6 +298,10 @@ msgstr "" msgid "&3 way merge" msgstr "" +#. Resource IDs: (73) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "" @@ -506,6 +510,10 @@ msgstr "" msgid "&Compressed Graph" msgstr "" +#. Resource IDs: (73) +msgid "&Continue" +msgstr "" + #. Resource IDs: (501, 1367, 1471, 57634) msgid "&Copy" msgstr "" @@ -582,6 +590,10 @@ msgstr "" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (73) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "" @@ -908,6 +920,10 @@ msgstr "" msgid "&Next Page" msgstr "" +#. Resource IDs: (73) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "" @@ -1096,6 +1112,10 @@ msgstr "" msgid "&Restore old state" msgstr "" +#. Resource IDs: (73) +msgid "&Retry" +msgstr "" + #. Resource IDs: (1252) msgid "&Revert change by this commit" msgstr "" @@ -1252,6 +1272,10 @@ msgstr "" msgid "&Trunk:" msgstr "" +#. Resource IDs: (73) +msgid "&Try Again" +msgstr "" + #. Resource IDs: (3845) msgid "&Two Page" msgstr "" @@ -1320,6 +1344,10 @@ msgstr "" msgid "&Within file" msgstr "" +#. Resource IDs: (73) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -6339,10 +6367,6 @@ msgstr "" msgid "Next inline difference" msgstr "" -#. Resource IDs: (73) -msgid "No" -msgstr "" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" @@ -7761,10 +7785,6 @@ msgstr "" msgid "Restored" msgstr "" -#. Resource IDs: (73) -msgid "Retry" -msgstr "" - #. Resource IDs: (602) msgid "Retrying in 2 seconds..." msgstr "" @@ -9662,10 +9682,6 @@ msgstr "" msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "" -#. Resource IDs: (73) -msgid "Try again" -msgstr "" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" @@ -10342,10 +10358,6 @@ msgstr "" msgid "Wrap long lines at the right border of the view\nWrap long lines" msgstr "" -#. Resource IDs: (73) -msgid "Yes" -msgstr "" - #. Resource IDs: (145) msgid "Yes to all" msgstr "" diff --git a/src/Changelog.txt b/src/Changelog.txt index 1a275475e..b0ee29474 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -9,6 +9,7 @@ Released: unreleased == Bug Fixes == * Fixed issue #2495: "Show Reflog" dialog shows empty action for "push" entries * Fixed issue #2500: Amend with date reset causes an error with git 2.x + * Fixed issue #2507: Support keyboard shortcuts in yes/no prompts = Release 1.8.14.0 = Released: 2015-04-08 diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc index 28dbee432..a779659f8 100644 --- a/src/Resources/TortoiseMergeENG.rc +++ b/src/Resources/TortoiseMergeENG.rc @@ -711,8 +711,8 @@ BEGIN "Save and exclude\nYour changes are saved and the original content is used" IDS_MARKEDBLCOKSSAVEIGNORE "Save and ignore marked blocks\nOnly your manual edits are saved, marked blocks are left as they are" - IDS_MSGBOX_YES "Yes" - IDS_MSGBOX_NO "No" + IDS_MSGBOX_YES "&Yes" + IDS_MSGBOX_NO "&No" IDS_MSGBOX_CANCEL "Cancel" END diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index dce9944e1..a0be59f39 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3140,16 +3140,16 @@ END STRINGTABLE BEGIN IDS_MSGBOX_HELP "Help" - IDS_MSGBOX_DONOTSHOWAGAIN "Don't show this message again" - IDS_MSGBOX_ABORT "Abort" - IDS_MSGBOX_RETRY "Retry" - IDS_MSGBOX_IGNORE "Ignore" + IDS_MSGBOX_DONOTSHOWAGAIN "&Don't show this message again" + IDS_MSGBOX_ABORT "&Abort" + IDS_MSGBOX_RETRY "&Retry" + IDS_MSGBOX_IGNORE "&Ignore" IDS_MSGBOX_CANCEL "Cancel" - IDS_MSGBOX_TRYAGAIN "Try again" - IDS_MSGBOX_CONTINUE "Continue" + IDS_MSGBOX_TRYAGAIN "&Try Again" + IDS_MSGBOX_CONTINUE "&Continue" IDS_MSGBOX_OK "OK" - IDS_MSGBOX_YES "Yes" - IDS_MSGBOX_NO "No" + IDS_MSGBOX_YES "&Yes" + IDS_MSGBOX_NO "&No" IDS_SVNACTION_ADD "Added" IDS_SVNACTION_COPY "Copied" IDS_SVNACTION_DELETE "Deleted" diff --git a/src/Utils/MiscUI/MessageBox.cpp b/src/Utils/MiscUI/MessageBox.cpp index a04d56203..b472a725f 100644 --- a/src/Utils/MiscUI/MessageBox.cpp +++ b/src/Utils/MiscUI/MessageBox.cpp @@ -302,21 +302,21 @@ int CMessageBox::FillBoxStandard(UINT uType) { case MB_ABORTRETRYIGNORE: #ifndef IDS_MSGBOX_ABORT - m_sButton1 = "Abort"; + m_sButton1 = "&Abort"; #else m_i18l.LoadString(IDS_MSGBOX_ABORT); m_sButton1 = m_i18l; #endif m_uButton1Ret = IDABORT; #ifndef IDS_MSGBOX_RETRY - m_sButton2 = "Retry"; + m_sButton2 = "&Retry"; #else m_i18l.LoadString(IDS_MSGBOX_RETRY); m_sButton2 = m_i18l; #endif m_uButton2Ret = IDRETRY; #ifndef IDS_MSGBOX_IGNORE - m_sButton3 = "Ignore"; + m_sButton3 = "&Ignore"; #else m_i18l.LoadString(IDS_MSGBOX_IGNORE); m_sButton3 = m_i18l; @@ -332,14 +332,14 @@ int CMessageBox::FillBoxStandard(UINT uType) #endif m_uButton1Ret = IDCANCEL; #ifndef IDS_MSGBOX_TRYAGAIN - m_sButton2 = "Try Again"; + m_sButton2 = "&Try Again"; #else m_i18l.LoadString(IDS_MSGBOX_TRYAGAIN); m_sButton2 = m_i18l; #endif m_uButton2Ret = IDTRYAGAIN; #ifndef IDS_MSGBOX_CONTINUE - m_sButton3 = "Continue"; + m_sButton3 = "&Continue"; #else m_i18l.LoadString(IDS_MSGBOX_CONTINUE); m_sButton3 = m_i18l; @@ -348,7 +348,7 @@ int CMessageBox::FillBoxStandard(UINT uType) break; case MB_OKCANCEL: #ifndef IDS_MSGBOX_OK - m_sButton1 = "Ok"; + m_sButton1 = "OK"; #else m_i18l.LoadString(IDS_MSGBOX_OK); m_sButton1 = m_i18l; @@ -364,7 +364,7 @@ int CMessageBox::FillBoxStandard(UINT uType) break; case MB_RETRYCANCEL: #ifndef IDS_MSGBOX_RETRY - m_sButton1 = "Retry"; + m_sButton1 = "&Retry"; #else m_i18l.LoadString(IDS_MSGBOX_RETRY); m_sButton1 = m_i18l; @@ -380,14 +380,14 @@ int CMessageBox::FillBoxStandard(UINT uType) break; case MB_YESNO: #ifndef IDS_MSGBOX_YES - m_sButton1 = "Yes"; + m_sButton1 = "&Yes"; #else m_i18l.LoadString(IDS_MSGBOX_YES); m_sButton1 = m_i18l; #endif m_uButton1Ret = IDYES; #ifndef IDS_MSGBOX_NO - m_sButton2 = "No"; + m_sButton2 = "&No"; #else m_i18l.LoadString(IDS_MSGBOX_NO); m_sButton2 = m_i18l; @@ -396,14 +396,14 @@ int CMessageBox::FillBoxStandard(UINT uType) break; case MB_YESNOCANCEL: #ifndef IDS_MSGBOX_YES - m_sButton1 = "Yes"; + m_sButton1 = "&Yes"; #else m_i18l.LoadString(IDS_MSGBOX_YES); m_sButton1 = m_i18l; #endif m_uButton1Ret = IDYES; #ifndef IDS_MSGBOX_NO - m_sButton2 = "No"; + m_sButton2 = "&No"; #else m_i18l.LoadString(IDS_MSGBOX_NO); m_sButton2 = m_i18l; @@ -420,7 +420,7 @@ int CMessageBox::FillBoxStandard(UINT uType) case MB_OK: default: #ifndef IDS_MSGBOX_OK - m_sButton1 = "Ok"; + m_sButton1 = "OK"; #else m_i18l.LoadString(IDS_MSGBOX_OK); m_sButton1 = m_i18l; -- 2.11.4.GIT