From b6b7f582ba039c5b059bc3faf1db2a01ff05f500 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Sun, 8 Jan 2006 22:48:21 +0000 Subject: [PATCH] Make the toolbar a bit more attractive. svn path=/trunk/; revision=20737 --- reactos/subsys/system/servman/En.rc | 5 +- reactos/subsys/system/servman/res/buttons.bmp | Bin 2102 -> 0 bytes reactos/subsys/system/servman/res/toolbar.bmp | Bin 0 -> 3638 bytes reactos/subsys/system/servman/resource.h | 70 ++++++++++-------- reactos/subsys/system/servman/servman.c | 35 +++++++-- reactos/subsys/system/servman/servman.h | 2 +- 6 files changed, 75 insertions(+), 37 deletions(-) delete mode 100644 reactos/subsys/system/servman/res/buttons.bmp create mode 100644 reactos/subsys/system/servman/res/toolbar.bmp diff --git a/reactos/subsys/system/servman/En.rc b/reactos/subsys/system/servman/En.rc index 7615ee8d082..6c54d93969c 100644 --- a/reactos/subsys/system/servman/En.rc +++ b/reactos/subsys/system/servman/En.rc @@ -67,7 +67,7 @@ BEGIN CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END -IDB_BUTTONS BITMAP "res/buttons.bmp" +IDB_BUTTONS BITMAP "res/toolbar.bmp" STRINGTABLE DISCARDABLE BEGIN @@ -118,4 +118,7 @@ BEGIN IDS_TOOLTIP_STOP "Stop service" IDS_TOOLTIP_PAUSE "Pause service" IDS_TOOLTIP_RESTART "Restart service" + IDS_TOOLTIP_NEW "Create a service" + IDS_TOOLTIP_HELP "Help" + IDS_TOOLTIP_EXIT "Exit" END diff --git a/reactos/subsys/system/servman/res/buttons.bmp b/reactos/subsys/system/servman/res/buttons.bmp deleted file mode 100644 index 77f6aa25232f2b78adebb2f06c8b9b58b3a72848..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2102 zcmd7QyO9(@41i%#g@H*3GKt`96+SsA6on##A`aQafT0l1$5{Rz_1*2K|I%zmrs zho&FXpT9hOkmGuIFY<{e!$-W6-9Y{QD@6E7#036%l&X^YQS$ixn}`}5G-#sGGl(hC z;0PoNE#d-&fr1ATh2G;T(clOq3N6B;q{83`Bnr(W1qy>BkSMeWKWT-*5l9qTOqix9 z*6j!+3N5Arg~1U>6nd6TCo_X1kSO$Qi7V0I2qX$U+Z9SQI0A`6&sL@q4URyf(6h~@ zM1v!cDD?3Otd(eR1QLaoVErMAwQ|S06NQ#w{hM<7w?IVPn)tZ4V0S+0!N71Q$6zFT*5kq&_S^dij#dPe1>7u44T7nNmN{^YAsiP#Ig| zbEUrdB9RUZTc;F%%DL3ArK>^+D*P4HKY!jSl^d|YiQGegRw<((2Rg=r0}laOrL2M+ z46tJzcnHw;znjw32+*cjAu{9gXP)NbGI*I{5l@1hh9DQ^he(q&Og&mCzI)u&{tPi z|G(;}k1_NyomrGI7LV7JyYg}8c6JeCHVT%@{%kp3R<3)&bnE^H;Tpp-SuGcfeg;kVh$H>hm(#2MO zn)=(I7yVwndNsv|87!5T62^XtIEgv9Xqx+`StY53j($%B<9Hy5-fZ?7zYLSbawQYQAKc zR!n9YVVTmYUdY~IM%>^R$5%G@S@Prdy&t_tzihvklvLDJk;#-Ux-9yM9&62Un*8G4 zv7Zlo0aKa26lfadnnYlOUd^IW;?_r8W1`=drKmexeC(IqGrs+zm;7Y09{u+FcklMe zk7?1JP91(|T*u6?DE5AFI_UZ_f9UaRkNMNfEVSqmk0Sj*svA9^=ZgBKT)zZgxE zHB8{aZ^`(sR!{x1{W}a1tn_v^Ei{9Cxjmp2{bbEfesrpiftR$!NYj@?QUd9ql=_k> zEa#<$2vHP0eRsLJnClyvBsUi~v%9puWcL}fL;PypXr7R2SjX#!{NdJh`*&PZZRanU zzQx+#o{WsihQaMa{8E(i`grnsqn^eWhzRz9UVnX-HSw0LFO9Bi zCa^3?a`G9!!*;`oOwZ?Eil5Als=B`J{Ww*1@n&_0j}#rXN~v-k=Tfkm#k&vtWj4G% zQU;^oX3*1RR+BYC*1u+de}CVsQ~F20$MMaItxW%}+rBI^#<$md^sA`87*SAqDS`4D z9%A{Co-X-}K?Y-7_Sr*gxH_)S_3nPZ9}bQ0-*JBM{;fn%Uo(wU{rxT(9Okc-XdgpI zP7}lMa<)nN7%oijg<<`bY8Cp43FV4=={|oG-TeGcenZ8;VOb)5Pf+-^7 J8($ma=0A~*^ML>W literal 0 HcmV?d00001 diff --git a/reactos/subsys/system/servman/resource.h b/reactos/subsys/system/servman/resource.h index 2893c66d5b3..ac77ec9c8f7 100644 --- a/reactos/subsys/system/servman/resource.h +++ b/reactos/subsys/system/servman/resource.h @@ -9,15 +9,17 @@ #define IDC_TOOLBAR 1001 #define IDC_STATUSBAR 1002 -#define ID_PROP 4010 -#define ID_REFRESH 4011 -#define ID_EXPORT 4012 - -#define ID_START 2000 -#define ID_STOP 2001 -#define ID_PAUSE 2002 -#define ID_RESUME 2003 -#define ID_RESTART 2004 +#define ID_PROP 2000 +#define ID_REFRESH 2001 +#define ID_EXPORT 2002 +#define ID_START 2003 +#define ID_STOP 2004 +#define ID_PAUSE 2005 +#define ID_RESUME 2006 +#define ID_RESTART 2007 +#define ID_NEW 2008 +#define ID_HELP 2009 +#define ID_EXIT 2010 #define IDR_MAINMENU 102 #define ID_FILE_EXIT 4001 @@ -37,34 +39,42 @@ #define IDS_TOOLTIP_STOP 6004 #define IDS_TOOLTIP_PAUSE 6005 #define IDS_TOOLTIP_RESTART 6006 - +#define IDS_TOOLTIP_NEW 6007 +#define IDS_TOOLTIP_HELP 6008 +#define IDS_TOOLTIP_EXIT 6009 #define IDS_SERVICES_STATUS_RUNNING 5000 #define IDS_SERVICES_STATUS_STOPPED 5001 -#define IDS_SERVICES_YES 5002 +#define IDS_SERVICES_YES 5002 #define IDS_SERVICES_UNKNOWN 5003 -#define IDS_SERVICES_AUTO 5004 -#define IDS_SERVICES_MAN 5005 -#define IDS_SERVICES_DIS 5006 +#define IDS_SERVICES_AUTO 5004 +#define IDS_SERVICES_MAN 5005 +#define IDS_SERVICES_DIS 5006 #define IDS_SERVICES_NUM_SERVICES 5010 #define IDI_SM_ICON 50 #define IDB_BUTTONS 51 -#define TBICON_START 2 -#define TBICON_STOP 3 -#define TBICON_PAUSE 0 -#define TBICON_RESTART 1 +#define TBICON_PROP 0 +#define TBICON_REFRESH 1 +#define TBICON_EXPORT 2 +#define TBICON_START 3 +#define TBICON_STOP 4 +#define TBICON_PAUSE 5 +#define TBICON_RESTART 6 +#define TBICON_NEW 7 +#define TBICON_HELP 8 +#define TBICON_EXIT 9 -#define IDS_PROP_SHEET 10000 -#define IDD_DLG_GENERAL 10001 -#define IDC_SERV_NAME 10041 -#define IDC_DISP_NAME 10051 -#define IDC_DESCRIPTION 10061 -#define IDC_START_TYPE 10101 -#define IDC_SERV_STATUS 10121 -#define IDC_START 10131 -#define IDC_STOP 10141 -#define IDC_PAUSE 10151 -#define IDC_RESUME 10161 -#define IDC_START_PARAM 10191 +#define IDS_PROP_SHEET 10000 +#define IDD_DLG_GENERAL 10001 +#define IDC_SERV_NAME 10041 +#define IDC_DISP_NAME 10051 +#define IDC_DESCRIPTION 10061 +#define IDC_START_TYPE 10101 +#define IDC_SERV_STATUS 10121 +#define IDC_START 10131 +#define IDC_STOP 10141 +#define IDC_PAUSE 10151 +#define IDC_RESUME 10161 +#define IDC_START_PARAM 10191 diff --git a/reactos/subsys/system/servman/servman.c b/reactos/subsys/system/servman/servman.c index 4b84889b053..49ffa6044cb 100644 --- a/reactos/subsys/system/servman/servman.c +++ b/reactos/subsys/system/servman/servman.c @@ -37,9 +37,9 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) /* Toolbar buttons */ TBBUTTON tbb [NUM_BUTTONS] = { // iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString - {STD_PROPERTIES, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ - {STD_FILENEW, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ - {STD_FILENEW, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ + {TBICON_PROP, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ + {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ + {TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */ /* Note: First item for a seperator is its width in pixels */ {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ @@ -48,6 +48,13 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ + + {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ + {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ + {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ + }; /* ======================== Create Toolbar ============================== */ @@ -76,11 +83,17 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) /* Add custom images */ tbab.hInst = hInstance; tbab.nID = IDB_BUTTONS; - iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 4, (LPARAM)&tbab); + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 11, (LPARAM)&tbab); + tbb[0].iBitmap += iImageOffset; /* properties */ + tbb[1].iBitmap += iImageOffset; /* refresh */ + tbb[2].iBitmap += iImageOffset; /* export */ tbb[4].iBitmap += iImageOffset; /* start */ tbb[5].iBitmap += iImageOffset; /* stop */ - tbb[6].iBitmap += iImageOffset; /* pause */ + tbb[6].iBitmap += iImageOffset; /* pause */ tbb[7].iBitmap += iImageOffset; /* restart */ + tbb[9].iBitmap += iImageOffset; /* new */ + tbb[10].iBitmap += iImageOffset; /* help */ + tbb[11].iBitmap += iImageOffset; /* exit */ /* Add buttons to toolbar */ SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); @@ -260,6 +273,18 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case ID_RESTART: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART); break; + + case ID_NEW: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEW); + break; + + case ID_HELP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); + break; + + case ID_EXIT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + break; } } diff --git a/reactos/subsys/system/servman/servman.h b/reactos/subsys/system/servman/servman.h index 9dc4da8d409..f34ddd284ee 100644 --- a/reactos/subsys/system/servman/servman.h +++ b/reactos/subsys/system/servman/servman.h @@ -9,7 +9,7 @@ #include "resource.h" #define MAX_KEY_LENGTH 256 -#define NUM_BUTTONS 8 +#define NUM_BUTTONS 12 BOOL RefreshServiceList(VOID); -- 2.17.1