mturk 2003/03/12 09:25:44
Modified: daemon/src/native/nt/procrun procgui.c procrun.h
Log:
Fix displaying try popup message.
Popup now displays Service display name.
Status bar displays Service description.
Revision Changes Path
1.5 +9 -3 jakarta-commons-sandbox/daemon/src/native/nt/procrun/procgui.c
Index: procgui.c
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/nt/procrun/procgui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- procgui.c 21 Feb 2003 21:07:24 -0000 1.4
+++ procgui.c 12 Mar 2003 17:25:44 -0000 1.5
@@ -117,6 +117,7 @@
static HWND ac_console_hwnd = NULL;
static char *ac_stdout_lines[MAX_LISTCOUNT + 1];
char *ac_cmdline;
+char *ac_cmdname;
RECT ac_winpos = {-1, 0, 640, 480};
void ac_add_list_string(const char *str, int len)
@@ -216,7 +217,7 @@
ac_append_menu_item(menu, IDM_CONSOLE, "Open Console Monitor", 1, 1);
ac_append_menu_item(menu, 0, "", 0, 1);
}
- strcpy(tmp, "Exit Service: ");
+ strcpy(tmp, "Shutdown: ");
strcat(tmp, g_env->m->service.name);
ac_append_menu_item(menu, IDM_EXIT, tmp, 0, 1);
@@ -349,6 +350,7 @@
switch (message) {
case WM_INITDIALOG:
ac_console_hwnd = hdlg;
+ SetWindowText(hdlg, ac_cmdname);
ac_list_hwnd = GetDlgItem(hdlg, IDL_STDOUT);
status_bar = CreateStatusWindow(0x0800 /* SBT_TOOLTIPS */
| WS_CHILD | WS_VISIBLE,
@@ -435,12 +437,12 @@
{
if (message == ac_taskbar_created) {
/* restore the tray icon on shell restart */
- ac_show_try_icon(hwnd, NIM_ADD, g_env->m->service.description);
+ ac_show_try_icon(hwnd, NIM_ADD, ac_cmdname);
return DefWindowProc(hwnd, message, wparam, lparam);
}
switch (message) {
case WM_CREATE:
- ac_show_try_icon(hwnd, NIM_ADD, g_env->m->service.description);
+ ac_show_try_icon(hwnd, NIM_ADD, ac_cmdname);
if (ac_use_show) {
DialogBox(ac_instance, MAKEINTRESOURCE(IDD_DLGCONSOLE),
hwnd, (DLGPROC)ac_console_dlg_proc);
@@ -538,6 +540,10 @@
ac_cmdline = env->m->service.description;
else
ac_cmdline = env->m->service.name;
+ if (env->m->service.display)
+ ac_cmdname = env->m->service.display;
+ else
+ ac_cmdname = env->m->service.name;
ac_main_hwnd = ac_create_main_window(ac_instance, cname,
env->m->service.name);
1.10 +1 -0 jakarta-commons-sandbox/daemon/src/native/nt/procrun/procrun.h
Index: procrun.h
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/nt/procrun/procrun.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- procrun.h 21 Feb 2003 21:07:24 -0000 1.9
+++ procrun.h 12 Mar 2003 17:25:44 -0000 1.10
@@ -209,6 +209,7 @@
struct service_t {
char *name;
char *description;
+ char *display;
char *path;
char *image;
char *account;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
