fixed XP uninstall and prepared for 1.5.1 releaseHEAD1.5.1master

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

6 files changed, 27 insertions, 16 deletions

diff --git a/COPYING b/COPYING
index 427b0ba..fa23ff9 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
-Copyright (c) 1996-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1996-2005 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
diff --git a/bigbrother.rc b/bigbrother.rc
index e4c335f..d7aedec 100644
--- a/bigbrother.rc
+++ b/bigbrother.rc
@@ -236,11 +236,11 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Big Brother"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,13,16,18,20

-    LTEXT           "Big Brother, Version 1.5",IDC_STATIC,48,16,119,8,

+    LTEXT           "Big Brother, Version 1.5.1",IDC_STATIC,48,16,119,8,

                     SS_NOPREFIX

-    LTEXT           "Copyright © 1996-2004 Klever Group",IDC_STATIC,48,31,119,8

+    LTEXT           "Copyright © 1996-2005 Klever Group",IDC_STATIC,48,31,119,8

     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,65,53,86,14

 END

 

@@ -367,10 +367,10 @@ END
 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,5,0,0

- PRODUCTVERSION 1,5,0,0

+ FILEVERSION 1,5,1,0

+ PRODUCTVERSION 1,5,1,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

@@ -385,15 +385,15 @@ BEGIN
         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "Big Brother, network monitoring tool\0"

-            VALUE "FileVersion", "1, 5, 0, 0\0"

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

             VALUE "InternalName", "BIGBROTHER\0"

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

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

 	    VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "BIGBRO.EXE\0"

             VALUE "ProductName", "Big Brother\0"

-            VALUE "ProductVersion", "1, 5, 0, 0\0"

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

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

diff --git a/help/bigbrother.rtf b/help/bigbrother.rtf
index e16c646..c2ae976 100644
--- a/help/bigbrother.rtf
+++ b/help/bigbrother.rtf
@@ -23,9 +23,9 @@ K{\footnote about}
 \par\sa120\sb120\qj\pard \f1\fs18\sb120 You can also hide {\b Big Brother} into your notify tray so that it won't occupy more than 16x16 square of your precious windows' desktop. Just click \{bmct bbullet.bmp\} in your notify tray or select {\uldb View/Main Window}{\v HID_VIEW_MAINWINDOW} from menu. Click \{bmct bbullet.bmp\} again to restore {\b Big Brother} to its full size.

 \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) 1996-2004 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1996-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.

 }

@@ -35,8 +35,10 @@ K{\footnote about}
 

 \pard\plain

 #{\footnote News}

 ${\footnote What's New}

+\par\pard\plain\f1\fs24\qc\cf2\b 1.5.1 - August 6th, 2005

+\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.5 - July 11th, 2004

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  License change and opening the source code

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Made it work with Win2k and friends

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added kinwide installer

diff --git a/help/bigbrother.xml b/help/bigbrother.xml
index ec391ee..39969b6 100644
--- a/help/bigbrother.xml
+++ b/help/bigbrother.xml
@@ -10,12 +10,15 @@
   <p>Your current <a href="#HIDD_PREFS">preferences</a> and network tree are automatically saved on Windows shutdown (unless specified otherwise) and may be <a href="#autosaveHIDD_PREFS">autosaved</a> every specified amount of minutes. Most recently used <a href="#MRUFile">file</a> is <a href="#HID_FILE_AUTOLOAD">automatically loaded</a> at <kin>Big Brother</kin>'s startup unless you don't want it.</p>

   <p>You can also hide <kin>Big Brother</kin> into your notify tray so that it won't occupy more than 16x16 square of your precious windows' desktop. Just click <image source="bbullet.bmp"/> in your notify tray or select <a href="#HID_VIEW_MAINWINDOW">View/Main Window</a> from menu. Click <image source="bbullet.bmp"/> again to restore <kin>Big Brother</kin> to its full size.</p>

   <p/>

   <p><b><i>Enjoy!</i></b></p>

-  <license years="1996-2004"/>

+  <license years="1996-2005"/>

   <credits/>

  </topic>

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

+  <newsfor version="1.5.1" date="August 6th, 2005">

+   <ni>Fixed uninstall procedure so that it works on XP</ni>

+  </newsfor>

   <newsfor version="1.5" date="July 11th, 2004">

    <ni>License change and opening the source code</ni>

    <ni>Made it work with Win2k and friends</ni>

    <ni>Added kinwide installer</ni>

diff --git a/install/install.cpp b/install/install.cpp
index 12b20f7..f16ec79 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -2,9 +2,9 @@
 #include "../shared-code/install.h"

 

 #define KINSHORT "BigBro"

 #define KINNAME "Big Brother"

-#define VERSION "1.5"

+#define VERSION "1.5.1"

 

 BOOL Install(void)

 {

 STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",KINSHORT "Path");

@@ -60,8 +60,14 @@ FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");
 	INF_MENU_ITEM(inf,1,KINNAME);

 	fclose(inf);

 

 	REG_UNINSTALL_COMMAND(KINSHORT,"Klever " KINNAME " " VERSION,shortPath,KINSHORT".INF","Uninstall");

+    REG_UNINSTALL_ICON(KINSHORT,path,"bigbrother.exe",0);

+    REG_UNINSTALL_COMMENT(KINSHORT,"Klever Big brother");

+    REG_UNINSTALL_VERSION(KINSHORT,VERSION);

+    REG_UNINSTALL_LOCATION(KINSHORT,path);

+    REG_UNINSTALL_PUBLISHER(KINSHORT,"Klever Group");

+    REG_UNINSTALL_URLS(KINSHORT,"http://www.klever.net/","http://kin.klever.net/bigbrother/");

 

 	MessageBox(NULL,KINNAME" " VERSION " installed successfully, you may now run it from 'Programs/Klever Group' menu 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 958704a..6b649fa 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -130,10 +130,10 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,5,0,0

- PRODUCTVERSION 1,5,0,0

+ FILEVERSION 1,5,1,0

+ PRODUCTVERSION 1,5,1,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

@@ -148,15 +148,15 @@ BEGIN
         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "INSTALL: Big Brother, network monitoring tool\0"

-            VALUE "FileVersion", "1, 5, 0, 0\0"

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

             VALUE "InternalName", "INSTALL\0"

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

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

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "Big Brother\0"

-            VALUE "ProductVersion", "1, 5, 0, 0\0"

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

         END

     END

     BLOCK "VarFileInfo"

     BEGIN