From: lx-s Date: Fri, 8 Dec 2023 20:11:10 +0000 (+0100) Subject: Translated settings>wifi X-Git-Tag: 2.4.9.0~77^2~4 X-Git-Url: https://repos.lx-s.de/gitweb/?a=commitdiff_plain;h=0665910ecc6453d1814944c1f4bcbd4f69fe6c72;p=winmute.git Translated settings>wifi --- diff --git a/Translations/wm_de/resource.h b/Translations/wm_de/resource.h index 7cdfcb9..25d399b 100644 --- a/Translations/wm_de/resource.h +++ b/Translations/wm_de/resource.h @@ -92,6 +92,14 @@ #define IDS_SETTINGS_QUIETHOURS_FORCE_UNMUTE 1304 #define IDS_SETTINGS_QUIETHOURS_FORCE_UNMUTE_DESCRIPTION 1305 #define IDS_SETTINGS_QUIETHOURS_SHOW_NOTIFICATIONS 1306 +#define IDS_SETTINGS_WIFI_INTRO 1400 +#define IDS_SETTINGS_WIFI_ENABLE 1401 +#define IDS_SETTINGS_WIFI_MUTE_WHEN_NOT_IN_LIST 1402 +#define IDS_SETTINGS_WIFI_DISABLED_INFO 1403 +#define IDS_SETTINGS_WIFI_ADD_DLG_TITLE 1450 +#define IDS_SETTINGS_WIFI_EDIT_DLG_TITLE 1451 +#define IDS_SETTINGS_WIFI_ADD_DLG_SSID_NAME_LABEL 1452 +#define IDS_SETTINGS_WIFI_ADD_DLG_ENTER_DEVICE_NAME_TEXT 1453 // Next default values for new objects // diff --git a/Translations/wm_de/wm_de.rc b/Translations/wm_de/wm_de.rc index 4afc7e5..91096ee 100644 Binary files a/Translations/wm_de/wm_de.rc and b/Translations/wm_de/wm_de.rc differ diff --git a/WinMute/Settings_BluetoothDlg.cpp b/WinMute/Settings_BluetoothDlg.cpp index de7de56..d55a01c 100644 --- a/WinMute/Settings_BluetoothDlg.cpp +++ b/WinMute/Settings_BluetoothDlg.cpp @@ -93,6 +93,10 @@ static INT_PTR CALLBACK Settings_BluetoothAddDlgProc(HWND hDlg, UINT msg, WPARAM } SetWindowLongPtr(hDlg, GWLP_USERDATA, reinterpret_cast(btDeviceData)); LoadBluetoothAddDlgTranslation(hDlg, btDeviceData->devName.length() != 0); + if (btDeviceData->devName.length() != 0) { + SetWindowTextW(GetDlgItem(hDlg, IDC_BT_DEVICE_NAME), + btDeviceData->devName.c_str()); + } // Disable save button until at least one string change is made EnableWindow(GetDlgItem(hDlg, IDOK), FALSE); diff --git a/WinMute/Settings_WifiDlg.cpp b/WinMute/Settings_WifiDlg.cpp index 12e5175..ef48e5f 100644 --- a/WinMute/Settings_WifiDlg.cpp +++ b/WinMute/Settings_WifiDlg.cpp @@ -39,6 +39,23 @@ struct WiFiData { std::wstring ssidName; }; +static void LoadWifiAddDlgTranslation(HWND hDlg, bool isEdit) +{ + WMi18n &i18n = WMi18n::GetInstance(); + if (isEdit) { + i18n.SetItemText(hDlg, IDS_SETTINGS_WIFI_EDIT_DLG_TITLE); + } else { + i18n.SetItemText(hDlg, IDS_SETTINGS_WIFI_ADD_DLG_TITLE); + } + i18n.SetItemText(hDlg, IDC_WIFI_NAME_LABEL, IDS_SETTINGS_WIFI_ADD_DLG_SSID_NAME_LABEL); + i18n.SetItemText(hDlg, IDOK, IDS_SETTINGS_BTN_SAVE); + i18n.SetItemText(hDlg, IDCANCEL, IDS_SETTINGS_BTN_CANCEL); + + Edit_SetCueBannerText( + GetDlgItem(hDlg, IDC_WIFI_NAME), + i18n.GetTextW(IDS_SETTINGS_WIFI_ADD_DLG_ENTER_DEVICE_NAME_TEXT).c_str()); +} + INT_PTR CALLBACK Settings_WifiAddDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -50,18 +67,13 @@ INT_PTR CALLBACK Settings_WifiAddDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPA } SetWindowLongPtr(hDlg, GWLP_USERDATA, reinterpret_cast(wifiData)); - if (wifiData->ssidName.length() == 0) { - if (!SetWindowTextW(hDlg, L"Add WiFi network")) { - PrintWindowsError(L"SetWindowText", GetLastError()); - return FALSE; - } - } else { - if (!SetWindowTextW(hDlg, L"Edit WiFi network") - || !SetWindowTextW(GetDlgItem(hDlg, IDC_WIFI_NAME), wifiData->ssidName.c_str())) { - PrintWindowsError(L"SetWindowText", GetLastError()); - return FALSE; - } + LoadWifiAddDlgTranslation(hDlg, wifiData->ssidName.length() != 0); + + if (wifiData->ssidName.length() != 0) { + SetWindowTextW(GetDlgItem(hDlg, IDC_WIFI_NAME), wifiData->ssidName.c_str()); } + // Disable save button until at least one string change is made + EnableWindow(GetDlgItem(hDlg, IDOK), FALSE); Edit_LimitText(hSsid, SSID_MAX_LEN); if (GetDlgCtrlID(reinterpret_cast(wParam)) != IDC_WIFI_NAME) { SetFocus(hSsid); @@ -70,18 +82,14 @@ INT_PTR CALLBACK Settings_WifiAddDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPA return TRUE; } case WM_COMMAND: - if (LOWORD(wParam) == IDOK) { + if (LOWORD(wParam) == IDC_WIFI_NAME && HIWORD(wParam) == CBN_EDITUPDATE) { + HWND hSsid = GetDlgItem(hDlg, IDC_WIFI_NAME); + const int textLen = Edit_GetTextLength(hSsid); + EnableWindow(GetDlgItem(hDlg, IDOK), textLen > 0); + } else if (LOWORD(wParam) == IDOK) { HWND hSsid = GetDlgItem(hDlg, IDC_WIFI_NAME); - int textLen = Edit_GetTextLength(hSsid); - if (textLen == 0) { - EDITBALLOONTIP ebt; - ZeroMemory(&ebt, sizeof(ebt)); - ebt.cbStruct = sizeof(ebt); - ebt.pszText = L"Please enter a SSID/WIFI name"; - ebt.pszTitle = L"SSID Name"; - ebt.ttiIcon = TTI_INFO; - Edit_ShowBalloonTip(hSsid, &ebt); - } else { + const int textLen = Edit_GetTextLength(hSsid); + if (textLen != 0) { wchar_t ssidBuf[SSID_MAX_LEN + 1]; WiFiData* wifiData = reinterpret_cast(GetWindowLongPtr(hDlg, GWLP_USERDATA)); if (wifiData != nullptr) { @@ -137,6 +145,21 @@ static BOOL CALLBACK ShowChildWindow(HWND hWnd, LPARAM lParam) return TRUE; } + +static void LoadWifiDlgTranslation(HWND hDlg) +{ + WMi18n &i18n = WMi18n::GetInstance(); + + i18n.SetItemText(hDlg, IDC_WIFI_INTRO, IDS_SETTINGS_WIFI_INTRO); + i18n.SetItemText(hDlg, IDC_ENABLE_WIFI_MUTE, IDS_SETTINGS_WIFI_ENABLE); + i18n.SetItemText(hDlg, IDC_IS_PERMITLIST, IDS_SETTINGS_WIFI_MUTE_WHEN_NOT_IN_LIST); + i18n.SetItemText(hDlg, IDC_WIFI_ADD, IDS_SETTINGS_BTN_ADD); + i18n.SetItemText(hDlg, IDC_WIFI_EDIT, IDS_SETTINGS_BTN_EDIT); + i18n.SetItemText(hDlg, IDC_WIFI_REMOVE, IDS_SETTINGS_BTN_REMOVE); + i18n.SetItemText(hDlg, IDC_WIFI_REMOVEALL, IDS_SETTINGS_BTN_REMOVE_ALL); + i18n.SetItemText(hDlg, IDC_STATIC_WLAN_NOT_AVAILABLE, IDS_SETTINGS_WIFI_DISABLED_INFO); +} + INT_PTR CALLBACK Settings_WifiDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -145,6 +168,7 @@ INT_PTR CALLBACK Settings_WifiDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM if (IsAppThemed()) { EnableThemeDialogTexture(hDlg, ETDT_ENABLETAB); } + LoadWifiDlgTranslation(hDlg); WMSettings* settings = reinterpret_cast(lParam); assert(settings != nullptr); SetWindowLongPtr(hDlg, GWLP_USERDATA, reinterpret_cast(settings)); diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc index 460146a..2c252a9 100644 --- a/WinMute/WinMute.rc +++ b/WinMute/WinMute.rc @@ -155,16 +155,16 @@ IDD_SETTINGS_WIFI DIALOGEX 0, 0, 242, 204 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LISTBOX IDC_WIFI_LIST,7,66,170,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add",IDC_WIFI_ADD,179,65,56,16 - PUSHBUTTON "Edit",IDC_WIFI_EDIT,179,84,56,16 - PUSHBUTTON "Remove",IDC_WIFI_REMOVE,179,103,56,16 - PUSHBUTTON "Remove all",IDC_WIFI_REMOVEALL,179,123,56,16 + LISTBOX IDC_WIFI_LIST,7,81,170,95,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Add",IDC_WIFI_ADD,179,80,56,16 + PUSHBUTTON "Edit",IDC_WIFI_EDIT,179,99,56,16 + PUSHBUTTON "Remove",IDC_WIFI_REMOVE,179,118,56,16 + PUSHBUTTON "Remove all",IDC_WIFI_REMOVEALL,179,138,56,16 LTEXT "Note: WLAN is not available on your device, so some options have been disabled.",IDC_STATIC_WLAN_NOT_AVAILABLE,7,179,228,18 - CONTROL "Enable WLAN based muting",IDC_ENABLE_WIFI_MUTE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,26,228,14 + CONTROL "Enable WLAN based muting",IDC_ENABLE_WIFI_MUTE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,44,228,14 CONTROL "Mute workstation if the WLAN network name is NOT in the list\n(default: mute if it is on the list)",IDC_IS_PERMITLIST, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,20,41,215,18 - LTEXT """WLAN Mute"" allows you to mute your workstation based on the name of the connected wireless network.",IDC_STATIC,7,7,228,19 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,20,59,215,18 + LTEXT """WLAN Mute"" allows you to mute your workstation based on the name of the connected wireless network.",IDC_WIFI_INTRO,7,7,228,35 END IDD_SETTINGS_WIFI_ADD DIALOGEX 0, 0, 201, 62 @@ -174,7 +174,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Save",IDOK,91,41,50,14 PUSHBUTTON "Cancel",IDCANCEL,144,41,50,14 - LTEXT "SSID/WiFi Name:",IDC_STATIC,7,7,62,14 + LTEXT "SSID/WiFi Name:",IDC_WIFI_NAME_LABEL,7,7,62,14 EDITTEXT IDC_WIFI_NAME,7,20,187,16,ES_AUTOHSCROLL END @@ -711,6 +711,25 @@ BEGIN "Show Quiet Hours notifications" END +STRINGTABLE +BEGIN + IDS_SETTINGS_WIFI_INTRO """WLAN Mute"" allows you to mute your workstation based on the name of the connected wireless network." + IDS_SETTINGS_WIFI_ENABLE "Enable WLAN based muting" + IDS_SETTINGS_WIFI_MUTE_WHEN_NOT_IN_LIST + "Mute workstation if the WLAN network name is NOT in the list\n(default: mute if it is on the list)" + IDS_SETTINGS_WIFI_DISABLED_INFO + "Note: WLAN is not available on your device, so some options have been disabled." +END + +STRINGTABLE +BEGIN + IDS_SETTINGS_WIFI_ADD_DLG_TITLE "Add WiFi network" + IDS_SETTINGS_WIFI_EDIT_DLG_TITLE "Edit WiFi network" + IDS_SETTINGS_WIFI_ADD_DLG_SSID_NAME_LABEL "SSID/WiFi Name:" + IDS_SETTINGS_WIFI_ADD_DLG_ENTER_DEVICE_NAME_TEXT + "Please enter a SSID/WiFi name" +END + #endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/WinMute/resource.h b/WinMute/resource.h index 4d47407..569dd42 100644 --- a/WinMute/resource.h +++ b/WinMute/resource.h @@ -158,6 +158,8 @@ #define IDC_QUIET_HOURS_START_LABEL 1060 #define IDC_QUIET_HOURS_END_LABEL 1061 #define IDC_QUIET_HOURS_FORCE_UNMUTE_DESCRIPTION 1062 +#define IDC_WIFI_INTRO 1063 +#define IDC_WIFI_NAME_LABEL 1064 #define IDS_SETTINGS_BLUETOOTH_ADD_DLG_TITLE 1101 #define IDS_SETTINGS_BLUETOOTH_EDIT_DLG_TITLE 1102 #define IDS_SETTINGS_BLUETOOTH_ADD_DLG_DEVICE_NAME_LABEL 1103 @@ -187,6 +189,14 @@ #define IDS_SETTINGS_QUIETHOURS_FORCE_UNMUTE 1304 #define IDS_SETTINGS_QUIETHOURS_FORCE_UNMUTE_DESCRIPTION 1305 #define IDS_SETTINGS_QUIETHOURS_SHOW_NOTIFICATIONS 1306 +#define IDS_SETTINGS_WIFI_INTRO 1400 +#define IDS_SETTINGS_WIFI_ENABLE 1401 +#define IDS_SETTINGS_WIFI_MUTE_WHEN_NOT_IN_LIST 1402 +#define IDS_SETTINGS_WIFI_DISABLED_INFO 1403 +#define IDS_SETTINGS_WIFI_ADD_DLG_TITLE 1450 +#define IDS_SETTINGS_WIFI_EDIT_DLG_TITLE 1451 +#define IDS_SETTINGS_WIFI_ADD_DLG_SSID_NAME_LABEL 1452 +#define IDS_SETTINGS_WIFI_ADD_DLG_ENTER_DEVICE_NAME_TEXT 1453 #define ID_TRAYMENU_INFO 40001 #define ID_TRAYMENU_ 40002 #define ID_TRAYMENU_MUTEON 40003 @@ -232,9 +242,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 140 +#define _APS_NEXT_RESOURCE_VALUE 141 #define _APS_NEXT_COMMAND_VALUE 40041 -#define _APS_NEXT_CONTROL_VALUE 1063 +#define _APS_NEXT_CONTROL_VALUE 1065 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif