[ros-diffs] [gedmurphy] 20737: Make the toolbar a bit more attractive.

Make the toolbar a bit more attractive.
Modified: trunk/reactos/subsys/system/servman/En.rc
Deleted: trunk/reactos/subsys/system/servman/res/buttons.bmp
Added: trunk/reactos/subsys/system/servman/res/toolbar.bmp
Modified: trunk/reactos/subsys/system/servman/resource.h
Modified: trunk/reactos/subsys/system/servman/servman.c
Modified: trunk/reactos/subsys/system/servman/servman.h
  _____  

Modified: trunk/reactos/subsys/system/servman/En.rc
--- trunk/reactos/subsys/system/servman/En.rc	2006-01-08 22:14:26 UTC
(rev 20736)
+++ trunk/reactos/subsys/system/servman/En.rc	2006-01-08 22:48:21 UTC
(rev 20737)
@@ -67,7 +67,7 @@

   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 @@
     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
  _____  

Deleted: trunk/reactos/subsys/system/servman/res/buttons.bmp
(Binary files differ)
  _____  

Added: trunk/reactos/subsys/system/servman/res/toolbar.bmp
(Binary files differ)
Property changes on: trunk/reactos/subsys/system/servman/res/toolbar.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
  _____  

Modified: trunk/reactos/subsys/system/servman/resource.h
--- trunk/reactos/subsys/system/servman/resource.h	2006-01-08
22:14:26 UTC (rev 20736)
+++ trunk/reactos/subsys/system/servman/resource.h	2006-01-08
22:48:21 UTC (rev 20737)
@@ -9,16 +9,18 @@

 #define IDC_TOOLBAR         1001
 #define IDC_STATUSBAR	    1002
 
-#define ID_PROP             4010
-#define ID_REFRESH          4011
-#define ID_EXPORT           4012
+#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 ID_START            2000
-#define ID_STOP             2001
-#define ID_PAUSE            2002
-#define ID_RESUME           2003
-#define ID_RESTART          2004
-
 #define IDR_MAINMENU        102
 #define ID_FILE_EXIT        4001
 #define ID_VIEW_CUSTOMIZE   4021
@@ -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
  _____  

Modified: trunk/reactos/subsys/system/servman/servman.c
--- trunk/reactos/subsys/system/servman/servman.c	2006-01-08
22:14:26 UTC (rev 20736)
+++ trunk/reactos/subsys/system/servman/servman.c	2006-01-08
22:48:21 UTC (rev 20737)
@@ -37,9 +37,9 @@

             /* 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 @@
                 {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 @@
             /* 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,7 +273,19 @@
                         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;
+
                     }
                 }
                 break;
  _____  

Modified: trunk/reactos/subsys/system/servman/servman.h
--- trunk/reactos/subsys/system/servman/servman.h	2006-01-08
22:14:26 UTC (rev 20736)
+++ trunk/reactos/subsys/system/servman/servman.h	2006-01-08
22:48:21 UTC (rev 20737)
@@ -9,7 +9,7 @@

 #include "resource.h"
 
 #define MAX_KEY_LENGTH 256
-#define NUM_BUTTONS 8
+#define NUM_BUTTONS 12
 
 BOOL RefreshServiceList(VOID);