From b083fbae016ee7d48600cb22814dbcc081a61fa1 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Sun, 1 Jan 2006 18:13:07 +0000 Subject: [PATCH] - split logoff and shutdown resources - add icons for each svn path=/trunk/; revision=20522 --- reactos/subsys/system/explorer/explorer.cpp | 1 + .../subsys/system/explorer/explorer_intres.rc | 1 + reactos/subsys/system/explorer/globals.h | 1 + reactos/subsys/system/explorer/res/logoff.ico | Bin 7782 -> 3606 bytes .../subsys/system/explorer/res/shutdown.ico | Bin 0 -> 3606 bytes reactos/subsys/system/explorer/resource.h | 1 + .../system/explorer/taskbar/quicklaunch.cpp | 2 +- .../system/explorer/taskbar/startmenu.cpp | 2 +- 8 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 reactos/subsys/system/explorer/res/shutdown.ico diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp index d2f1df181b4..22ed0360161 100644 --- a/reactos/subsys/system/explorer/explorer.cpp +++ b/reactos/subsys/system/explorer/explorer.cpp @@ -392,6 +392,7 @@ void IconCache::init() _icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK); _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF); + _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE); } diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index 9b1310db91b..4411fd1ab77 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -138,6 +138,7 @@ IDI_REACTOS ICON DISCARDABLE "res/reactos.ico" IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" +IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" diff --git a/reactos/subsys/system/explorer/globals.h b/reactos/subsys/system/explorer/globals.h index 99f8ffd02ee..361e3811c3a 100644 --- a/reactos/subsys/system/explorer/globals.h +++ b/reactos/subsys/system/explorer/globals.h @@ -80,6 +80,7 @@ enum ICON_ID { ICID_NETWORK, ICID_COMPUTER, ICID_LOGOFF, + ICID_SHUTDOWN, ICID_BOOKMARK, ICID_MINIMIZE, diff --git a/reactos/subsys/system/explorer/res/logoff.ico b/reactos/subsys/system/explorer/res/logoff.ico index a10592b738c5c4d625c827e979d67800a583b195..ad98a3a4d400a5e27a9d7abbff2236b149dc8b49 100644 GIT binary patch literal 3606 zcmd^C>r+)#6yGXM}x%>(70xsLQELVm|&5adlM^pWw|p zBjW3yp+Sxf)i~667D@Hhmi%7H2I)Wg=@Dk<=5SAbtEq-^?1+tqV@d*?(vQOVL@HcP zrs36$cc6Jc9qw5t7{psin|`Nt^WQJv#?2eJe*HS`j(?3i3G4%=%RSuUxr;kx>)QH8mkV2MUp~SBT_T(pT#JN9CjF?Cb>fjmwuWV{mW~mo8mGM@I+O zB&xwdK|u%&4Mli(IAf{)zr959UENdk`flFCz`y_qU0q#VXQ{`LeqdlALPA2=2HCNt zuk;#aq<*9BIR?WJ$6o25REz8D>sf!#o;|#W;NV~|mgJ8T53?re+Sx6@-u?${-TI>? zRy{pK94G2;x9{HJ{zm@$$vR1Up!YzqUIA9zbxDHy1E8I{g+}-{ja*Zn*I0j z@d522AV8i0B$m@x`j|4Rd!oT`mCpxswovy+^54tL3%zB2X^n?4R3F6#!`LyTGf}iCzJNot5YzUOq`pPmz1m2E9>g&Eb-a3 zYZu$_^z;N_HTtAY-`C9CET6N~c}aO=G#Wwul>FCdG$0#Vtvo|XtWrOM)=kgOa9)z{ zw$2Bn@9OHxHr(9YKv-Gd94lJ)&D0d~;CnpDKX=zAFNx{yYJK^Hu!gk2kTJ*=h z`jY*ovq@1=5%Ti#_)L_Pl!UmrIEJI6Bb=O^*bdoRi++7m11c&iSetx4e*8F&965sc z_;{{qRM$vTjkW00+Vw!4jsNBQ2hw?9Q7p>;Zfg83pZ|IWqa1BP`JL9Pxr<_x)CA)n D-fY;r literal 7782 zcmeHMZETZO6h4EEeY6|vI_bxz`v50Xf|QCfMF&$*ru>iu6PEa^S>rzmjp4^)W^~yP zvlubUq)pL8(?u3%q*|iHwnSk{tnZ78qlr5GLuND)Gk#2i@%o(mwr}sc(QbkX#@*c8 z`*F^Bo^#K=?|JtEQ3;h&Z7s?2R2k7OjGCK``CAo4?_kZ8uOxb+Mv+^I5;mgsP-h4> zD8oSAp_M~H&lqSW#F+q8cuNC#dxOpis9-TQWrlPMoHL=zEiC^sr3{vZA%2 zb*5(M>5nz)Po?N!Dvdr(`?2mv>xb+h`oo70(~%=b=;+a-^uoKxX>4qa-uvJ~djG?d zl!TA3CO)Sj;J$(WqvR=i1$aT=B|rI$V(8yI_a(h^ev;n(?t2>f?q?cG3kqIDn?VzT z;y?Wg_h%@AadKvcqF9ge7%hc%;rBn3ATAG=BkLdgm4zP;1 zy`kyWj&0i>y4P56t}Wl*)&1yW_wSVRjV+Gq_1hopestUJjl8g-`KFrIJ9g}P_<=_@ z$hmEewZu}k>gKN7jQPqnEe?BC+m6mkIp4UVrgn9`%YBQxLfVVmT;hw;to%-6zPZlO zZ@kBti_Pn9Y1*=7t2Z+((h>dHN%Y%lq94nRb_zK)zh!0Ivo2DBY@BDC(YB+RdA1aj zY~dW6$+KRspS*rQ?b)-3_U+q8evA(tI)t?##zExYAaX0lXh>Qz&-yvnB5!%oI9GaQ zK141>KR7r@BO@d9^09F`e*C!1b3v?g9y@d944plDmOj^Xn5XEAbLZ%*Z@!`P=g(6* zou-M&OEft>Epys$SFoAovK)cs2>fdiD3XM(pSY>fX_ltedAO}kd%e2>rLCdC?Q-TT zv^whDQVa!@hCBs`>+9_`7Fiq)*SfYj3a!pMh%NOD&&B0xTc;|tR@c?lS4n;;ztsU9 z#f3&&U0v;pdg%fy+y=S3F}H^`EH4KKyT}TVH{6tyud>{KVRj@$5Dkm?q*=*KI zfMglizAPs%Wx3UA%L2gvHg~Bax3avtqTFIxQC?D3VTT`fMZU6<0jjI2?QV<9<*>s` zw`HYbUkLzPU2S!FmBsF2>jsBKu`jIzITYZa-OlIacGy*UStS&p!3tdLHFk?d@qZP> ztF6|`Dij=1jhz*g{jXWbUWs4hLiSBL|JPQ{=XWUQ*Xo?lub#hXa^(B3nuDm>G1q@b zj@%eEJ8G5vJM+atsQ16IX}+3`;&=9>U{=;VY? z7rulRNKEzVT3FX2Ur(aOf4LM-Oh7?pfe$T-*$#cSdo(`utpG(_2u+B|D`Nb@Bv_!J z>UZtzs?dceG3^OyJ-T2Mkud=U9P8TArRuYXIz9}iX;f>`ML-wfY2HHo@@(vfsn}(a zw}tlg?G&A&#H=%(i%LK`FeQPz?HpR~@68FA)#uQ(zhX z;Zk61Ja4}pTRSKefipBZ<&0{csMZtJe5i>j{vD05f>QSG+gn(F@8f$Fb?SMtr{lHp ztKknsV|np}ZQt_)En^e&{Ry0y73bS%2aLWD$1tS^&Rkonf(^X z{{~oSUif>!c+Q@)USA*o=V-BLtav>Uiznj$AW-p>ae(`D4ap{qDsmP1BQs@@1~n)z zi30k=W8)d*x!?veD9nnLB~h5*oF=(yz7T3SufhRT_&;&s61Wyg0X0-l2H5})^G32U zG2J!>z(>UxEQW32Krwho1HM7wf!iG9tK#F+6}vFGU|tj-3ERN;=$fb3XGDo9vMlNr zX0HeZpQBV5e|ThgE`HdIm5Gm7sT4VUAqEBq3gZW!3GfTY*a8C8%lL&UaPFD-2*KtB zi?7#b;PY=tqfj`*B~N_8D5?IldBMUj9O-`+9~7EFkvjdoALoHz$lz9(i-bb74WAJfUdiqSED*7I z!6N++8!<5`j%lw}?+$F{z;6?HAaDW1yEcO1tWbtp|48@}TUlO?S zd>a&a#VquQ8SmxH+Zi!gyyt52FygtGU)5@Pd_zTG&gc2R_wNDy^1mq-`1gRn0ix0{ Av;Y7A diff --git a/reactos/subsys/system/explorer/res/shutdown.ico b/reactos/subsys/system/explorer/res/shutdown.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b76962495a5837ecc0d78115e8125a68f0f9027 GIT binary patch literal 3606 zcmds(yGva`5XRS#K$0Rz5=a^)g^7X+sf2(<1X~FfrU(gYA&H=9CkU5VD25dJFNlR8 zHiB4)5~4;#kQ8EJ<@^19TTbRTx|hqzF~@uCvhdyAvpe(6?CkE$buPo*ahaJ;`xoxZ zUFTjo=bk^m{Qma9xelGn(>WDUiOYHI+*_Rwwzluz5(CSrQEm4K{}idt}dEe{XM3@PBo6)zIABER&Oyvb(!$SXo(-%F4>* zI^Wpz`sl(({6I}jjr8{R%Fxh|jE|37>Xo}MP} zPQlEI@*ZKK*^1M>d zE;xpRv-0*i(^QU&iwn69*kHfNdws@naHW5n_nQdjgLJ>iGn#tbYX$j;R;4*8&6c6^ z_Z0UPj}%W7j}=d^z8`AOI&$eYym_W5P`p*VQ+!Z-y6Vfcf1`M*z;;NM)Y+7#aewd6 z?iT&$6w2ff?$KXkc8?`yvp4X2n)_9nB)%HpFYCw0$9Cs=PmFng+;i?NZ<{>9TjyOM z&pJKweh#iMe%$uD$itORUMIKGZo-eR>E``(_~X$Tvbv2*))Vhz}zxeS3e*Ta8yoruS@V|ne_p<20aZUa#9sV(5 r>*hp^AGqOA{)S-w=UeAXv3*NWqyL+xVRm8o>At!+SX8}3h3EVOcRZJ8 literal 0 HcmV?d00001 diff --git a/reactos/subsys/system/explorer/resource.h b/reactos/subsys/system/explorer/resource.h index 52b20d7431d..680d9933d1b 100644 --- a/reactos/subsys/system/explorer/resource.h +++ b/reactos/subsys/system/explorer/resource.h @@ -67,6 +67,7 @@ #define IDI_FOLDERARROW 125 #define IDI_ARROW 125 #define IDI_ARROW_SELECTED 126 +#define IDI_SHUTDOWN 127 #define IDB_LOGOV 129 #define IDB_LOGOV256 130 #define IDA_SEARCH_PROGRAM 133 diff --git a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp index 29c1538720a..19acaa39569 100644 --- a/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp +++ b/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp @@ -121,7 +121,7 @@ void QuickLaunchBar::AddShortcuts() COLORREF bk_color = GetSysColor(COLOR_BTNFACE); HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); - AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE/*@@*/).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); + AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index 83dc2a9d8ce..fb54000c638 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -1753,7 +1753,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs) #else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif - AddButton(ResString(IDS_SHUTDOWN), ICID_LOGOFF, false, IDC_SHUTDOWN); + AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); #ifndef _ROS_