From 9fe01b87e896be67f2cec7eed6370060f05fc78b Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 10 May 2019 20:26:29 +0200 Subject: [PATCH] + chg: rename "Doc Tail Chasing" => "Monitoring Log" + chg: initial default of Toolbar buttons: removed "Monitoring Log" (eye buton) --- language/np3_af_za/menu_af_za.rc | 2 +- language/np3_af_za/strings_af_za.rc | 2 +- language/np3_be_by/menu_be_by.rc | 2 +- language/np3_be_by/strings_be_by.rc | 6 +- language/np3_de_de/menu_de_de.rc | 2 +- language/np3_de_de/strings_de_de.rc | 6 +- language/np3_en_gb/menu_en_gb.rc | 2 +- language/np3_en_gb/strings_en_gb.rc | 6 +- language/np3_en_us/menu_en_us.rc | 2 +- language/np3_en_us/strings_en_us.rc | 6 +- language/np3_es_es/menu_es_es.rc | 2 +- language/np3_hu_hu/menu_hu_hu.rc | 2 +- language/np3_hu_hu/strings_hu_hu.rc | 6 +- language/np3_it_it/strings_it_it.rc | 4 +- language/np3_ja_jp/menu_ja_jp.rc | 3 +- language/np3_ja_jp/strings_ja_jp.rc | 7 +- language/np3_ko_kr/menu_ko_kr.rc | 3 +- language/np3_ko_kr/strings_ko_kr.rc | 3 +- language/np3_nl_nl/menu_nl_nl.rc | 2 +- language/np3_pl_pl/menu_pl_pl.rc | 2 +- language/np3_pl_pl/strings_pl_pl.rc | 6 +- language/np3_pt_br/menu_pt_br.rc | 2 +- language/np3_pt_br/strings_pt_br.rc | 6 +- language/np3_ru_ru/menu_ru_ru.rc | 3 +- language/np3_ru_ru/strings_ru_ru.rc | 3 +- language/np3_zh_cn/menu_zh_cn.rc | 6 +- language/np3_zh_cn/strings_zh_cn.rc | 4 +- src/Notepad3.c | 99 +++++++++++++++-------------- 28 files changed, 104 insertions(+), 95 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index dad6620e6..6b926dc8c 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Kode &Vou\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Wissel Voue\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Gefokusde &Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "&Doc Stert Jaag", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Rol na Einde Van Die &Ler", IDM_VIEW_SCROLLPASTEOF END POPUP "Nu&tsbalk" diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 112ea450b..00d589d61 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -89,7 +89,7 @@ STRINGTABLE BEGIN IDT_FILE_LAUNCH "Voer Dokument Uit" IDT_VIEW_TOGGLE_VIEW "Gefokusde Aansig" - IDT_VIEW_CHASING_DOCTAIL "Doc Tail Chasing" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index fcd285ef2..19f448ca6 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "& \tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "/& \tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM " \tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM " &", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM " ", IDM_VIEW_SCROLLPASTEOF END POPUP " &" diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 4ea2aa476..2f21da5cf 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH " " - IDT_VIEW_TOGGLE_VIEW " " - IDT_VIEW_CHASING_DOCTAIL " " + IDT_FILE_LAUNCH " " + IDT_VIEW_TOGGLE_VIEW " " + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 2c8444100..69f19e4b2 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "&Code Faltung\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "Code Faltung &Umschalten\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "&Fokussierte Ansicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Verfolge Dokument Wachstum", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "Logfile &Monitoring", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Erweiterte Dokument Ende Ansicht", IDM_VIEW_SCROLLPASTEOF END POPUP "&Werkzeugleiste" diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 00f5f4ba4..7ecf2a55f 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Dokument ausfhren" - IDT_VIEW_TOGGLE_VIEW "Fokussierte Ansicht" - IDT_VIEW_CHASING_DOCTAIL"Dateiende berwachung" + IDT_FILE_LAUNCH "Dokument ausfhren" + IDT_VIEW_TOGGLE_VIEW "Fokussierte Ansicht" + IDT_VIEW_CHASING_DOCTAIL "Logfile Monitoring" END STRINGTABLE diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index b5bbcba40..5eccb60c5 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Doc Tail Chasing", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF END POPUP "&Toolbar" diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index f4e20ee27..27a60cecc 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Execute Document" - IDT_VIEW_TOGGLE_VIEW "Focused View" - IDT_VIEW_CHASING_DOCTAIL "Doc Tail Chasing" + IDT_FILE_LAUNCH "Execute Document" + IDT_VIEW_TOGGLE_VIEW "Focused View" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 13f4d7a5c..56edd847d 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Doc Tail Chasing", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF END POPUP "&Toolbar" diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 21cea8659..fe5bd7d16 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Execute Document" - IDT_VIEW_TOGGLE_VIEW "Focused View" - IDT_VIEW_CHASING_DOCTAIL "Doc Tail Chasing" + IDT_FILE_LAUNCH "Execute Document" + IDT_VIEW_TOGGLE_VIEW "Focused View" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index c34570e48..edef6bf37 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -341,7 +341,7 @@ BEGIN MENUITEM "&Alternar pliegues\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "&Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoreo de Log (Tail)", IDM_VIEW_CHASING_DOCTAIL - MENUITEM "&Desplazarse despus del final de archivo", IDM_VIEW_SCROLLPASTEOF + MENUITEM "&Desplazarse despus del final de archivo", IDM_VIEW_SCROLLPASTEOF END POPUP "Barra de herram&ientas" BEGIN diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 64596e42f..5bff0bbda 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Doc Tail Chasing", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF END POPUP "&Toolbar" diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index fafee8af3..360b0f482 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Futatts" - IDT_VIEW_TOGGLE_VIEW "Fkuszlt nzet" - IDT_VIEW_CHASING_DOCTAIL "Dokumentum kvets" + IDT_FILE_LAUNCH "Futatts" + IDT_VIEW_TOGGLE_VIEW "Fkuszlt nzet" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 981a55b6d..1b856806c 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -87,8 +87,8 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Esegui documento" - IDT_VIEW_TOGGLE_VIEW "Vista focalizzata" + IDT_FILE_LAUNCH "Esegui documento" + IDT_VIEW_TOGGLE_VIEW "Vista focalizzata" IDT_VIEW_CHASING_DOCTAIL "Rileva modifiche Log (Tail)" END diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index a2cd8f49f..5f8656601 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -340,7 +340,8 @@ BEGIN MENUITEM "R[h܂肽݂\(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "ׂĐ܂肽(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "P][h\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "ҏW[h", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL + //MENUITEM "ҏW[h", IDM_VIEW_CHASING_DOCTAIL MENUITEM "̏I[ȍ~փXN[(&F)", IDM_VIEW_SCROLLPASTEOF END POPUP "c[o[(&T)" diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 77ab26f39..9ee5b3365 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -87,9 +87,10 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "JĂ镶s" - IDT_VIEW_TOGGLE_VIEW "P][h" - IDT_VIEW_CHASING_DOCTAIL "ҏW[h" + IDT_FILE_LAUNCH "JĂ镶s" + IDT_VIEW_TOGGLE_VIEW "P][h" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" + //IDT_VIEW_CHASING_DOCTAIL "ҏW[h" END STRINGTABLE diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 20b3f23d6..ce43225c5 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -340,7 +340,8 @@ 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 "", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL + //MENUITEM "", IDM_VIEW_CHASING_DOCTAIL MENUITEM " ũ(&F)", IDM_VIEW_SCROLLPASTEOF END POPUP " (&T)" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index bc56bc39a..54b7b7f9a 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -89,7 +89,8 @@ STRINGTABLE BEGIN IDT_FILE_LAUNCH " " IDT_VIEW_TOGGLE_VIEW "" - IDT_VIEW_CHASING_DOCTAIL "" + IDT_VIEW_CHASING_DOCTAIL "&Monitoring Log" + //IDT_VIEW_CHASING_DOCTAIL "" END STRINGTABLE diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 9c2fb832a..028188897 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Sectie &samenvouwen\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Toggle vouwen\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Gefocust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Log Monitoren (Tail)", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "Log &Monitoren (Tail)", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scrollen na einde van bes&tand", IDM_VIEW_SCROLLPASTEOF END POPUP "&Werkbalk" diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 9750d6dad..a1ecd64ae 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Skadanie kodu\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Przecz skadanie kodu\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Doc Tail Chasing", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF END POPUP "&Pasek narzdzi" diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index a1fa609f7..631c0fefc 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Ten Document" - IDT_VIEW_TOGGLE_VIEW "Focused View" - IDT_VIEW_CHASING_DOCTAIL "Doc Tail Chasing" + IDT_FILE_LAUNCH "Ten Document" + IDT_VIEW_TOGGLE_VIEW "Focused View" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 407fd5684..1b13ce97e 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -340,7 +340,7 @@ BEGIN MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "Doc Tail Chasing", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF END POPUP "&Toolbar" diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 599631eae..8d0066971 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -87,9 +87,9 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Execute Document" - IDT_VIEW_TOGGLE_VIEW "Focused View" - IDT_VIEW_CHASING_DOCTAIL "Doc Tail Chasing" + IDT_FILE_LAUNCH "Execute Document" + IDT_VIEW_TOGGLE_VIEW "Focused View" + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" END STRINGTABLE diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 61d7f5583..a1070beb2 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -340,7 +340,8 @@ BEGIN MENUITEM "& \tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "/& \tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM " \tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM " &", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL + //MENUITEM " &", IDM_VIEW_CHASING_DOCTAIL MENUITEM " ", IDM_VIEW_SCROLLPASTEOF END POPUP " &" diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 592190bce..b9f97f4a9 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -89,7 +89,8 @@ STRINGTABLE BEGIN IDT_FILE_LAUNCH " " IDT_VIEW_TOGGLE_VIEW " " - IDT_VIEW_CHASING_DOCTAIL " " + IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" + //IDT_VIEW_CHASING_DOCTAIL " " END STRINGTABLE diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 22de1428b..cc21aa45a 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -337,9 +337,9 @@ BEGIN MENUITEM SEPARATOR POPUP "ʾ(&D)" BEGIN - MENUITEM "۵(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING - MENUITEM "л۵(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS - MENUITEM "л۽(&V)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW + MENUITEM "۵(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "л۵(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS + MENUITEM "л۽(&V)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "׷ļĩβ&tail ", IDM_VIEW_CHASING_DOCTAIL MENUITEM "ļβ(&F)", IDM_VIEW_SCROLLPASTEOF END diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 926d8ce87..58b205985 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -87,8 +87,8 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "еǰĵ" - IDT_VIEW_TOGGLE_VIEW "ʾƥ" + IDT_FILE_LAUNCH "еǰĵ" + IDT_VIEW_TOGGLE_VIEW "ʾƥ" IDT_VIEW_CHASING_DOCTAIL "׷ļβtail " END diff --git a/src/Notepad3.c b/src/Notepad3.c index 893b6bd81..b75cbb490 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -146,52 +146,55 @@ static HMODULE s_hRichEdit = INVALID_HANDLE_VALUE; static int const INISECTIONBUFCNT = 32; // .ini file load buffer in KB -static TBBUTTON s_tbbMainWnd[] = { { 0,IDT_FILE_NEW,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 1,IDT_FILE_OPEN,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 3,IDT_FILE_SAVE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 2,IDT_FILE_BROWSE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 27,IDT_FILE_RECENT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 4,IDT_EDIT_UNDO,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 5,IDT_EDIT_REDO,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 6,IDT_EDIT_CUT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 7,IDT_EDIT_COPY,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 8,IDT_EDIT_PASTE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 9,IDT_EDIT_FIND,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 10,IDT_EDIT_REPLACE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 11,IDT_VIEW_WORDWRAP,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 23,IDT_VIEW_TOGGLEFOLDS,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 25,IDT_VIEW_TOGGLE_VIEW,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 21,IDT_FILE_OPENFAV,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 22,IDT_FILE_ADDTOFAV,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 12,IDT_VIEW_ZOOMIN,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 13,IDT_VIEW_ZOOMOUT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 26,IDT_VIEW_CHASING_DOCTAIL,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 14,IDT_VIEW_SCHEME,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 24,IDT_FILE_LAUNCH,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 16,IDT_FILE_EXIT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 15,IDT_VIEW_SCHEMECONFIG,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 0,0,0,BTNS_SEP,{0},0,0 }, - { 17,IDT_FILE_SAVEAS,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 18,IDT_FILE_SAVECOPY,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 19,IDT_EDIT_CLEAR,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, - { 20,IDT_FILE_PRINT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 } +static TBBUTTON s_tbbMainWnd[] = { + { 0,IDT_FILE_NEW,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 1,IDT_FILE_OPEN,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 3,IDT_FILE_SAVE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 2,IDT_FILE_BROWSE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 27,IDT_FILE_RECENT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 4,IDT_EDIT_UNDO,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 5,IDT_EDIT_REDO,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 6,IDT_EDIT_CUT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 7,IDT_EDIT_COPY,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 8,IDT_EDIT_PASTE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 9,IDT_EDIT_FIND,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 10,IDT_EDIT_REPLACE,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 11,IDT_VIEW_WORDWRAP,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 23,IDT_VIEW_TOGGLEFOLDS,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 25,IDT_VIEW_TOGGLE_VIEW,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 21,IDT_FILE_OPENFAV,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 22,IDT_FILE_ADDTOFAV,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 12,IDT_VIEW_ZOOMIN,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 13,IDT_VIEW_ZOOMOUT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 26,IDT_VIEW_CHASING_DOCTAIL,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 14,IDT_VIEW_SCHEME,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 24,IDT_FILE_LAUNCH,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 16,IDT_FILE_EXIT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 15,IDT_VIEW_SCHEMECONFIG,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 0,0,0,BTNS_SEP,{0},0,0 }, + { 17,IDT_FILE_SAVEAS,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 18,IDT_FILE_SAVECOPY,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 19,IDT_EDIT_CLEAR,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }, + { 20,IDT_FILE_PRINT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 } }; +static const int NUMTOOLBITMAPS = 28; -static int const NUMTOOLBITMAPS = 28; -static const WCHAR* const TBBUTTON_DEFAULT_IDS = L"1 2 4 3 28 0 5 6 0 7 8 9 0 10 11 0 12 0 24 26 0 22 23 0 13 14 0 27 0 15 0 25 0 17"; -static int const NUMINITIALTOOLS = 34; +// ---------------------------------------------------------------------------- + +static const WCHAR* const TBBUTTON_DEFAULT_IDS_V1 = L"1 2 4 3 28 0 5 6 0 7 8 9 0 10 11 0 12 0 24 26 0 22 23 0 13 14 0 27 0 15 0 25 0 17"; +static const WCHAR* const TBBUTTON_DEFAULT_IDS_V2 = L"1 2 4 3 28 0 5 6 0 7 8 9 0 10 11 0 12 0 24 26 0 22 23 0 13 14 0 15 0 25 0 17"; //============================================================================= @@ -2125,10 +2128,10 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) SendMessage(s_hwndToolbar,TB_SETEXTENDEDSTYLE,0, (SendMessage(s_hwndToolbar,TB_GETEXTENDEDSTYLE,0,0) | (TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER))); - SendMessage(s_hwndToolbar,TB_ADDBUTTONS,NUMINITIALTOOLS,(LPARAM)s_tbbMainWnd); + SendMessage(s_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, NUMINITIALTOOLS, (LPARAM)s_tbbMainWnd); + SendMessage(s_hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); } RECT rc; SendMessage(s_hwndToolbar,TB_GETITEMRECT,0,(LPARAM)&rc); @@ -6733,7 +6736,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam) for (i = 0; i < c; i++) { SendMessage(s_hwndToolbar, TB_DELETEBUTTON, 0, 0); } - SendMessage(s_hwndToolbar,TB_ADDBUTTONS,NUMINITIALTOOLS,(LPARAM)s_tbbMainWnd); + SendMessage(s_hwndToolbar, TB_ADDBUTTONS, COUNTOF(s_tbbMainWnd), (LPARAM)s_tbbMainWnd); } return FALSE; @@ -7232,7 +7235,7 @@ void LoadSettings() ///~Settings2.IMEInteraction = clampi(IniSectionGetInt(pIniSection, L"IMEInteraction", Settings2.IMEInteraction), SC_IME_WINDOWED, SC_IME_INLINE); // see TBBUTTON s_tbbMainWnd[] for initial/reset set of buttons - StringCchCopyW(Defaults.ToolbarButtons, COUNTOF(Defaults.ToolbarButtons), TBBUTTON_DEFAULT_IDS); + StringCchCopyW(Defaults.ToolbarButtons, COUNTOF(Defaults.ToolbarButtons), (s_iSettingsVersion < CFG_VER_0002) ? TBBUTTON_DEFAULT_IDS_V1 : TBBUTTON_DEFAULT_IDS_V2); IniSectionGetString(pIniSection, L"ToolbarButtons", Defaults.ToolbarButtons, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons)); GET_BOOL_VALUE_FROM_INISECTION(ShowToolbar, true);