prepared for klog 1.1 release1.1

git-svn-id: http://svn.klever.net/kin/klog/trunk@8 fe716a7a-6dde-0310-88d9-d003556173a8

8 files changed, 30 insertions, 25 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..a9fb0c7
--- a/dev/null
+++ b/AUTHORS
@@ -0,0 +1,3 @@
+Klever dissected:
+        Michael 'hacker' Krelin <hacker@klever.net>
+        Leonid Ivanov <kamel@klever.net>
diff --git a/COPYING b/COPYING
index 997e508..9abe63f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,13 @@
-Copyright (c) 1998, 2002 Klever Group (http://www.klever.net/)
+Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)
 
 Permission 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:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
diff --git a/README b/README.RELEASE
index fbdfd9c..fbdfd9c 100644
--- a/README
+++ b/README.RELEASE
diff --git a/help/klog.rtf b/help/klog.rtf
index 587fbcd..9531c73 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -8,38 +8,39 @@ DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
    \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, 2002 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2004 {\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.00 Beta 2 - August 19th, 2002

+\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}

diff --git a/help/klog.xml b/help/klog.xml
index f566200..830b297 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -1,25 +1,26 @@
 <?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, 2002"/>

+  <license years="1998-2004"/>

   <credits/>

  </topic>

  <topic id="News" title="What's New">

-  <newsfor version="1.00 Beta 2" date="August 19th, 2002">

+  <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>

diff --git a/install/install.cpp b/install/install.cpp
index 212ad40..c0e0bb8 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,22 +1,22 @@
 #include "resource.h"
 #include "../shared-code/install.h"
 

-        #define         KINAME"KLog 1.00 Beta 2"

+        #define         KINAME"KLog 1.1"

         #define SKINAME"KLog"

 
 BOOL Install(void)
 {
-STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.", SKINAME "Path");

-STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.","KINPath");

+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;

         #ifdefK_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);

@@ -25,46 +25,46 @@ STRING shortPath = GET_SHORT_PATH(path);
                 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("Accessories\\Klever Co.",SKINAME,path,SKINAME ".exe");

-        strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.",SKINAME "Path",path);

-        strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group, Inc.","KINPath",path);

+        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,"Accessories\\Klever Co.");

+        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");

 

-        MessageBox(NULL,KINAME " installed successfully, you may now run it from Programs/Accessories/Klever Co. menu, move it to your Startup group or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);

+        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 45bc88b..6a3fd3e 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -122,49 +122,49 @@ END
 

 // 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,0,0,2

- PRODUCTVERSION 1,0,0,2

+ FILEVERSION 1,1,0,0

+ PRODUCTVERSION 1,1,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, 0, 0, 2\0"

+            VALUE "FileVersion", "1, 1, 0, 0\0"

             VALUE "InternalName", "INSTALL\0"

-            VALUE "LegalCopyright", "Copyright © 1998, 2002 Klever Group (http://www.klever.net/)\0"

+            VALUE "LegalCopyright", "Copyright © 1998-2004 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, 0, 0, 2\0"

+            VALUE "ProductVersion", "1, 1, 0, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

diff --git a/klog.rc b/klog.rc
index 4b61320..92755ed 100644
--- a/klog.rc
+++ b/klog.rc
@@ -74,27 +74,27 @@ 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.00 Beta 2",IDC_STATIC,40,16,119,8,

+    LTEXT           "KLog, Version 1.1",IDC_STATIC,40,16,119,8,

                     SS_NOPREFIX

-    LTEXT           "Copyright © 1998,2002 Klever Group",IDC_STATIC,40,31,119,8

+    LTEXT           "Copyright © 1998-2004 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, 291, 286

 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW

 CAPTION "KLog"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 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

@@ -795,45 +795,45 @@ BEGIN
                     BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22,

                     WS_EX_STATICEDGE

 END

 

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,0,0,2

- PRODUCTVERSION 1,0,0,2

+ FILEVERSION 1,1,0,0

+ PRODUCTVERSION 1,1,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, 0, 0, 2\0"

+            VALUE "FileVersion", "1, 1, 0, 0\0"

             VALUE "InternalName", "KLOG\0"

-            VALUE "LegalCopyright", "Copyright © 1998, 2002 Klever Group (http://www.klever.net/)\0"

+            VALUE "LegalCopyright", "Copyright © 1998-2004 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, 0, 0, 2\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

@@ -1063,25 +1063,25 @@ BEGIN
     ID_TRAY_ABOUTKLOG       "About KLog"

     ID_TRAY_EXIT            "Terminate KLog"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_LOG_SELECT          "Log To"

     IDS_LOG_EXT             ".log"

     IDS_KLOGFILTER          "KLog files (*.klg)|*.klg|All files (*.*)|*.*|"

     IDS_KLOG_EXPORT         "Export to"

     IDS_KLOG_IMPORT         "Import from"

     IDS_KLOG_EXT            ".klg"

-    IDS_REGISTRYKEY         "Klever Group, Inc."

+    IDS_REGISTRYKEY         "Klever Group"

     IDS_KLEVERNET_URL       "http://www.klever.net/"

     IDS_TIP_LOG             "%s [%s] %s.%s"

     IDS_LOGTIMEFORMAT       "%H:%M:%S %B %d"

     IDS_LOGPATTERN_TITLE    "Logging pattern"

     IDS_LOGFILETIMEFORMAT   "%c "

     IDS_TIP_FACILITY_ON     "Turn on logging for given facility"

     IDS_TIP_FACILITY_XOR    "Invert logging for given facility"

     IDS_TIP_PRIORITY_ON     "Turn on all logging for given priority"

     IDS_TIP_PRIORITY_XOR    "Invert logging for given priority"

 END

 

 STRINGTABLE DISCARDABLE