https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb2a9bb60ddc690933baf5845b7ff767c49471b2
commit fb2a9bb60ddc690933baf5845b7ff767c49471b2 Author: Kyle Katarn <[email protected]> AuthorDate: Tue May 19 12:09:05 2020 +0200 Commit: GitHub <[email protected]> CommitDate: Tue May 19 19:09:05 2020 +0900 [JOY] Fix missing UI elements and French translation (#2808) Missing GUI elements added. Improve French translation. --- dll/cpl/joy/joy.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dll/cpl/joy/lang/bg-BG.rc | 1 + dll/cpl/joy/lang/cs-CZ.rc | 1 + dll/cpl/joy/lang/de-DE.rc | 1 + dll/cpl/joy/lang/el-GR.rc | 1 + dll/cpl/joy/lang/en-US.rc | 1 + dll/cpl/joy/lang/es-ES.rc | 1 + dll/cpl/joy/lang/fr-FR.rc | 9 +++++---- dll/cpl/joy/lang/he-IL.rc | 1 + dll/cpl/joy/lang/id-ID.rc | 1 + dll/cpl/joy/lang/it-IT.rc | 1 + dll/cpl/joy/lang/no-NO.rc | 1 + dll/cpl/joy/lang/pl-PL.rc | 1 + dll/cpl/joy/lang/pt-PT.rc | 1 + dll/cpl/joy/lang/ro-RO.rc | 1 + dll/cpl/joy/lang/ru-RU.rc | 1 + dll/cpl/joy/lang/sk-SK.rc | 1 + dll/cpl/joy/lang/sq-AL.rc | 1 + dll/cpl/joy/lang/tr-TR.rc | 1 + dll/cpl/joy/lang/uk-UA.rc | 1 + dll/cpl/joy/lang/zh-CN.rc | 1 + dll/cpl/joy/lang/zh-TW.rc | 1 + dll/cpl/joy/resource.h | 1 + 23 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index 530a78d442c..f58c874c9e6 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -23,12 +23,13 @@ * PURPOSE: ReactOS Software Control Panel * PROGRAMMER: Dmitry Chapyshev ([email protected]) * UPDATE HISTORY: - * 10-18-2007 Created + * 10-18-2007 Created + * 05-18-2020 Updated (init of dialog and combobox) */ #include "joy.h" -#define NUM_APPLETS (1) +#define NUM_APPLETS (1) LONG CALLBACK SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2); HINSTANCE hApplet = 0; @@ -80,7 +81,15 @@ AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: + { + WCHAR szBuf[256]; + HWND hComboHwnd = GetDlgItem(hwndDlg,IDC_PREFERRED_DEV_COMBO); + + LoadStringW(hApplet, IDS_NONE, szBuf, _countof(szBuf)); + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + SendMessageW(hComboHwnd, CB_SETCURSEL, 0, (LPARAM)NULL); break; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -118,7 +127,37 @@ CustomPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: + { + WCHAR szBuf[2]; + HWND hComboHwnd; + szBuf[1] = UNICODE_NULL; + + CheckDlgButton(hwndDlg, IDC_JOYSTICK_RADIO, BST_CHECKED); + + hComboHwnd = GetDlgItem(hwndDlg, IDC_AXES_COMBO); + szBuf[0] = L'2'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'3'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'4'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + SendMessageW(hComboHwnd, CB_SETCURSEL, 0, 0); + + hComboHwnd = GetDlgItem(hwndDlg, IDC_BUTTONS_COMBO); + szBuf[0] = L'0'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'1'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'2'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'3'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'4'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + SendMessageW(hComboHwnd, CB_SETCURSEL, 4, 0); + break; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -203,7 +242,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: - AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST)); + AddColumns(GetDlgItem(hwndDlg, IDC_CONTROLLER_LIST)); s_hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); s_hIconSm = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM), IMAGE_ICON, diff --git a/dll/cpl/joy/lang/bg-BG.rc b/dll/cpl/joy/lang/bg-BG.rc index 5ceabd05425..f675307354b 100644 --- a/dll/cpl/joy/lang/bg-BG.rc +++ b/dll/cpl/joy/lang/bg-BG.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Добавяне, премахване и настройване на игрови управления от рода на ръчки и игрови подложки." IDS_CONTROLLER "Управление" IDS_STATUS "Състояние" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/cs-CZ.rc b/dll/cpl/joy/lang/cs-CZ.rc index c737c3d3daa..c26b43fc031 100644 --- a/dll/cpl/joy/lang/cs-CZ.rc +++ b/dll/cpl/joy/lang/cs-CZ.rc @@ -86,4 +86,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Přidat, odebrat a konfigurovat herní ovladače jako například joysticky nebo gamepady." IDS_CONTROLLER "Ovladač" IDS_STATUS "Stav" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/de-DE.rc b/dll/cpl/joy/lang/de-DE.rc index 3868dfdc2c5..93f62df313f 100644 --- a/dll/cpl/joy/lang/de-DE.rc +++ b/dll/cpl/joy/lang/de-DE.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Hinzufügen, Entfernen und Konfigurieren von Gamecontrollerhardware wie Joysticks und Gamepads." IDS_CONTROLLER "Controller" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/el-GR.rc b/dll/cpl/joy/lang/el-GR.rc index 3ef9c253816..01098f0877a 100644 --- a/dll/cpl/joy/lang/el-GR.rc +++ b/dll/cpl/joy/lang/el-GR.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Προσθήκη, κατάργηση και ρύθμιση του υλικού ελεγκτών παιχνιδιών όπως joystick και χειριστήρια παιχνιδιών." IDS_CONTROLLER "Ελεγκτής" IDS_STATUS "Κατάσταση" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/en-US.rc b/dll/cpl/joy/lang/en-US.rc index 543c4dfde9f..2ec701a5afa 100644 --- a/dll/cpl/joy/lang/en-US.rc +++ b/dll/cpl/joy/lang/en-US.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." IDS_CONTROLLER "Controller" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/es-ES.rc b/dll/cpl/joy/lang/es-ES.rc index 95ae4bd2471..021c2a8ac5e 100644 --- a/dll/cpl/joy/lang/es-ES.rc +++ b/dll/cpl/joy/lang/es-ES.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Agrega, quita y configura hardware de dispositivos de juego como joysticks y controladores para juegos." IDS_CONTROLLER "Dispositivo" IDS_STATUS "Estado" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/fr-FR.rc b/dll/cpl/joy/lang/fr-FR.rc index dd3cdbfdde1..a0f813ba571 100644 --- a/dll/cpl/joy/lang/fr-FR.rc +++ b/dll/cpl/joy/lang/fr-FR.rc @@ -28,10 +28,10 @@ BEGIN LTEXT "Sélectionnez un contrôleur de jeu dans la liste suivante, puis cliquez sur OK. Si votre contrôleur de jeu n'apparaît pas dans la liste, cliquez sur Personnaliser.", -1, 35, 7, 210, 33 LTEXT "Contrôleurs de jeu :", -1, 8, 45, 126, 8 LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP - AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 250, 10, WS_GROUP LTEXT "Port de jeu:", -1, 7, 134, 38, 8, NOT WS_VISIBLE COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 200, 147, 58, 14 CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 208, 179, 50, 14 @@ -54,7 +54,7 @@ BEGIN AUTORADIOBUTTON "Axe Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE GROUPBOX "&Boutons", -1, 137, 67, 116, 44 COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "Inclue un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + AUTOCHECKBOX "Inclut un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 120, 10 LTEXT "N&om du contrôleur :", -1, 7, 139, 200, 9 EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 @@ -70,7 +70,7 @@ BEGIN ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 163, 65, 50, 14 - LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 10 + LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 16 LTEXT "&Périphérique préféré:", -1, 34, 24, 70, 10 COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL END @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Ajouter, supprimer, et configurer le matériel de contrôle de jeu comme les joysticks et les manettes de jeu." IDS_CONTROLLER "Contrôleur" IDS_STATUS "Statut" + IDS_NONE "(Aucun)" END diff --git a/dll/cpl/joy/lang/he-IL.rc b/dll/cpl/joy/lang/he-IL.rc index b647bf742c1..eaa45c61bce 100644 --- a/dll/cpl/joy/lang/he-IL.rc +++ b/dll/cpl/joy/lang/he-IL.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." IDS_CONTROLLER "בקר" IDS_STATUS "מצב" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/id-ID.rc b/dll/cpl/joy/lang/id-ID.rc index 4356e48a2d0..8c90a5fc8b7 100644 --- a/dll/cpl/joy/lang/id-ID.rc +++ b/dll/cpl/joy/lang/id-ID.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Tambahkan, hapus, dan konfigurasikan perangkat keras pengontrol permainan seperti joystick dan gamepad." IDS_CONTROLLER "Pengontrol" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/it-IT.rc b/dll/cpl/joy/lang/it-IT.rc index bc006c8f6b9..79c66454ddd 100644 --- a/dll/cpl/joy/lang/it-IT.rc +++ b/dll/cpl/joy/lang/it-IT.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Aggiunge, rimuove e configura periferiche di gioco come joystick e gamepad." IDS_CONTROLLER "Dispositivo" IDS_STATUS "Stato" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/no-NO.rc b/dll/cpl/joy/lang/no-NO.rc index ad35c8330fb..9bfc0c0c27c 100644 --- a/dll/cpl/joy/lang/no-NO.rc +++ b/dll/cpl/joy/lang/no-NO.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Legg til, fjern, og konfigurer spillkontroller maskinvare som styrespak og spillkontroll." IDS_CONTROLLER "Kontroller" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/pl-PL.rc b/dll/cpl/joy/lang/pl-PL.rc index 24c1a3b6bbb..bebdba06ccf 100644 --- a/dll/cpl/joy/lang/pl-PL.rc +++ b/dll/cpl/joy/lang/pl-PL.rc @@ -89,4 +89,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Dodaje, usuwa i konfiguruje Kontrolery gier, takie jak joysticki, pady czy kierownice." IDS_CONTROLLER "Kontroler" IDS_STATUS "Stan" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/pt-PT.rc b/dll/cpl/joy/lang/pt-PT.rc index 7874363de5d..4a5095c3709 100644 --- a/dll/cpl/joy/lang/pt-PT.rc +++ b/dll/cpl/joy/lang/pt-PT.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Adicionar, remover e configurar o hardware controlador de jogos, tais como joysticks e consolas de jogos." IDS_CONTROLLER "Controlador" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/ro-RO.rc b/dll/cpl/joy/lang/ro-RO.rc index fbcd4e65d76..91ade0a0f19 100644 --- a/dll/cpl/joy/lang/ro-RO.rc +++ b/dll/cpl/joy/lang/ro-RO.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Adăugarea, eliminarea sau configurarea dispozitivelor de control pentru jocuri, precum joystick-uri sau gamepad-uri." IDS_CONTROLLER "Dispozitiv de control" IDS_STATUS "Stare" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/ru-RU.rc b/dll/cpl/joy/lang/ru-RU.rc index 062bd3ac398..9c7239b4bd2 100644 --- a/dll/cpl/joy/lang/ru-RU.rc +++ b/dll/cpl/joy/lang/ru-RU.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Добавление, удаление и настройка параметров игровых устройств, например, джойстиков или игровых планшетов." IDS_CONTROLLER "Устройство" IDS_STATUS "Состояние" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/sk-SK.rc b/dll/cpl/joy/lang/sk-SK.rc index 3c19f4d6e4f..c5bc1b0365f 100644 --- a/dll/cpl/joy/lang/sk-SK.rc +++ b/dll/cpl/joy/lang/sk-SK.rc @@ -85,4 +85,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Pridá, odstráni a konfiguruje hracie zariadenia, ako sú napríklad pákové ovládače alebo gamepady." IDS_CONTROLLER "Zariadenie" IDS_STATUS "Stav" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/sq-AL.rc b/dll/cpl/joy/lang/sq-AL.rc index e97ee17bbbd..62ffb9280fa 100644 --- a/dll/cpl/joy/lang/sq-AL.rc +++ b/dll/cpl/joy/lang/sq-AL.rc @@ -85,4 +85,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Shtoni, hiqni, dhe konfiguroni pajisjet elektronike kontrolluese të lojërave të tilla si levë dhe pad-loje." IDS_CONTROLLER "Kontrollues" IDS_STATUS "Gjendje" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/tr-TR.rc b/dll/cpl/joy/lang/tr-TR.rc index 09944f942df..a43d537128b 100644 --- a/dll/cpl/joy/lang/tr-TR.rc +++ b/dll/cpl/joy/lang/tr-TR.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Oyun çubukları ve oyun kolları gibi oyun denetleyicisi donanımlarını ekler, çıkarır ve yapılandırır." IDS_CONTROLLER "Denetleyici" IDS_STATUS "Durum" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/uk-UA.rc b/dll/cpl/joy/lang/uk-UA.rc index bd416680cc5..597e9f122b4 100644 --- a/dll/cpl/joy/lang/uk-UA.rc +++ b/dll/cpl/joy/lang/uk-UA.rc @@ -89,4 +89,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Додавання, видалення й настройка параметрів ігрових пристроїв, наприклад, джойстиків або ігрових планшетів." IDS_CONTROLLER "Пристрій" IDS_STATUS "Стан" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/zh-CN.rc b/dll/cpl/joy/lang/zh-CN.rc index 56b0266f9c1..c7747bdb56e 100644 --- a/dll/cpl/joy/lang/zh-CN.rc +++ b/dll/cpl/joy/lang/zh-CN.rc @@ -87,4 +87,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "添加、删除或配置游戏控制器硬件，如游戏杆和游戏板" IDS_CONTROLLER "控制器" IDS_STATUS "状态" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/zh-TW.rc b/dll/cpl/joy/lang/zh-TW.rc index cbe77f94a13..bfb0645686a 100644 --- a/dll/cpl/joy/lang/zh-TW.rc +++ b/dll/cpl/joy/lang/zh-TW.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "添加、刪除或配置遊戲控制器硬體，如遊戲杆和遊戲板" IDS_CONTROLLER "控制器" IDS_STATUS "狀態" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/resource.h b/dll/cpl/joy/resource.h index 7e6ad4d8804..27b09dd6a3c 100644 --- a/dll/cpl/joy/resource.h +++ b/dll/cpl/joy/resource.h @@ -14,6 +14,7 @@ #define IDS_CPLSYSTEMDESCRIPTION 1099 #define IDS_CONTROLLER 1151 #define IDS_STATUS 1152 +#define IDS_NONE 1200 /* Controls */ #define IDC_CONTROLLER_LIST 1020
