From a9349d5d8bc29552d26bbaa63b27ff9c2e0c06cf Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Tue, 30 May 2006 17:30:58 +0000 Subject: [PATCH] Use the new branding for the icons. Set the dialog box icon appropriately too. --- win32/FireflyShell/MainDlg.cpp | 10 ++++++++++ win32/FireflyShell/MainDlg.h | 2 ++ win32/FireflyShell/res/FireflyShell.ico | Bin 1150 -> 5430 bytes win32/FireflyShell/res/ShellRunning.ico | Bin 1150 -> 5430 bytes win32/FireflyShell/res/ShellStopped.ico | Bin 1150 -> 5430 bytes 5 files changed, 12 insertions(+) diff --git a/win32/FireflyShell/MainDlg.cpp b/win32/FireflyShell/MainDlg.cpp index 79b3813a..0ee6a4c9 100644 --- a/win32/FireflyShell/MainDlg.cpp +++ b/win32/FireflyShell/MainDlg.cpp @@ -32,6 +32,16 @@ CMainDlg::CMainDlg(bool move_window) this->SetTitle(m_strTitle); } +void CMainDlg::OnSheetInitialized() +{ + HICON hIcon = (HICON)::LoadImage(_Module.GetResourceInstance(), MAKEINTRESOURCE(IDR_MAINFRAME), + IMAGE_ICON, ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON), LR_DEFAULTCOLOR); + SetIcon(hIcon, TRUE); + HICON hIconSmall = (HICON)::LoadImage(_Module.GetResourceInstance(), MAKEINTRESOURCE(IDR_MAINFRAME), + IMAGE_ICON, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + SetIcon(hIconSmall, FALSE); +} + LRESULT CMainDlg::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { bool restart_service = false; diff --git a/win32/FireflyShell/MainDlg.h b/win32/FireflyShell/MainDlg.h index cdb211e9..9484c21b 100644 --- a/win32/FireflyShell/MainDlg.h +++ b/win32/FireflyShell/MainDlg.h @@ -44,6 +44,8 @@ class CMainDlg : public CPropertySheetImpl void OnMove(CPoint); void PositionWindow(); + void OnSheetInitialized(); + public: // Pass true if you want the window to be moved to near the mouse pointer. // This is usually only the case if the window is displayed as a result of diff --git a/win32/FireflyShell/res/FireflyShell.ico b/win32/FireflyShell/res/FireflyShell.ico index bb4df498d87f8d41af512cbb2b1f416370fc96ee..d02a47a17200fb38011d5f586b3719691923fd2c 100644 GIT binary patch literal 5430 zcmeI0O^91n6vt1dtz%Vuv(X~TWMH6nA!Jk(L?NN8x|)?Mh1vPB(6I`ls~KE~C^jxc z1cfK!LR1`3bZNSBp=i3)g`^+~eqd_RHnp+O-#^^*xP5sqlhka43H&(co^$U1oO@qh z7BQ>Yf~~9=cE#RXGCOQ$OIWQR-EZ~{{t;r7SPK-_XPfxmXYU5)aRYb0a;^?dXC9in zX@p)WwhvheU1FP%?4~tK9zC7417$tSVw!JjmL65L=xjjMdCPjoG2O?+yCC0yHmnzC zAg122-j(NMkT1r1M|x#5q@FLc=y}i4 zI}@$dE8mOXgS8&uPU{C&eO&d@3A8^_qQ4zadoYI}`xkn7+Vdvv{4wwRA|Wj^&y z$RMA=>l6z)e-0uCeA=zGpdcXw?a<&w4x@ipXBd0L+3y07kf8LX72i3 z7A>_2^yf4~+w}`G^gLc>scp<*hWx$o9%ydCj`TfNWmN+`DBkBZ>$FODmN>l=XwNW% z=3Sqq$27HQ)?pJmP&~hSrZD%u)6BM4^Z&eotn71UG0RTYvdk>|+-&Q5vnGEl)VFP| ze$t+;|764D{7om4i=Qke7fvs>2dBU84vxRkA2jWe!LqFmud~{azaK7{t)cN;wr%L` z%d#`cSU3Gop}!?o!2hRc(QMie-}n7+Rp0=&roGrw3B>~ok?%3LdCo3w#9H^D9XAJ6OKs<+G|i3THw2=Rq+& zAK9xxcP0NVXn}su?t>TLH&}+dU|)~#jY0q+i;5CkipID`4gL%{R_1lveN(n literal 1150 zcmcIjF%H5o47>^+(22PtJ1YYpVQ1$F46J;Hg$?l%CLYiw6+<{TGIBziRv=Pc?bvr0 zS5bkAPhEqn!EO#Lm@Nq@HAL0Ffem|qUt4$xzFC*GhhWHKsLr!a{v5Q{!_HvqnfXfk zQqLX{@yr=fUBAx?(>%k8JdAfL?e`h|n^)>7sl+MuQoY`nop-8Ucna$?Rj;#1R3D9Y z9?R2Qc^b7YQEDT4xvS{D)JNlp-X16UhhIwgVek2;w#5AbTyMmIIngoi+5oo#+zfcK L?)D+~M?kbM5=h4+ diff --git a/win32/FireflyShell/res/ShellRunning.ico b/win32/FireflyShell/res/ShellRunning.ico index bb4df498d87f8d41af512cbb2b1f416370fc96ee..d02a47a17200fb38011d5f586b3719691923fd2c 100644 GIT binary patch literal 5430 zcmeI0O^91n6vt1dtz%Vuv(X~TWMH6nA!Jk(L?NN8x|)?Mh1vPB(6I`ls~KE~C^jxc z1cfK!LR1`3bZNSBp=i3)g`^+~eqd_RHnp+O-#^^*xP5sqlhka43H&(co^$U1oO@qh z7BQ>Yf~~9=cE#RXGCOQ$OIWQR-EZ~{{t;r7SPK-_XPfxmXYU5)aRYb0a;^?dXC9in zX@p)WwhvheU1FP%?4~tK9zC7417$tSVw!JjmL65L=xjjMdCPjoG2O?+yCC0yHmnzC zAg122-j(NMkT1r1M|x#5q@FLc=y}i4 zI}@$dE8mOXgS8&uPU{C&eO&d@3A8^_qQ4zadoYI}`xkn7+Vdvv{4wwRA|Wj^&y z$RMA=>l6z)e-0uCeA=zGpdcXw?a<&w4x@ipXBd0L+3y07kf8LX72i3 z7A>_2^yf4~+w}`G^gLc>scp<*hWx$o9%ydCj`TfNWmN+`DBkBZ>$FODmN>l=XwNW% z=3Sqq$27HQ)?pJmP&~hSrZD%u)6BM4^Z&eotn71UG0RTYvdk>|+-&Q5vnGEl)VFP| ze$t+;|764D{7om4i=Qke7fvs>2dBU84vxRkA2jWe!LqFmud~{azaK7{t)cN;wr%L` z%d#`cSU3Gop}!?o!2hRc(QMie-}n7+Rp0=&roGrw3B>~ok?%3LdCo3w#9H^D9XAJ6OKs<+G|i3THw2=Rq+& zAK9xxcP0NVXn}su?t>TLH&}+dU|)~#jY0q+i;5CkipID`4gL%{R_1lveN(n literal 1150 zcmcIjF%H5o47>^+(22PtJ1YYpVQ1$F46J;Hg$?l%CLYiw6+<{TGIBziRv=Pc?bvr0 zS5bkAPhEqn!EO#Lm@Nq@HAL0Ffem|qUt4$xzFC*GhhWHKsLr!a{v5Q{!_HvqnfXfk zQqLX{@yr=fUBAx?(>%k8JdAfL?e`h|n^)>7sl+MuQoY`nop-8Ucna$?Rj;#1R3D9Y z9?R2Qc^b7YQEDT4xvS{D)JNlp-X16UhhIwgVek2;w#5AbTyMmIIngoi+5oo#+zfcK L?)D+~M?kbM5=h4+ diff --git a/win32/FireflyShell/res/ShellStopped.ico b/win32/FireflyShell/res/ShellStopped.ico index 3033762d11a37b073cc13cad2a309b3ecd36f0c6..86b82840d2ccc772b32bcd44d53887ec278bc0ca 100644 GIT binary patch literal 5430 zcmb_gO>9(E6uvXlb~;1bnYR3t|6)U_KR^pYLLi}W1uIsrB*B%@1t^-hrEy^hiLxU?%*O=sL>ArcoZTtA6r8_4| zy5+ar{UN*d#=FV-uXEbhKeiRPb#kxySMH2xKHr%7nl^lQ%+INLM1!6$n9Qo{hkX0> z@yk5pQ7snrEtj@7cNI@IF28y}>m|2f)!J9nVDF85qJg^XwOaY<$J`07?lp&KSV+F( zXcJt`@7gD8JPxMV(4P5Y^XYEw8+)j^Wvn$2L&rt9bnn`iPrs|iTpDPnHIX;>;_X2; z(ct11JeLN}$-1i-PB}9&CZFxgSlZk?KeW-ct~Er}q3Ge>ZER{FzN~Z2#+k=~GcUI6 z^}4<0dgmR>z1SMWj&l-wYG5vi&v?kZ%g@#zSiWBPwFc%y*Q9W9P3J^^2dIJmK3W%u= zRcf*M{Tk@Q-=RF?uG%Cg_ggz}d>xhg-L(^Kqq%(JTCl76__*TCSHq54kAolACW^#HT}ZoD7*_To3f zU%ZRjUmbsn_K&`ovTKIlu`$~E#(tqq(+eZV^PBJ9Z{Kn68QOp1*S2l!*W63DF97#( zi2J0j>Dx^K2KJIj4rW?5-8uui-*9&qXoL6PiQC#c`co=%VI6JL?U!Ez#@_+ghLMi~ zf93{jz-VNw_>Q~k6uyc5ywA|@fv%5%_Xlz6^FuqJZ3a3=VVj_z#1%3406NYRgMQ>` z?!Ng2adI!;8LC@yu{)XmW*Ks^AN#o^yyBnfxb{Y%t*iJc=YV$<_RGcp=BpAkozESuwB7@2fQ1LpCLv)@H@e=-EbfO%-9gCAwRS$zzAy-THmv6`OX}M zZJJ}``#j@=SpJFlJ_!9;OF>QG8#(~{e>D!r%p<;8I93INcyzIqtJtbT#t*u?cUcQUc$r!x};(VXGK=yqzMs-R9B~G-`Qz^ z6`!sH-#eT(z!t!sAVntd3^+3P|223(@Xhkn2}&L%9_V}3YD{N{`7~G8fA$V%wRLk3 z%j@}S|0l1p9<%qdORk^mYB{Z{)zosSUglJ!IsIOW(j$g?NNnvN`^H|a`dE{C$sFY+ wcV+J@_G;;Gy>maC|K&@j8HvXexZQ~h_r%2gGzPc>;MTy4ygP@zzlNK510o2{_W%F@