7 files changed, 38 insertions, 17 deletions
diff --git a/KTAGS b/KTAGS
index 81b6fc2..9a783e1 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,11 +1,11 @@
        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
diff --git a/help/klog.rtf b/help/klog.rtf
index 0f72570..6be99a3 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -26,14 +26,15 @@ ${\footnote About KLog}
 \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
diff --git a/help/klog.xml b/help/klog.xml
index 08daf61..c5863a0 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -6,14 +6,15 @@
  <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>
diff --git a/install/install.cpp b/install/install.cpp
index 81d5a7e..82811b9 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,10 +1,11 @@
 #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");
@@ -60,11 +61,17 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
        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
@@ -128,14 +128,14 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
+ FILEVERSION 1,2,0,0
- PRODUCTVERSION 1,1,1,0
+ PRODUCTVERSION 1,2,0,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
 #else
 FILEFLAGS 0x0L
 #endif
@@ -146,19 +146,19 @@ 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
diff --git a/klog.mak b/klog.mak
index 323d0a4..96fe85a 100644
--- a/klog.mak
+++ b/klog.mak
@@ -1195,35 +1195,47 @@ DEP_RSC_INSTA=\
 # 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
diff --git a/klog.rc b/klog.rc
index 6685059..2cb3ce7 100644
--- a/klog.rc
+++ b/klog.rc
@@ -80,13 +80,13 @@ IDI_LOGPATTERN          ICON    DISCARDABLE     "res\\log-pattern.ico"
 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
@@ -801,14 +801,14 @@ END
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
+ FILEVERSION 1,2,0,0
- PRODUCTVERSION 1,1,0,0
+ PRODUCTVERSION 1,2,0,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
 #else
 FILEFLAGS 0x0L
 #endif
@@ -819,19 +819,19 @@ 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