From 32f80b592983e94dba211db8d41a5def4b83e2e5 Mon Sep 17 00:00:00 2001 From: Jose Carlos Jesus Date: Sat, 20 May 2023 14:48:30 -0400 Subject: [PATCH] [UTILMAN] Fix content order in IDC_LISTBOX (#5289) OSK et Magnify are mixed at initialization (language dependent), LBS_STANDARD includes LBS_SORT style that changes the content in the listbox. Patch by KRosUser. CORE-18274 --- base/applications/utilman/umandlg/lang/de-DE.rc | 2 +- base/applications/utilman/umandlg/lang/en-US.rc | 2 +- base/applications/utilman/umandlg/lang/es-ES.rc | 2 +- base/applications/utilman/umandlg/lang/fr-FR.rc | 2 +- base/applications/utilman/umandlg/lang/he-IL.rc | 2 +- base/applications/utilman/umandlg/lang/it-IT.rc | 2 +- base/applications/utilman/umandlg/lang/pl-PL.rc | 2 +- base/applications/utilman/umandlg/lang/pt-PT.rc | 2 +- base/applications/utilman/umandlg/lang/ro-RO.rc | 2 +- base/applications/utilman/umandlg/lang/ru-RU.rc | 2 +- base/applications/utilman/umandlg/lang/tr-TR.rc | 2 +- base/applications/utilman/umandlg/lang/uk-UA.rc | 2 +- base/applications/utilman/umandlg/lang/zh-CN.rc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/utilman/umandlg/lang/de-DE.rc b/base/applications/utilman/umandlg/lang/de-DE.rc index 1c2a8c0c973..84e17778dfe 100644 --- a/base/applications/utilman/umandlg/lang/de-DE.rc +++ b/base/applications/utilman/umandlg/lang/de-DE.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Eingabehilfen-Manager" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Stop", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/en-US.rc b/base/applications/utilman/umandlg/lang/en-US.rc index 67fb8b87e53..ef287434f5d 100644 --- a/base/applications/utilman/umandlg/lang/en-US.rc +++ b/base/applications/utilman/umandlg/lang/en-US.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Accessibility Utility Manager" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Stop", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/es-ES.rc b/base/applications/utilman/umandlg/lang/es-ES.rc index 4b5813f5c16..7b0dba939b3 100644 --- a/base/applications/utilman/umandlg/lang/es-ES.rc +++ b/base/applications/utilman/umandlg/lang/es-ES.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Herramientas de Accesibilidad" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Empezar", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Parar", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/fr-FR.rc b/base/applications/utilman/umandlg/lang/fr-FR.rc index 76c8e0a2505..dc49a682df7 100644 --- a/base/applications/utilman/umandlg/lang/fr-FR.rc +++ b/base/applications/utilman/umandlg/lang/fr-FR.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Gestionnaire d'utilitaires d'accessibilité" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Démarrer", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Arrêter", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/he-IL.rc b/base/applications/utilman/umandlg/lang/he-IL.rc index d16ce949376..f518769d9a4 100644 --- a/base/applications/utilman/umandlg/lang/he-IL.rc +++ b/base/applications/utilman/umandlg/lang/he-IL.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "מנהל כלי הנגישות" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "הפעל", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "עצור", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/it-IT.rc b/base/applications/utilman/umandlg/lang/it-IT.rc index 7d8006c1650..6adee07823a 100644 --- a/base/applications/utilman/umandlg/lang/it-IT.rc +++ b/base/applications/utilman/umandlg/lang/it-IT.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Accessibilità Utility Manager" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Avvia", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Arresta", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/pl-PL.rc b/base/applications/utilman/umandlg/lang/pl-PL.rc index 328457265fb..b932bb3f31b 100644 --- a/base/applications/utilman/umandlg/lang/pl-PL.rc +++ b/base/applications/utilman/umandlg/lang/pl-PL.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Menedżer narzędzi ułatwienia dostępu" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Uruchom", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Zatrzymaj", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/pt-PT.rc b/base/applications/utilman/umandlg/lang/pt-PT.rc index f9cf90e7beb..f539128dca1 100644 --- a/base/applications/utilman/umandlg/lang/pt-PT.rc +++ b/base/applications/utilman/umandlg/lang/pt-PT.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Gestor de Utilitários de Acessibilidade" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Iniciar", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Parar", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/ro-RO.rc b/base/applications/utilman/umandlg/lang/ro-RO.rc index 869f3f793ae..b3c9cf3edfd 100644 --- a/base/applications/utilman/umandlg/lang/ro-RO.rc +++ b/base/applications/utilman/umandlg/lang/ro-RO.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Manager utilitare" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Oprire", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/ru-RU.rc b/base/applications/utilman/umandlg/lang/ru-RU.rc index 2f43caa391b..0be8dc349b3 100644 --- a/base/applications/utilman/umandlg/lang/ru-RU.rc +++ b/base/applications/utilman/umandlg/lang/ru-RU.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Диспетчер служебных программ" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Запустить", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Остановить", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/tr-TR.rc b/base/applications/utilman/umandlg/lang/tr-TR.rc index 2faa962c4bc..bcb21f9e3b7 100644 --- a/base/applications/utilman/umandlg/lang/tr-TR.rc +++ b/base/applications/utilman/umandlg/lang/tr-TR.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Erişilebilirlik Yardımcı Programı Yöneticisi" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Başla", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Durdur", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/uk-UA.rc b/base/applications/utilman/umandlg/lang/uk-UA.rc index e5c487c37f2..82da0871476 100644 --- a/base/applications/utilman/umandlg/lang/uk-UA.rc +++ b/base/applications/utilman/umandlg/lang/uk-UA.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Диспетчер службових програм" FONT 8, "MS Shell Dlg" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "Запустити", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Зупинити", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 diff --git a/base/applications/utilman/umandlg/lang/zh-CN.rc b/base/applications/utilman/umandlg/lang/zh-CN.rc index 12bf246c1fa..8716c8001d7 100644 --- a/base/applications/utilman/umandlg/lang/zh-CN.rc +++ b/base/applications/utilman/umandlg/lang/zh-CN.rc @@ -13,7 +13,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "可访问性实用工具管理器" FONT 8, "宋体" BEGIN - LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_NOTIFY | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 CONTROL "开始", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "停止", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16