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

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

@@ -459,7 +459,7 @@ BEGIN
     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

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

 

diff --git a/help/dipstick.rtf b/help/dipstick.rtf
index 839d331..6568499 100644
--- a/help/dipstick.rtf
+++ b/help/dipstick.rtf
@@ -31,8 +31,9 @@ K{\footnote about}
 #{\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

diff --git a/help/dipstick.xml b/help/dipstick.xml
index 8ed0383..21363ab 100644
--- a/help/dipstick.xml
+++ b/help/dipstick.xml
@@ -10,8 +10,9 @@
  </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>
diff --git a/install/install.cpp b/install/install.cpp
index 1d91bc2..fcd32d7 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,7 +3,7 @@
 

 #define KINNAME "Dipstick"

 #define KINSHORT KINNAME

-#define VERSION "3.1-trunk"

+#define VERSION "3.1"

 

 BOOL Install(void)

 {

@@ -61,6 +61,12 @@ FILE* inf=CREATE_INF_FILE(path,KINSHORT ".INF");
         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);