From e9a5addbc139cdd409bcc9352814c1da93f9c00c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20Steinh=C3=B6fer?= Date: Mon, 14 Aug 2017 13:29:01 +0200 Subject: [PATCH] New icon! --- Build/bin/changelog.txt | 4 +++- WinMute/WinMute.cpp | 11 +++++++++-- WinMute/WinMute.h | 1 + WinMute/WinMute.vcxproj | 1 + WinMute/WinMute.vcxproj.filters | 3 +++ WinMute/app.ico | Bin 9662 -> 7406 bytes WinMute/res.rc | 4 +++- WinMute/resource.h | 4 +++- WinMute/tray.ico | Bin 0 -> 7406 bytes 9 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 WinMute/tray.ico diff --git a/Build/bin/changelog.txt b/Build/bin/changelog.txt index 384740b..c862b20 100644 --- a/Build/bin/changelog.txt +++ b/Build/bin/changelog.txt @@ -1,5 +1,7 @@ Version 1.4.4 (2017-08-14) - * Maintenance release, no new features + * New, simpler icon + * System notification area icon is now white, to fit better with + with windows' default icons * Upgraded compiler toolset to VS2017 Version 1.4.3 (2016-08-11) diff --git a/WinMute/WinMute.cpp b/WinMute/WinMute.cpp index 0d0bbe0..8219099 100644 --- a/WinMute/WinMute.cpp +++ b/WinMute/WinMute.cpp @@ -61,7 +61,9 @@ static LRESULT CALLBACK WinMuteWndProc(HWND hWnd, UINT msg, WPARAM wParam, WinMute::WinMute() : muteOnLock_(true), muteOnScreensaver_(true), - restoreAudio_(true) + restoreAudio_(true), + hTrayIcon_(NULL), + hTrayMenu_(NULL) { } WinMute::~WinMute() @@ -172,7 +174,12 @@ bool WinMute::Init() return false; } - trayIcon_.Init(hWnd_, 0, hAppIcon_, _T("WinMute"), true); + hTrayIcon_ = LoadIcon(hglobInstance, MAKEINTRESOURCE(IDI_TRAY)); + if (hTrayIcon_ == NULL) { + PrintWindowsError(_T("LoadIcon")); + return false; + } + trayIcon_.Init(hWnd_, 0, hTrayIcon_, _T("WinMute"), true); return true; } diff --git a/WinMute/WinMute.h b/WinMute/WinMute.h index 4882d7a..47b9595 100644 --- a/WinMute/WinMute.h +++ b/WinMute/WinMute.h @@ -51,6 +51,7 @@ private: HWND hWnd_; HMENU hTrayMenu_; HICON hAppIcon_; + HICON hTrayIcon_; bool muteOnLock_, muteOnScreensaver_, restoreAudio_; diff --git a/WinMute/WinMute.vcxproj b/WinMute/WinMute.vcxproj index ccc041d..8455f22 100644 --- a/WinMute/WinMute.vcxproj +++ b/WinMute/WinMute.vcxproj @@ -239,6 +239,7 @@ + diff --git a/WinMute/WinMute.vcxproj.filters b/WinMute/WinMute.vcxproj.filters index 01f7499..006f288 100644 --- a/WinMute/WinMute.vcxproj.filters +++ b/WinMute/WinMute.vcxproj.filters @@ -96,6 +96,9 @@ Resource Files + + Resource Files + diff --git a/WinMute/app.ico b/WinMute/app.ico index 2ff05b284d6c6c593f47f7a2adfa636037e9a4d5..fb8d0d693063318d4f8dc10089cea3496f45072a 100644 GIT binary patch literal 7406 zcmeI1F-T-r6o!w)fC1fE8WB+X=^oB83@8QHn*}dB!yi- zNVN+VvT%t-gb)ddMv_;=Vq}_maWW_0x$o@~S4Vio1_JLrzxR93oO|zi=e`;58AT@K z9eMIZIHu&A2O^*F+rmQGo)Y;5+rx)N`}222zIb2cBbwG_4JPQ9j`s>l*9oqM=&K)8 z?FWm>ix)3M2R-@m&%fkEJLV<7ef*_7e*BenlF7+QnVOoC>FH^iot>4rxjC7ipO?kO zMOj)}66c(>S}j>#UY3=W6$t3+=!|fCvh<_zpY-h@fB(gaZ!&A}H8H;=n@y1un#b4FW_^;Dz*r zkfoFntm(v=SXeCx5J7XnJ+kd?Ko&NW@-{pUw`>ixGz-`-omWu8SRlUc3^WS`p zS|Vo~#MVf!N2{$XbdqYX%**+4(LT%y?e+_8LiUHUb_T|G{7W@`Hs`-*)5Uhh-V_vaYw zsP`%LKBfLXoxK6ON~ph2zxjFiMh#o3d2^)yqV-026-sb@POb4&Wb~cL-`|Q{e=Tx! dEb{9vwE16UN91RGeu5w1claK5+ak}=e*muY%E$l! literal 9662 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%0Di$e++7gwlHsL}{`YNtWqPp36Q*RxYP_=g5i- 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 diff --git a/WinMute/res.rc b/WinMute/res.rc index 6728ce0..7679bec 100644 --- a/WinMute/res.rc +++ b/WinMute/res.rc @@ -84,7 +84,7 @@ BEGIN CONTROL "lx-systems - lx-s.de",IDC_LINK_HOMEPAGE, "SysLink",WS_TABSTOP,43,31,69,13 LTEXT "Copyright © 2017, Alexander Steinhöfer",IDC_STATIC,43,20,148,12 - ICON IDI_APP,IDC_STATIC,13,7,20,20 + ICON IDI_APP,IDC_STATIC,13,9,21,20,SS_CENTERIMAGE END @@ -167,6 +167,8 @@ END // remains consistent on all systems. IDI_APP ICON "app.ico" +IDI_TRAY ICON "tray.ico" + ///////////////////////////////////////////////////////////////////////////// // diff --git a/WinMute/resource.h b/WinMute/resource.h index f0fa03c..5c59479 100644 --- a/WinMute/resource.h +++ b/WinMute/resource.h @@ -5,6 +5,8 @@ #define IDR_TRAYMENU 101 #define IDD_ABOUT 102 #define IDI_APP 106 +#define IDI_ICON1 107 +#define IDI_TRAY 107 #define IDC_LINK_HOMEPAGE 1001 #define ID_TRAYMENU_INFO 40001 #define ID_TRAYMENU_EXIT 40002 @@ -23,7 +25,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 107 +#define _APS_NEXT_RESOURCE_VALUE 108 #define _APS_NEXT_COMMAND_VALUE 40013 #define _APS_NEXT_CONTROL_VALUE 1002 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/WinMute/tray.ico b/WinMute/tray.ico new file mode 100644 index 0000000000000000000000000000000000000000..73d5cc968c34c5a268135ee31d1f885e9ba640a7 GIT binary patch literal 7406 zcmeI1J!l+96vv;if)vn)-8d;6PS{QCG=_zM;KBv>F5L?ZOG=k9DP&`aAQ;@ZnaYhr zQn(8kQrVzF7>1~bAjE`3$`V|}5D7JR(d8z;H#7Trx94*gh<5$kxAWeAX5PL%-R_)4 z=H!fAy((;r^6iSq$DFOL#rC4eulUZM4eig~5&7~xkq>EVmkpSspWogM#vkW6D&q2g zSf~H+IC=j3xw!tJ{PgGFvgbBcCBJ|4m0Y>Kku3eMs*RRWs8#iQQV?)w3m0P!N$(=iQ!SAmBeCRLNHauip`q3wH|)Sa84qQ(Z`l;y!WmP|e zyqeD}@``>Yd8waGUg&3(=lWUYQ9nVhu6(Q9ws;e&Wew3>i>=64w4tG@&!10lMa@Kc zeqm$dOdh@Y!795=9=%oHCU427RX$nYE}y8MBA=w6CZC|6Dj(NJ`S_g;wQkmSuuL4D$jCJX$yHJjVbzyyzJ1fugQxJt@?&M@6e_nlgAD%`U&#T zVX}Ur+;?czmu0P-wTx3yG*0Qz@VucpLC;!Zz-th%M(!xugJ@s4WA8UE^LE{Bs~z2T zTWW^`x2kq97QD#GvqxR9B)_hfYb?Q8gd^=sI z>M}}~Ou9VMr4aA=e7+zqUv#OW%Mx9J=#qm2dWcH|T@LVh)Pk~RWM{R;kgOSj6#;I1 zaJo)q&B)Gbjk-`^ihjCIWxeRD!Fmy^`+sAd`i94ahNnCpd^nGf3$<_2zc?u#FW!^8 zb6Z4X&**Op$G4@{uwUJjN$3ML-Q$MbMYya@X^t>CCwUp4hM^3!SuaXcBH zzX*F_HC_zrPr^XWc<3GOYMj5g{&MbIRlmMQYUA^lsrguQ{7Tpl<=bWbYvCwRljj$b zj@K4)rCjv#Tj?*(@UP?rUiPm)?jElXX9jL`>BtRlX0D&@xT9AOT=rLIe__kdE9y8YqJ z?$PK{H*;sYJMLb0mzO^0vb*}8qCc^(LGhmAe?P~e+v$7C>3hoQ@9Df7@Ky=`@88px zm&4OL|1OJ9sN6|2{&pD!`bDVUg=Ld=Z2GT30(mrw@@5>fXohy#^lh5?*m|PTvduF_ zhmUjnXe}P1c|49BP1!HT-80r2pNNdU7y0Kqk&|ykc6LR6djviHuX0o57c@V^kMIZl L0FQbi&#?ajn5?9D literal 0 HcmV?d00001 -- 2.43.0