--- trunk/reactos/subsys/system/servman/En.rc 2006-01-11 20:16:29 UTC (rev 20788)
+++ trunk/reactos/subsys/system/servman/En.rc 2006-01-11 21:31:25 UTC (rev 20789)
@@ -3,27 +3,27 @@
BEGIN
POPUP "&File"
BEGIN
- MENUITEM "E&xit",ID_EXIT
+ MENUITEM "E&xit", ID_EXIT
END
POPUP "Action"
BEGIN
- MENUITEM "Start",ID_START
- MENUITEM "Stop",ID_STOP
- MENUITEM "Pause",ID_PAUSE
- MENUITEM "Resume",ID_RESUME
- MENUITEM "Restart",ID_RESTART
+ MENUITEM "Start", ID_START
+ MENUITEM "Stop", ID_STOP
+ MENUITEM "Pause", ID_PAUSE
+ MENUITEM "Resume", ID_RESUME
+ MENUITEM "Restart", ID_RESTART
MENUITEM SEPARATOR
- MENUITEM "Refresh",ID_REFRESH
+ MENUITEM "Refresh", ID_REFRESH
MENUITEM SEPARATOR
- MENUITEM "Properties",ID_PROP
+ MENUITEM "Properties", ID_PROP
END
POPUP "View"
BEGIN
- MENUITEM "Customize",ID_VIEW_CUSTOMIZE
+ MENUITEM "Customize", ID_VIEW_CUSTOMIZE
END
POPUP "Help"
BEGIN
- MENUITEM "About",ID_ABOUT
+ MENUITEM "About", ID_ABOUT
END
END
@@ -31,28 +31,28 @@
IDR_POPUP MENU
BEGIN
POPUP "popup"
- BEGIN
- MENUITEM "Start",ID_START
- MENUITEM "Stop",ID_STOP
- MENUITEM "Pause",ID_PAUSE
- MENUITEM "Resume",ID_RESUME
- MENUITEM "Restart",ID_RESTART
+ BEGIN
+ MENUITEM "Start", ID_START
+ MENUITEM "Stop", ID_STOP
+ MENUITEM "Pause", ID_PAUSE
+ MENUITEM "Resume", ID_RESUME
+ MENUITEM "Restart", ID_RESTART
MENUITEM SEPARATOR
POPUP "All tasks"
BEGIN
- MENUITEM "Start",ID_START
- MENUITEM "Stop",ID_STOP
- MENUITEM "Pause",ID_PAUSE
- MENUITEM "Resume",ID_RESUME
- MENUITEM "Restart",ID_RESTART
- MENUITEM "Refresh",ID_REFRESH
+ MENUITEM "Start", ID_START
+ MENUITEM "Stop", ID_STOP
+ MENUITEM "Pause", ID_PAUSE
+ MENUITEM "Resume", ID_RESUME
+ MENUITEM "Restart", ID_RESTART
+ MENUITEM "Refresh", ID_REFRESH
END
MENUITEM SEPARATOR
- MENUITEM "Refresh",ID_REFRESH
+ MENUITEM "Refresh", ID_REFRESH
MENUITEM SEPARATOR
- MENUITEM "Properties",ID_PROP
+ MENUITEM "Properties", ID_PROP
MENUITEM SEPARATOR
- MENUITEM "About",ID_HELP
+ MENUITEM "Help", ID_HELP
END
END
@@ -119,21 +119,7 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Num Services: %d"
-
- IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
- /*"This program is free software; you can redistribute it "
- "and/or modify it under the terms of the GNU Lesser General "
- "Public License as published by the Free Software Foundation; "
- "either version 2.1 of the License, or (at your option) any "
- "later version.\r\n\r\nThis program is distributed in the hope "
- "that it will be useful, but WITHOUT ANY WARRANTY; without even "
- "the implied warranty of MERCHANTABILITY or FITNESS FOR A "
- "PARTICULAR PURPOSE. See the GNU General Public License for more "
- "details.\r\n\r\nYou should have received a copy of the GNU "
- "General Public License along with this program; if not, write "
- "to the Free Software Foundation, Inc., 59 Temple Place - Suite "
- "330, Boston, MA 02111-1307, USA." */
-
+ IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
END
STRINGTABLE DISCARDABLE
--- trunk/reactos/subsys/system/servman/servman.c 2006-01-11 20:16:29 UTC (rev 20788)
+++ trunk/reactos/subsys/system/servman/servman.c 2006-01-11 21:31:25 UTC (rev 20789)
@@ -25,8 +25,6 @@
{
case WM_CREATE:
{
- //HFONT hfDefault;
-
TBADDBITMAP tbab;
INT iImageOffset;
INT statwidths[] = {110, -1}; /* widths of status bar */
@@ -41,18 +39,21 @@
{TBICON_EXPORT, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* export */
/* Note: First item for a seperator is its width in pixels */
- {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */
+ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */
+ {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* create */
+
+ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */
+
{TBICON_START, ID_START, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */
{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 */
- {25, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */
+ {15, 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 */
+ {TBICON_HELP, ID_HELP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* help */
+ {TBICON_EXIT, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* exit */
};
@@ -74,25 +75,20 @@
/* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */
SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
- /* Add standard image list */
- tbab.hInst = HINST_COMMCTRL;
- tbab.nID = IDB_STD_SMALL_COLOR;
- SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM) &tbab);
-
/* Add custom images */
tbab.hInst = hInstance;
tbab.nID = IDB_BUTTONS;
- iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 11, (LPARAM)&tbab);
+ iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, NUM_BUTTONS, (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[7].iBitmap += iImageOffset; /* restart */
- tbb[9].iBitmap += iImageOffset; /* new */
- tbb[10].iBitmap += iImageOffset; /* help */
- tbb[11].iBitmap += iImageOffset; /* exit */
+ tbb[4].iBitmap += iImageOffset; /* new */
+ tbb[6].iBitmap += iImageOffset; /* start */
+ tbb[7].iBitmap += iImageOffset; /* stop */
+ tbb[8].iBitmap += iImageOffset; /* pause */
+ tbb[9].iBitmap += iImageOffset; /* restart */
+ tbb[11].iBitmap += iImageOffset; /* help */
+ tbb[12].iBitmap += iImageOffset; /* exit */
/* Add buttons to toolbar */
SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb);
@@ -126,21 +122,21 @@
/* name */
lvc.iSubItem = 0;
- lvc.cx = 160;
+ lvc.cx = 150;
LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, 256);
lvc.pszText = szTemp;
ListView_InsertColumn(hListView, 0, &lvc);
/* description */
lvc.iSubItem = 1;
- lvc.cx = 260;
+ lvc.cx = 240;
LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, 256);
lvc.pszText = szTemp;
ListView_InsertColumn(hListView, 1, &lvc);
/* status */
lvc.iSubItem = 2;
- lvc.cx = 75;
+ lvc.cx = 55;
LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, 256);
lvc.pszText = szTemp;
ListView_InsertColumn(hListView, 2, &lvc);
@@ -232,8 +228,8 @@
case WM_NOTIFY:
{
LPNMITEMACTIVATE item;
-
+
switch (((LPNMHDR) lParam)->code)
{
case NM_DBLCLK:
@@ -247,10 +243,10 @@
UINT idButton;
lpttt = (LPTOOLTIPTEXT) lParam;
- lpttt->hinst = hInstance;
+ //lpttt->hinst = hInstance;
- // Specify the resource identifier of the descriptive
- // text for the given button.
+ /* Specify the resource identifier of the descriptive
+ * text for the given button. */
idButton = (UINT)lpttt->hdr.idFrom;
switch (idButton)
{
@@ -318,10 +314,11 @@
{
int xPos, yPos;
- xPos = GET_X_LPARAM(lParam);
+ xPos = GET_X_LPARAM(lParam);
yPos = GET_Y_LPARAM(lParam);
- TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, xPos, yPos, hwnd, NULL);
+ TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON,
+ xPos, yPos, hwnd, NULL);
}
break;
@@ -333,8 +330,8 @@
break;
case ID_REFRESH:
- if (! RefreshServiceList() )
- GetError(0);
+ RefreshServiceList();
+ break;
case ID_EXPORT:
break;
@@ -425,7 +422,7 @@
ClassName,
_T("ReactOS Service Manager"),
WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
- CW_USEDEFAULT, CW_USEDEFAULT, 700, 500,
+ CW_USEDEFAULT, CW_USEDEFAULT, 650, 450,
NULL, NULL, hInstance, NULL);
if(hMainWnd == NULL)