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 zcmX|>3ou+)7=ZV(XloZ`Jz`MZq6t+j`(T$Wqo_u!wYuZc#B;?fJ0wVq$I_(Jb~2e+ zmndyKhJ6vw%Tfdl>XC{}RURa1Jfmn$(+n9C^Y^URKl9yt?wxbK^PhA6IXkSKAUnU1 zTszWUZ+ z*P?r(w$6>GfcS1YB;QGb#PK+Y9X}0GBSHx32-x9LW5&LM z=+Ov>{8b3yL!Sdr<@Jwakz*9{(hmIEgqI#2lNRa<%md8z<9lN_)JvTZ(h~eKckJTJ z^0_j|yeozjlz&IT(7n6DpT^m`*aTN5zuxju;(UsY)!6OQ z&(>x}Tw!KLH&Aghk*i=Y9jRt1^uyE+RYPmH;pgYw(6yol^-2c}uJ%LL@P&W5O3yTu z8eTx97_sVDE}k;hts~D4m5ymjUK2pVe3ZQVr&@v@1~&&D@iA%#Hu=wb$=MH>GW=Tu zx=}@{J3GJFmAO9-t<2Jpj^TNR3>~?Ml_19n!xIG0$QHBN?@*P(w3a8aSNkqUoS7&U z`}E}tyyYTy8p?{SNaIQH`$i5#^xL+WrrJ@+6PZqRA|@zOI6c2yjjJHC0vl=*7`U6I zwUr{7TQgdjwe_g81g2`v!&G%9JRPV7RT^)S$Ta>Cvm}ueXF0YlIiI|06#Mq6QoR=2 zbAsn(iOd*j1`RhbvDUj)1r4d(DWb&06|<6{lW55~wK`s1@S-7|KP*dPy^x8Ro3aFk zJ8nY@Ackpl%&1Y!Z=UO~huNO$-QMqG|HfIS9@w9Fs;M=xYHEYw0cQSMkJR{8Gh2dU lj=odOMTDybYFx80#%l3ei!efP4DFHnSR8TDQcH6~{SP=N`~m;~ delta 171 zcmez6@ykrb$+t?H0Su~uWDXE}0I>uRGcqVJFav1@>5VF#jGK9xWEeMhGAl4{=46#* zoY=s&xr0rTaWf-_JmcmDPN3W$E}&cu50Lo73u5tuSOOrH5QrrVVu^xSVjz};3gadz iCC1H7(khIb*<=;KCick5foTB+2t7p+s6tGcg%JSa&?-m( 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