From c6dde6d2704f48e4ca5da588b53abf5d9e86022a Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 27 Jul 2015 23:09:41 +0200 Subject: [PATCH] Fixed issue #2513: TortoiseGitUDiff: Add keyboard shortcuts Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 74 +++++++++++++++++++++----------------- src/Changelog.txt | 1 + src/TortoiseIDiff/TortoiseIDiff.rc | 32 ++++++++--------- src/TortoiseUDiff/TortoiseUDiff.rc | 11 +++--- 4 files changed, 64 insertions(+), 54 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 3c21be0fe..728fcf66f 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -643,7 +643,7 @@ msgid "&Enable edit" msgstr "" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" #. Resource IDs: (5152) @@ -662,12 +662,12 @@ msgstr "" msgid "&Find" msgstr "" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "" #. Resource IDs: (32778) -msgid "&Fit images in window" +msgid "&Fit images in window\tF" msgstr "" #. Resource IDs: (1050) @@ -756,7 +756,7 @@ msgid "&Image" msgstr "" #. Resource IDs: (32790) -msgid "&Image info" +msgid "&Image info\tI" msgstr "" #. Resource IDs: (16505) @@ -952,7 +952,7 @@ msgstr "" msgid "&Onto" msgstr "" -#. Resource IDs: (1602, 20014, 32773) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "" @@ -960,11 +960,7 @@ msgstr "" msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -977,7 +973,7 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" +msgid "&Overlay images\tO" msgstr "" #. Resource IDs: (1411, 5002, 65535) @@ -1000,10 +996,14 @@ msgstr "" msgid "&Print Preview" msgstr "" -#. Resource IDs: (32782, 58116) +#. Resource IDs: (58116) msgid "&Print..." msgstr "" +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "" + #. Resource IDs: (9677) msgid "&Proceed" msgstr "" @@ -1136,7 +1136,7 @@ msgstr "" msgid "&Saturation:" msgstr "" -#. Resource IDs: (1125, 16921, 32776) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "" @@ -1152,6 +1152,10 @@ msgstr "" msgid "&Save list of selected files to..." msgstr "" +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "" + #. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1977,7 +1981,7 @@ msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" +msgid "Arrange &vertical\tV" msgstr "" #. Resource IDs: (4210) @@ -4699,11 +4703,11 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) @@ -5221,23 +5225,23 @@ msgstr "" msgid "ID:220:V C +G" msgstr "" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32773; 'Save &as...' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open...' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" @@ -5249,27 +5253,27 @@ msgstr "" msgid "ID:32775:V C +D" msgstr "" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "" -#. Accelerator Entry for Menu ID:32782; '&Print...' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "" @@ -5281,11 +5285,11 @@ msgstr "" msgid "ID:32811:V C +U" msgstr "" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "" @@ -6846,7 +6850,7 @@ msgid "Options" msgstr "" #. Resource IDs: (32779) -msgid "Ori&ginal size" +msgid "Ori&ginal size\tS" msgstr "" #. Resource IDs: (1531) @@ -8107,10 +8111,14 @@ msgstr "" msgid "Save" msgstr "" -#. Resource IDs: (1600, 32773, 57604) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "" +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "" + #. Resource IDs: (61441) msgid "Save As" msgstr "" @@ -10580,7 +10588,7 @@ msgid "Zip File" msgstr "" #. Resource IDs: (32783) -msgid "Zoo&m out" +msgid "Zoo&m out\t-" msgstr "" #. Resource IDs: (17093) @@ -10609,7 +10617,7 @@ msgid "Zoom Out\nZoom Out" msgstr "" #. Resource IDs: (32784) -msgid "Zoom i&n" +msgid "Zoom i&n\t+" msgstr "" #. Resource IDs: (32772) diff --git a/src/Changelog.txt b/src/Changelog.txt index 8f5359efe..b05cd56be 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -17,6 +17,7 @@ Released: unreleased * Fixed issue #1793: Fetch + rebase: Launch rebase only if the branch is not up to date * Fixed issue #1886: Fetch&Rebase should allow automatic branch update if FF * Fixed issue #836: Do not auto-select deleted but unstaged files on commit dialog (optional) + * Fixed issue #2513: TortoiseGitUDiff: Add keyboard shortcuts == Bug Fixes == * Fixed issue #2495: "Show Reflog" dialog shows empty action for "push" entries diff --git a/src/TortoiseIDiff/TortoiseIDiff.rc b/src/TortoiseIDiff/TortoiseIDiff.rc index 18b903078..f6e5341d0 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.rc +++ b/src/TortoiseIDiff/TortoiseIDiff.rc @@ -105,26 +105,26 @@ IDC_TORTOISEIDIFF MENU BEGIN POPUP "&File" BEGIN - MENUITEM "&Open", ID_FILE_OPEN + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "E&xit", IDM_EXIT END POPUP "&View" BEGIN - MENUITEM "&Overlay images", ID_VIEW_OVERLAPIMAGES + MENUITEM "&Overlay images\tO", ID_VIEW_OVERLAPIMAGES MENUITEM "Blend alpha", ID_VIEW_BLENDALPHA, INACTIVE MENUITEM "&Link image positions", ID_VIEW_LINKIMAGESTOGETHER, CHECKED - MENUITEM "Fit image &widths", ID_VIEW_FITIMAGEWIDTHS - MENUITEM "Fit image &heights", ID_VIEW_FITIMAGEHEIGHTS - MENUITEM "&Fit images in window", ID_VIEW_FITIMAGESINWINDOW - MENUITEM "Ori&ginal size", ID_VIEW_ORININALSIZE + MENUITEM "Fit image &widths\tW", ID_VIEW_FITIMAGEWIDTHS + MENUITEM "Fit image &heights\tH", ID_VIEW_FITIMAGEHEIGHTS + MENUITEM "&Fit images in window\tF", ID_VIEW_FITIMAGESINWINDOW + MENUITEM "Ori&ginal size\tS", ID_VIEW_ORININALSIZE MENUITEM "Transparent &color...", ID_VIEW_TRANSPARENTCOLOR MENUITEM SEPARATOR - MENUITEM "Zoo&m out", ID_VIEW_ZOOMOUT - MENUITEM "Zoom i&n", ID_VIEW_ZOOMIN + MENUITEM "Zoo&m out\t-", ID_VIEW_ZOOMOUT + MENUITEM "Zoom i&n\t+", ID_VIEW_ZOOMIN MENUITEM SEPARATOR - MENUITEM "&Image info", ID_VIEW_IMAGEINFO - MENUITEM "Arrange &vertical", ID_VIEW_ARRANGEVERTICAL + MENUITEM "&Image info\tI", ID_VIEW_IMAGEINFO + MENUITEM "Arrange &vertical\tV", ID_VIEW_ARRANGEVERTICAL END MENUITEM "?", ID_ABOUT END @@ -137,15 +137,15 @@ BEGIN END POPUP "&View" BEGIN - MENUITEM "&Fit images in window", ID_VIEW_FITIMAGESINWINDOW - MENUITEM "Ori&ginal size", ID_VIEW_ORININALSIZE + MENUITEM "&Fit images in window\tF", ID_VIEW_FITIMAGESINWINDOW + MENUITEM "Ori&ginal size\tS", ID_VIEW_ORININALSIZE MENUITEM "Transparent &color...", ID_VIEW_TRANSPARENTCOLOR MENUITEM SEPARATOR - MENUITEM "Zoo&m out", ID_VIEW_ZOOMOUT - MENUITEM "Zoom i&n", ID_VIEW_ZOOMIN + MENUITEM "Zoo&m out\t-", ID_VIEW_ZOOMOUT + MENUITEM "Zoom i&n\t+", ID_VIEW_ZOOMIN MENUITEM SEPARATOR - MENUITEM "&Image info", ID_VIEW_IMAGEINFO - MENUITEM "Arrange &vertical", ID_VIEW_ARRANGEVERTICAL + MENUITEM "&Image info\tI", ID_VIEW_IMAGEINFO + MENUITEM "Arrange &vertical\tV", ID_VIEW_ARRANGEVERTICAL END MENUITEM "?", ID_ABOUT END diff --git a/src/TortoiseUDiff/TortoiseUDiff.rc b/src/TortoiseUDiff/TortoiseUDiff.rc index f5068a630..85e589118 100644 --- a/src/TortoiseUDiff/TortoiseUDiff.rc +++ b/src/TortoiseUDiff/TortoiseUDiff.rc @@ -80,18 +80,19 @@ IDC_TORTOISEUDIFF MENU BEGIN POPUP "&File" BEGIN - MENUITEM "&Open...", ID_FILE_OPEN - MENUITEM "&Save", ID_FILE_SAVE - MENUITEM "Save &as...", ID_FILE_SAVEAS + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE + MENUITEM "Save &as...\tCtrl+Shift+S", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "P&age setup...", ID_FILE_PAGESETUP - MENUITEM "&Print...", ID_FILE_PRINT + MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT MENUITEM SEPARATOR MENUITEM "Se&ttings...", ID_FILE_SETTINGS MENUITEM SEPARATOR + MENUITEM "&Find\tCtrl+F", IDM_SHOWFINDBAR MENUITEM "Apply &Patch...", ID_FILE_APPLYPATCH MENUITEM SEPARATOR - MENUITEM "&Exit", ID_FILE_EXIT + MENUITEM "&Exit\tCtrl+W", ID_FILE_EXIT END END -- 2.11.4.GIT