Commit a5fe8046 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

> 1. Cleaned the ApacheMonitor code a little bit.
> 2. Removed two icons apmall.ico and apsrvmon.ico
> 3. Added option to recognize the Apache*.exe (e.g. Apache-1.3.20.exe)
> 4. Removed AboutBox
> 5. Changed refresh time to 2/20 sec.

Submitted by:	Mladen Turk <mladen.turk@mail.inet.hr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90160 13f79535-47bb-0310-9956-ffa450edef68
parent 8ed4f95d
Loading
Loading
Loading
Loading
+400 −540

File changed.

Preview size limit exceeded, changes collapsed.

+18 −33
Original line number Diff line number Diff line
#define IDD_APSRVMON_DIALOG             101
#define IDD_ABOUTBOX                    102
#define IDS_APP_TITLE                   103
#define IDD_DLGSERVICES		            101
#define IDS_APMONITORTITLE              102
#define IDS_APMONITORCLASS              103
#define IDM_RESTORE                     104
#define IDM_ABOUT                       105
#define IDM_EXIT                        106
#define IDI_APSRVMONM                   107
#define IDI_APSRVMON                    108
#define IDI_APSMALL                     109
#define IDC_APSRVMON                    110
#define IDS_VERSION_ERROR               111
#define IDS_VER_INFO_LANG               112
#define IDR_MAINFRAME                   128
#define IDI_ICOSTOP                     129
#define IDI_ICORUN                      130
#define IDC_STATBAR                     134
#define DLG_VERFIRST                    140
#define IDC_COMPANY                     140
#define IDC_FILEDESC                    141
#define IDC_PRODVER                     142
#define IDC_COPYRIGHT                   143
#define IDC_OSVERSION                   144
#define IDC_TRADEMARK                   145
#define DLG_VERLAST                     145
#define IDC_LABEL                       146
#define IDB_BMPSTOP                     155
#define IDB_BMPRUN                      156
#define IDB_BMPHEADER                   158
#define IDL_SERVICES                    1001
#define IDL_STDOUT                      1002
#define IDC_SSTART                      1003
#define IDC_SSTOP                       1004
#define IDC_SRESTART                    1005
#define IDC_SABOUT                      1006
#define IDM_EXIT                        105
#define IDI_APSRVMON                    106
#define IDI_ICOSTOP                     107
#define IDI_ICORUN                      108
#define IDC_STATBAR                     109
#define IDC_SSTATUS                     110
#define IDB_BMPSTOP                     111
#define IDB_BMPRUN                      112
#define IDB_BMPHEADER                   113
#define IDL_SERVICES                    114
#define IDL_STDOUT                      115
#define IDC_SSTART                      116
#define IDC_SSTOP                       117
#define IDC_SRESTART                    118
#define IDC_SEXIT                       119
#define IDC_STATIC                      -1
+13 −63
Original line number Diff line number Diff line
#include "ApacheMonitor.h"
#include "windows.h"

IDI_APSRVMONM           ICON    DISCARDABLE     "ApacheMonitor.ico"
IDI_APSMALL             ICON    DISCARDABLE     "apsmall.ico"
IDI_APSRVMON            ICON    DISCARDABLE     "apsrvmon.ico"
#include "apachemonitor.h"
#include <windows.h>
IDI_APSRVMON            ICON    DISCARDABLE     "ApacheMonitor.ico"
IDI_ICOSTOP             ICON    DISCARDABLE     "apstop.ico"
IDI_ICORUN              ICON    DISCARDABLE     "aprun.ico"

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,0,1
 PRODUCTVERSION 1,0,0,1
 FILEVERSION 1,0,1,1
 PRODUCTVERSION 1,0,1,1
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x1L
#else
 FILEFLAGS 0x0L
#endif
 FILEOS 0x40004L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
@@ -27,14 +20,14 @@ BEGIN
            VALUE "Comments", "Contributed by Mladen Turk <mturk@mappingsoft.com>\0"
            VALUE "CompanyName", "Apache Software Foundation.\0"
            VALUE "FileDescription", "Apache service monitor\0"
            VALUE "FileVersion", "1.0\0"
            VALUE "FileVersion", "1.1\0"
            VALUE "InternalName", "apsrvmon\0"
            VALUE "LegalCopyright", "Copyright  2001 The Apache Software Foundation.\0"
            VALUE "LegalTrademarks", "This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation.  For more information on the Apache Software Foundation, please see <http://www.apache.org/>\0"
            VALUE "OriginalFilename", "apsrvmon.exe\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "Apache service monitor\0"
            VALUE "ProductVersion", "1.0\0"
            VALUE "ProductVersion", "1.1\0"
            VALUE "SpecialBuild", "\0"
        END
    END
