diff --git a/language/common_res.rc b/language/common_res.rc index e095fc56b..2926dcbc0 100644 --- a/language/common_res.rc +++ b/language/common_res.rc @@ -93,7 +93,7 @@ IDS_MUI_ABOUT_LIBS "\ \\cf0 K.Takata (Onigmo Regex)\\tab https://github.com/k-takata/Onigmo\\par\ \\cf0 D.Dyer (NotepadCrypt)\\tab https://www.real-me.net/ddyer/notepad/NotepadCrypt.html\\par\ \\cf0 T.D.Hanson (uthash)\\tab https://troydhanson.github.io/uthash\\par\ -\\cf0 Jinsuk Kim (CED EncDet)\\tab https://github.com/google/compact_enc_det\\par\ +\\cf0 Carbo Kuo (Mozilla's uchardet)\\tab https://www.freedesktop.org/wiki/Software/uchardet\\par\ \\cf0 Lewis Van Winkle (TinyExpr)\\tab https://github.com/codeplea/tinyexpr\\par\ \\cf0 \\par\ " @@ -131,7 +131,7 @@ IDS_MUI_ABOUT_LICENSES "\ \\cf0 Scintilla\\tab https://www.scintilla.org/License.txt\\par\ \\cf0 Onigmo Regex\\tab https://github.com/kkos/oniguruma/blob/master/COPYING\\par\ \\cf0 uthash\\tab https://troydhanson.github.io/uthash/license.html\\par\ -\\cf0 CED\\tab https://github.com/google/compact_enc_det/blob/master/LICENSE\\par\ +\\cf0 uchardet\\tab https://www.freedesktop.org/wiki/Software/uchardet/#license\\par\ \\cf0 TinyExpr\\tab https://github.com/codeplea/tinyexpr/blob/master/LICENSE\\par\ \\cf0 \\par\ " diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index e62445e6b..e03796b2a 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Meer...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Force Enkodering Opsporing", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR - MENUITEM "Hercodeer na &Standaard\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Hercodeer na &ANSI\tCtrl-Shift+A", CMD_RECODEANSI - MENUITEM "Hercodeer na &OEM\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Hercodeer na &Standaard\tCtrl-Alt-F", CMD_RECODEDEFAULT + MENUITEM "Hercodeer na &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Hercodeer na &OEM\tCtrl+Shift+O", CMD_RECODEOEM + MENUITEM "Hercodeer na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Hercodeer na UCHARDET-analise", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII as UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignoreer Kodering &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Strip &Eerste Karakter\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Strip &Laaste Karakter\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Strip &Agterliggende Spasies\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "&Kompres Spasies\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "&Kompres Spasies\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modifiseer Lyne...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Bring Lyne in Lyn...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 2ec71480f..26272d039 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 BO&M", IDM_ENCODING_UTF8SIGN MENUITEM "&...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM " ", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM " &\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM " A&NSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM " &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM " &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM " &UCHARDET ", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM " ASCII & UTF-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM " & \tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM " \tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM " \tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM " \tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "' \tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "' \tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "& ...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "& ...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 925cef42c..060909b7e 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 mit &Signatur", IDM_ENCODING_UTF8SIGN MENUITEM "&Mehr Codierungen...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Erzwinge Encoding Detection", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Recodiere als &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Recodiere als &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Recodiere als &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recodiere als &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Recodiere wie UCHARDET Analyse", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII als UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignoriere Codierungs &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "&Entferne ersten Buchstaben\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Entferne letzten &Buchstaben\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Entferne &anhngende Leerzeichen\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Vereinige &Leerzeichen\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Vereinige &Leerzeichen\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Numeriere Zeilen...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Zeilen &ausrichten...\tAlt+J", IDM_EDIT_ALIGN @@ -295,17 +294,6 @@ BEGIN END POPUP "&Ansicht" BEGIN - POPUP "&Themen" - BEGIN - MENUITEM "&Syntax Schemata anpassen...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG - MENUITEM SEPARATOR - MENUITEM "Standard Synta&x Schema...\tF12", IDM_VIEW_SCHEME - MENUITEM "&2tes Standard Schema\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM SEPARATOR - MENUITEM "Globaler &Standard Font...\tAlt+F12", IDM_VIEW_FONT - MENUITEM "Aktueller Schema Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME - END - MENUITEM SEPARATOR MENUITEM "Langzeilen Umbruch\tCtrl+W", IDM_VIEW_WORDWRAP MENUITEM "&Langzeilen Markierung\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER MENUITEM "Leitlinien Einrckung\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES @@ -374,6 +362,16 @@ BEGIN MENUITEM "Fenster Position einfrieren", IDM_VIEW_STICKYWINPOS END END + POPUP "&Aussehen" + BEGIN + MENUITEM "&Schemata anpassen...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR + MENUITEM "Synta&x Schema whlen...\tF12", IDM_VIEW_SCHEME + MENUITEM "&2tes Standard Schema\tShift+F12", IDM_VIEW_USE2NDDEFAULT + MENUITEM SEPARATOR + MENUITEM "Globaler &Standard Font...\tAlt+F12", IDM_VIEW_FONT + MENUITEM "Aktueller Schema Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME + END POPUP "&Einstellungen" BEGIN MENUITEM "Tabs mittels &Leerzeichen einfgen", IDM_VIEW_TABSASSPACES diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 318738a19..0e0a1c8c4 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "&Sprache" - IDS_MUI_MENU_THEMES "&Thema Wechseln" + IDS_MUI_MENU_THEMES "&Schema Sammlung" IDM_THEMES_DEFAULT "Fabrik-Vorgaben" IDM_THEMES_FILE_ITEM "Standard Einstellungen" END diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index f74b7c6d9..92b7cf12a 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Force Encoding Detection", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Recode to &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Recode to &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Recode to UCHARDET Analysis", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII as UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignore Encoding &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Strip &First Character\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Strip &Last Character\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Compress &Blanks\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Compress &Blanks\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN @@ -295,17 +294,6 @@ BEGIN END POPUP "&View" BEGIN - POPUP "&Themes" - BEGIN - MENUITEM "&Customise Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG - MENUITEM SEPARATOR - MENUITEM "Synta&x Scheme...\tF12", IDM_VIEW_SCHEME - MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM SEPARATOR - MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT - MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME - END - MENUITEM SEPARATOR MENUITEM "Word W&rap\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 @@ -374,6 +362,16 @@ BEGIN MENUITEM "Sticky Window &Position", IDM_VIEW_STICKYWINPOS END END + POPUP "A&ppearance" + BEGIN + MENUITEM "&Customise Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR + MENUITEM "Select Synta&x Scheme...\tF12", IDM_VIEW_SCHEME + MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT + MENUITEM SEPARATOR + MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT + MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME + END POPUP "&Settings" BEGIN MENUITEM "Insert Tabs as &Spaces", IDM_VIEW_TABSASSPACES diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index 9c8df363f..43b038305 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "&Language" - IDS_MUI_MENU_THEMES "&Switch Theme" + IDS_MUI_MENU_THEMES "&Scheme Collection" IDM_THEMES_DEFAULT "Factory Default" IDM_THEMES_FILE_ITEM "Standard Settings" END diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 2dde4c85f..04f9e2dad 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Force Encoding Detection", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Recode to &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Recode to &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Recode to UCHARDET Analysis", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII as UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignore Encoding &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Strip &First Character\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Strip &Last Character\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Compress &Blanks\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Compress &Blanks\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN @@ -295,17 +294,6 @@ BEGIN END POPUP "&View" BEGIN - POPUP "&Themes" - BEGIN - MENUITEM "&Customize Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG - MENUITEM SEPARATOR - MENUITEM "Synta&x Scheme...\tF12", IDM_VIEW_SCHEME - MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM SEPARATOR - MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT - MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME - END - MENUITEM SEPARATOR MENUITEM "Word W&rap\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 @@ -374,6 +362,16 @@ BEGIN MENUITEM "Sticky Window &Position", IDM_VIEW_STICKYWINPOS END END + POPUP "A&ppearance" + BEGIN + MENUITEM "&Customize Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR + MENUITEM "Select Synta&x Scheme...\tF12", IDM_VIEW_SCHEME + MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT + MENUITEM SEPARATOR + MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT + MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME + END POPUP "&Settings" BEGIN MENUITEM "Insert Tabs as &Spaces", IDM_VIEW_TABSASSPACES diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 13387eb18..666269fd6 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "&Language" - IDS_MUI_MENU_THEMES "&Switch Theme" + IDS_MUI_MENU_THEMES "&Scheme Collection" IDM_THEMES_DEFAULT "Factory Default" IDM_THEMES_FILE_ITEM "Standard Settings" END diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 8bdf4b9ff..af0a4ed16 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 con &signatura", IDM_ENCODING_UTF8SIGN MENUITEM "&Ms...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Forzar la Deteccin de Codificacin", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR - MENUITEM "Recodificar a &Defecto\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Recodificar a &ANSI\tCtrl-Shift+A", CMD_RECODEANSI - MENUITEM "Recodificar a &OEM\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Recodificar a &Defecto\tCtrl-Alt-F", CMD_RECODEDEFAULT + MENUITEM "Recodificar a &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Recodificar a &OEM\tCtrl+Shift+O", CMD_RECODEOEM + MENUITEM "Recodificar a &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Recodificar a anlisis UCHARDET", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII como UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignorar Codificacin &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Eliminar el &primer carcter\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Eliminar el <imo carcter\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Eliminar los blancos al &final de lnea\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Comprimir &blancos\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Comprimir &blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modificar lneas...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Alinear lneas...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index de7eb3c2b..721385d89 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 avec &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Plus...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Forcer la dtection d'encodage", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Rencoder vers &Dfaut\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Rencoder vers &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Rencoder vers &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Rencoder vers &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Rencoder vers analyse UCHARDET", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII comme UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignorer Encodage &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Supprimer le &premier charactre\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Supprimer le &dernier charactre\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Supprimer les b&lancs en fin de ligne\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Compresser les blancs\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Compresser les blancs\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modifier les lignes...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Aligner les lignes...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc index e2cb6cfe5..08a7a0c16 100644 --- a/language/np3_hu_hu/dialogs_hu_hu.rc +++ b/language/np3_hu_hu/dialogs_hu_hu.rc @@ -89,7 +89,7 @@ BEGIN CONTROL "&Kisbet/nagybet szmt",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10 CONTROL "E&gsz szavakra egyezs",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10 CONTROL "Sz ele&jre egyezs",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 - CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10 + CONTROL "&Visszaperjel talaktsa",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10 CONTROL "R&egulris kifejezssel",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10 CONTROL "Pont &mindenre egyezik",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10 CONTROL "&Ne menjen krbe",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10 @@ -98,7 +98,7 @@ BEGIN CONTROL "&Joker kar. keress",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,63,10 CONTROL "tltsz md, ha nincs fkuszban ",IDC_TRANSPARENT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,118,124,10 - DEFPUSHBUTTON "&Kvetkez keresse",IDOK,211,7,55,14 + DEFPUSHBUTTON "&Kv. keresse",IDOK,211,7,55,14 PUSHBUTTON "&Elz keresse",IDC_FINDPREV,211,24,55,14 PUSHBUTTON "Bezrs",IDCANCEL,211,99,55,14 CONTROL "Csere... (Ctrl+H)",IDC_TOGGLEFINDREPLACE, @@ -123,7 +123,7 @@ BEGIN CONTROL "Kis/nagybet eg&yezs",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10 CONTROL "Egs&z szavakra egyezs",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10 CONTROL "Szkez&detre egyezs",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10 - CONTROL "&Fordtott perjelek talaktsa",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 + CONTROL "&Backslash-ek talaktsa",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 CONTROL "R&egulris kifejezs keresse",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10 CONTROL "Pont &mindenre illeszkedik",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10 CONTROL "Ne keressen kr&ben",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 @@ -285,9 +285,9 @@ CAPTION "Sz FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 - CONTROL "Kivlasztott sznkiemels bellts &alaprtelmezett.",IDC_DEFAULTSCHEME, + CONTROL "E sznkiemels bellts &alaprtelmezett.",IDC_DEFAULTSCHEME, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 - CONTROL "Fjlnv &kiterjesztse alapjn automatikusan.",IDC_AUTOSELECT, + CONTROL "Fjlnv &kit. alapjn automatikusan.",IDC_AUTOSELECT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED PUSHBUTTON "Mgsem",IDCANCEL,108,113,50,14 @@ -317,7 +317,7 @@ BEGIN PUSHBUTTON "Mgsem",IDCANCEL,410,233,50,14 GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 - LTEXT "Sznkiemelsek testraszabsa",IDC_TITLE,220,25,200,12 + LTEXT "Sznkiemelsek testreszabsa",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END @@ -371,9 +371,9 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Hossz sorok" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Hossz sorok korltja:",IDC_STATIC,7,10,60,8 + LTEXT "&Sor korltja:",IDC_STATIC,7,10,60,8 EDITTEXT 100,77,7,30,14,ES_AUTOHSCROLL - CONTROL "&Vonal megjelentse.",101,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,27,67,10 + CONTROL "&Vonal megjel.",101,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,27,67,10 CONTROL "&Httrszn vltoztatsa.",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,100,10 DEFPUSHBUTTON "OK",IDOK,127,7,50,14 PUSHBUTTON "Mgsem",IDCANCEL,127,24,50,14 diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 9216675b3..cc5a3f139 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Tovbbiak...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "K&dols detektlsnak erltetse", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "jrakdols az ala&prt.-re\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "jrakdols A&NSI-ra\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "jrakdols &OEM-re\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "jrakdols &GB18030-ra\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "jrakdols UCHARDET elemzshez", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII-t UTF-8-k&nt\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Kdolsi elemek ki&hagysa\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "&Els kar. trlse\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "&Utols kar. trlse\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Sorvgi &res kar. trlse\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "res kar. &tmrtse\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "res kar. &tmrtse\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "Sorok &mdostsa...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "Sorok i&gaztsa...\tAlt+J", IDM_EDIT_ALIGN @@ -400,7 +399,7 @@ BEGIN POPUP "&Emlkezs" BEGIN MENUITEM "&Legutbbi fjlokra emlkezzen", IDM_VIEW_NOSAVERECENT - MENUITEM "&rizze meg a kurzos pozcijt", IDM_VIEW_NOPRESERVECARET + MENUITEM "&rizze meg a kurzor pozcijt", IDM_VIEW_NOPRESERVECARET MENUITEM "&Keressi mintkre emlkezzen", IDM_VIEW_NOSAVEFINDREPL END POPUP "&Ablak" diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index b31ec2c22..028fdc9f5 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Altri...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Forza il rilevamento compatto dell'Encoding", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Ricodifica con Encoding di &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Ricodifica come &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Ricodifica come &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Ricodifica come &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Ricodifica a UCHARDET Analysis", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII come UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignora Encoding &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Rimuovi &primo carattere\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Rimuovi &ultimo carattere\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Rimuovi i blanks a fine riga\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Comprimi i blanks\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Comprimi i blanks\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modifica righe...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Allinea righe...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 0e88b8174..d117d98ba 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 BOM (&S)", IDM_ENCODING_UTF8SIGN MENUITEM "̑̕R[hw(&M)...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "R[hʂs()", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "ftHgœǂݒ(&D)\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "ANSIœǂݒ(&A)\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "OEMœǂݒ(&O)\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "GB18030œǂݒ(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "UCHARDET͂œǂݒ", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCIIUTF-8ƂĊJ(&8)\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "R[h𖳎(&T)\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "s폜\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "s폜(&L)\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "̋󔒍폜(&T)\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "󔒂܂Ƃ߂(&W)\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "󔒂܂Ƃ߂(&W)\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "s̏C(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "s̐(&A)...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 9ef47f078..52372ca9c 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -134,7 +134,7 @@ BEGIN IDS_MUI_ERR_UNICODE "Unicodeւ̕ϊɃG[܂B\nt@Cۑƃf[^邩܂B" IDS_MUI_ERR_BITMAP "rbg}bvt@C̓ǂݍ݃G[: %s\nKvȐ@: %i x %i ( >= %i x )." IDS_MUI_ERR_ELEVATED_RIGHTS - "[U[̏iG[B" + "擾̃G[B" END STRINGTABLE @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "(&L)" - IDS_MUI_MENU_THEMES "e[}؂ւ(&S)" + IDS_MUI_MENU_THEMES "e[}̐؂ւ(&S)" IDM_THEMES_DEFAULT "ݒ" IDM_THEMES_FILE_ITEM "Wݒ" END @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ gq̋؂ ; łB\r\n\ -use \\; to define a filename matching pattern:\r\n\ +\\K\L@; ƂŃt@C̈vp^[`ł܂:\r\n\ \\xyz$; t@C(x[Xt@C+gq)̖ xyz ɍv\r\n\r\n\ ݒ菑(ew͏ȗ”\, fore͕F):\r\n\ font:tHg; size:[+/-]nn.mm; bold; italic; underline;\r\n\ diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 0a6dec3e9..eb4e5d2ee 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -56,25 +56,25 @@ IDR_MUI_MAINMENU MENU BEGIN POPUP "(&F)" BEGIN - MENUITEM " (&N)\tCtrl+N", IDM_FILE_NEW - MENUITEM "(&O)...\tCtrl+O", IDM_FILE_OPEN - MENUITEM " ħ(&V)\tF5", IDM_FILE_REVERT - MENUITEM "(&S)\tCtrl+S", IDM_FILE_SAVE - MENUITEM "ٸ ̸ (&A)...\tF6", IDM_FILE_SAVEAS + MENUITEM " (&N)\tCtrl+N", IDM_FILE_NEW + MENUITEM "(&O)...\tCtrl+O", IDM_FILE_OPEN + MENUITEM " ħ(&V)\tF5", IDM_FILE_REVERT + MENUITEM "(&S)\tCtrl+S", IDM_FILE_SAVE + MENUITEM "ٸ ̸ (&A)...\tF6", IDM_FILE_SAVEAS MENUITEM "纻 (&C)...\tCtrl+F6", IDM_FILE_SAVECOPY MENUITEM "б (&R)", IDM_FILE_READONLY MENUITEM SEPARATOR - MENUITEM "ȣȭ ȣ (&Y)...", IDM_SETPASS + MENUITEM "ȣȭ ȣ (&Y)...", IDM_SETPASS MENUITEM SEPARATOR POPUP "(&L)" BEGIN MENUITEM " â (&N)\tAlt+N", IDM_FILE_NEWWINDOW MENUITEM " â (&E)\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR - MENUITEM " ٽ (&R)", IDM_FILE_LAUNCH_ELEVATED + MENUITEM " ٽ (&R)", IDM_FILE_LAUNCH_ELEVATED MENUITEM SEPARATOR MENUITEM " (&D)\tCtrl+L", IDM_FILE_LAUNCH - MENUITEM "ٸ α׷ (&O)...\tAlt+L", IDM_FILE_OPENWITH + MENUITEM "ٸ α׷ (&O)...\tAlt+L", IDM_FILE_OPENWITH MENUITEM "(&C)...\tCtrl+R", IDM_FILE_RUN MENUITEM SEPARATOR MENUITEM " ø 1(&1)\tCtrl+Shift+1", CMD_WEBACTION1 @@ -83,22 +83,21 @@ BEGIN MENUITEM SEPARATOR POPUP "ڵ(&E)" BEGIN - MENUITEM "&ANSI", IDM_ENCODING_ANSI - MENUITEM "ڵ(&U)", IDM_ENCODING_UNICODE - MENUITEM "ڵ &Big Endian", IDM_ENCODING_UNICODEREV - MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8 - MENUITEM " ִ UTF-8(&S)", IDM_ENCODING_UTF8SIGN + MENUITEM "&ANSI", IDM_ENCODING_ANSI + MENUITEM "ڵ(&U)", IDM_ENCODING_UNICODE + MENUITEM "ڵ &Big Endian", IDM_ENCODING_UNICODEREV + MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8 + MENUITEM " ִ UTF-8(&S)", IDM_ENCODING_UTF8SIGN MENUITEM "Ÿ(&M)...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM " ڵ ", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR - MENUITEM "⺻ ǥ(&F)\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "ANSI ǥ(&N)\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "⺻ ǥ(&F)\tCtrl-Alt-F", CMD_RECODEDEFAULT + MENUITEM "ANSI ǥ(&N)\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "OEM ǥ(&O)\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM "GB18030 ǥ(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "GB18030 ǥ(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "UCHARDET м ڵ", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR - MENUITEM "ASCII UTF-8 (&8)\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 - MENUITEM "ڵ ± (&T)\tAlt+F8", CMD_RELOADNOFILEVARS + MENUITEM "ASCII UTF-8 (&8)\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 + MENUITEM "ڵ ± (&T)\tAlt+F8", CMD_RELOADNOFILEVARS MENUITEM " (&R)...\tF8", IDM_ENCODING_RECODE MENUITEM SEPARATOR MENUITEM "⺻ (&D)...", IDM_ENCODING_SETDEFAULT @@ -106,54 +105,54 @@ BEGIN POPUP " (&G)" BEGIN MENUITEM "(&W) (CR+LF)", IDM_LINEENDINGS_CRLF - MENUITEM "&Mac (CR)", IDM_LINEENDINGS_CR - MENUITEM "н(&U) (LF)", IDM_LINEENDINGS_LF + MENUITEM "&Mac (CR)", IDM_LINEENDINGS_CR + MENUITEM "н(&U) (LF)", IDM_LINEENDINGS_LF MENUITEM SEPARATOR - MENUITEM "⺻ (&D)...", IDM_LINEENDINGS_SETDEFAULT + MENUITEM "⺻ (&D)...", IDM_LINEENDINGS_SETDEFAULT END MENUITEM SEPARATOR MENUITEM "鿩 Ȯ(&I)...", CMD_CHECK_INDENTATION MENUITEM SEPARATOR MENUITEM " (&T)...", IDM_FILE_PAGESETUP - MENUITEM "μ(&P)...\tCtrl+P", IDM_FILE_PRINT + MENUITEM "μ(&P)...\tCtrl+P", IDM_FILE_PRINT MENUITEM SEPARATOR - MENUITEM "Ӽ(&I)...", IDM_FILE_PROPERTIES - MENUITEM " ȭ ũ (&D)", IDM_FILE_CREATELINK + MENUITEM "Ӽ(&I)...", IDM_FILE_PROPERTIES + MENUITEM " ȭ ũ (&D)", IDM_FILE_CREATELINK MENUITEM SEPARATOR - MENUITEM "Minipath Ž(&B)...\tCtrl+M", IDM_FILE_BROWSE + MENUITEM "Minipath Ž(&B)...\tCtrl+M", IDM_FILE_BROWSE POPUP " ã(&F)" BEGIN MENUITEM " ã (&O)...\tAlt+I", IDM_FILE_OPENFAV MENUITEM " ߰(&A)...\tAlt+K", IDM_FILE_ADDTOFAV - MENUITEM "(&M)...\tAlt+F9", IDM_FILE_MANAGEFAV + MENUITEM "(&M)...\tAlt+F9", IDM_FILE_MANAGEFAV END - MENUITEM "ֱ ϵ(&H)...\tCtrl+Alt+H", IDM_FILE_RECENT + MENUITEM "ֱ ϵ(&H)...\tCtrl+Alt+H", IDM_FILE_RECENT MENUITEM SEPARATOR - MENUITEM "(&X)\tAlt+F4", IDM_FILE_EXIT + MENUITEM "(&X)\tAlt+F4", IDM_FILE_EXIT END POPUP "(&E)" BEGIN MENUITEM " (&U)\tCtrl+Z", IDM_EDIT_UNDO MENUITEM "ٽ (&R)\tCtrl+Y", IDM_EDIT_REDO MENUITEM SEPARATOR - MENUITEM "߶󳻱(&T)\tCtrl+X", IDM_EDIT_CUT - MENUITEM "(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "߶󳻱(&T)\tCtrl+X", IDM_EDIT_CUT + MENUITEM "(&C)\tCtrl+C", IDM_EDIT_COPY MENUITEM " (&L)\tAlt+C", IDM_EDIT_COPYALL MENUITEM " ߰(&A)\tCtrl+E", IDM_EDIT_COPYADD MENUITEM "ٿ ֱ(&P)\tCtrl+V", IDM_EDIT_PASTE - MENUITEM "Ŭ ȯ(&W)\tCtrl+K", IDM_EDIT_SWAP - MENUITEM "(&D)\tDel", IDM_EDIT_CLEAR - MENUITEM "Ŭ (&E)", IDM_EDIT_CLEARCLIPBOARD + MENUITEM "Ŭ ȯ(&W)\tCtrl+K", IDM_EDIT_SWAP + MENUITEM "(&D)\tDel", IDM_EDIT_CLEAR + MENUITEM "Ŭ (&E)", IDM_EDIT_CLEARCLIPBOARD MENUITEM " (&S)\tCtrl+A", IDM_EDIT_SELECTALL MENUITEM SEPARATOR POPUP "ܾ(&W)" BEGIN MENUITEM "ܾ ڵ ϼ(&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD MENUITEM SEPARATOR - MENUITEM "ܾ Ŀ ̵(&L)\tCtrl+Left", CMD_CTRLLEFT + MENUITEM "ܾ Ŀ ̵(&L)\tCtrl+Left", CMD_CTRLLEFT MENUITEM "ܾ Ŀ ̵(&R)\tCtrl+Right", CMD_CTRLRIGHT - MENUITEM " ܾ (&D)\tCtrl+Back", CMD_CTRLBACK - MENUITEM " ܾ (&W)\tCtrl+Del", CMD_CTRLDEL + MENUITEM " ܾ (&D)\tCtrl+Back", CMD_CTRLBACK + MENUITEM " ܾ (&W)\tCtrl+Del", CMD_CTRLDEL END POPUP "(&I)" BEGIN @@ -161,25 +160,25 @@ BEGIN MENUITEM "Ʒ ű(&M)\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN MENUITEM SEPARATOR MENUITEM " ߶󳻱(&L)\tCtrl[+Shift]+X", IDM_EDIT_CUTLINE - MENUITEM " (&C)\tCtrl[+Shift]+C", IDM_EDIT_COPYLINE - MENUITEM "/ (&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION - MENUITEM "ٰ ¹ٲٱ(&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE + MENUITEM " (&C)\tCtrl[+Shift]+C", IDM_EDIT_COPYLINE + MENUITEM "/ (&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION + MENUITEM "ٰ ¹ٲٱ(&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE MENUITEM " (&E)\tCtrl+Shift+D", IDM_EDIT_DELETELINE MENUITEM SEPARATOR MENUITEM "Ŀ ʺ ó \tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT MENUITEM "Ŀ ʺ \tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT MENUITEM SEPARATOR - MENUITEM "÷ (&W)...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP + MENUITEM "÷ (&W)...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP MENUITEM " (&S)\tCtrl+I", IDM_EDIT_SPLITLINES - MENUITEM " (&J)\tCtrl+J", IDM_EDIT_JOINLINES - MENUITEM " (&F)\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP - MENUITEM "ܶ (&P)\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA + MENUITEM " (&J)\tCtrl+J", IDM_EDIT_JOINLINES + MENUITEM " (&F)\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP + MENUITEM "ܶ (&P)\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA MENUITEM SEPARATOR MENUITEM " ġ(&G)\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES - MENUITEM " ġ\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES + MENUITEM " ġ\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM " (&R)\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES MENUITEM " \tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES - MENUITEM "ߺ (&O)\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES + MENUITEM "ߺ (&O)\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "(&S)" BEGIN @@ -188,24 +187,24 @@ BEGIN MENUITEM SEPARATOR POPUP " ܺ ٹ̱(&E)" BEGIN - MENUITEM "ǥ(&S)\tCtrl+1", CMD_STRINGIFY - MENUITEM "ūǥ(&D)\tCtrl+2", CMD_STRINGIFY2 + MENUITEM "ǥ(&S)\tCtrl+1", CMD_STRINGIFY + MENUITEM "ūǥ(&D)\tCtrl+2", CMD_STRINGIFY2 MENUITEM SEPARATOR MENUITEM "( )\tCtrl+3", CMD_EMBRACE MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2 MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3 MENUITEM SEPARATOR - MENUITEM "ǥ(&B)\tCtrl+6", CMD_EMBRACE4 + MENUITEM "ǥ(&B)\tCtrl+6", CMD_EMBRACE4 MENUITEM SEPARATOR - MENUITEM "(&W)...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION + MENUITEM "(&W)...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION END MENUITEM " / (&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM SEPARATOR - MENUITEM " ä ߱(&P)\tAlt+B", IDM_EDIT_PADWITHSPACES - MENUITEM "ù (&F)\tAlt+Z", IDM_EDIT_STRIP1STCHAR - MENUITEM " (&L)\tAlt+U", IDM_EDIT_STRIPLASTCHAR - MENUITEM " (&T)\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM " ̱(&B)\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM " ä ߱(&P)\tAlt+B", IDM_EDIT_PADWITHSPACES + MENUITEM "ù (&F)\tAlt+Z", IDM_EDIT_STRIP1STCHAR + MENUITEM " (&L)\tAlt+U", IDM_EDIT_STRIPLASTCHAR + MENUITEM " (&T)\tAlt+W", IDM_EDIT_TRIMLINES + MENUITEM " ̱(&B)\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM " ܺ ٹ̱(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM " (&N)...\tAlt+J", IDM_EDIT_ALIGN @@ -216,7 +215,7 @@ BEGIN MENUITEM "빮ڷ(&U)\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE MENUITEM "ҹڷ(&L)\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE MENUITEM SEPARATOR - MENUITEM "ҹ (&I)\tCtrl+Alt+U", IDM_EDIT_INVERTCASE + MENUITEM "ҹ (&I)\tCtrl+Alt+U", IDM_EDIT_INVERTCASE MENUITEM "ܾ ùڸ 빮(&C)\tCtrl+Alt+I", IDM_EDIT_TITLECASE MENUITEM " ùڸ 빮(&S)\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE MENUITEM SEPARATOR @@ -234,19 +233,19 @@ BEGIN MENUITEM SEPARATOR MENUITEM "ڵ ĺ(&E)\tCtrl+F8", IDM_EDIT_INSERT_ENCODING MENUITEM SEPARATOR - MENUITEM "¥/ð(ª )(&S)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE + MENUITEM "¥/ð(ª )(&S)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE MENUITEM "¥/ð( )(&L)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE - MENUITEM "Ÿ Ʈ(&T)\tShift+F5", CMD_TIMESTAMPS + MENUITEM "Ÿ Ʈ(&T)\tShift+F5", CMD_TIMESTAMPS MENUITEM SEPARATOR MENUITEM " ̸(&F)\tCtrl+F9", IDM_EDIT_INSERT_FILENAME - MENUITEM " ̸(&P)\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME + MENUITEM " ̸(&P)\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME MENUITEM SEPARATOR - MENUITEM "&GUID\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID + MENUITEM "&GUID\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID END POPUP "Ư (&I)" BEGIN MENUITEM " ּ (ȯ)(&T)\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "ּ ȣ (&C)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "ּ ȣ (&C)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR MENUITEM "URL ڵ(&E)\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL ڵ(&D)\tCtrl+Shift+R", IDM_EDIT_URLDECODE @@ -254,81 +253,78 @@ BEGIN MENUITEM "C ̽ ȯ(&P)\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS MENUITEM "C ̽ (&U)\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS MENUITEM SEPARATOR - MENUITEM "ڸ Hex ȯ(&H)\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX - MENUITEM "Hex ڷ ȯ(&R)\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR + MENUITEM "ڸ Hex ȯ(&H)\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX + MENUITEM "Hex ڷ ȯ(&R)\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR MENUITEM SEPARATOR - MENUITEM "ȣ \tCtrl+Alt+NK+", CMD_INCREASENUM - MENUITEM "ȣ \tCtrl+Alt+NK-", CMD_DECREASENUM - MENUITEM SEPARATOR - MENUITEM "ȣ ¦ ã(&F)\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE - MENUITEM "ȣ (&S)\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE - MENUITEM SEPARATOR - MENUITEM " (&X)\tCtrl+Alt+F2", IDM_EDIT_SELTONEXT - MENUITEM " (&V)\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV + MENUITEM "ȣ \tCtrl+Alt+NK+", CMD_INCREASENUM + MENUITEM "ȣ \tCtrl+Alt+NK-", CMD_DECREASENUM MENUITEM SEPARATOR - MENUITEM "Select &Word or Lines\tCtrl+Spc", IDM_EDIT_SELECTWORD - MENUITEM "Multi-Select &All Matches\tCtrl+Shift+Spc", IDM_EDIT_SELECTALLMATCHES + MENUITEM "ȣ ¦ ã(&F)\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE + MENUITEM "ȣ (&S)\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE + MENUITEM SEPARATOR + MENUITEM " (&X)\tCtrl+Alt+F2", IDM_EDIT_SELTONEXT + MENUITEM " (&V)\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV END MENUITEM SEPARATOR POPUP "å(&K)" BEGIN MENUITEM "/(&T)\tCtrl+F2", BME_EDIT_BOOKMARKTOGGLE MENUITEM SEPARATOR - MENUITEM " åǷ ٷΰ(&N)\tF2", BME_EDIT_BOOKMARKNEXT - MENUITEM " åǷ ٷΰ(&P)\tShift+F2", BME_EDIT_BOOKMARKPREV + MENUITEM " åǷ ٷΰ(&N)\tF2", BME_EDIT_BOOKMARKNEXT + MENUITEM " åǷ ٷΰ(&P)\tShift+F2", BME_EDIT_BOOKMARKPREV MENUITEM SEPARATOR - MENUITEM " (&C)\tAlt+F2", BME_EDIT_BOOKMARKCLEAR + MENUITEM " (&C)\tAlt+F2", BME_EDIT_BOOKMARKCLEAR END MENUITEM SEPARATOR POPUP "ã(&S)" BEGIN - MENUITEM "ã(&F)...\tCtrl+F", IDM_EDIT_FIND - MENUITEM "˻ \tAlt+F3", IDM_EDIT_SAVEFIND + MENUITEM "ã(&F)...\tCtrl+F", IDM_EDIT_FIND + MENUITEM "˻ \tAlt+F3", IDM_EDIT_SAVEFIND MENUITEM " ã(&X)\tF3", IDM_EDIT_FINDNEXT MENUITEM " ã(&V)\tShift+F3", IDM_EDIT_FINDPREV MENUITEM " ã\tCtrl+F3", CMD_FINDNEXTSEL MENUITEM " ã\tCtrl+Shift+F3", CMD_FINDPREVSEL - MENUITEM "ٲٱ(&R)...\tCtrl+H", IDM_EDIT_REPLACE + MENUITEM "ٲٱ(&R)...\tCtrl+H", IDM_EDIT_REPLACE MENUITEM " ٲٱ(&X)\tF4", IDM_EDIT_REPLACENEXT - MENUITEM "ٷΰ(&G)...\tCtrl+G", IDM_EDIT_GOTOLINE + MENUITEM "ٷΰ(&G)...\tCtrl+G", IDM_EDIT_GOTOLINE END END POPUP "(&V)" BEGIN POPUP "׸(&T)" BEGIN - MENUITEM "Ű (&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM "Ű (&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG MENUITEM SEPARATOR - MENUITEM " Ű(&X)...\tF12", IDM_VIEW_SCHEME - MENUITEM "&2nd ⺻ Ű\tShift+F12", IDM_VIEW_USE2NDDEFAULT + MENUITEM " Ű(&X)...\tF12", IDM_VIEW_SCHEME + MENUITEM "&2nd ⺻ Ű\tShift+F12", IDM_VIEW_USE2NDDEFAULT MENUITEM SEPARATOR MENUITEM "ü ⺻ ۲(&D)...\tAlt+F12", IDM_VIEW_FONT - MENUITEM " Ű ⺻ ۲(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME + MENUITEM " Ű ⺻ ۲(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME END MENUITEM SEPARATOR MENUITEM " (&R)\tCtrl+W", IDM_VIEW_WORDWRAP MENUITEM " ǥ(&L)\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER - MENUITEM "鿩 ȳ(&A)\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES + MENUITEM "鿩 ȳ(&A)\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR - MENUITEM " ȣ ǥ(&P)\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS + MENUITEM " ȣ ǥ(&P)\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS MENUITEM " ǥ(&B)\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS MENUITEM " ǥ(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR - MENUITEM " ũ ֽ(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS + MENUITEM " ũ ֽ(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "ȣ ¦ (&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP " (&G)\tCtrl+Shift+I" BEGIN MENUITEM " (&N)", IDM_VIEW_HILITCURLN_NONE MENUITEM "(&C)", IDM_VIEW_HILITCURLN_BACK - MENUITEM "׵θ (&F)", IDM_VIEW_HILITCURLN_FRAME + MENUITEM "׵θ (&F)", IDM_VIEW_HILITCURLN_FRAME END POPUP " ׸ (&K)" BEGIN MENUITEM "Ȱ(&A)\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF MENUITEM SEPARATOR - MENUITEM "̴ ׸ ġ", IDM_VIEW_MARKOCCUR_VISIBLE + MENUITEM "̴ ׸ ġ", IDM_VIEW_MARKOCCUR_VISIBLE MENUITEM SEPARATOR - MENUITEM "ҹ (&C)", IDM_VIEW_MARKOCCUR_CASE + MENUITEM "ҹ (&C)", IDM_VIEW_MARKOCCUR_CASE POPUP "ܾ ġ(&W)" BEGIN MENUITEM " ", IDM_VIEW_MARKOCCUR_WNONE @@ -338,22 +334,22 @@ BEGIN END MENUITEM SEPARATOR MENUITEM " ȣ(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS - MENUITEM " (&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN + MENUITEM " (&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN MENUITEM SEPARATOR POPUP "(&D)" BEGIN MENUITEM "ڵ (&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING - MENUITEM " ȯ(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS - MENUITEM "\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "(&M)", IDM_VIEW_CHASING_DOCTAIL - MENUITEM " ũ(&F)", IDM_VIEW_SCROLLPASTEOF - MENUITEM " ũ ̱(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP + MENUITEM " ȯ(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS + MENUITEM "\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW + MENUITEM "(&M)", IDM_VIEW_CHASING_DOCTAIL + MENUITEM " ũ(&F)", IDM_VIEW_SCROLLPASTEOF + MENUITEM " ũ ̱(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP END POPUP " (&T)" BEGIN MENUITEM " ̱(&T)", IDM_VIEW_TOOLBAR MENUITEM " ȯ(&G)", IDM_VIEW_TOGGLETB - MENUITEM " (&U)...", IDM_VIEW_CUSTOMIZETB + MENUITEM " (&U)...", IDM_VIEW_CUSTOMIZETB MENUITEM " ׸ (&L)...", IDM_VIEW_LOADTHEMETB MENUITEM " ǥ ̱(&S)", IDM_VIEW_STATUSBAR END @@ -365,35 +361,35 @@ BEGIN END POPUP "ġ(&P)" BEGIN - MENUITEM "â ġ \tCtrl+Shift+K", CMD_COPYWINPOS + MENUITEM "â ġ \tCtrl+Shift+K", CMD_COPYWINPOS MENUITEM "⺻ ġ ߱\tCtrl+Shift+P", CMD_DEFAULTWINPOS MENUITEM "⺻ ġ ", CMD_SAVEASDEFWINPOS - MENUITEM " ⺻ ġ ", CMD_CLEARSAVEDWINPOS + MENUITEM " ⺻ ġ ", CMD_CLEARSAVEDWINPOS MENUITEM "ó ġ ߱\tCtrl+F11", CMD_INITIALWINPOS MENUITEM "ü ġ ȯ\tF11", CMD_FULLSCRWINPOS - MENUITEM "â ġ (&P)", IDM_VIEW_STICKYWINPOS + MENUITEM "â ġ (&P)", IDM_VIEW_STICKYWINPOS END END POPUP "(&S)" BEGIN - MENUITEM " (&S)", IDM_VIEW_TABSASSPACES - MENUITEM " (&T)...\tCtrl+T", IDM_VIEW_TABSETTINGS - MENUITEM " (&W)...", IDM_VIEW_WORDWRAPSETTINGS + MENUITEM " (&S)", IDM_VIEW_TABSASSPACES + MENUITEM " (&T)...\tCtrl+T", IDM_VIEW_TABSETTINGS + MENUITEM " (&W)...", IDM_VIEW_WORDWRAPSETTINGS MENUITEM " ǥ (&L)...", IDM_VIEW_LONGLINESETTINGS - MENUITEM "ڵ 鿩(&D)", IDM_VIEW_AUTOINDENTTEXT + MENUITEM "ڵ 鿩(&D)", IDM_VIEW_AUTOINDENTTEXT MENUITEM "HTML/XML ڵ ݱ(&H)\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS - MENUITEM "ڵ ܾ ϼ(&U)", IDM_VIEW_AUTOCOMPLETEWORDS + MENUITEM "ڵ ܾ ϼ(&U)", IDM_VIEW_AUTOCOMPLETEWORDS MENUITEM "Lexer-Key-Words ڵ ϼ(&K)", IDM_VIEW_AUTOCLEXKEYWORDS - MENUITEM "ܾ Ž (&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV + MENUITEM "ܾ Ž (&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV MENUITEM SEPARATOR - MENUITEM " νϽ(&F)", IDM_VIEW_SINGLEFILEINSTANCE + MENUITEM " νϽ(&F)", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM " ˸(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY - MENUITEM "޽ Ұ(&B)", IDM_VIEW_MUTE_MESSAGEBEEP + MENUITEM "޽ Ұ(&B)", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "ESC Ű (&K)" BEGIN MENUITEM " (&N)", IDM_VIEW_NOESCFUNC MENUITEM "Notepad3 ּȭ(&M)", IDM_VIEW_ESCMINIMIZE - MENUITEM "Notepad3 (&X)", IDM_VIEW_ESCEXIT + MENUITEM "Notepad3 (&X)", IDM_VIEW_ESCEXIT END MENUITEM " (&B)", IDM_VIEW_SAVEBEFORERUNNINGTOOLS MENUITEM SEPARATOR @@ -408,27 +404,27 @@ BEGIN POPUP "â ǥ(&Y)" BEGIN MENUITEM " ̸(&O)", IDM_VIEW_SHOWFILENAMEONLY - MENUITEM " ̸ ͸(&D)", IDM_VIEW_SHOWFILENAMEFIRST + MENUITEM " ̸ ͸(&D)", IDM_VIEW_SHOWFILENAMEFIRST MENUITEM "ü (&P)", IDM_VIEW_SHOWFULLPATH MENUITEM " ο(&T)\tCtrl+9", IDM_VIEW_SHOWEXCERPT END - MENUITEM "â ٽ (&R)", IDM_VIEW_REUSEWINDOW + MENUITEM "â ٽ (&R)", IDM_VIEW_REUSEWINDOW MENUITEM "׻ (&A)\tAlt+T", IDM_VIEW_ALWAYSONTOP - MENUITEM "Ʈ̷ ּȭ(&Z)", IDM_VIEW_MINTOTRAY - MENUITEM " (&M)\tAlt+G", IDM_VIEW_TRANSPARENT + MENUITEM "Ʈ̷ ּȭ(&Z)", IDM_VIEW_MINTOTRAY + MENUITEM " (&M)\tAlt+G", IDM_VIEW_TRANSPARENT END POPUP "(&T)" BEGIN POPUP "(&R)" BEGIN MENUITEM "GDI ⺻(&G)", IDM_SET_RENDER_TECH_DEFAULT - MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D + MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D MENUITEM "DirectWrite (&R)", IDM_SET_RENDER_TECH_D2DRETAIN - MENUITEM "GDI DC (&W)", IDM_SET_RENDER_TECH_D2DDC + MENUITEM "GDI DC (&W)", IDM_SET_RENDER_TECH_D2DDC END POPUP "" BEGIN - MENUITEM "(&N).", IDM_SET_BIDIRECTIONAL_NONE + MENUITEM "(&N).", IDM_SET_BIDIRECTIONAL_NONE MENUITEM "ʿ ", IDM_SET_BIDIRECTIONAL_L2R MENUITEM "ʿ ", IDM_SET_BIDIRECTIONAL_R2L END @@ -436,8 +432,8 @@ BEGIN POPUP " (&A)" BEGIN MENUITEM " ϰ (&X)", IDM_VIEW_SAVESETTINGS - MENUITEM " (&N)\tF7", IDM_VIEW_SAVESETTINGSNOW - MENUITEM " (&O)\tCtrl+F7", CMD_OPENINIFILE + MENUITEM " (&N)\tF7", IDM_VIEW_SAVESETTINGSNOW + MENUITEM " (&O)\tCtrl+F7", CMD_OPENINIFILE END END POPUP "(&H)" @@ -445,7 +441,7 @@ BEGIN MENUITEM "¶ (&O)\tF1", IDM_HELP_ONLINEDOCUMENTATION MENUITEM SEPARATOR MENUITEM " (&T)...", IDM_HELP_ADMINEXE - MENUITEM " Ʈ Ʈ Ȯ(&W)", IDM_HELP_UPDATEWEBSITE + MENUITEM " Ʈ Ʈ Ȯ(&W)", IDM_HELP_UPDATEWEBSITE MENUITEM SEPARATOR MENUITEM " (&C)...", IDM_HELP_CMD MENUITEM "Ʈе3 (&A)...\tShift+F1", IDM_HELP_ABOUT @@ -460,11 +456,11 @@ BEGIN MENUITEM "ٽ (&R)", IDM_EDIT_REDO MENUITEM SEPARATOR MENUITEM "߶󳻱(&T)", IDM_EDIT_CUT - MENUITEM "(&C)", IDM_EDIT_COPY + MENUITEM "(&C)", IDM_EDIT_COPY MENUITEM "ٿ ֱ(&P)", IDM_EDIT_PASTE - MENUITEM "(&D)", IDM_EDIT_CLEAR + MENUITEM "(&D)", IDM_EDIT_CLEAR MENUITEM SEPARATOR - MENUITEM " (&S)", IDM_EDIT_SELECTALL + MENUITEM " (&S)", IDM_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM " ȯ(&T)", IDM_VIEW_TOGGLE_CURRENT_FOLD MENUITEM SEPARATOR @@ -472,9 +468,9 @@ BEGIN END POPUP "+" BEGIN - MENUITEM " ̱(&T)", IDM_VIEW_TOOLBAR + MENUITEM " ̱(&T)", IDM_VIEW_TOOLBAR MENUITEM " ȯ(&G)", IDM_VIEW_TOGGLETB - MENUITEM " (&C)...", IDM_VIEW_CUSTOMIZETB + MENUITEM " (&C)...", IDM_VIEW_CUSTOMIZETB MENUITEM " ׸ (&L)...", IDM_VIEW_LOADTHEMETB MENUITEM " ǥ ̱(&S)", IDM_VIEW_STATUSBAR END diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 22777ef13..da2dba0ed 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 met &signatuur", IDM_ENCODING_UTF8SIGN MENUITEM "&Meer...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Forceren encodering detectie", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Hercoderen naar &Standaard\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Hercoderen naar &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Hercoderen naar &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Hercoderen naar &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Hercoderen naar UCHARDET-analyse", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII als UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Encoderingst&ags negeren\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Strippen &eerste teken\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Strippen &laatste teken\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Strippen &achteraan blancos\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Comprimeren &blancos\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Comprimeren &blancos\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Wijzigen lijnen...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "Lijnen &uitlijnen...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index c9ca84742..64b12a257 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 z &sygnatur", IDM_ENCODING_UTF8SIGN MENUITEM "&Wicej...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Wymu wykrywanie kodowania", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Przekoduj na domylny &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Przekoduj na &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Przekoduj na &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Przekoduj na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Przekoduj na analizy UCHARDET", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII jako UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignoruj znaczniki &kodowania\tAlt+F8", CMD_RELOADNOFILEVARS @@ -201,11 +200,11 @@ BEGIN END MENUITEM "&Duplikuj zaznaczenie/wiersz\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM SEPARATOR - MENUITEM "&Wyciel pustym miejscem\tAlt+B", IDM_EDIT_PADWITHSPACES - MENUITEM "Usu pierszy znak wiersza\tAlt+Z", IDM_EDIT_STRIP1STCHAR - MENUITEM "Usu ostatni znak wiersza\tAlt+U", IDM_EDIT_STRIPLASTCHAR - MENUITEM "Usu kocowe niewidoczne znaki\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Skompresuj niewidoczne znaki\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "&Wyciel pustym miejscem\tAlt+B", IDM_EDIT_PADWITHSPACES + MENUITEM "Usu pierszy znak wiersza\tAlt+Z", IDM_EDIT_STRIP1STCHAR + MENUITEM "Usu ostatni znak wiersza\tAlt+U", IDM_EDIT_STRIPLASTCHAR + MENUITEM "Usu kocowe niewidoczne znaki\tAlt+W", IDM_EDIT_TRIMLINES + MENUITEM "Skompresuj niewidoczne znaki\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modyfikuj wiersze...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Wyrwnaj wiersze...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 5cb1b66b0..775732011 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Force Encoding Detection", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "Recode to &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "Recode to &ANSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "Recode to UCHARDET Analysis", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM "ASCII as UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ignore Encoding &Tags\tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM "Strip &First Character\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "Strip &Last Character\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Compress &Blanks\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "Compress &Blanks\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 86eb53d07..5652f45b9 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 BO&M", IDM_ENCODING_UTF8SIGN MENUITEM "&...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM " ", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM " & \tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM " A&NSI\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM " &OEM\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM " &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM " &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM " &UCHARDET ", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM " ASCII & UTF-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM " & \tAlt+F8", CMD_RELOADNOFILEVARS @@ -205,7 +204,7 @@ BEGIN MENUITEM " \tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM " \tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM " \tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM " \tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM " \tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "& ...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "& ...\tAlt+J", IDM_EDIT_ALIGN diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 089fbd8b5..fa69820ff 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -90,12 +90,11 @@ BEGIN MENUITEM "UTF-8 ǩ(&S)", IDM_ENCODING_UTF8SIGN MENUITEM "(&M)...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "ǿƼ(&M)", CMD_RELOADFORCEDETECTION - MENUITEM SEPARATOR MENUITEM "±ΪĬ(&E)\tCtrl-Alt-F", CMD_RECODEDEFAULT MENUITEM "±Ϊ ANSI(&A)\tCtrl-Shift+A", CMD_RECODEANSI MENUITEM "±Ϊ OEM(&O)\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "±Ϊ GB18030(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "±Ϊ UCHARDET ", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR MENUITEM " ASCII Ϊ UTF-8(&8)\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "Ա(&T)\tAlt+F8", CMD_RELOADNOFILEVARS @@ -201,11 +200,11 @@ BEGIN END MENUITEM "дѡ/(&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM SEPARATOR - MENUITEM "ո(&P)\tAlt+B", IDM_EDIT_PADWITHSPACES + MENUITEM "ո(&P)\tAlt+B", IDM_EDIT_PADWITHSPACES MENUITEM "ɾһַ(&F)\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "ɾһַ(&L)\tAlt+U", IDM_EDIT_STRIPLASTCHAR - MENUITEM "ɾβո(&T)\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "ѹհַ(&W)\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "ɾβո(&T)\tAlt+W", IDM_EDIT_TRIMLINES + MENUITEM "ѹհַ(&W)\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "޸(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "(&A)...\tAlt+J", IDM_EDIT_ALIGN diff --git a/minipath/language/mp_hu_hu/strings_hu_hu.rc b/minipath/language/mp_hu_hu/strings_hu_hu.rc index ef032f86c..96399eacb 100644 --- a/minipath/language/mp_hu_hu/strings_hu_hu.rc +++ b/minipath/language/mp_hu_hu/strings_hu_hu.rc @@ -94,7 +94,7 @@ BEGIN IDS_ERR_LNK_GETPATH "Hivatkozsi hiba\nNincs rvnyes fjlrendszer-tvonal a hivatkozott objektumhoz.\nTaln a hivatkozs nem egy fjlra vagy mappra mutat." IDS_ERR_LNK_NOACCESS "Hivatkozsi hiba\nNincs hozzfrsem a hivatkozott objektum fjlrendszeri tvonalhoz.\nEllenrizze a lemezt vagy a hlzati kapcsolatot." IDS_ERR_CREATELINK "Hivatkozsi hiba\nHiba a megadott hivatkozs ltrehozsakor.\nTaln a clmappa rsvdett." - IDS_ERR_FILTER "File Filter Error\nNincs tovbbi szr megadva.\nKrem, nzze meg a MiniPath readme fjlban a tovbbi informcikat." + IDS_ERR_FILTER "Fjlszr hiba\nNincs tovbbi szr megadva.\nKrem, nzze meg a MiniPath readme fjlban a tovbbi informcikat." IDS_ERR_PREVWINDISABLED "MiniPath\nA mr fut MiniPath ablak foglalt vagy nyitva van egy prbeszdablaka.\nSzeretne egy jabb Minipath ablakot megnyitni?" END diff --git a/oniguruma/src/oniguruma.h b/oniguruma/src/oniguruma.h index 21e2b7a73..7c9028103 100644 --- a/oniguruma/src/oniguruma.h +++ b/oniguruma/src/oniguruma.h @@ -52,6 +52,7 @@ extern "C" { # define PV_(args) args #endif +#ifndef ONIG_STATIC #ifndef ONIG_EXTERN #if defined(_WIN32) && !defined(__GNUC__) #if defined(ONIGURUMA_EXPORT) @@ -65,6 +66,9 @@ extern "C" { #ifndef ONIG_EXTERN #define ONIG_EXTERN extern #endif +#else +#define ONIG_EXTERN extern +#endif /* PART: character encoding */ diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj index c0a3ca8fd..3519a2795 100644 --- a/scintilla/Scintilla.vcxproj +++ b/scintilla/Scintilla.vcxproj @@ -121,7 +121,7 @@ true Disabled NotUsing - _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_EXTERN=extern;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_STATIC;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) MultiThreadedDebug Level3 false @@ -146,7 +146,7 @@ true Disabled NotUsing - _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_EXTERN=extern;_WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_STATIC;_WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) MultiThreadedDebug Level3 false @@ -170,7 +170,7 @@ true MaxSpeed NotUsing - _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_EXTERN=extern;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_STATIC;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) MultiThreaded Level3 true @@ -193,7 +193,7 @@ true MaxSpeed NotUsing - _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_EXTERN=extern;_WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;NP3;NO_CXX11_REGEX;SCI_OWNREGEX;ONIG_STATIC;_WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions) MultiThreaded Level3 true diff --git a/src/Helpers.h b/src/Helpers.h index a502f6a10..b4f707ee9 100644 --- a/src/Helpers.h +++ b/src/Helpers.h @@ -311,6 +311,9 @@ inline bool IsButtonUnchecked(HWND hwnd, int iButtonID) { return (IsDlgButtonChe #define EnableCmd(hmenu,id,b) EnableMenuItem((hmenu),(id),(b)?MF_BYCOMMAND|MF_ENABLED:MF_BYCOMMAND|MF_GRAYED) #define CheckCmd(hmenu,id,b) CheckMenuItem((hmenu),(id),(b)?MF_BYCOMMAND|MF_CHECKED:MF_BYCOMMAND|MF_UNCHECKED) +#define EnableTool(htbar,id,b) SendMessage(htbar,TB_ENABLEBUTTON,id, MAKELONG(((b) ? 1 : 0), 0)) +#define CheckTool(htbar,id,b) SendMessage(htbar,TB_CHECKBUTTON,id, MAKELONG((b),0)) + #define EnableCmdPos(hmenu,pos,b) EnableMenuItem((hmenu),(pos),(b)?MF_BYPOSITION|MF_ENABLED:MF_BYPOSITION|MF_GRAYED) #define CheckCmdPos(hmenu,pos,b) CheckMenuItem((hmenu),(pos),(b)?MF_BYPOSITION|MF_CHECKED:MF_BYPOSITION|MF_UNCHECKED) diff --git a/src/Notepad3.c b/src/Notepad3.c index 7dc32707d..0d7f0a704 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -70,7 +70,6 @@ static WCHAR s_wchWndClass[16] = _W(SAPPNAME); static HWND s_hwndEditFrame = NULL; static HWND s_hwndNextCBChain = NULL; -static HWND s_hwndToolbar = NULL; static HWND s_hwndReBar = NULL; static WCHAR s_wchTmpFilePath[MAX_PATH] = { L'\0' }; @@ -674,6 +673,8 @@ typedef struct _lng_menu_t { const WCHAR* MenuItem; } LNG_MENU_T; +static HMENU s_hmenuLanguage = NULL; + #include "../language/language_menus.hpp" static bool _InsertLanguageMenu(HMENU hMenuBar) @@ -683,7 +684,8 @@ static bool _InsertLanguageMenu(HMENU hMenuBar) return false; } - HMENU hmenuLanguage = CreatePopupMenu(); + if (s_hmenuLanguage) { DestroyMenu(s_hmenuLanguage); } + s_hmenuLanguage = CreatePopupMenu(); WCHAR wchMenuItemFmt[128] = L"%s"; WCHAR wchMenuItemStrg[196] = { L'\0' }; @@ -701,7 +703,7 @@ static bool _InsertLanguageMenu(HMENU hMenuBar) } StringCchPrintfW(wchMenuItemStrg, COUNTOF(wchMenuItemStrg), wchMenuItemFmt, MUI_LanguageDLLs[lng].szLocaleName); - AppendMenu(hmenuLanguage, MF_ENABLED | MF_STRING, MUI_LanguageDLLs[lng].rid, wchMenuItemStrg); + AppendMenu(s_hmenuLanguage, MF_ENABLED | MF_STRING, MUI_LanguageDLLs[lng].rid, wchMenuItemStrg); } } @@ -709,8 +711,8 @@ static bool _InsertLanguageMenu(HMENU hMenuBar) int const pos = GetMenuItemCount(hMenuBar) - 1; if (pos >= 0) { GetLngString(IDS_MUI_MENU_LANGUAGE, wchMenuItemStrg, COUNTOF(wchMenuItemStrg)); - //return InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg); - bool const res = InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg); + //return InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)s_hmenuLanguage, wchMenuItemStrg); + bool const res = InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)s_hmenuLanguage, wchMenuItemStrg); InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_SEPARATOR, (UINT_PTR)NULL, NULL); return res; } @@ -1947,7 +1949,7 @@ LRESULT MsgCreate(HWND hwnd, WPARAM wParam,LPARAM lParam) MRU_Load(Globals.pMRUreplace); if (Globals.hwndEdit == NULL || s_hwndEditFrame == NULL || - Globals.hwndStatus == NULL || s_hwndToolbar == NULL || s_hwndReBar == NULL) + Globals.hwndStatus == NULL || Globals.hwndToolbar == NULL || s_hwndReBar == NULL) return -1LL; Style_SetDefaultLexer(Globals.hwndEdit); @@ -2066,12 +2068,12 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) { DWORD dwToolbarStyle = NP3_WS_TOOLBAR; - if (s_hwndToolbar) { DestroyWindow(s_hwndToolbar); } + if (Globals.hwndToolbar) { DestroyWindow(Globals.hwndToolbar); } - s_hwndToolbar = CreateWindowEx(0,TOOLBARCLASSNAME,NULL,dwToolbarStyle, + Globals.hwndToolbar = CreateWindowEx(0,TOOLBARCLASSNAME,NULL,dwToolbarStyle, 0,0,0,0,hwnd,(HMENU)IDC_TOOLBAR,hInstance,NULL); - SendMessage(s_hwndToolbar,TB_BUTTONSTRUCTSIZE,(WPARAM)sizeof(TBBUTTON),0); + SendMessage(Globals.hwndToolbar,TB_BUTTONSTRUCTSIZE,(WPARAM)sizeof(TBBUTTON),0); // Add Toolbar Bitmap HBITMAP hbmp = NULL; @@ -2112,7 +2114,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) HIMAGELIST himlOld = NULL; BUTTON_IMAGELIST bi; - if (SendMessage(s_hwndToolbar, TB_GETIMAGELIST, 0, (LPARAM)&bi)) { + if (SendMessage(Globals.hwndToolbar, TB_GETIMAGELIST, 0, (LPARAM)&bi)) { himlOld = bi.himl; } @@ -2125,7 +2127,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) ImageList_AddMasked(himl,hbmp,CLR_DEFAULT); DeleteObject(hbmp); hbmp = NULL; - SendMessage(s_hwndToolbar,TB_SETIMAGELIST,0,(LPARAM)himl); + SendMessage(Globals.hwndToolbar,TB_SETIMAGELIST,0,(LPARAM)himl); if (himlOld) { ImageList_Destroy(himlOld); himlOld = NULL; @@ -2154,7 +2156,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) LPWSTR toolBarIntRes = (s_iToolBarTheme == 0) ? MAKEINTRESOURCE(IDR_MAINWNDTBHOT) : MAKEINTRESOURCE(IDR_MAINWNDTB2HOT); hbmp = LoadImage(hInstance, toolBarIntRes, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); } - if (SendMessage(s_hwndToolbar, TB_GETHOTIMAGELIST, 0, (LPARAM)& bi)) { + if (SendMessage(Globals.hwndToolbar, TB_GETHOTIMAGELIST, 0, (LPARAM)& bi)) { himlOld = bi.himl; } if (hbmp) { @@ -2169,10 +2171,10 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) ImageList_AddMasked(himl, hbmp, CLR_DEFAULT); DeleteObject(hbmp); hbmp = NULL; - SendMessage(s_hwndToolbar, TB_SETHOTIMAGELIST, 0, (LPARAM)himl); + SendMessage(Globals.hwndToolbar, TB_SETHOTIMAGELIST, 0, (LPARAM)himl); } else { // clear the old one - SendMessage(s_hwndToolbar, TB_SETHOTIMAGELIST, 0, 0); + SendMessage(Globals.hwndToolbar, TB_SETHOTIMAGELIST, 0, 0); } if (himlOld) { ImageList_Destroy(himlOld); @@ -2201,7 +2203,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) LPWSTR toolBarIntRes = (s_iToolBarTheme == 0) ? MAKEINTRESOURCE(IDR_MAINWNDTBDIS) : MAKEINTRESOURCE(IDR_MAINWNDTB2DIS); hbmp = LoadImage(hInstance, toolBarIntRes, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); } - if (SendMessage(s_hwndToolbar, TB_GETDISABLEDIMAGELIST, 0, (LPARAM)& bi)) { + if (SendMessage(Globals.hwndToolbar, TB_GETDISABLEDIMAGELIST, 0, (LPARAM)& bi)) { himlOld = bi.himl; } if (hbmp) { @@ -2216,7 +2218,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) ImageList_AddMasked(himl, hbmp, CLR_DEFAULT); DeleteObject(hbmp); hbmp = NULL; - SendMessage(s_hwndToolbar, TB_SETDISABLEDIMAGELIST, 0, (LPARAM)himl); + SendMessage(Globals.hwndToolbar, TB_SETDISABLEDIMAGELIST, 0, (LPARAM)himl); } else { // create disabled Toolbar, no external bitmap is supplied @@ -2233,12 +2235,12 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) BitmapMergeAlpha(hbmpCopy, GetSysColor(COLOR_3DFACE)); } if (fProcessed) { - if (SendMessage(s_hwndToolbar, TB_GETDISABLEDIMAGELIST, 0, (LPARAM)& bi)) { + if (SendMessage(Globals.hwndToolbar, TB_GETDISABLEDIMAGELIST, 0, (LPARAM)& bi)) { himlOld = bi.himl; } himl = ImageList_Create(cx, cy, ILC_COLOR32 | ILC_MASK, 0, 0); ImageList_AddMasked(himl, hbmpCopy, CLR_DEFAULT); - SendMessage(s_hwndToolbar, TB_SETDISABLEDIMAGELIST, 0, (LPARAM)himl); + SendMessage(Globals.hwndToolbar, TB_SETDISABLEDIMAGELIST, 0, (LPARAM)himl); } } } @@ -2267,31 +2269,31 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) StringCchPrintf(tchIndex, COUNTOF(tchIndex), L"%02i", n); if (IniSectionGetString(pIniSection, tchIndex, L"", tchDesc, COUNTOF(tchDesc)) > 0) { - s_tbbMainWnd[i].iString = SendMessage(s_hwndToolbar, TB_ADDSTRING, 0, (LPARAM)tchDesc); + s_tbbMainWnd[i].iString = SendMessage(Globals.hwndToolbar, TB_ADDSTRING, 0, (LPARAM)tchDesc); s_tbbMainWnd[i].fsStyle |= BTNS_AUTOSIZE | BTNS_SHOWTEXT; } else { GetLngString(s_tbbMainWnd[i].idCommand, tchDesc, COUNTOF(tchDesc)); - s_tbbMainWnd[i].iString = SendMessage(s_hwndToolbar, TB_ADDSTRING, 0, (LPARAM)tchDesc); // tooltip + s_tbbMainWnd[i].iString = SendMessage(Globals.hwndToolbar, TB_ADDSTRING, 0, (LPARAM)tchDesc); // tooltip s_tbbMainWnd[i].fsStyle &= ~(BTNS_AUTOSIZE | BTNS_SHOWTEXT); } } FreeMem(pIniSection); } - //~SendMessage(s_hwndToolbar, TB_SETMAXTEXTROWS, 0, 0); + //~SendMessage(Globals.hwndToolbar, TB_SETMAXTEXTROWS, 0, 0); - SendMessage(s_hwndToolbar,TB_SETEXTENDEDSTYLE,0, - (SendMessage(s_hwndToolbar,TB_GETEXTENDEDSTYLE,0,0) | (TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER))); + SendMessage(Globals.hwndToolbar,TB_SETEXTENDEDSTYLE,0, + (SendMessage(Globals.hwndToolbar,TB_GETEXTENDEDSTYLE,0,0) | (TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER))); - SendMessage(s_hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); + SendMessage(Globals.hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); - if (Toolbar_SetButtons(s_hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, s_tbbMainWnd, COUNTOF(s_tbbMainWnd)) == 0) { - SendMessage(s_hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); + if (Toolbar_SetButtons(Globals.hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, s_tbbMainWnd, COUNTOF(s_tbbMainWnd)) == 0) { + SendMessage(Globals.hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); } RECT rc; - SendMessage(s_hwndToolbar,TB_GETITEMRECT,0,(LPARAM)&rc); - //SendMessage(s_hwndToolbar,TB_SETINDENT,2,0); + SendMessage(Globals.hwndToolbar,TB_GETITEMRECT,0,(LPARAM)&rc); + //SendMessage(Globals.hwndToolbar,TB_SETINDENT,2,0); // Create Statusbar @@ -2326,7 +2328,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) rbBand.fStyle = s_bIsAppThemed ? (RBBS_FIXEDSIZE | RBBS_CHILDEDGE) : RBBS_FIXEDSIZE; rbBand.hbmBack = NULL; rbBand.lpText = L"Toolbar"; - rbBand.hwndChild = s_hwndToolbar; + rbBand.hwndChild = Globals.hwndToolbar; rbBand.cxMinChild = (rc.right - rc.left) * COUNTOF(s_tbbMainWnd); rbBand.cyMinChild = (rc.bottom - rc.top) + 2 * rc.top; rbBand.cx = 0; @@ -2377,7 +2379,7 @@ LRESULT MsgEndSession(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) DestroyWindow(Globals.hwndDlgCustomizeSchemes); } - // call SaveSettings() when s_hwndToolbar is still valid + // call SaveSettings() when Globals.hwndToolbar is still valid SaveSettings(false); if (StrIsNotEmpty(Globals.IniFile)) @@ -2449,7 +2451,7 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam) SciCall_GotoPos(pos); // recreate toolbar and statusbar - Toolbar_GetButtons(s_hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons)); + Toolbar_GetButtons(Globals.hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons)); CreateBars(hwnd, Globals.hInstance); @@ -2513,7 +2515,7 @@ LRESULT MsgThemeChanged(HWND hwnd, WPARAM wParam ,LPARAM lParam) } // recreate toolbar and statusbar - Toolbar_GetButtons(s_hwndToolbar,IDT_FILE_NEW,Settings.ToolbarButtons,COUNTOF(Settings.ToolbarButtons)); + Toolbar_GetButtons(Globals.hwndToolbar,IDT_FILE_NEW,Settings.ToolbarButtons,COUNTOF(Settings.ToolbarButtons)); CreateBars(hwnd,hInstance); @@ -2549,13 +2551,13 @@ LRESULT MsgSize(HWND hwnd, WPARAM wParam, LPARAM lParam) if (Settings.ShowToolbar) { -/* SendMessage(s_hwndToolbar,WM_SIZE,0,0); +/* SendMessage(Globals.hwndToolbar,WM_SIZE,0,0); RECT rc; - GetWindowRect(s_hwndToolbar,&rc); + GetWindowRect(Globals.hwndToolbar,&rc); y = (rc.bottom - rc.top); cy -= (rc.bottom - rc.top);*/ - //SendMessage(s_hwndToolbar,TB_GETITEMRECT,0,(LPARAM)&rc); + //SendMessage(Globals.hwndToolbar,TB_GETITEMRECT,0,(LPARAM)&rc); SetWindowPos(s_hwndReBar,NULL,0,0,LOWORD(lParam),s_cyReBar,SWP_NOZORDER); // the ReBar automatically sets the correct height // calling SetWindowPos() with the height of one toolbar button @@ -3816,8 +3818,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (s_flagPasteBoard) { s_bLastCopyFromMe = true; } - if (!HandleHotSpotURL(SciCall_GetCurrentPos(), COPY_HYPERLINK)) { - SciCall_CopyAllowLine(); + if (!SciCall_IsSelectionEmpty() || + !HandleHotSpotURL(SciCall_GetCurrentPos(), COPY_HYPERLINK)) + { + SciCall_CopyAllowLine(); } UpdateToolbar(); break; @@ -5319,7 +5323,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) break; case IDM_VIEW_CUSTOMIZETB: - SendMessage(s_hwndToolbar,TB_CUSTOMIZE,0,0); + SendMessage(Globals.hwndToolbar,TB_CUSTOMIZE,0,0); break; case IDM_VIEW_LOADTHEMETB: @@ -7077,11 +7081,11 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) case TBN_RESET: { - int i; int c = (int)SendMessage(s_hwndToolbar, TB_BUTTONCOUNT, 0, 0); + int i; int c = (int)SendMessage(Globals.hwndToolbar, TB_BUTTONCOUNT, 0, 0); for (i = 0; i < c; i++) { - SendMessage(s_hwndToolbar, TB_DELETEBUTTON, 0, 0); + SendMessage(Globals.hwndToolbar, TB_DELETEBUTTON, 0, 0); } - SendMessage(s_hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); + SendMessage(Globals.hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); } return FALSE; @@ -7946,7 +7950,7 @@ void SaveSettings(bool bSaveSettingsNow) ///~IniSectionSetInt(pIniSection, L"IMEInteraction", Settings2.IMEInteraction); - Toolbar_GetButtons(s_hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons)); + Toolbar_GetButtons(Globals.hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons)); if (StringCchCompareX(Settings.ToolbarButtons, Defaults.ToolbarButtons) == 0) { IniSectionSetString(pIniSection, L"ToolbarButtons", NULL); } else { @@ -8776,9 +8780,6 @@ void UpdateToolbar() //============================================================================= -#define EnableTool(id,b) SendMessage(s_hwndToolbar,TB_ENABLEBUTTON,id, MAKELONG(((b) ? 1 : 0), 0)) -#define CheckTool(id,b) SendMessage(s_hwndToolbar,TB_CHECKBUTTON,id, MAKELONG((b),0)) - static void _UpdateToolbarDelayed() { SetWindowTitle(Globals.hwndMain, s_uidsAppTitle, s_bIsElevated, IDS_MUI_UNTITLED, Globals.CurrentFile, @@ -8787,38 +8788,38 @@ static void _UpdateToolbarDelayed() if (!Settings.ShowToolbar) { return; } - EnableTool(IDT_FILE_ADDTOFAV, StringCchLenW(Globals.CurrentFile, COUNTOF(Globals.CurrentFile))); - EnableTool(IDT_FILE_SAVE, IsSaveNeeded(ISN_GET) /*&& !bReadOnly*/); - EnableTool(IDT_FILE_RECENT, (MRU_Count(Globals.pFileMRU) > 0)); + EnableTool(Globals.hwndToolbar, IDT_FILE_ADDTOFAV, StringCchLenW(Globals.CurrentFile, COUNTOF(Globals.CurrentFile))); + EnableTool(Globals.hwndToolbar, IDT_FILE_SAVE, IsSaveNeeded(ISN_GET) /*&& !bReadOnly*/); + EnableTool(Globals.hwndToolbar, IDT_FILE_RECENT, (MRU_Count(Globals.pFileMRU) > 0)); - CheckTool(IDT_VIEW_WORDWRAP, Globals.fvCurFile.bWordWrap); - CheckTool(IDT_VIEW_CHASING_DOCTAIL, FileWatching.MonitoringLog); - CheckTool(IDT_VIEW_PIN_ON_TOP, Settings.AlwaysOnTop); + CheckTool(Globals.hwndToolbar, IDT_VIEW_WORDWRAP, Globals.fvCurFile.bWordWrap); + CheckTool(Globals.hwndToolbar, IDT_VIEW_CHASING_DOCTAIL, FileWatching.MonitoringLog); + CheckTool(Globals.hwndToolbar, IDT_VIEW_PIN_ON_TOP, Settings.AlwaysOnTop); bool b1 = SciCall_IsSelectionEmpty(); bool b2 = (bool)(SciCall_GetTextLength() > 0); bool ro = SciCall_GetReadOnly(); bool tv = FocusedView.HideNonMatchedLines; - EnableTool(IDT_EDIT_UNDO, SciCall_CanUndo() && !ro); - EnableTool(IDT_EDIT_REDO, SciCall_CanRedo() && !ro); - EnableTool(IDT_EDIT_PASTE, SciCall_CanPaste() && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_UNDO, SciCall_CanUndo() && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_REDO, SciCall_CanRedo() && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_PASTE, SciCall_CanPaste() && !ro); - EnableTool(IDT_FILE_LAUNCH, b2); + EnableTool(Globals.hwndToolbar, IDT_FILE_LAUNCH, b2); - EnableTool(IDT_EDIT_FIND, b2); - //EnableTool(IDT_EDIT_FINDNEXT,b2); - //EnableTool(IDT_EDIT_FINDPREV,b2 && StringCchLenA(Settings.EFR_Data.szFind,0)); - EnableTool(IDT_EDIT_REPLACE, b2 && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_FIND, b2); + //EnableTool(Globals.hwndToolbar, ,b2); + //EnableTool(Globals.hwndToolbar, IDT_EDIT_FINDPREV,b2 && StringCchLenA(Settings.EFR_Data.szFind,0)); + EnableTool(Globals.hwndToolbar, IDT_EDIT_REPLACE, b2 && !ro); - EnableTool(IDT_EDIT_CUT, !b1 && !ro); - EnableTool(IDT_EDIT_COPY, !b1 && !ro); - EnableTool(IDT_EDIT_CLEAR, !b1 && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_CUT, !b1 && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_COPY, !b1 && !ro); + EnableTool(Globals.hwndToolbar, IDT_EDIT_CLEAR, !b1 && !ro); - EnableTool(IDT_VIEW_TOGGLEFOLDS, b2 && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding)); + EnableTool(Globals.hwndToolbar, IDT_VIEW_TOGGLEFOLDS, b2 && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding)); - EnableTool(IDT_VIEW_TOGGLE_VIEW, b2 && IsFocusedViewAllowed()); - CheckTool(IDT_VIEW_TOGGLE_VIEW, tv); + EnableTool(Globals.hwndToolbar, IDT_VIEW_TOGGLE_VIEW, b2 && IsFocusedViewAllowed()); + CheckTool(Globals.hwndToolbar, IDT_VIEW_TOGGLE_VIEW, tv); } diff --git a/src/Styles.c b/src/Styles.c index 2cfa18558..664f3e668 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -256,10 +256,13 @@ void Style_SetIniFile(LPCWSTR szIniFile) // // Style_InsertThemesMenu() // +static HMENU s_hmenuThemes = NULL; + bool Style_InsertThemesMenu(HMENU hMenuBar) { - HMENU hmenuThemes = CreatePopupMenu(); - //int const pos = GetMenuItemCount(hMenuBar) - 1; + if (s_hmenuThemes) { DestroyMenu(s_hmenuThemes); } + s_hmenuThemes = CreatePopupMenu(); + //int const pos = GetMenuItemCount(hMenuBar) - 2; GetLngString(Theme_Files[0].rid, Theme_Files[0].szName, COUNTOF(Theme_Files[0].szName)); GetLngString(Theme_Files[1].rid, Theme_Files[1].szName, COUNTOF(Theme_Files[1].szName)); @@ -267,10 +270,10 @@ bool Style_InsertThemesMenu(HMENU hMenuBar) for (unsigned i = 0; i < ThemeItems_CountOf(); ++i) { if (i == 2) { - AppendMenu(hmenuThemes, MF_SEPARATOR, 0, 0); + AppendMenu(s_hmenuThemes, MF_SEPARATOR, 0, 0); } if (Theme_Files[i].rid > 0) { - AppendMenu(hmenuThemes, MF_ENABLED | MF_STRING, Theme_Files[i].rid, Theme_Files[i].szName); + AppendMenu(s_hmenuThemes, MF_ENABLED | MF_STRING, Theme_Files[i].rid, Theme_Files[i].szName); } else { break; // done @@ -281,8 +284,8 @@ bool Style_InsertThemesMenu(HMENU hMenuBar) WCHAR wchMenuItemStrg[80] = { L'\0' }; GetLngString(IDS_MUI_MENU_THEMES, wchMenuItemStrg, COUNTOF(wchMenuItemStrg)); - //bool const res = InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg); - bool const res = InsertMenu(hMenuBar, IDM_VIEW_SCHEMECONFIG, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg); + //bool const res = InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)s_hmenuThemes, wchMenuItemStrg); + bool const res = InsertMenu(hMenuBar, IDM_VIEW_SCHEMECONFIG, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)s_hmenuThemes, wchMenuItemStrg); CheckCmd(hMenuBar, Theme_Files[s_idxSelectedTheme].rid, true); @@ -300,6 +303,12 @@ bool Style_InsertThemesMenu(HMENU hMenuBar) // Style_DynamicThemesMenuCmd() - Handles IDS_MUI_MENU_THEMES messages // // +static void _EnableSchemeConfig(const bool bEnable) +{ + EnableCmd(GetMenu(Globals.hwndMain), IDM_VIEW_SCHEMECONFIG, bEnable); + EnableTool(Globals.hwndToolbar, IDT_VIEW_SCHEMECONFIG, bEnable); +} + void Style_DynamicThemesMenuCmd(int cmd, bool bEnableSaveSettings) { unsigned const iThemeIdx = (unsigned)(cmd - IDM_THEMES_DEFAULT); // consecutive IDs @@ -313,7 +322,7 @@ void Style_DynamicThemesMenuCmd(int cmd, bool bEnableSaveSettings) if (Settings.SaveSettings) { if (s_idxSelectedTheme == 0) { - // nothing to do: internal defaults + // internal defaults } else if (s_idxSelectedTheme == 1) { if (bEnableSaveSettings) { @@ -348,6 +357,7 @@ void Style_DynamicThemesMenuCmd(int cmd, bool bEnableSaveSettings) Style_ResetCurrentLexer(Globals.hwndEdit); SendWMSize(Globals.hwndMain, NULL); UpdateUI(); + _EnableSchemeConfig(s_idxSelectedTheme != 0); UpdateAllBars(true); } @@ -671,9 +681,10 @@ bool Style_Export(HWND hwnd) // DWORD Style_ExportToFile(const WCHAR* szFile, bool bForceAll) { - if (StrIsEmpty(szFile)) { - InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_SETTINGSNOTSAVED); + if (s_idxSelectedTheme != 0) { + InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_SETTINGSNOTSAVED); + } return false; } @@ -971,14 +982,13 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew) if (IsLexerStandard(pLexNew)) { - // styles ar already set - EnableCmd(GetMenu(Globals.hwndMain), IDM_VIEW_CURRENTSCHEME, false); + // styles are already set + EnableCmd(GetMenu(Globals.hwndMain), IDM_VIEW_CURRENTSCHEME, true); } else { // merge lexer default styles Style_SetStyles(hwnd, STYLE_DEFAULT, wchNewLexerStyleStrg, false); - - EnableCmd(GetMenu(Globals.hwndMain), IDM_VIEW_CURRENTSCHEME, true && !IsWindow(Globals.hwndDlgCustomizeSchemes)); + EnableCmd(GetMenu(Globals.hwndMain), IDM_VIEW_CURRENTSCHEME, !IsWindow(Globals.hwndDlgCustomizeSchemes)); } // Broadcast STYLE_DEFAULT as base style to all other styles diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 9b6ecedab..12581e125 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -284,6 +284,7 @@ typedef struct _globals_t HANDLE hndlProcessHeap; HWND hwndEdit; HANDLE hndlScintilla; + HANDLE hwndToolbar; HWND hwndStatus; DWORD dwLastError; HMENU hMainMenu;