From: lx-s <lx-s@users.noreply.github.com>
Date: Fri, 8 Apr 2022 06:59:40 +0000 (+0200)
Subject: Reworked (maybe less aweful) icons.
X-Git-Tag: 1.9.9.2~7
X-Git-Url: https://repos.lx-s.de/gitweb/?a=commitdiff_plain;h=4c1b8ad847839d044fe416fce28f1f9142489500;p=winmute.git

Reworked (maybe less aweful) icons.
---

diff --git a/WinMute/AboutDlg.cpp b/WinMute/AboutDlg.cpp
index d2da303..27b919b 100644
--- 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 a41a7b4..6ccd061 100644
--- 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 ef4e24f..aa95722 100644
--- 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 400ba1b..ccc510a 100644
--- 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 a1e22e8..bbb5355 100644
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 8aa98e5..9118b8f 100644
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 bbb5355..f070e5f 100644
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 92ed62e..d3590f9 100644
Binary files a/WinMute/icons/tray_dark.ico and b/WinMute/icons/tray_dark.ico differ