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,13 +1,13 @@
-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
 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/bigbrother.rc b/bigbrother.rc
index e4c335f..d7aedec 100644
--- a/bigbrother.rc
+++ b/bigbrother.rc
@@ -228,27 +228,27 @@ END
 

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

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74

 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

 

 IDD_PROPS_SETTINGS DIALOG DISCARDABLE  0, 0, 220, 90

 STYLE DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Settings"

 FONT 8, "MS Sans Serif"

 BEGIN

     GROUPBOX        "",IDC_STATIC,7,7,206,45,BS_NOTIFY

     CONTROL         "Ping &Intervals",IDC_OVERRIDE_INTERVALS,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,14,7,55,10

@@ -359,49 +359,49 @@ BEGIN
     CONTROL         "&Store recent activity pane data",IDC_STOREACTIVITY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,134,113,10

 END

 

 

 #ifndef _MAC

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

 //

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

  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", "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

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

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

diff --git a/help/bigbrother.rtf b/help/bigbrother.rtf
index e16c646..c2ae976 100644
--- a/help/bigbrother.rtf
+++ b/help/bigbrother.rtf
@@ -15,36 +15,38 @@ ${\footnote About Big Brother}
 K{\footnote about}

 { \f1\fs18\b\sb120 About {\b Big Brother}}

 \par\sa120\sb120\qr\f1\fs16 dedicated to Kundel

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b Big Brother} is a program designed to monitor your IP-network activities. it gives you a comprehensive picture of what happened to any point on the Net that you put in. Just {\uldb add}{\v Add} this point by specifying it's IP address or hostname and optional short description (for your information only).

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 The hosts are organized into a hierarchical tree so that you may configure your network picture according to your needs and imagination. Most of the father host properties are inherited by his children unless you wish to specify child's settings explicitly.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Every specified period of time {\b Big Brother} will send echo request to every host. And wait for response for at most specified {\uldb timeout}{\v timeOutHIDD_PROPS_SETTINGS}.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Results are presented in a graphical form in the lower pane. Each line of the lower window is related to specific host which is shown on the tooltip when you move your mouse over the graphics. Host activities are also {\uldb logged into file}{\v fileHIDD_PREFS}.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Your current {\uldb preferences}{\v HIDD_PREFS} and network tree are automatically saved on Windows shutdown (unless specified otherwise) and may be {\uldb autosaved}{\v autosaveHIDD_PREFS} every specified amount of minutes. Most recently used {\uldb file}{\v MRUFile} is {\uldb automatically loaded}{\v HID_FILE_AUTOLOAD} at {\b Big Brother}'s startup unless you don't want it.

 \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.

 }

 \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.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

 \page

 

 \pard\plain\keepn

 #{\footnote Using}

 ${\footnote Using Big Brother}

 { \f1\fs18\b\sb120 Using {\b Big Brother}}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Using {\b Big Brother} consists of two parts - designing your network tree and monitoring it's activity. The latter takes no effort of yours.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 To design the network layout is to put your hosts into Network Tree pane. To {\uldb add a child host}{\v HID_BROTHERS_NEW} to the current just press insert or Select Brothers/Add child from menu. To {\uldb add a brother}{\v HID_BROTHERS_ADDBROTHER} of the current host select Brothers/Add brother from menu. (note: You can't add brother to the root node)

diff --git a/help/bigbrother.xml b/help/bigbrother.xml
index ec391ee..39969b6 100644
--- a/help/bigbrother.xml
+++ b/help/bigbrother.xml
@@ -2,28 +2,31 @@
 <winhelp>

  <topic id="About" title="About Big Brother" keywords="about">

   <heading scroll="no">About <kin>Big Brother</kin></heading>

   <dedication>dedicated to Kundel</dedication>

   <p><kin>Big Brother</kin> is a program designed to monitor your IP-network activities. it gives you a comprehensive picture of what happened to any point on the Net that you put in. Just <a href="#Add">add</a> this point by specifying it's IP address or hostname and optional short description (for your information only).</p>

   <p>The hosts are organized into a hierarchical tree so that you may configure your network picture according to your needs and imagination. Most of the father host properties are inherited by his children unless you wish to specify child's settings explicitly.</p>

   <p>Every specified period of time <kin>Big Brother</kin> will send echo request to every host. And wait for response for at most specified <a href="#timeOutHIDD_PROPS_SETTINGS">timeout</a>.</p>

   <p>Results are presented in a graphical form in the lower pane. Each line of the lower window is related to specific host which is shown on the tooltip when you move your mouse over the graphics. Host activities are also <a href="#fileHIDD_PREFS">logged into file</a>.</p>

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

   </newsfor>

  </topic>

  <topic id="Using" title="Using Big Brother">

   <heading scroll="no">Using <kin>Big Brother</kin></heading>

   <p>Using <kin>Big Brother</kin> consists of two parts - designing your network tree and monitoring it's activity. The latter takes no effort of yours.</p>

   <p>To design the network layout is to put your hosts into Network Tree pane. To <a href="#HID_BROTHERS_NEW">add a child host</a> to the current just press insert or Select Brothers/Add child from menu. To <a href="#HID_BROTHERS_ADDBROTHER">add a brother</a> of the current host select Brothers/Add brother from menu. (note: You can't add brother to the root node)</p>

   <p>You may also show <a href="#HostProps">properties</a> dialog box by selecting View/Host Properties menu. <a href="#HostProps">Properties</a> dialog box also pops up automatically whenever you press <b>Enter</b> in the tree view pane.</p>

   <p>Monitoring your network activities is even easier. You just relax and watch the screen (or listen to your speakers if you have ones). Network activities are reflected using the lower host activity pane and icons in the tree view. The possible states of the host are:</p>

diff --git a/install/install.cpp b/install/install.cpp
index 12b20f7..f16ec79 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,18 +1,18 @@
 #include "resource.h"

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

 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("  " KINNAME " " VERSION,"\nEnter destination path:",qPath);

         if(!path)

                 return NULL;

 

         #ifdefK_ANNED

 STRING sysDir(_MAX_PATH);

@@ -52,17 +52,23 @@ FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");
         INF_REMOVE_ROOT(inf,KINSHORT "Files",path);

         INF_REMOVE_FILE(inf,KINSHORT "Files","bigbro.exe");

         INF_REMOVE_HELP_FILE(inf,KINSHORT "Files","bigbro");

         INF_REMOVE_FILE(inf,KINSHORT "Files","bigbro.inf");

         INF_FILE_SECTION(inf,"kReg");

         INF_UNINSTALL_REG(inf,KINSHORT);

         INF_FILE_SECTION(inf,"kMenu");

         INF_MENU_GROUP(inf,1,"Klever Group");

         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
@@ -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,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

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

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

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

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