From 821503a4f5990a59f870b231d320926068fb8316 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 5 Mar 2019 11:02:54 +0100 Subject: [PATCH] + chg: menu item "HighDPI Toolbar" -> "Toggle Toolbar" to toggle through all 3 possible Toolbars --- language/np3_af_za/menu_af_za.rc | 4 ++-- language/np3_be_by/menu_be_by.rc | 4 ++-- language/np3_de_de/menu_de_de.rc | 4 ++-- language/np3_en_gb/menu_en_gb.rc | 4 ++-- language/np3_en_us/menu_en_us.rc | 8 ++++---- language/np3_es_es/menu_es_es.rc | 4 ++-- language/np3_fr_fr/menu_fr_fr.rc | 4 ++-- language/np3_hu_hu/menu_hu_hu.rc | 4 ++-- language/np3_it_it/menu_it_it.rc | 4 ++-- language/np3_ja_jp/menu_ja_jp.rc | 4 ++-- language/np3_ko_kr/menu_ko_kr.rc | 8 ++++---- language/np3_nl_nl/menu_nl_nl.rc | 4 ++-- language/np3_pt_br/menu_pt_br.rc | 4 ++-- language/np3_ru_ru/menu_ru_ru.rc | 4 ++-- language/np3_zh_cn/menu_zh_cn.rc | 6 +++--- src/Notepad3.c | 24 ++++++++++-------------- src/Notepad3.h | 1 + 17 files changed, 46 insertions(+), 49 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 0dfe29ce0..a6e0f3158 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -340,7 +340,7 @@ BEGIN POPUP "Nu&tsbalk" BEGIN MENUITEM "Wys Nuts&balk", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Nutsbalk", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Nutsbalk", IDM_VIEW_TOGGLETB MENUITEM "Pas&maak Nutsbalk...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Wys &Statusbalk", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Wys &Nutsbalk", IDM_VIEW_TOOLBAR - MENUITEM "&HighDPI Nutsbalk", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Nutsbalk", IDM_VIEW_TOGGLETB MENUITEM "&Pas Nutsbalk...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Wys &Statusbalk", IDM_VIEW_STATUSBAR diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index f16910c0a..4f08265f7 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -340,7 +340,7 @@ BEGIN POPUP "Паліца пры&ладаў" BEGIN MENUITEM "Паказаць &паліцу прыладаў", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI паліца пр&ыладаў", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle паліца прыладаў", IDM_VIEW_TOGGLETB MENUITEM "&Наладзіць паліцу прыладаў...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Паказаць &радок стану", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Паказаць &паліцу прыладаў", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI паліца пр&ыладаў", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle паліца прыладаў", IDM_VIEW_TOGGLETB MENUITEM "&Наладзіць паліцу прыладаў...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Паказаць &радок стану", IDM_VIEW_STATUSBAR diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index d50ecc1ee..1e5f83df8 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Werkzeugleiste" BEGIN MENUITEM "Zeige &Werkzeugleiste", IDM_VIEW_TOOLBAR - MENUITEM "&HighDPI Werkzeugleiste", IDM_VIEW_TOGGLETB + MENUITEM "Werkzeugleiste &Umschalten", IDM_VIEW_TOGGLETB MENUITEM "Werkzeugleiste &anpassen...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Lade andere Toolbar...", IDM_VIEW_LOADTHEMETB MENUITEM "Zeige &Statusleiste", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Zeige &Werkzeugleiste", IDM_VIEW_TOOLBAR - MENUITEM "&HighDPI Werkzeugleiste", IDM_VIEW_TOGGLETB + MENUITEM "Werkzeugleiste &Umschalten", IDM_VIEW_TOGGLETB MENUITEM "&Werkzeugleiste anpassen...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Lade andere Toolbar...", IDM_VIEW_LOADTHEMETB MENUITEM "Zeige &Statusleiste", IDM_VIEW_STATUSBAR diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 0013b7eec..12092e7a7 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Toolbar" BEGIN MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 3f231b34f..a16ae001f 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -339,9 +339,9 @@ BEGIN END POPUP "&Toolbar" BEGIN - MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB - MENUITEM "C&ustomize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR END @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 2a39a34a4..4bc3ccaa5 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -340,7 +340,7 @@ BEGIN POPUP "Barra de herram&ientas" BEGIN MENUITEM "&Mostrar la barra de herramientas", IDM_VIEW_TOOLBAR - MENUITEM "&Barra de herramientas con Iconos grandes", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Personalizar la barra de herramientas...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Cargar tema de la barra de herramientas...", IDM_VIEW_LOADTHEMETB MENUITEM "Mostrar barra de &estado", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "&Mostrar la barra de herramientas", IDM_VIEW_TOOLBAR - MENUITEM "&Barra de herramientas con Iconos grandes", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Personalizar la barra de herramientas...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Cargar tema de la barra de herramientas...", IDM_VIEW_LOADTHEMETB MENUITEM "Mostrar la barra de &estado", IDM_VIEW_STATUSBAR diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 52bac9c10..fc9ad308c 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Barre а outils" BEGIN MENUITEM "Afficher la &barre а outils", IDM_VIEW_TOOLBAR - MENUITEM "Barre а outils avec grandes Icфnes", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "Gйrer la barre а outils...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Afficher la barre d'йt&at", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Afficher la barre а ou&tils", IDM_VIEW_TOOLBAR - MENUITEM "Barre а outils avec grandes Icфnes", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Gйrer la barre а outils...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Afficher la barre d'йt&at", IDM_VIEW_STATUSBAR diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 509fbaac9..ed6752fa0 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Toolbar" BEGIN MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 4307d1980..dd54cb6c8 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Toolbar" BEGIN MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index cddc48ef2..9bd0e5bc4 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -340,7 +340,7 @@ BEGIN POPUP "ѓcЃ[ѓ‹ѓoЃ[(&T)" BEGIN MENUITEM "ѓcЃ[ѓ‹ѓoЃ[‚р•\Ћ¦(&B)", IDM_VIEW_TOOLBAR - MENUITEM "Ќ‚‰р‘њ“xѓcЃ[ѓ‹ѓoЃ[", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "ѓcЃ[ѓ‹ѓoЃ[‚М•ТЏW(&U)...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "ѓXѓeЃ[ѓ^ѓXѓoЃ[‚р•\Ћ¦(&S)", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "ѓcЃ[ѓ‹ѓoЃ[‚М•\Ћ¦(&T)", IDM_VIEW_TOOLBAR - MENUITEM "Ќ‚‰р‘њ“xѓcЃ[ѓ‹ѓoЃ[", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "ѓcЃ[ѓ‹ѓoЃ[‚М•ТЏW(&C)...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "ѓXѓeЃ[ѓ^ѓXѓoЃ[‚М•\Ћ¦(&S)", IDM_VIEW_STATUSBAR diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 5b16f4b76..6acedcb1f 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -340,10 +340,10 @@ BEGIN POPUP "µµ±ё ёрАЅ(&T)" BEGIN MENUITEM "µµ±ё ёрАЅ єё±в(&B)", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI µµ±ё ёрАЅ", IDM_VIEW_TOGGLETB - MENUITEM "µµ±ё ёрАЅ »зїлАЪ БцБ¤(&U)...", IDM_VIEW_CUSTOMIZETB - MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "»уЕВ ЗҐЅГ БЩ єёАМ±в(&S)", IDM_VIEW_STATUSBAR + MENUITEM "To&ggle µµ±ё ёрАЅ", IDM_VIEW_TOGGLETB + MENUITEM "µµ±ё ёрАЅ »зїлАЪ БцБ¤(&U)...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB + MENUITEM "»уЕВ ЗҐЅГ БЩ єёАМ±в(&S)", IDM_VIEW_STATUSBAR END POPUP "И®ґл/ГајТ(&Z)" BEGIN diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index db49d8266..bd44fd418 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Werkbalk" BEGIN MENUITEM "Werk&balk tonen", IDM_VIEW_TOOLBAR - MENUITEM "Grote pictogrammen", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "Werkbal&k aanpassen...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Toon &statusbalk", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Werk&balk tonen", IDM_VIEW_TOOLBAR - MENUITEM "Grote pictogrammen", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Werkbal&k aanpassen...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Toon &statusbalk", IDM_VIEW_STATUSBAR diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 156b44dfe..700d20ad9 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -340,7 +340,7 @@ BEGIN POPUP "&Toolbar" BEGIN MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index c18765cbb..d3bee0232 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -340,7 +340,7 @@ BEGIN POPUP "Панель инстр&ументов" BEGIN MENUITEM "Показать &панель инструментов", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI панель &инструментов", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle панель инструментов", IDM_VIEW_TOGGLETB MENUITEM "&Настроить панель инструментов...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Показать &строку состояния", IDM_VIEW_STATUSBAR @@ -460,7 +460,7 @@ BEGIN POPUP "+" BEGIN MENUITEM "Показать &панель инструментов", IDM_VIEW_TOOLBAR - MENUITEM "HighDPI панель &инструментов", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle панель инструментов", IDM_VIEW_TOGGLETB MENUITEM "&Настроить панель инструментов...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "Показать &строку состояния", IDM_VIEW_STATUSBAR diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 9309f5d31..8af888e18 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -340,7 +340,7 @@ BEGIN POPUP "№¤ѕЯАё(&T)" BEGIN MENUITEM "ПФКѕ№¤ѕЯАё(&T)", IDM_VIEW_TOOLBAR - MENUITEM "К№УГёЯЅвОц¶И№¤ѕЯАё(&H)", IDM_VIEW_TOGGLETB + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "ЧФ¶ЁТ幤ѕЯАё(&C)...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "ПФКѕЧґМ¬Аё(&S)", IDM_VIEW_STATUSBAR @@ -459,8 +459,8 @@ BEGIN END POPUP "+" BEGIN - MENUITEM "ПФКѕ№¤ѕЯАё(&T)", IDM_VIEW_TOOLBAR - MENUITEM "К№УГёЯЅвОц¶И№¤ѕЯАё(&H)", IDM_VIEW_TOGGLETB + MENUITEM "ПФКѕ№¤ѕЯАё(&T)", IDM_VIEW_TOOLBAR + MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB MENUITEM "ЧФ¶ЁТ幤ѕЯАё(&C)...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB MENUITEM "ПФКѕЧґМ¬Аё(&S)", IDM_VIEW_STATUSBAR diff --git a/src/Notepad3.c b/src/Notepad3.c index 4673eaae2..8af379155 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -1796,6 +1796,7 @@ bool SelectExternalToolBar(HWND hwnd) { StringCchCopy(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), L""); // clear StringCchCopy(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapHot), L""); // clear + s_iHighDpiToolBar = 2; return true; } return false; @@ -1818,7 +1819,8 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) // Add Toolbar Bitmap HBITMAP hbmp = NULL; HBITMAP hbmpCopy = NULL; - if (StrIsNotEmpty(s_tchToolbarBitmap)) + + if ((s_iHighDpiToolBar == 2) && StrIsNotEmpty(s_tchToolbarBitmap)) { hbmp = _LoadBitmapFile(s_tchToolbarBitmap); @@ -1833,14 +1835,14 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) (bmp.bmHeight * NUMTOOLBITMAPS), bmp.bmHeight, NUMTOOLBITMAPS); StringCchCopy(s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), L""); + s_iHighDpiToolBar = 1; DeleteObject(hbmp); hbmp = NULL; } - } if (!hbmp) { - LPWSTR toolBarIntRes = (s_iHighDpiToolBar >= 1) ? MAKEINTRESOURCE(IDR_MAINWNDTB2) : MAKEINTRESOURCE(IDR_MAINWNDTB); + LPWSTR toolBarIntRes = (s_iHighDpiToolBar == 0) ? MAKEINTRESOURCE(IDR_MAINWNDTB) : MAKEINTRESOURCE(IDR_MAINWNDTB2); hbmp = LoadImage(hInstance, toolBarIntRes, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); } @@ -2997,8 +2999,6 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) EnableCmd(hmenu,IDM_VIEW_NOSAVEFINDREPL,i); EnableCmd(hmenu,IDM_VIEW_SAVESETTINGS,s_bEnableSaveSettings && i); - CheckCmd(hmenu, IDM_VIEW_TOGGLETB, ((s_iHighDpiToolBar >= 1) && StrIsEmpty(s_tchToolbarBitmap))); - i = (StringCchLenW(Globals.IniFile,COUNTOF(Globals.IniFile)) > 0 || StringCchLenW(s_wchIniFile2,COUNTOF(s_wchIniFile2)) > 0); EnableCmd(hmenu,IDM_VIEW_SAVESETTINGSNOW,s_bEnableSaveSettings && i); @@ -4943,12 +4943,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) break; case IDM_VIEW_TOGGLETB: - s_iHighDpiToolBar = (s_iHighDpiToolBar <= 0) ? 1 : 0; - if (s_iHighDpiToolBar >= 0) { - StringCchCopy(s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), L""); - StringCchCopy(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), L""); - StringCchCopy(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapDisabled), L""); - } + s_iHighDpiToolBar = (s_iHighDpiToolBar + 1) % (StrIsEmpty(s_tchToolbarBitmap) ? 2 : 3); SendMessage(hwnd, WM_THEMECHANGED, 0, 0); break; @@ -7093,8 +7088,8 @@ void LoadSettings() WCHAR tchHighDpiToolBar[32] = { L'\0' }; StringCchPrintf(tchHighDpiToolBar, COUNTOF(tchHighDpiToolBar), L"%ix%i HighDpiToolBar", ResX, ResY); - s_iHighDpiToolBar = IniSectionGetInt(pIniSection, tchHighDpiToolBar, 0); - s_iHighDpiToolBar = clampi(s_iHighDpiToolBar, -1, 1); + s_iHighDpiToolBar = IniSectionGetInt(pIniSection, tchHighDpiToolBar, -1); + s_iHighDpiToolBar = StrIsNotEmpty(s_tchToolbarBitmap) ? 2 : clampi(s_iHighDpiToolBar, -1, 1); if (s_iHighDpiToolBar < 0) { // undefined: determine high DPI (higher than Full-HD) s_iHighDpiToolBar = IsFullHDOrHigher(ResX, ResY) ? 1 : 0; } @@ -8988,7 +8983,7 @@ void UpdateSettingsCmds() CheckCmd(hmenu, IDM_VIEW_SAVESETTINGS, Settings.SaveSettings && s_bEnableSaveSettings); EnableCmd(hmenu, IDM_VIEW_SAVESETTINGS, hasIniFile && s_bEnableSaveSettings); EnableCmd(hmenu, IDM_VIEW_SAVESETTINGSNOW, hasIniFile && s_bEnableSaveSettings); - if (SciCall_GetZoom() != 100) { ShowZoomCallTip(); } + COND_SHOW_ZOOM_CALLTIP(); } @@ -9005,6 +9000,7 @@ void UpdateUI() scn.updated = (SC_UPDATE_CONTENT | SC_UPDATE_NP3_INTERNAL_NOTIFY); SendMessage(Globals.hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn); //PostMessage(Globals.hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn); + COND_SHOW_ZOOM_CALLTIP(); } diff --git a/src/Notepad3.h b/src/Notepad3.h index 702352b9c..f7f7eded5 100644 --- a/src/Notepad3.h +++ b/src/Notepad3.h @@ -194,6 +194,7 @@ bool CheckNotifyChangeEvent(); #define _IGNORE_NOTIFY_CHANGE_ __try { IgnoreNotifyChangeEvent(); #define _OBSERVE_NOTIFY_CHANGE_ } __finally { ObserveNotifyChangeEvent(); } +#define COND_SHOW_ZOOM_CALLTIP() { if (SciCall_GetZoom() != 100) { ShowZoomCallTip(); } } #endif //_NP3_NOTEPAD3_H_ /// End of Notepad3.h ///