| -rw-r--r-- | KTAGS | 2 | ||||
| -rw-r--r-- | help/klog.rtf | 3 | ||||
| -rw-r--r-- | help/klog.xml | 3 | ||||
| -rw-r--r-- | install/install.cpp | 9 | ||||
| -rw-r--r-- | install/install.rc | 8 | ||||
| -rw-r--r-- | klog.mak | 20 | ||||
| -rw-r--r-- | klog.rc | 10 |
7 files changed, 38 insertions, 17 deletions
@@ -1,12 +1,12 @@ about-date klog.rc /LTEXT\s\+"Copyright /;" kind:d about-version klog.rc /LTEXT\s\+"KLog, Version /;" kind:v help-license-date ./help/klog.xml /<license\s/;" kind:d help-news ./help/klog.xml /<newsfor\s/ -install-version ./install/install.cpp /^#define\s\+KINAME\s\+"/;" kind:v +install-version ./install/install.cpp /^#define\s\+VERSION\s\+"/;" kind:v install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;" kind:d install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;" kind:v install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;" kind:v license-date COPYING :1;" kind:d vsinfo-date klog.rc /VALUE\s\+"LegalCopyright",/;" kind:d vsinfo-numeric-version klog.rc /^\s\+FILEVERSION\s\+/;" kind:v vsinfo-string-version klog.rc /^\s\+VALUE\s\+"FileVersion",/;" kind:v diff --git a/help/klog.rtf b/help/klog.rtf index 0f72570..6be99a3 100644 --- a/help/klog.rtf +++ b/help/klog.rtf @@ -1,67 +1,68 @@ {\rtf1\ansi
@{\footnote
THIS FILE WAS AUTOMATICALLY GENERATED FROM XML DOCUMENT.
DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
}
{\fonttbl{\f0\froman Times New Roman;}{\f1\fswiss Arial;}{\f3\froman Symbol;}}{\colortbl;
\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
\pard\plain\keepn
#{\footnote About}
${\footnote About KLog}
{ \f1\fs18\b\sb120 Abotu {\b KLog}}
\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b KLog} is our {\i Win32} implementation of {\b\cf6 *nix}{\i syslog} daemon to support remote logging of messages from {\b\cf6 unix} servers, routers, terminal servers and other syslog-enabled devices/applications.
\par\sa120\sb120\qj\pard \f1\fs18\sb120
\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}
{
\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2005 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}
\par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
\par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
}
\par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")}
\par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")}
\page
\pard\plain
#{\footnote News}
${\footnote What's New}
-\par\pard\plain\f1\fs24\qc\cf2\b 1.1.1-trunk -
+\par\pard\plain\f1\fs24\qc\cf2\b 1.2 - August 6th, 2005
\par\pard\plain\fi0\li0\f1\fs18 \bullet Added vertical resizability
+\par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP
\par\pard\plain\f1\fs24\qc\cf2\b 1.1 - July 11th, 2004
\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source code
\par\pard\plain\fi0\li0\f1\fs18 \bullet Minor changes in code, mostly bugfixes
\page
\pard\plain\keepn
#{\footnote Using}
${\footnote Using KLog}
{ \f1\fs18\b\sb120 Using {\b KLog}}
\par\sa120\sb120\qj\pard \f1\fs18\sb120 When you start {\b KLog} for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the {\uldb Main Window}{\v MainWindow} section.
\page
\pard\plain\keepn
#{\footnote MainWindow}
${\footnote Main Window}
{ \f1\fs18\b\sb120 Main Window}
\par\sa120\sb120\qj\pard \f1\fs18\sb120 Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound {\b KLog} will produce when triggered by event matching criteria.
\par\sa120\sb120\qj\pard \f1\fs18\sb120 Each tab consists of following fields:\pard
\par \fi0\li0 \bullet {\b Short description} - short descriptive text appearing on the tab on top of window.
\par \fi0\li0 \bullet {\b Log to File/Log to Host/Don't Log radio buttons} - let you specify where to forward the events matching criteria below.
\par \fi0\li0 \bullet {\b File/Host name} - Either file name for logging or host name to forward syslog messages to. (note: host address lookups are performed by blocking call, so if you it takes time to resolve host from it's name {\b Klog} may seem to lock up for a while)
\par \fi0\li0 \bullet {\b IP/mask pairs list} - lets you enter ip address/netmask pairs to specify access list for this destination. If none are entered \endash all hosts activities are logged into selected destination.
\par \fi0\li0 \bullet {\b Facility/priority pattern} - may be set in two ways: either by selecting desired facility from the dropdown list and check appropriate priorities and repeat this procedure for every facility or by clicking '{\uldb edit logging pattern}{\v Pattern}' button and use the dialog box to edit logging pattern. If you have experience with logging you don't need any explanation about logging facilities/priorities what are they all about and why do you need them. If you don't, then you, probably, don't need {\b KLog}.
\par \fi0\li0 \bullet {\b Sound to play when triggered} - whenever event is logged using current destination {\b KLog} may produce the sound to make you aware of its activity. You can select any preset sound or specify your own wave file.
\par \fi0\li0 \bullet {\b Log window} - shows recent activity.\pard
\page
\pard\plain\keepn
#{\footnote Pattern}
${\footnote Edit Logging Pattern}
{ \f1\fs18\b\sb120 Edit Logging Pattern Dialog}
\par\sa120\sb120\qj\pard \f1\fs18\sb120 Use this tabbed dialog to edit your logging pattern. Logging facilities are separated into three tabs for your convenience. Use top/left rows of buttons to turn a whole bunch of priorities/facilities, bottom/right rows of buttons to toggle the whole column/row, or simply turn on/off individual facility/priority pairs.
\page
}
\ No newline at end of file diff --git a/help/klog.xml b/help/klog.xml index 08daf61..c5863a0 100644 --- a/help/klog.xml +++ b/help/klog.xml @@ -1,42 +1,43 @@ <?xml version="1.0"?>
<winhelp>
<topic id="About" title="About KLog">
<heading scroll="no">Abotu <kin>KLog</kin></heading>
<p><kin>KLog</kin> is our <term>Win32</term> implementation of <product>*nix</product> <term>syslog</term> daemon to support remote logging of messages from <product>unix</product> servers, routers, terminal servers and other syslog-enabled devices/applications.</p>
<p/>
<p><b><i>Enjoy!</i></b></p>
<license years="1998-2005"/>
<credits/>
</topic>
<topic id="News" title="What's New">
- <newsfor version="1.1.1-trunk">
+ <newsfor version="1.2" date="August 6th, 2005">
<ni>Added vertical resizability</ni>
+ <ni>Fixed uninstall procedure so that it works on XP</ni>
</newsfor>
<newsfor version="1.1" date="July 11th, 2004">
<ni>Change of license and opening the source code</ni>
<ni>Minor changes in code, mostly bugfixes</ni>
</newsfor>
</topic>
<topic id="Using" title="Using KLog">
<heading scroll="no">Using <kin>KLog</kin></heading>
<p>When you start <kin>KLog</kin> for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the <a href="#MainWindow">Main Window</a> section.</p>
</topic>
<topic id="MainWindow" title="Main Window">
<heading scroll="no">Main Window</heading>
<p>Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound <kin>KLog</kin> will produce when triggered by event matching criteria.</p>
<p>Each tab consists of following fields:</p>
<ul>
<li><b>Short description</b> - short descriptive text appearing on the tab on top of window.</li>
<li><b>Log to File/Log to Host/Don't Log radio buttons</b> - let you specify where to forward the events matching criteria below.</li>
<li><b>File/Host name</b> - Either file name for logging or host name to forward syslog messages to. (note: host address lookups are performed by blocking call, so if you it takes time to resolve host from it's name <kin>Klog</kin> may seem to lock up for a while)</li>
<li><b>IP/mask pairs list</b> - lets you enter ip address/netmask pairs to specify access list for this destination. If none are entered \endash all hosts activities are logged into selected destination.</li>
<li><b>Facility/priority pattern</b> - may be set in two ways: either by selecting desired facility from the dropdown list and check appropriate priorities and repeat this procedure for every facility or by clicking '<a href="#Pattern">edit logging pattern</a>' button and use the dialog box to edit logging pattern. If you have experience with logging you don't need any explanation about logging facilities/priorities what are they all about and why do you need them. If you don't, then you, probably, don't need <kin>KLog</kin>.</li>
<li><b>Sound to play when triggered</b> - whenever event is logged using current destination <kin>KLog</kin> may produce the sound to make you aware of its activity. You can select any preset sound or specify your own wave file.</li>
<li><b>Log window</b> - shows recent activity.</li>
</ul>
</topic>
<topic id="Pattern" title="Edit Logging Pattern">
<heading scroll="no">Edit Logging Pattern Dialog</heading>
<p>Use this tabbed dialog to edit your logging pattern. Logging facilities are separated into three tabs for your convenience. Use top/left rows of buttons to turn a whole bunch of priorities/facilities, bottom/right rows of buttons to toggle the whole column/row, or simply turn on/off individual facility/priority pairs.</p>
</topic>
</winhelp>
diff --git a/install/install.cpp b/install/install.cpp index 81d5a7e..82811b9 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -1,70 +1,77 @@ #include "resource.h" #include "../shared-code/install.h" -#define KINAME "KLog 1.1.1-trunk"
+#define VERSION "1.2"
+#define KINAME "KLog " VERSION
#define SKINAME "KLog"
BOOL Install(void) { STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path");
STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");
STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath);
if(!path)
return NULL;
#ifdef K_ANNED
STRING sysDir(_MAX_PATH);
GetSystemDirectory(sysDir,_MAX_PATH);
INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");
#endif
MAKE_PATH(path);
STRING shortPath = GET_SHORT_PATH(path);
if(!shortPath){
MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);
return FALSE;
}
if(!(
INSTALLFILE(SKINAME ".ex_",path, SKINAME ".exe") &&
INSTALLFILE(SKINAME ".hl_",path, SKINAME ".hlp") &&
INSTALLFILE(SKINAME ".cn_",path, SKINAME ".cnt")
)){
MessageBox(NULL,"Failed to install " KINAME "in specified directory",NULL,MB_ICONERROR|MB_OK);
return FALSE;
}
ADDMENU("Klever Group",SKINAME,path,SKINAME ".exe");
strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path);
strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);
FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
if(!inf){
MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK);
return FALSE;
}
INF_FILE_HEADER(inf);
INF_FILE_SECTION(inf,"Uninstall");
fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");
INF_FILE_SECTION(inf,"kFiles");
INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath);
INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe");
INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME);
INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf");
INF_FILE_SECTION(inf,"kReg");
INF_UNINSTALL_REG(inf,SKINAME);
INF_FILE_SECTION(inf,"kMenu");
INF_MENU_GROUP(inf,1,"Klever Group");
INF_MENU_ITEM(inf,1,SKINAME);
fclose(inf);
REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
+ REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
+ REG_UNINSTALL_COMMENT(SKINAME,"Klever " KINAME);
+ REG_UNINSTALL_VERSION(SKINAME,VERSION);
+ REG_UNINSTALL_LOCATION(SKINAME,path);
+ REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
+ REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/klog/");
MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu, move it to your Startup group or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);
return TRUE;
} diff --git a/install/install.rc b/install/install.rc index cee7f66..2de75ab 100644 --- a/install/install.rc +++ b/install/install.rc @@ -38,145 +38,145 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,143,53,50,14,BS_CENTER | BS_VCENTER |
BS_NOTIFY | BS_FLAT,WS_EX_DLGMODALFRAME
CONTROL "Animate1",IDC_DISKS,"SysAnimate32",ACS_TRANSPARENT |
ACS_AUTOPLAY | WS_TABSTOP,161,7,32,32
LTEXT "",IDC_STATE,7,7,150,32,SS_NOPREFIX | SS_NOTIFY
CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",0x0,7,45,
186,7,WS_EX_DLGMODALFRAME
END
#endif
IDD_PATH DIALOGEX 0, 0, 255, 73
STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP |
WS_VISIBLE | WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
LTEXT "",IDC_PROMPT,7,7,241,30
EDITTEXT IDC_PATH,7,37,195,12,ES_AUTOHSCROLL
PUSHBUTTON "B&rowse..",IDC_BROWSE,208,37,40,12
DEFPUSHBUTTON "OK",IDOK,69,52,50,14
PUSHBUTTON "Cancel",IDCANCEL,135,52,50,14
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
"IDD_INSTALLING$(FALSE)", DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 193
TOPMARGIN, 7
BOTTOMMARGIN, 67
HORZGUIDE, 39
END
IDD_PATH, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 248
VERTGUIDE, 202
VERTGUIDE, 208
TOPMARGIN, 7
BOTTOMMARGIN, 66
HORZGUIDE, 37
END
END
#endif // APSTUDIO_INVOKED
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""custom.rch""\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico"
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
- PRODUCTVERSION 1,1,1,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
VALUE "FileDescription", "INSTALL: KLog, logging daemon\0"
- VALUE "FileVersion", "1, 1, 1, 0\0"
+ VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "INSTALL\0"
VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
VALUE "OriginalFilename", "INSTALL.EXE\0"
VALUE "ProductName", "KLog\0"
- VALUE "ProductVersion", "1, 1, 1, 0\0"
+ VALUE "ProductVersion", "1, 2, 0, 0\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "custom.rch"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
@@ -1105,147 +1105,159 @@ DEP_CPP_WARNB=\ !IF "$(CFG)" == "KLog - Win32 Release"
"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\
"$(INTDIR)\klog.pch"
!ELSEIF "$(CFG)" == "KLog - Win32 Debug"
"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\
"$(INTDIR)\klog.pch"
!ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\
"$(INTDIR)\klog.pch"
!ENDIF
# End Source File
# End Target
################################################################################
# Begin Target
# Name "Install - Win32 Debug"
# Name "Install - Win32 Pure"
# Name "Install - Win32 Canned"
# Name "Install - Win32 Static"
!IF "$(CFG)" == "Install - Win32 Debug"
!ELSEIF "$(CFG)" == "Install - Win32 Pure"
!ELSEIF "$(CFG)" == "Install - Win32 Canned"
!ELSEIF "$(CFG)" == "Install - Win32 Static"
!ENDIF
################################################################################
# Begin Source File
SOURCE=.\Install\Install.rc
DEP_RSC_INSTA=\
".\Install\custom.rch"\
".\shared-data\install-icon.ico"\
!IF "$(CFG)" == "Install - Win32 Debug"
"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
$(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "_DEBUG" /d\
"_AFXDLL" $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Pure"
"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
$(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
"_AFXDLL" $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Canned"
"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
$(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
"_AFXDLL" /d "K_ANNED" $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Static"
"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
$(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
"_AFXDLL" /d "STATI_K" $(SOURCE)
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\Install\install.cpp
!IF "$(CFG)" == "Install - Win32 Debug"
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
+
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Pure"
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
+
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Canned"
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
+
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Static"
+DEP_CPP_INSTAL=\
+ ".\shared-code\install.h"\
+
-"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File
################################################################################
# Begin Project Dependency
# Project_Dep_Name "KLog"
!IF "$(CFG)" == "Install - Win32 Debug"
"KLog - Win32 Debug" :
$(MAKE) /$(MAKEFLAGS) /F ".\klog.mak" CFG="KLog - Win32 Debug"
!ELSEIF "$(CFG)" == "Install - Win32 Pure"
!ELSEIF "$(CFG)" == "Install - Win32 Canned"
!ELSEIF "$(CFG)" == "Install - Win32 Static"
!ENDIF
# End Project Dependency
# End Target
# End Project
################################################################################
@@ -1,182 +1,182 @@ //Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
"\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
"#ifdef _WIN32\r\n"
"LANGUAGE 9, 1\r\n"
"#pragma code_page(1252)\r\n"
"#endif\r\n"
"#include ""res\\klog.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
"#include ""afxres.rc"" // Standard components\r\n"
"#endif\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME ICON DISCARDABLE "res\\klog.ico"
IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico"
IDI_PREPLAY ICON DISCARDABLE "shared-data/play-icon.ico"
IDI_KLOG ICON DISCARDABLE "res\\klog-icon.ico"
IDI_KLOG_TRIGGERED ICON DISCARDABLE "res\\klog-triggered-icon.ico"
IDI_LOGPATTERN ICON DISCARDABLE "res\\log-pattern.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 70
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About KLog"
FONT 8, "MS Sans Serif"
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
- LTEXT "KLog, Version 1.1.1-trunk",IDC_STATIC,40,16,119,8,SS_NOPREFIX
+ LTEXT "KLog, Version 1.2",IDC_STATIC,40,16,119,8,SS_NOPREFIX
LTEXT "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31,
119,8
DEFPUSHBUTTON "OK",IDOK,178,13,32,14,WS_GROUP
PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14
END
IDD_KLOG_DIALOG DIALOGEX 0, 0, 293, 286
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW
CAPTION "KLog"
FONT 8, "MS Sans Serif"
BEGIN
CTEXT "Short de&scription:",IDC_STATIC,11,48,78,8,SS_NOTIFY
EDITTEXT IDC_DESC,91,46,187,13,ES_AUTOHSCROLL,WS_EX_STATICEDGE
CONTROL "Log to &File",IDC_TYPE_FILE,"Button",BS_AUTORADIOBUTTON |
BS_PUSHLIKE | WS_GROUP,11,60,87,19,WS_EX_STATICEDGE
CONTROL "Log to &Host",IDC_TYPE_HOST,"Button",BS_AUTORADIOBUTTON |
BS_PUSHLIKE,101,60,87,19,WS_EX_STATICEDGE
CONTROL "&Don't Log",IDC_TYPE_NONE,"Button",BS_AUTORADIOBUTTON |
BS_PUSHLIKE,191,60,87,19,WS_EX_STATICEDGE
CTEXT "File &name:",IDC_HOSTORFILE,12,84,40,8
EDITTEXT IDC_HOSTFILE,56,82,201,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_BROWSE,262,82,17,13,0,WS_EX_STATICEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,12,99,13,1
LTEXT "Log data:",IDC_STATIC,27,95,31,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,60,99,218,1
LTEXT "Fa&cility:",IDC_STATIC,19,108,27,8
COMBOBOX IDC_FACILITY,48,106,85,104,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "[::]",IDC_LOGPATTERN,136,106,23,12,BS_ICON | BS_CENTER |
BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
GROUPBOX " &Priorities: ",IDC_STATIC,162,100,92,53,BS_CENTER |
BS_NOTIFY,WS_EX_TRANSPARENT
CONTROL "emerg",IDC_EMERG,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_RIGHT | BS_NOTIFY | WS_TABSTOP,169,110,36,10
CONTROL "alert",IDC_ALERT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_RIGHT | BS_NOTIFY | WS_TABSTOP,169,120,36,10
CONTROL "crit",IDC_CRIT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_RIGHT | BS_NOTIFY | WS_TABSTOP,169,130,36,10
CONTROL "err",IDC_ERR,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_RIGHT | BS_NOTIFY | WS_TABSTOP,169,140,36,10
CONTROL "warn",IDC_WARNING,"Button",BS_AUTOCHECKBOX | BS_LEFT |
BS_NOTIFY | WS_TABSTOP,209,110,36,10
CONTROL "notice",IDC_NOTICE,"Button",BS_AUTOCHECKBOX | BS_LEFT |
BS_NOTIFY | WS_TABSTOP,209,120,36,10
CONTROL "info",IDC_INFO,"Button",BS_AUTOCHECKBOX | BS_LEFT |
BS_NOTIFY | WS_TABSTOP,209,130,36,10
CONTROL "debug",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | BS_LEFT |
BS_NOTIFY | WS_TABSTOP,209,140,36,10
PUSHBUTTON "all",IDC_ALL,256,105,23,12,0,WS_EX_STATICEDGE
PUSHBUTTON "none",IDC_NONE,256,119,23,12,0,WS_EX_STATICEDGE
PUSHBUTTON "invert",IDC_INVERT,256,132,23,14,BS_NOTIFY,
WS_EX_STATICEDGE
LTEXT "IP:",IDC_STATIC,20,126,10,8,SS_NOTIFY
EDITTEXT IDC_HL_IP,43,124,65,13,ES_AUTOHSCROLL
LTEXT "mask:",IDC_STATIC,20,140,20,8,SS_NOTIFY
EDITTEXT IDC_HL_MASK,43,139,65,13,ES_AUTOHSCROLL
PUSHBUTTON "add",IDC_HL_ADD,111,124,30,12,BS_NOTIFY,
WS_EX_STATICEDGE
PUSHBUTTON "remove",IDC_HL_REMOVE,111,140,30,12,0,WS_EX_STATICEDGE
LISTBOX IDC_HOSTS,12,154,140,33,LBS_USETABSTOPS |
LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_VSCROLL |
WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE
GROUPBOX "When &triggered play:",IDC_STATIC,161,154,117,33,0,
WS_EX_TRANSPARENT
COMBOBOX IDC_SOUND,170,167,92,66,CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "..",IDC_BROWSESOUND,264,160,12,12,BS_ICON | BS_CENTER |
BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
PUSHBUTTON "..",IDC_PLAYSOUND,264,173,12,12,BS_ICON | BS_CENTER |
BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
LISTBOX IDC_LOG,7,192,279,87,LBS_USETABSTOPS | LBS_NOSEL |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME |
WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
PUSHBUTTON "&Add",IDC_ADD,7,7,39,18,BS_NOTIFY,WS_EX_CLIENTEDGE
PUSHBUTTON "&Remove",IDC_REMOVE,48,7,39,18,0,WS_EX_CLIENTEDGE
PUSHBUTTON "E&xit",IDC_EXIT,247,7,39,18,0,WS_EX_CLIENTEDGE
CONTROL "Tab1",IDC_TABS,"SysTabControl32",TCS_TOOLTIPS,7,31,279,
161,WS_EX_CLIENTEDGE
CTEXT "10",IDC_LOGLENGTH,166,11,33,12,SS_NOPREFIX | SS_NOTIFY,
WS_EX_DLGMODALFRAME
CONTROL "Spin4",IDC_LOGLENSPIN,"msctls_updown32",UDS_WRAP |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS | UDS_NOTHOUSANDS,189,11,10,12
CTEXT "Log window length:",IDC_STATIC_LOGLENGTH,89,11,77,12,
SS_NOPREFIX | SS_NOTIFY,WS_EX_DLGMODALFRAME
DEFPUSHBUTTON "",IDOK,0,279,6,7,NOT WS_VISIBLE
PUSHBUTTON "",IDCANCEL,286,279,6,7,NOT WS_VISIBLE | WS_DISABLED
PUSHBUTTON "Files",IDC_FILES,204,7,39,18,BS_CENTER | BS_VCENTER |
BS_NOTIFY | NOT WS_TABSTOP,WS_EX_CLIENTEDGE
END
IDD_LOG_UNIX DIALOG DISCARDABLE 0, 0, 394, 143
STYLE DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Unix"
FONT 8, "MS Sans Serif"
@@ -711,217 +711,217 @@ BEGIN BS_NOTIFY | WS_TABSTOP,233,99,16,10
CONTROL "",IDC_L5_DEBUG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,233,112,16,10
CONTROL "",IDC_L6_EMERG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,21,16,10
CONTROL "",IDC_L6_ALERT,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,34,16,10
CONTROL "",IDC_L6_CRIT,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,47,16,10
CONTROL "",IDC_L6_ERR,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,60,16,10
CONTROL "",IDC_L6_WARN,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,73,16,10
CONTROL "",IDC_L6_NOTICE,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,86,16,10
CONTROL "",IDC_L6_INFO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,99,16,10
CONTROL "",IDC_L6_DEBUG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,263,112,16,10
CONTROL "",IDC_L7_EMERG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,21,16,10
CONTROL "",IDC_L7_ALERT,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,34,16,10
CONTROL "",IDC_L7_CRIT,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,47,16,10
CONTROL "",IDC_L7_ERR,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,60,16,10
CONTROL "",IDC_L7_WARN,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,73,16,10
CONTROL "",IDC_L7_NOTICE,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,86,16,10
CONTROL "",IDC_L7_INFO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,99,16,10
CONTROL "",IDC_L7_DEBUG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
BS_NOTIFY | WS_TABSTOP,293,112,16,10
PUSHBUTTON "emerg",IDC_EMERG_XOR,316,20,25,13,BS_CENTER |
BS_VCENTER | BS_NOTIFY
PUSHBUTTON "alert",IDC_ALERT_XOR,316,33,25,13,BS_CENTER |
BS_VCENTER | BS_NOTIFY
PUSHBUTTON "crit",IDC_CRIT_XOR,316,46,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "err",IDC_ERR_XOR,316,59,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "warn",IDC_WARN_XOR,316,72,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "notice",IDC_NOTICE_XOR,316,85,25,13,BS_CENTER |
BS_VCENTER | BS_NOTIFY
PUSHBUTTON "info",IDC_INFO_XOR,316,98,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "debug",IDC_DEBUG_XOR,316,111,25,13,BS_CENTER |
BS_VCENTER | BS_NOTIFY
PUSHBUTTON "0",IDC_L0_XOR,76,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "1",IDC_L1_XOR,106,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "2",IDC_L2_XOR,136,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "3",IDC_L3_XOR,166,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "4",IDC_L4_XOR,196,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "5",IDC_L5_XOR,226,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "6",IDC_L6_XOR,256,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "7",IDC_L7_XOR,286,124,30,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
LTEXT "Toggle",IDC_STATIC,317,126,23,8
LTEXT "ON",IDC_STATIC,58,9,12,8
END
IDD_WARNBLOCKING DIALOGEX 0, 0, 195, 88
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE
CAPTION " Blocking call warning"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,39,67,50,14
PUSHBUTTON "Cancel",IDCANCEL,105,67,50,14
LTEXT "WARNING: ",IDC_STATIC,7,7,38,8
LTEXT "All host address lookups are performed in a blocking mode, so KLog may temporarily stop responding until host address is resolved or operation failed.",
IDC_STATIC,46,7,142,35
CONTROL "Enough is said, no need to remind me again. Thanks.",
IDC_WARNBLOCKING,"Button",BS_AUTOCHECKBOX | BS_RIGHT |
BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22,
WS_EX_STATICEDGE
END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
VALUE "FileDescription", "KLog, logging daemon\0"
- VALUE "FileVersion", "1, 1, 1, 0\0"
+ VALUE "FileVersion", "1, 2, 0, 0\0"
VALUE "InternalName", "KLOG\0"
VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
VALUE "OriginalFilename", "KLOG.EXE\0"
VALUE "ProductName", "KLog\0"
- VALUE "ProductVersion", "1, 1, 1, 0\0"
+ VALUE "ProductVersion", "1, 2, 0, 0\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 210
TOPMARGIN, 7
BOTTOMMARGIN, 63
END
IDD_KLOG_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 286
VERTGUIDE, 12
VERTGUIDE, 278
TOPMARGIN, 7
BOTTOMMARGIN, 279
HORZGUIDE, 31
HORZGUIDE, 192
END
IDD_LOG_UNIX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 387
VERTGUIDE, 32
VERTGUIDE, 362
TOPMARGIN, 7
BOTTOMMARGIN, 136
HORZGUIDE, 20
HORZGUIDE, 124
END
IDD_LOG_RESERVED, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 387
VERTGUIDE, 96
VERTGUIDE, 121
VERTGUIDE, 271
VERTGUIDE, 296
TOPMARGIN, 7
BOTTOMMARGIN, 136
HORZGUIDE, 20
HORZGUIDE, 124
END
IDD_LOG_LOCAL, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 387
VERTGUIDE, 51
VERTGUIDE, 76
VERTGUIDE, 316
VERTGUIDE, 341
TOPMARGIN, 7
BOTTOMMARGIN, 136
HORZGUIDE, 20
HORZGUIDE, 124
END
IDD_WARNBLOCKING, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 188
VERTGUIDE, 130
TOPMARGIN, 7
BOTTOMMARGIN, 81
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Dialog Info
//
|