mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-11 21:03:05 +08:00
Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA
# Conflicts: # language/np3_ko_kr/menu_ko_kr.rc # src/Notepad3.rc
This commit is contained in:
Rainer Kottenhoff
commit
ab2d4b2afd
@ -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\
|
||||
"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 &anhängende 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 Einrückung\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 wählen...\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 einfügen", IDM_VIEW_TABSASSPACES
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -90,12 +90,11 @@ BEGIN
|
||||
MENUITEM "UTF-8 con &signatura", IDM_ENCODING_UTF8SIGN
|
||||
MENUITEM "&Más...\tF9", IDM_ENCODING_SELECT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Forzar la Detección de Codificación", 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 análisis UCHARDET", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "ASCII como UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
|
||||
MENUITEM "Ignorar Codificación &Tags\tAlt+F8", CMD_RELOADNOFILEVARS
|
||||
@ -205,7 +204,7 @@ BEGIN
|
||||
MENUITEM "Eliminar el &primer carácter\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "Eliminar el ú<imo carácter\tAlt+U", IDM_EDIT_STRIPLASTCHAR
|
||||
MENUITEM "Eliminar los blancos al &final de línea\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 líneas...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
MENUITEM "&Alinear líneas...\tAlt+J", IDM_EDIT_ALIGN
|
||||
|
||||
@ -90,12 +90,11 @@ BEGIN
|
||||
MENUITEM "UTF-8 avec &Signature", IDM_ENCODING_UTF8SIGN
|
||||
MENUITEM "&Plus...\tF9", IDM_ENCODING_SELECT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Forcer la détection d'encodage", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Réencoder vers &Défaut\tCtrl-Alt-F", CMD_RECODEDEFAULT
|
||||
MENUITEM "Réencoder vers &ANSI\tCtrl-Shift+A", CMD_RECODEANSI
|
||||
MENUITEM "Réencoder vers &OEM\tCtrl+Shift+O", CMD_RECODEOEM
|
||||
MENUITEM "Réencoder vers &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
|
||||
MENUITEM "Réencoder 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 charactère\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "Supprimer le &dernier charactère\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
|
||||
|
||||
@ -89,7 +89,7 @@ BEGIN
|
||||
CONTROL "&Kisbetû/nagybetû számít",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10
|
||||
CONTROL "E&gész szavakra egyezés",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
|
||||
CONTROL "Szó ele&jére egyezés",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 átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10
|
||||
CONTROL "R&eguláris kifejezéssel",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 körbe",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
|
||||
@ -98,7 +98,7 @@ BEGIN
|
||||
CONTROL "&Joker kar. keresés",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,63,10
|
||||
CONTROL "Átlátszó mód, ha nincs fókuszban ",IDC_TRANSPARENT,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,118,124,10
|
||||
DEFPUSHBUTTON "&Következõ keresése",IDOK,211,7,55,14
|
||||
DEFPUSHBUTTON "&Köv. keresése",IDOK,211,7,55,14
|
||||
PUSHBUTTON "&Elõzõ keresése",IDC_FINDPREV,211,24,55,14
|
||||
PUSHBUTTON "Bezárás",IDCANCEL,211,99,55,14
|
||||
CONTROL "<a>Csere... (Ctrl+H)</a>",IDC_TOGGLEFINDREPLACE,
|
||||
@ -123,7 +123,7 @@ BEGIN
|
||||
CONTROL "Kis/nagybetû eg&yezés",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10
|
||||
CONTROL "Egés&z szavakra egyezés",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
|
||||
CONTROL "Szókez&detre egyezés",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
|
||||
CONTROL "&Fordított perjelek átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10
|
||||
CONTROL "&Backslash-ek átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10
|
||||
CONTROL "R&eguláris kifejezés keresése",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 kör&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 "Kiválasztott színkiemelés beállítás &alapértelmezetté.",IDC_DEFAULTSCHEME,
|
||||
CONTROL "E színkiemelés beállítás &alapértelmezetté.",IDC_DEFAULTSCHEME,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10
|
||||
CONTROL "Fájlnév &kiterjesztése alapján automatikusan.",IDC_AUTOSELECT,
|
||||
CONTROL "Fájlnév &kit. alapján automatikusan.",IDC_AUTOSELECT,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10
|
||||
DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED
|
||||
PUSHBUTTON "Mégsem",IDCANCEL,108,113,50,14
|
||||
@ -317,7 +317,7 @@ BEGIN
|
||||
PUSHBUTTON "Mégsem",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 "Színkiemelések testraszabása",IDC_TITLE,220,25,200,12
|
||||
LTEXT "Színkiemelések testreszabása",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 korlátja:",IDC_STATIC,7,10,60,8
|
||||
LTEXT "&Sor korlátja:",IDC_STATIC,7,10,60,8
|
||||
EDITTEXT 100,77,7,30,14,ES_AUTOHSCROLL
|
||||
CONTROL "&Vonal megjelenítése.",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 "&Háttérszín változtatása.",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,100,10
|
||||
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
|
||||
PUSHBUTTON "Mégsem",IDCANCEL,127,24,50,14
|
||||
|
||||
@ -90,12 +90,11 @@ BEGIN
|
||||
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
|
||||
MENUITEM "&Továbbiak...\tF9", IDM_ENCODING_SELECT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "K&ódolás detektálásának erõltetése", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Újrakódolás az ala&pért.-re\tCtrl-Alt-F", CMD_RECODEDEFAULT
|
||||
MENUITEM "Újrakódolás A&NSI-ra\tCtrl-Shift+A", CMD_RECODEANSI
|
||||
MENUITEM "Újrakódolás &OEM-re\tCtrl+Shift+O", CMD_RECODEOEM
|
||||
MENUITEM "Újrakódolás &GB18030-ra\tCtrl+Shift+F10", CMD_RECODEGB18030
|
||||
MENUITEM "Újrakódolás UCHARDET elemzéshez", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "ASCII-t UTF-8-k&ént\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
|
||||
MENUITEM "Kódolási elemek ki&hagyása\tAlt+F8", CMD_RELOADNOFILEVARS
|
||||
@ -205,7 +204,7 @@ BEGIN
|
||||
MENUITEM "&Elsõ kar. törlése\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "&Utolsó kar. törlése\tAlt+U", IDM_EDIT_STRIPLASTCHAR
|
||||
MENUITEM "Sorvégi &üres kar. törlése\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Üres kar. &tömörítése\tAlt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM "Üres kar. &tömörítése\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Sorok &módosítása...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
MENUITEM "Sorok i&gazítása...\tAlt+J", IDM_EDIT_ALIGN
|
||||
@ -400,7 +399,7 @@ BEGIN
|
||||
POPUP "&Emlékezés"
|
||||
BEGIN
|
||||
MENUITEM "&Legutóbbi fájlokra emlékezzen", IDM_VIEW_NOSAVERECENT
|
||||
MENUITEM "&Õrizze meg a kurzos pozícióját", IDM_VIEW_NOPRESERVECARET
|
||||
MENUITEM "&Õrizze meg a kurzor pozícióját", IDM_VIEW_NOPRESERVECARET
|
||||
MENUITEM "&Keresési mintákre emlékezzen", IDM_VIEW_NOSAVEFINDREPL
|
||||
END
|
||||
POPUP "&Ablak"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -90,12 +90,11 @@ BEGIN
|
||||
MENUITEM "UTF-8 BOM (&S)", IDM_ENCODING_UTF8SIGN
|
||||
MENUITEM "その他の文字コードを指定(&M)...\tF9", IDM_ENCODING_SELECT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "文字コード判別を実行(文字化け時)", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "デフォルトで読み直し(&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 "ASCIIをUTF-8として開く(&8)\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
|
||||
MENUITEM "文字コードを無視(&T)\tAlt+F8", CMD_RELOADNOFILEVARS
|
||||
@ -205,7 +204,7 @@ BEGIN
|
||||
MENUITEM "行頭削除\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 "空白をまとめる(&W)\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "行の修飾(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
MENUITEM "行の整列(&A)...\tAlt+J", IDM_EDIT_ALIGN
|
||||
|
||||
@ -134,7 +134,7 @@ BEGIN
|
||||
IDS_MUI_ERR_UNICODE "Unicodeへの変換中にエラーが発生しました。\nファイルを保存するとデータが失われるかもしれません。"
|
||||
IDS_MUI_ERR_BITMAP "ビットマップファイルの読み込みエラー: %s\n必要な寸法: %i x %i (横幅 >= %i x 高さ)."
|
||||
IDS_MUI_ERR_ELEVATED_RIGHTS
|
||||
"ユーザー権限の昇格エラー。"
|
||||
"権限取得のエラー。"
|
||||
END
|
||||
|
||||
STRINGTABLE
|
||||
@ -234,7 +234,7 @@ END
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_MUI_MENU_LANGUAGE "言語(&L)"
|
||||
IDS_MUI_MENU_THEMES "テーマを切り替える(&S)"
|
||||
IDS_MUI_MENU_THEMES "テーマの切り替え(&S)"
|
||||
IDM_THEMES_DEFAULT "初期設定"
|
||||
IDM_THEMES_FILE_ITEM "標準設定"
|
||||
END
|
||||
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
|
||||
|
||||
IDS_MUI_STYLEEDIT_HELP "\
|
||||
拡張子の区切りは ; です。\r\n\
|
||||
use \\<regex>; to define a filename matching pattern:\r\n\
|
||||
\\正規表現記法; という書式でファイル名の一致パターンを定義できます:\r\n\
|
||||
例 \\xyz$; ファイル名(ベースファイル名+拡張子)の末尾が xyz に合致\r\n\r\n\
|
||||
設定書式(各指定は省略可能, foreは文字色):\r\n\
|
||||
font:フォント名; size:[+/-]nn.mm; bold; italic; underline;\r\n\
|
||||
|
||||
@ -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
|
||||
|
||||
@ -90,12 +90,11 @@ BEGIN
|
||||
MENUITEM "UTF-8 z &sygnatur¹", IDM_ENCODING_UTF8SIGN
|
||||
MENUITEM "&Wiêcej...\tF9", IDM_ENCODING_SELECT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Wymuś wykrywanie kodowania", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Przekoduj na domyœlny &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 "&Wyściel 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ń końcowe niewidoczne znaki\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Skompresuj niewidoczne znaki\tAlt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM "&Wyściel 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ń końcowe 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 "&Wyrównaj wiersze...\tAlt+J", IDM_EDIT_ALIGN
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -94,7 +94,7 @@ BEGIN
|
||||
IDS_ERR_LNK_GETPATH "Hivatkozási hiba\nNincs érvényes fájlrendszer-útvonal a hivatkozott objektumhoz.\nTalán a hivatkozás nem egy fájlra vagy mappára mutat."
|
||||
IDS_ERR_LNK_NOACCESS "Hivatkozási hiba\nNincs hozzáférésem a hivatkozott objektum fájlrendszeri útvonalához.\nEllenőrizze a lemezt vagy a hálózati kapcsolatot."
|
||||
IDS_ERR_CREATELINK "Hivatkozási hiba\nHiba a megadott hivatkozás létrehozásakor.\nTalán a célmappa írásvédett."
|
||||
IDS_ERR_FILTER "File Filter Error\nNincs további szûrõ megadva.\nKérem, nézze meg a MiniPath readme fájlban a további információkat."
|
||||
IDS_ERR_FILTER "Fájlszűrő hiba\nNincs további szűrő megadva.\nKérem, nézze meg a MiniPath readme fájlban a további információkat."
|
||||
IDS_ERR_PREVWINDISABLED "MiniPath\nA már futó MiniPath ablak foglalt vagy nyitva van egy párbeszédablaka.\nSzeretne egy újabb Minipath ablakot megnyitni?"
|
||||
END
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
131
src/Notepad3.c
131
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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
36
src/Styles.c
36
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
|
||||
|
||||
@ -284,6 +284,7 @@ typedef struct _globals_t
|
||||
HANDLE hndlProcessHeap;
|
||||
HWND hwndEdit;
|
||||
HANDLE hndlScintilla;
|
||||
HANDLE hwndToolbar;
|
||||
HWND hwndStatus;
|
||||
DWORD dwLastError;
|
||||
HMENU hMainMenu;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user