@@ -44,7 +37,7 @@ BEGIN
    END
END

IDD_APSRVMON_DIALOG DIALOGEX 0, 0, 350, 174
IDD_DLGSERVICES DIALOGEX 0, 0, 350, 174
STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_MINIMIZEBOX | WS_VISIBLE | 
    WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
@@ -57,63 +50,20 @@ BEGIN
                    LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
    LISTBOX         IDL_STDOUT,2,124,285,37,LBS_NOINTEGRALHEIGHT | 
                    LBS_DISABLENOSCROLL | LBS_NOSEL | WS_VSCROLL
    LTEXT           "Service Status :",IDC_STATIC,3,40,51,8
    LTEXT           "Service Status :",IDC_SSTATUS,3,40,272,8
    PUSHBUTTON      "&Start",IDC_SSTART,298,75,50,14
    PUSHBUTTON      "S&top",IDC_SSTOP,298,91,50,14
    PUSHBUTTON      "&Restart",IDC_SRESTART,298,107,50,14
    PUSHBUTTON      "&About",IDC_SABOUT,298,147,50,14
    CONTROL         158,IDC_STATIC,"Static",SS_BITMAP,0,0,349,38
END

IDD_ABOUTBOX DIALOG DISCARDABLE  50, 50, 214, 114
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "About"
FONT 8, "MS Sans Serif"
BEGIN
    DEFPUSHBUTTON   "OK",IDOK,161,3,50,14,WS_GROUP
    ICON            IDI_APSRVMON,IDC_STATIC,3,3,20,20
    LTEXT           "CompanyName",IDC_COMPANY,30,3,125,8
    LTEXT           "FileDescription",IDC_FILEDESC,30,13,93,8
    LTEXT           "ProductVersion",IDC_PRODVER,123,13,33,8
    LTEXT           "LegalCopyright",IDC_COPYRIGHT,30,23,174,8
    LTEXT           "OSVERSION",IDC_OSVERSION,61,44,150,20
    LTEXT           "LegalTrademarks",IDC_TRADEMARK,3,69,210,40
    LTEXT           "Running on:",IDC_LABEL,3,44,50,11
    CONTROL         "",IDC_STATIC,"Static",SS_BLACKRECT,2,41,210,1
    CONTROL         "",IDC_STATIC,"Static",SS_BLACKRECT,2,65,210,1
    PUSHBUTTON      "&Exit",IDC_SEXIT,298,147,50,14
    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,0,0,349,38
END

IDB_BMPSTOP             BITMAP  DISCARDABLE     "sstop.bmp"
IDB_BMPRUN              BITMAP  DISCARDABLE     "srun.bmp"
IDB_BMPHEADER           BITMAP  DISCARDABLE     "apache_header.bmp"

IDC_APSRVMON MENU DISCARDABLE 
BEGIN
    POPUP "&File"
    BEGIN
        MENUITEM "&Restore",                    IDM_RESTORE
        MENUITEM "E&xit",                       IDM_EXIT
    END
    POPUP "&Help"
    BEGIN
        MENUITEM "&About ...",                  IDM_ABOUT
    END
END

IDC_APSRVMON ACCELERATORS MOVEABLE PURE 
BEGIN
    "?",            IDM_ABOUT,              ASCII,  ALT
    "/",            IDM_ABOUT,              ASCII,  ALT
END

STRINGTABLE DISCARDABLE 
BEGIN
    IDS_APP_TITLE           "Apache service monitor"
    IDC_APSRVMON            "ApacheServiceMonitorClass"
    IDS_VERSION_ERROR       "Error %lu"
END

STRINGTABLE DISCARDABLE 
BEGIN
    IDS_VER_INFO_LANG       "\\StringFileInfo\\000004B0\\"
    IDS_APMONITORTITLE      "Apache service monitor"
    IDS_APMONITORCLASS      "ApacheServiceMonitorClass"
END

support/win32/apsmall.ico

deleted100644 → 0
−318 B
Loading image diff...

support/win32/apsrvmon.ico

deleted100644 → 0
−766 B
Loading image diff...