Further settings translations

diff --git a/Translations/wm_de/resource.h b/Translations/wm_de/resource.h
index ebeb704d17431591c794c0683b6d917714978d32..c7a06a2e6df409e82435d77406e678538454a627 100644 (file)
--- a/Translations/wm_de/resource.h
+++ b/Translations/wm_de/resource.h
@@ -50,9 +50,19 @@
 #define IDS_TRAYMENU_EXIT               412
 #define IDS_SETTINGS_BTN_SAVE           1000
 #define IDS_SETTINGS_BTN_CANCEL         1001
+#define IDS_SETTINGS_TAB_GENERAL        1010
+#define IDS_SETTINGS_TAB_MUTE           1011
+#define IDS_SETTINGS_TAB_QUIET_HOURS    1012
+#define IDS_SETTINGS_TAB_BLUETOOTH      1013
+#define IDS_SETTINGS_TAB_WIFI           1014
+#define IDS_SETTINGS_GENERAL_RUN_ON_STARTUP 1050
+#define IDS_SETTINGS_GENERAL_ENABLE_LOGGING 1051
+#define IDS_SETTINGS_GENERAL_OPEN_LOG_FILE 1052
 #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
+#define IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TITLE 1104
+#define IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TEXT 1105
 
 // Next default values for new objects
 // 

diff --git a/Translations/wm_de/wm_de.rc b/Translations/wm_de/wm_de.rc
index 972ef3df9a071cdac66070a2b46ddae465ee1122..6594c99ca85e7b6edaa0c9ca4e26be18017dc20c 100644 (file)
Binary files a/Translations/wm_de/wm_de.rc and b/Translations/wm_de/wm_de.rc differ

