From 37fffff644e328b079ff5a5290795522eb9ba642 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 4 Jun 2019 20:15:37 +0200 Subject: [PATCH] Change Hotkey for Window submenu in View - List of @craigo- https://github.com/rizonesoft/Notepad3/issues/1274#issuecomment-498527005 --- Build/Changes.txt | 7 +++++++ language/np3_en_gb/menu_en_gb.rc | 10 +++++----- language/np3_en_us/menu_en_us.rc | 10 +++++----- language/np3_pt_br/menu_pt_br.rc | 10 +++++----- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index ea08e9fe8..97e050737 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -40,6 +40,13 @@ NEW: -------------------------------------------------- CHANGES: -------------------------------------------------- +- Add a top level menu "Appearance" +- Force Encoding Detector result -> Recode to UCHARDET Analysis +- In case of (partial) selection, copy only selection instead of complete hyperlink (issue #1296) +- New top-level menu "Appearance" holding Themes and Schemes stuff (en-US, en-GB and de-DE) +- Rearranging the" Encoding" menu +- replace Onigmo by Oniguruma +- CED -> UCHARDET license and acknowledgement - In case of (partial) selection, copy only selection instead of complete hyperlink - MUI - Rearranging the Language and Themes menus diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index c9e810b2e..1f7835f44 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -291,15 +291,15 @@ BEGIN END POPUP "&View" BEGIN - MENUITEM "Word W&rap\tCtrl+W", IDM_VIEW_WORDWRAP + MENUITEM "&Word Wrap\tCtrl+W", IDM_VIEW_WORDWRAP MENUITEM "&Long Line Marker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER - MENUITEM "Indent&ation Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES + MENUITEM "Indentation &Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR - MENUITEM "Show Wra&p Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS + MENUITEM "Show W&rap Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS MENUITEM "Show &Blanks\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR - MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS + MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP "Highlight C&urrent Line\tCtrl+Shift+I" BEGIN @@ -334,7 +334,7 @@ BEGIN MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END - POPUP "&Toolbar" + POPUP "T&oolbar" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 683e8b767..77d455061 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -291,15 +291,15 @@ BEGIN END POPUP "&View" BEGIN - MENUITEM "Word W&rap\tCtrl+W", IDM_VIEW_WORDWRAP + MENUITEM "&Word Wrap\tCtrl+W", IDM_VIEW_WORDWRAP MENUITEM "&Long Line Marker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER - MENUITEM "Indent&ation Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES + MENUITEM "Indentation &Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR - MENUITEM "Show Wra&p Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS + MENUITEM "Show W&rap Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS MENUITEM "Show &Blanks\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR - MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS + MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP "Highlight C&urrent Line\tCtrl+Shift+I" BEGIN @@ -334,7 +334,7 @@ BEGIN MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END - POPUP "&Toolbar" + POPUP "T&oolbar" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 0ff79a285..4f8260359 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -291,15 +291,15 @@ BEGIN END POPUP "&View" BEGIN - MENUITEM "Word W&rap\tCtrl+W", IDM_VIEW_WORDWRAP + MENUITEM "&Word Wrap\tCtrl+W", IDM_VIEW_WORDWRAP MENUITEM "&Long Line Marker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER - MENUITEM "Indent&ation Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES + MENUITEM "Indentation &Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR - MENUITEM "Show Wra&p Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS + MENUITEM "Show W&rap Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS MENUITEM "Show &Blanks\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR - MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS + MENUITEM "&Hyperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP "Highlight C&urrent Line\tCtrl+Shift+I" BEGIN @@ -334,7 +334,7 @@ BEGIN MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END - POPUP "&Toolbar" + POPUP "T&oolbar" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB