Reworked (maybe less aweful) icons.

diff --git a/WinMute/AboutDlg.cpp b/WinMute/AboutDlg.cpp
index d2da303df5decec8064c3f8b02e8e06f705ead0c..27b919b9c7ea253d2d32780bcdab196aa41825e8 100644 (file)
--- a/WinMute/AboutDlg.cpp
+++ b/WinMute/AboutDlg.cpp
@@ -285,6 +285,11 @@ INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
          reinterpret_cast<WPARAM>(dlgData->hTitleFont),
          TRUE);
 
+      HICON hIcon = LoadIcon(
+         GetModuleHandle(NULL),
+         MAKEINTRESOURCE(IDI_TRAY_DARK));
+      SendMessageW(hDlg, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hIcon));
+
       return TRUE;
    }
    case WM_NOTIFY: {

diff --git a/WinMute/SettingsDlg.cpp b/WinMute/SettingsDlg.cpp
index a41a7b472e1dfe353081227773af91bda26d7f7d..6ccd061ec048c02ee5cc2ba21234515109f8a544 100644 (file)
--- a/WinMute/SettingsDlg.cpp
+++ b/WinMute/SettingsDlg.cpp
@@ -123,10 +123,10 @@ INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
          ResizeTab(dlgData->hTabCtrl, hCurTab);
       }
 
-      /*HICON hIcon = LoadIcon(
+      HICON hIcon = LoadIcon(
          GetModuleHandle(NULL),
          MAKEINTRESOURCE(IDI_SETTINGS));
-      SendMessageW(hDlg, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hIcon));*/
+      SendMessageW(hDlg, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hIcon));
 
       SwitchTab(dlgData, dlgData->hTabs[SETTINGS_TAB_GENERAL]);
       return TRUE;

diff --git a/WinMute/WMSettings.cpp b/WinMute/WMSettings.cpp
index ef4e24faa94affb4198ef9e5b04c8593db12c42b..aa957223898bc727eabe6a9128d08782abf91943 100644 (file)
--- a/WinMute/WMSettings.cpp
+++ b/WinMute/WMSettings.cpp
@@ -208,13 +208,13 @@ void WMSettings::EnableAutostart(bool enable)
                wmPath,
                (lstrlen(wmPath) + 1) * sizeof(TCHAR));
             if (regError != ERROR_SUCCESS) {
-               PrintWindowsError(_T("RegOpenKeyEx"), regError);
+               PrintWindowsError(_T("RegSetKeyValue"), regError);
             }
          }
       } else {
          DWORD regError = RegDeleteKeyValue(hRunKey, NULL, LX_SYSTEMS_AUTOSTART_KEY);
-         if (regError != ERROR_SUCCESS) {
-            PrintWindowsError(_T("RegOpenKeyEx"), regError);
+         if (regError != ERROR_SUCCESS && regError != ERROR_FILE_NOT_FOUND) {
+            PrintWindowsError(_T("RegDeleteKeyValue"), regError);
          }
       }
       RegCloseKey(hRunKey);

diff --git a/WinMute/WinMute.rc b/WinMute/WinMute.rc
index 400ba1b75945bb2943d2ea86eac65ec94a1be1d0..ccc510a40891808cec60f44c188e4c9e5db38d14 100644 (file)
--- a/WinMute/WinMute.rc
+++ b/WinMute/WinMute.rc
@@ -51,7 +51,7 @@ END
 //
 
 IDD_ABOUT DIALOGEX 0, 0, 313, 269
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About WinMute"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN

diff --git a/WinMute/icons/app.ico b/WinMute/icons/app.ico
index a1e22e804adb30ca0c31e8322ba12d447e1e1b5c..bbb5355d0795e9ef6095c1490b080257d27c5000 100644 (file)
Binary files a/WinMute/icons/app.ico and b/WinMute/icons/app.ico differ

diff --git a/WinMute/icons/settings.ico b/WinMute/icons/settings.ico
index 8aa98e515dae1fd85d0df9997de54ed10730c400..9118b8f127de5cd8624e488ad0465419ab3b5cea 100644 (file)
Binary files a/WinMute/icons/settings.ico and b/WinMute/icons/settings.ico differ

diff --git a/WinMute/icons/tray_bright.ico b/WinMute/icons/tray_bright.ico
index bbb5355d0795e9ef6095c1490b080257d27c5000..f070e5fff91175d5e4541cfcc59c2cb1e54a4456 100644 (file)
Binary files a/WinMute/icons/tray_bright.ico and b/WinMute/icons/tray_bright.ico differ

diff --git a/WinMute/icons/tray_dark.ico b/WinMute/icons/tray_dark.ico
index 92ed62e79dc167cb34a74b7f0d0d21cc534a5a76..d3590f9ec4a15c7bedd47dce57cc1baf790f57e6 100644 (file)
Binary files a/WinMute/icons/tray_dark.ico and b/WinMute/icons/tray_dark.ico differ