From 46c40d4cb5eec5147b9a0da051bfbff7f8aa5846 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Mon, 22 Jan 2018 21:06:53 +0300 Subject: [PATCH] [DESK.CPL] Add flat menus option to effects dialog --- dll/cpl/desk/effappdlg.c | 17 +++++++++++++++++ dll/cpl/desk/lang/bg-BG.rc | 2 ++ dll/cpl/desk/lang/cs-CZ.rc | 2 ++ dll/cpl/desk/lang/de-DE.rc | 2 ++ dll/cpl/desk/lang/el-GR.rc | 2 ++ dll/cpl/desk/lang/en-GB.rc | 2 ++ dll/cpl/desk/lang/en-US.rc | 2 ++ dll/cpl/desk/lang/es-ES.rc | 2 ++ dll/cpl/desk/lang/fr-FR.rc | 2 ++ dll/cpl/desk/lang/he-IL.rc | 2 ++ dll/cpl/desk/lang/hu-HU.rc | 2 ++ dll/cpl/desk/lang/id-ID.rc | 2 ++ dll/cpl/desk/lang/it-IT.rc | 2 ++ dll/cpl/desk/lang/ja-JP.rc | 2 ++ dll/cpl/desk/lang/nl-NL.rc | 2 ++ dll/cpl/desk/lang/no-NO.rc | 2 ++ dll/cpl/desk/lang/pl-PL.rc | 2 ++ dll/cpl/desk/lang/pt-BR.rc | 2 ++ dll/cpl/desk/lang/ro-RO.rc | 2 ++ dll/cpl/desk/lang/ru-RU.rc | 2 ++ dll/cpl/desk/lang/sk-SK.rc | 2 ++ dll/cpl/desk/lang/sq-AL.rc | 2 ++ dll/cpl/desk/lang/sv-SE.rc | 2 ++ dll/cpl/desk/lang/tr-TR.rc | 2 ++ dll/cpl/desk/lang/uk-UA.rc | 2 ++ dll/cpl/desk/lang/zh-CN.rc | 2 ++ dll/cpl/desk/lang/zh-TW.rc | 2 ++ dll/cpl/desk/resource.h | 1 + 28 files changed, 70 insertions(+) diff --git a/dll/cpl/desk/effappdlg.c b/dll/cpl/desk/effappdlg.c index e5856a2d48d..e34ae4eea60 100644 --- a/dll/cpl/desk/effappdlg.c +++ b/dll/cpl/desk/effappdlg.c @@ -23,6 +23,12 @@ do { \ ((state == BST_CHECKED) != (__CONTROL_ID == IDC_EFFAPPEARANCE_KEYBOARDCUES)); \ } while(0) +#define SAVE_CHECKBOX_SCH(__CONTROL_ID, __MEMBER) \ +do { \ + state = SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_GETCHECK, 0, 0); \ + g->SchemeAdv.__MEMBER = (state == BST_CHECKED); \ +} while(0) + #define RSET_COMBOBOX(__CONTROL_ID, __PARENT_MEMBER, __MEMBER) \ do { \ SendDlgItemMessageW(hwndDlg, __CONTROL_ID, CB_SETCURSEL, (WPARAM)g->SchemeAdv.Effects.__MEMBER, 0); \ @@ -41,6 +47,7 @@ do { \ SAVE_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); SAVE_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); SAVE_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues); + SAVE_CHECKBOX_SCH(IDC_EFFAPPEARANCE_FLATMENUS, bFlatMenus); #undef SAVE_CHECKBOX #undef RSET_COMBOBOX @@ -85,6 +92,14 @@ do { \ SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_SETCHECK, state, 0); \ } while(0) +#define INIT_CHECKBOX_SCH(__CONTROL_ID, __MEMBER) \ +do { \ + state = /* Do a XOR of both the conditions */ \ + ((g->SchemeAdv.__MEMBER) == TRUE) \ + ? BST_CHECKED : BST_UNCHECKED; \ + SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_SETCHECK, state, 0); \ +} while(0) + #define FILL_COMBOBOX(__CONTROL_ID, __FIRST_STR, __LAST_STR) \ AddToCombobox(__CONTROL_ID, hwndDlg, __FIRST_STR, __LAST_STR) @@ -102,6 +117,7 @@ do { \ INIT_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); INIT_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); INIT_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues); + INIT_CHECKBOX_SCH(IDC_EFFAPPEARANCE_FLATMENUS, bFlatMenus); #undef INIT_CHECKBOX #undef FILL_COMBOBOX @@ -146,6 +162,7 @@ EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_EFFAPPEARANCE_SETDROPSHADOW: case IDC_EFFAPPEARANCE_DRAGFULLWINDOWS: case IDC_EFFAPPEARANCE_KEYBOARDCUES: + case IDC_EFFAPPEARANCE_FLATMENUS: if (HIWORD(wParam) == BN_CLICKED) { EffAppearanceDlgUpdateControls(hwndDlg, g); diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index 780247ecd99..e946ca59836 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "С&криване на подчертаването за клавиатурното насочване, до натискане на Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Отказ", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Добре", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index 95c5bd907c3..107c682255b 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -115,6 +115,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Nezobrazovat podtržení písmen u klávesových zkratek, dokud nestisknu klávesu Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Storno", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index c49ebeb9321..f555dfe55ba 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der Alt-Taste", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Abbrechen", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index 304a15f1682..6b15f528df5 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 75a53f3e5b5..fdae5dfc99d 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index c29493c1bd6..87f7f7ddbc9 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 815192ea1ff..11887134435 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar el subrayado de acceso rápido hasta presionar la tecla Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Aceptar", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 820eb254d67..b5d4d35672d 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Cacher les lettres soulignées pour la navigation du clavier jusqu'à ce que j'appuie sur la touche Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Annuler", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Accepter", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index cd5b9adbbed..c37d2c94ab6 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "ביטול", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "אישור", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index fd99370fc46..141e8b90e76 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index fbae9c9b881..e97de4556d5 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index 0d44f3da777..41109ebf3fd 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Nascondere la sottolineatura delle lettere di navigazione finche non è premuto il tasto Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Annulla", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index 20ff2aa9266..b54c0df6c5b 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Alt キーを押すまでキーボード ナビゲーションの下線を隠しておく(&H)", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "キャンセル", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 2cd1033e31d..4e80c3eca0b 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot ALT wordt ingedrukt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Annuleren", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 210f49f7ae5..71816e4bf53 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker på Alt tasten", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index a108d91f0a6..3702194b570 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -118,6 +118,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ukryj podkreślenie liter do nawigacji &klawiaturą, dopóki nie nacisnę klawisza Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Anuluj", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index fffaca84bf8..9aacdf47392 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar sublinhados para navegação do teclado até eu pressionar a tecla Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 0dfbb37cb52..7c8a975a20e 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -114,6 +114,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Amână sublinierea literelor navigării din tastatură până la apăsarea tastei «Alt»", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "A&nulează", IDCANCEL, 130, 165, 50, 14 DEFPUSHBUTTON "Con&firmă", IDOK, 77, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index 78c9b5bbc71..62925bbbe99 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -109,6 +109,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Скр&ывать указатели вызова с клавиатуры до нажатия ", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Отмена", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index 5c6311dad8f..32b43cb9a0f 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Skrývať podčiarknuté písmená (klávesové skratky) až do stlačenia klávesu Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Zrušiť", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index 0a9fc973ab7..c04ec0794d0 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -113,6 +113,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Fsheh gërma të nënvizuara për kërkimin e tastierës deri sa të shtypni butonin Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Anulo", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index f286b2a9210..d7530faa567 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index e257e4c5782..acb07dc767d 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "S&eçenek Düğmesine Basana Dek Düğme Takımıyla Gezinme İçin Altı Çizili Harfleri Gizle", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "İptal", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Tamam", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index f768d290080..0763067d8f2 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -117,6 +117,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Приховувати покажчики виклику з клавіатури до натиснення ", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Скасувати", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 15c121b48d9..7fb48832e35 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -117,6 +117,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "直到我按 Alt 键之前，请隐藏有下划线的字母供键盘使用", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "取消", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "确定", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index fb057d3053f..6b64aa6665f 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -111,6 +111,8 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "直到我按 Alt 鍵之前，請隱藏有下劃線的字母供鍵盤使用", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "取消", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "確定", IDOK, 172, 165, 50, 14 END diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index 6884290e167..816ab45311f 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -160,6 +160,7 @@ #define IDC_EFFAPPEARANCE_LARGEICONS 3606 #define IDC_EFFAPPEARANCE_SETDROPSHADOW 3607 #define IDC_EFFAPPEARANCE_DRAGFULLWINDOWS 3608 +#define IDC_EFFAPPEARANCE_FLATMENUS 3609 #define IDS_SLIDEEFFECT 3701 #define IDS_FADEEFFECT 3702