Refined UI. Added screenshots.

diff --git a/Dist/screenshot.png b/Dist/screenshots/app.png
similarity index 100%
rename from Dist/screenshot.png
rename to Dist/screenshots/app.png

diff --git a/Dist/screenshots/settings_general.png b/Dist/screenshots/settings_general.png
new file mode 100644 (file)
index 0000000..3d61364
Binary files /dev/null and b/Dist/screenshots/settings_general.png differ

diff --git a/Dist/screenshots/settings_quiethours.png b/Dist/screenshots/settings_quiethours.png
new file mode 100644 (file)
index 0000000..aadf0b7
Binary files /dev/null and b/Dist/screenshots/settings_quiethours.png differ

diff --git a/Dist/screenshots/settings_wlan.png b/Dist/screenshots/settings_wlan.png
new file mode 100644 (file)
index 0000000..2976523
Binary files /dev/null and b/Dist/screenshots/settings_wlan.png differ

diff --git a/README.md b/README.md
index 876a98c1843018a7103001e5e805b538a1557b3f..066f2867bc754f569e31151c5a8dd9c517fa6d54 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,8 +14,11 @@ WinMute can automatically mute all sound devices on your PC when
 
 This is very helpful e.g. if you leave your desk and don't want to annoy your co-workers with random sounds or music from your computer or don't want music blasting out of your speakers, the next time you power on your pc during a presentation.
 
-### Screenshot ###
-![Screenshot of WinMute](https://raw.githubusercontent.com/lx-s/WinMute/master/Dist/screenshot.png? "Screenshot of WinMute")
+### Screenshot s###
+![Screenshot of WinMute](https://raw.githubusercontent.com/lx-s/WinMute/master/Dist/screenshots/app.png? "Screenshot of WinMute")
+![Screenshot of the Settings](https://raw.githubusercontent.com/lx-s/WinMute/master/Dist/screenshots/settings_general? "Screenshot of the Settings")
+![Screenshot of the QuietHour-Settings](https://raw.githubusercontent.com/lx-s/WinMute/master/Dist/screenshots/settings_quiethours.png? "Screenshot of the QuietHour-Settings")
+![Screenshot of the WLAN-Settings](https://raw.githubusercontent.com/lx-s/WinMute/master/Dist/screenshots/settings_wlan? "Screenshot of the WLAN-Settings")
 
 ### Requirements ###
 * Windows Vista or any newer version of Windows.

diff --git a/WinMute/Settings_WifiDlg.cpp b/WinMute/Settings_WifiDlg.cpp
index 9629fe9ff52d31df741c130d0b543bfb4c5d968a..b196ba7102bdbebd7979ae2c07f74d7523f29bd2 100644 (file)
--- a/WinMute/Settings_WifiDlg.cpp
+++ b/WinMute/Settings_WifiDlg.cpp
@@ -148,10 +148,11 @@ INT_PTR CALLBACK Settings_GeneralWifiDlgProc(HWND hDlg, UINT msg, WPARAM wParam,
       DWORD enabled = settings->QueryValue(SettingsKey::MUTE_ON_WLAN);
       Button_SetCheck(GetDlgItem(hDlg, IDC_ENABLE_WIFI_MUTE),
                       enabled ? BST_CHECKED : BST_UNCHECKED);
-
+      Button_Enable(GetDlgItem(hDlg, IDC_IS_PERMITLIST), enabled);
       enabled = settings->QueryValue(SettingsKey::MUTE_ON_WLAN_ALLOWLIST);
       Button_SetCheck(GetDlgItem(hDlg, IDC_IS_PERMITLIST),
                       enabled ? BST_CHECKED : BST_UNCHECKED);
+      
 
       Button_Enable(GetDlgItem(hDlg, IDC_WIFI_EDIT), FALSE);
       Button_Enable(GetDlgItem(hDlg, IDC_WIFI_REMOVE), FALSE);
@@ -178,7 +179,10 @@ INT_PTR CALLBACK Settings_GeneralWifiDlgProc(HWND hDlg, UINT msg, WPARAM wParam,
    }
    case WM_COMMAND:
    {
-      if (LOWORD(wParam) == IDC_WIFI_LIST) {
+      if (LOWORD(wParam) == IDC_ENABLE_WIFI_MUTE) {
+         DWORD checked = Button_GetCheck(GetDlgItem(hDlg, IDC_ENABLE_WIFI_MUTE));
+         Button_Enable(GetDlgItem(hDlg, IDC_IS_PERMITLIST), checked == BST_CHECKED);
+      } else if (LOWORD(wParam) == IDC_WIFI_LIST) {
          HWND hList = GetDlgItem(hDlg, IDC_WIFI_LIST);
          if (HIWORD(wParam) == LBN_SELCHANGE || HIWORD(wParam) == LBN_SELCANCEL) {
             bool entrySelected = (ListBox_GetCurSel(hList) != LB_ERR);

diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc
index 9128e763469fa76251b74724f6b4f7b9d3b44e13..107aa43ae3c29f0ef0861e838d86b199a084d2ce 100644 (file)
--- a/WinMute/WinMute.rc
+++ b/WinMute/WinMute.rc
@@ -152,9 +152,9 @@ BEGIN
     PUSHBUTTON      "Remove",IDC_WIFI_REMOVE,179,103,56,16
     PUSHBUTTON      "Remove all",IDC_WIFI_REMOVEALL,179,123,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 Mute"".",IDC_ENABLE_WIFI_MUTE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,26,228,14
-    CONTROL         "Mute workstation when WLAN network name is NOT in list\n(default: mute if in list).",IDC_IS_PERMITLIST,
-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,41,228,18
+    CONTROL         "Enable WLAN based muting",IDC_ENABLE_WIFI_MUTE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,26,228,14
+    CONTROL         "Mute workstation if the WLAN network name is NOT in the list\n(default: mute if it is in 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
 END