From 54bb7bc51dd77d37d95967d063f738d80bd5ed76 Mon Sep 17 00:00:00 2001 From: Erich Hoover Date: Tue, 27 Sep 2011 08:11:05 -0600 Subject: [PATCH] hhctrl.ocx: Use a modified (two color) refresh icon for the 'Sync' toolbar button. --- dlls/hhctrl.ocx/help.c | 11 +++---- dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 7034 -> 9338 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 75 +++++++++++++++++++++++++++++++----------- dlls/hhctrl.ocx/resource.h | 8 +++-- 4 files changed, 66 insertions(+), 28 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 267f24ee64f..fbb93d495cf 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -796,7 +796,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw /* hhctrl.ocx bitmaps */ tbAB.hInst = hhctrl_hinstance; tbAB.nID = IDB_HHTOOLBAR; - nHHBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + nHHBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, HHTB_NUMBITMAPS, (LPARAM)&tbAB); *pdwNumButtons = 0; @@ -826,17 +826,16 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_FORWARD, nHistBitmaps + HIST_FORWARD); if (dwButtonFlags & HHWIN_BUTTON_STOP) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP, nHHBitmaps + HH_STOP); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP, nHHBitmaps + HHTB_STOP); if (dwButtonFlags & HHWIN_BUTTON_REFRESH) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH, nHHBitmaps + HH_REFRESH); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH, nHHBitmaps + HHTB_REFRESH); if (dwButtonFlags & HHWIN_BUTTON_HOME) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME, nHHBitmaps + HH_HOME); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME, nHHBitmaps + HHTB_HOME); - /* FIXME: Load the correct button bitmaps */ if (dwButtonFlags & HHWIN_BUTTON_SYNC) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nStdBitmaps + STD_PRINT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nHHBitmaps + HHTB_SYNC); if (dwButtonFlags & HHWIN_BUTTON_OPTIONS) TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PROPERTIES); diff --git a/dlls/hhctrl.ocx/hhtoolbar.bmp b/dlls/hhctrl.ocx/hhtoolbar.bmp index b2db3714e53b954eb763e8743cb1383c947fb060..36fa4b576209548a442d45bc0ebca7fbb66268d2 100644 GIT binary patch delta 1234 zcwRk}3ou+)7=ZV(XloZ`7cr=A(S#_LeXxsV6xC?8R(Cv_c&>P5hXjf7SlV>jP9`(! z5~YpDu)CIcUaul(P>)n(s`4O7;~7P3nr6tDn7?Ob`DebFd+s^s`~Ul&J7}d?qj9FqbDFvr%h03I4Vp7Wn!%t{O%cOe5 zmbNJ-r15A}W|?ya+GB=z2VsXeiC~hcWS(vMySeOZ%wb*)XUR+Mxyi5RZu06pR=8E} z(@w>X1r%#t2ej4-VTv$7=n^|*M=U~zdYo#)sdwLZy6h-Muir;FQ{JQaF|WGb@KyS3 zME6DQoSRGm$(?jazMTY#lW`C`c^aa|L=e;&u1|}=i6`BQ@>BslSZgsD8K}c)xi`c20&?O&{ASl`C-koMfNHS;uFaQ1(QF}Hx|+i;{Ld;wv`t6>2W1gER@5K zk1C*Pu@Um7F6{`Eyr*vEuE`Wv3SDzzRD^y=w|Brd6B&Oj-yf_Ob_756Z})r2Yv7I& zC2u)k>N7@h=x$$WgUUxgK=qUB(6ibF!j7>2_)2b``lDnS=9brov&*&~j3qyt9TNDf zyq966G)a#oI1^AyHmX@{zjja%^ZvtH;~>xS;NP8ePvgsjmE|MD6<(oku50hMCJ zu46lU$k{iKJbP3Ic2Y9{66W2&zjvxN=s|Ex;1M4o0-OEkJr$h$EIIzI0mG;w)s2&1 z?7}+ISQs)eJkOA+qY$$b6gXjcg5Vq3VAijvt5R52iX_hZz}FFHrb;E=1NlNPh1iXT zsv;}X_)`3ykv$Rpwhd@RbGaiYcu}6nijif| za03%7y_;3gn97?WN=#fZODSq!YtE_l$?AgVjp>3>c@q1%T+G^*CotV`Ygzy?N@HL~ zO%g%N!eBkj_f_xre;@ld&ZfI#f8wchD`K5)jo|^N{#p;a@hhe_1jP)EQ_RGKi#d9@ bYHp0x;E85tB9m_ZWK8&x_PH}f*dFmCQ-R$$!B$tuY> zv4L%K2b(10W=0Nq#?1|!K)F9$K)D(oAn}J6#Nr3B1VAhy5K9=u5(TluKr9Ir#!XU6 hjGLRJRTww3$tr+N?2(fL(*g<*dWs@Yg_tr6BLL#iDo6kT diff --git a/dlls/hhctrl.ocx/hhtoolbar.svg b/dlls/hhctrl.ocx/hhtoolbar.svg index ac826619e1d..8622bfd79e0 100644 --- a/dlls/hhctrl.ocx/hhtoolbar.svg +++ b/dlls/hhctrl.ocx/hhtoolbar.svg @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - + @@ -43,11 +43,11 @@ - + - + @@ -55,18 +55,18 @@ - + - + - + @@ -74,7 +74,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -108,29 +108,45 @@ - + - + - - - + + + - + - - + + + + + + + + + + + + + + + + + + - + @@ -168,7 +184,7 @@ - + @@ -181,5 +197,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 64f125c2428..9d98ccfa068 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -34,6 +34,8 @@ #define IDB_HHTOOLBAR 1000 /* IDB_HHTOOLBAR bitmaps: */ -#define HH_STOP 0 -#define HH_REFRESH 1 -#define HH_HOME 2 +#define HHTB_STOP 0 +#define HHTB_REFRESH 1 +#define HHTB_HOME 2 +#define HHTB_SYNC 3 +#define HHTB_NUMBITMAPS HHTB_SYNC -- 2.11.4.GIT