diff --git a/WinMute/SettingsDlg.cpp b/WinMute/SettingsDlg.cpp
index ea0e434fe776eb212d9934f30ddc6570138723c5..4c66a5f2ae013607601ad8f8715bf629f71dcd4e 100644 (file)
--- a/WinMute/SettingsDlg.cpp
+++ b/WinMute/SettingsDlg.cpp
@@ -133,6 +133,8 @@ INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
       reinterpret_cast<SettingsDlgData*>(GetWindowLongPtr(hDlg, GWLP_USERDATA));
    switch (msg) {
    case WM_INITDIALOG: {
+      WMi18n &i18n = WMi18n::GetInstance();
+
       assert(dlgData == nullptr);
       WMSettings* settings = reinterpret_cast<WMSettings*>(lParam);
       dlgData = new SettingsDlgData(settings);
@@ -140,11 +142,19 @@ INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
       
       dlgData->hTabCtrl = GetDlgItem(hDlg, IDC_SETTINGS_TAB);
 
-      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_GENERAL, L"General");
-      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_MUTE, L"Mute");
-      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_QUIETHOURS, L"Quiet Hours");
-      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_BLUETOOTH, L"Bluetooth");
-      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_WIFI, L"WLAN");
+      i18n.SetItemText(hDlg, IDOK, IDS_SETTINGS_BTN_SAVE);
+      i18n.SetItemText(hDlg, IDCANCEL, IDS_SETTINGS_BTN_CANCEL);
+
+      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_GENERAL,
+                    i18n.GetTextW(IDS_SETTINGS_TAB_GENERAL).c_str());
+      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_MUTE,
+                    i18n.GetTextW(IDS_SETTINGS_TAB_MUTE).c_str());
+      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_QUIETHOURS,
+                    i18n.GetTextW(IDS_SETTINGS_TAB_QUIETHOURS).c_str());
+      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_BLUETOOTH,
+                    i18n.GetTextW(IDS_SETTINGS_TAB_BLUETOOTH).c_str());
+      InsertTabItem(dlgData->hTabCtrl, SETTINGS_TAB_WIFI,
+                    i18n.GetTextW(IDS_SETTINGS_TAB_WIFI).c_str());
 
       dlgData->hTabs[SETTINGS_TAB_GENERAL] = CreateDialogParam(
          hglobInstance,

diff --git a/WinMute/Settings_BluetoothDlg.cpp b/WinMute/Settings_BluetoothDlg.cpp
index 900fd2f56e1a55fb2c69877dbfffd4bdc97848b1..05f30cb3f91dca7b489f5a48f39dde1a06532e64 100644 (file)
--- a/WinMute/Settings_BluetoothDlg.cpp
+++ b/WinMute/Settings_BluetoothDlg.cpp
@@ -89,7 +89,6 @@ static INT_PTR CALLBACK Settings_BluetoothAddDlgProc(HWND hDlg, UINT msg, WPARAM
       }
       SetWindowLongPtr(hDlg, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(btDeviceData));
       LoadBluetoothAddDlgTranslation(hDlg, btDeviceData->devName.length() == 0);
-
       // Fill Combobox
       std::vector<std::wstring> registeredBtDevices;
       if (GetPairedBtAudioDevices(registeredBtDevices)) {
@@ -103,6 +102,8 @@ static INT_PTR CALLBACK Settings_BluetoothAddDlgProc(HWND hDlg, UINT msg, WPARAM
          SetFocus(hBtDevName);
          return FALSE;
       }
+      ComboBox_SetCueBannerText(GetDlgItem(hDlg, IDC_BT_DEVICE_NAME), L"Test");
+
       return TRUE;
    }
    case WM_COMMAND:
@@ -110,11 +111,14 @@ static INT_PTR CALLBACK Settings_BluetoothAddDlgProc(HWND hDlg, UINT msg, WPARAM
          HWND hDevName = GetDlgItem(hDlg, IDC_BT_DEVICE_NAME);
          const int textLen = Edit_GetTextLength(hDevName);
          if (textLen == 0) {
+            WMi18n &i18n = WMi18n::GetInstance();
             EDITBALLOONTIP ebt;
+            const auto popupTitle = i18n.GetTextW(IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TITLE);
+            const auto popupText = i18n.GetTextW(IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TEXT);
             ZeroMemory(&ebt, sizeof(ebt));
             ebt.cbStruct = sizeof(ebt);
-            ebt.pszText = L"Please enter a Bluetooth device name";
-            ebt.pszTitle = L"Bluetooth Device Name";
+            ebt.pszTitle = L"Test"; //popupTitle.c_str();
+            ebt.pszText = L"Test"; //popupText.c_str();
             ebt.ttiIcon = TTI_INFO;
             Edit_ShowBalloonTip(hDevName, &ebt);
          } else {

diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc
index 6a2e07f57f8f8460976ac2e1a088683cf366b6ff..ca5df223af63328bc1cd73947dfee9322931cd31 100644 (file)
--- a/WinMute/WinMute.rc
+++ b/WinMute/WinMute.rc
@@ -639,6 +639,30 @@ BEGIN
     IDS_SETTINGS_BTN_CANCEL "Cancel"
 END
 
+STRINGTABLE
+BEGIN
+    IDS_SETTINGS_TAB_GENERAL "General"
+    IDS_SETTINGS_TAB_MUTE   "Mute"
+    IDS_SETTINGS_TAB_QUIETHOURS "Quiet Hours"
+    IDS_SETTINGS_TAB_BLUETOOTH "Bluetooth"
+    IDS_SETTINGS_TAB_WIFI   "WLAN"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SETTINGS_GENERAL_RUN_ON_STARTUP "Start WinMute on system startup"
+    IDS_SETTINGS_GENERAL_ENABLE_LOGGING "Enable logging"
+    IDS_SETTINGS_GENERAL_OPEN_LOG_FILE "Open log file..."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TITLE 
+                            "Bluetooth Device Name"
+    IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TEXT 
+                            "Please enter a bluetooth device name"
+END
+
 #endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/WinMute/resource.h b/WinMute/resource.h
index 7573827189ee2bc08cd05eabe125ba11c52b6e2b..49e9aa60c6da01bfa7716ef9e0ea06233077ab3d 100644 (file)
--- a/WinMute/resource.h
+++ b/WinMute/resource.h
@@ -83,13 +83,18 @@
 #define IDC_MANAGE_AUDIO_ENDPOINTS_INDIVIDUALLY 1008
 #define IDC_TAB1                        1010
 #define IDC_SETTINGS_TAB                1010
+#define IDS_SETTINGS_TAB_GENERAL        1010
 #define IDC_CHECK1                      1011
 #define IDC_RUNONSTARTUP                1011
 #define IDC_MUTE_WHEN_WS_LOCKED         1011
 #define IDC_ENABLE_WIFI_MUTE            1011
+#define IDS_SETTINGS_TAB_MUTE           1011
 #define IDC_ENABLELOGGING               1012
+#define IDS_SETTINGS_TAB_QUIETHOURS     1012
 #define IDC_CHECK3                      1013
+#define IDS_SETTINGS_TAB_BLUETOOTH      1013
 #define IDC_OPENLOG                     1014
+#define IDS_SETTINGS_TAB_WIFI           1014
 #define IDC_LICENSETEXT                 1015
 #define IDC_ABOUT_TAB                   1016
 #define IDC_ABOUTTEXT                   1019
@@ -133,11 +138,16 @@
 #define IDC_ENDPOINT_REMOVEALL          1048
 #define IDC_ENDPOINT_NAME               1049
 #define IDC_MUTEDELAY                   1050
+#define IDS_SETTINGS_GENERAL_RUN_ON_STARTUP 1050
 #define IDC_LANGUAGE                    1051
+#define IDS_SETTINGS_GENERAL_ENABLE_LOGGING 1051
 #define IDC_LABEL_BT_DEVICE_NAME        1052
+#define IDS_SETTINGS_GENERAL_OPEN_LOG_FILE 1052
 #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
+#define IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TITLE 1104
+#define IDS_SETTINGS_BLUETOOTH_ADD_POPUP_ENTER_DEVICE_NAME_TEXT 1105
 #define ID_TRAYMENU_INFO                40001
 #define ID_TRAYMENU_                    40002
 #define ID_TRAYMENU_MUTEON              40003