4 files changed, 15 insertions, 7 deletions

diff --git a/dipstick.rc b/dipstick.rc
index 8797946..305eb77 100644
--- a/dipstick.rc
+++ b/dipstick.rc
@@ -79,24 +79,24 @@ IDI_UNREACHABLE         ICON    DISCARDABLE     "res\\unreach.ico"
 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 213, 61

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About Dipstick"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,11,17,21,20

-    LTEXT           "Dipstick, Version 3.1-trunk",IDC_STATIC,40,7,89,8,SS_NOPREFIX

+    LTEXT           "Dipstick, Version 3.1",IDC_STATIC,40,7,89,8,SS_NOPREFIX

     LTEXT           "Copyright © 1996-2005 Klever Group",IDC_STATIC,40,25,

                     166,8

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

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,40,40,91,14

 END

 

 IDD_DIPSTICK_DIALOG DIALOGEX 0, 0, 419, 152

 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | 

     WS_EX_APPWINDOW

-CAPTION "  Dipstick 3.1-trunk"

+CAPTION "  Dipstick 3.1"

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

 BEGIN

     CONTROL         "List1",IDC_HOSTLIST,"SysListView32",LVS_REPORT | 

                     LVS_SORTASCENDING | LVS_AUTOARRANGE | WS_BORDER | 

                     WS_TABSTOP,8,8,349,136,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Manual Ping",IDC_MANUALPING,361,8,50,14

@@ -456,13 +456,13 @@ BEGIN
     IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."

     IDS_CSVEXT              ".csv"

     IDS_HN_BADURL           "Bad URL"

     IDS_ABEST_CLEANUP       "Remove all locations from list?"

     IDS_ABEST_NONEFOUND     "No reachable locations were found."

     IDS_ABEST_TITLE         "  Dipstick - report"

-    IDS_DRAGPAD_TITLE       " Dipstick 3.1-trunk"

+    IDS_DRAGPAD_TITLE       " Dipstick 3.1"

     IDS_DRAGPAD_URLS        "  %d/%d URL(s)"

     IDS_REGEX_HTMLURL       "<A[^[:alpha:]][^>]*href[[:space:]]*=[[:space:]]*""?([^[:space:]>""]+)""?[^>]*>"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

@@ -476,13 +476,13 @@ BEGIN
     IDS_PS_HWERROR          "Hardware error"

     IDS_PS_BIGPACKET        "Packet size is too big"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

-    IDC_DNDTARGET           "Dipstick 3.1-trunk, click the right mouse button to display main window, left mouse button for menu"

+    IDC_DNDTARGET           "Dipstick 3.1, click the right mouse button to display main window, left mouse button for menu"

     IDC_HOST                "Host name as specified or resolved by Dipstick"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_URLCAPTION          "Universal Resource Locator (URL) associated with this location"

diff --git a/help/dipstick.rtf b/help/dipstick.rtf
index 839d331..6568499 100644
--- a/help/dipstick.rtf
+++ b/help/dipstick.rtf
@@ -28,14 +28,15 @@ K{\footnote about}
 \page

 

 \pard\plain\keepn

 #{\footnote News}

 ${\footnote What's new}

 { \f1\fs18\b\sb120 What's New}

-\par\pard\plain\f1\fs24\qc\cf2\b 3.1 - July 26th, 2005

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

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Ability to parse multiple URLs from plaintext selection

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

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Change of {\uldb license}{\v About} and opening the source.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Minor cosmetic changes

 \par\pard\plain\f1\fs24\qc\cf2\b 2.52 - June 3rd, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Now works properly with  Winsock 2 for  Windows95. Also may start working with non-Microsoft  TCP/IP stacks.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed bug that caused  GPF when removing all  URLs after testing is over and you picked the  URL of your choice.

diff --git a/help/dipstick.xml b/help/dipstick.xml
index 8ed0383..21363ab 100644
--- a/help/dipstick.xml
+++ b/help/dipstick.xml
@@ -7,14 +7,15 @@
   <p><b><i>Enjoy!</i></b></p>
   <license years="1996-2005"/>
   <credits/>
  </topic>
  <topic id="News" title="What's new">
   <heading scroll="no">What's New</heading>
-  <newsfor version="3.1" date="July 26th, 2005">
+  <newsfor version="3.1" date="August 6th, 2005">
    <ni>Ability to parse multiple URLs from plaintext selection</ni>
+   <ni>Fixed uninstall procedure so that it works on XP</ni>
   </newsfor>
   <newsfor version="3.0" date="July 11th, 2004">
    <ni>Change of <a href="#About">license</a> and opening the source.</ni>
    <ni>Minor cosmetic changes</ni>
   </newsfor>
   <newsfor version="2.52" date="June 3rd, 1998">
diff --git a/install/install.cpp b/install/install.cpp
index 1d91bc2..fcd32d7 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,12 +1,12 @@
 #include "resource.h"

 #include "../shared-code/install.h"

 

 #define KINNAME "Dipstick"

 #define KINSHORT KINNAME

-#define VERSION "3.1-trunk"

+#define VERSION "3.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");

@@ -58,11 +58,17 @@ FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");
         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,"dipstick.exe",0);

+        REG_UNINSTALL_COMMENT(KINSHORT,"Klever Dipstick");

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

 

         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;

 }