fixed XP uninstall and prepared 1.5.1 releaseHEAD1.5.1master

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

7 files changed, 29 insertions, 17 deletions

diff --git a/COPYING b/COPYING
index 9abe63f..b71fe11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,13 @@
-Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1998-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/KTAGS b/KTAGS
index 53a4c56..51936ef 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,12 +1,12 @@
         about-date      T42.rc  /LTEXT\s\+"Copyright /;"kind:d
         about-version   T42.rc  /LTEXT\s\+"T42, Version/;"kind:v
         help-license-date       ./help/T42.xml  /<license\s/;"kind:d
         help-news       ./help/T42.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     T42.rc  /VALUE\s\+"LegalCopyright",/;"kind:d
         vsinfo-numeric-version  T42.rc  /^\s\+FILEVERSION\s\+/;"kind:v
         vsinfo-string-version   T42.rc  /^\s\+VALUE\s\+"FileVersion",/;"kind:v
diff --git a/T42.rc b/T42.rc
index 6c51796..1bc84ac 100644
--- a/T42.rc
+++ b/T42.rc
@@ -76,26 +76,26 @@ IDR_FLIPPEDCUP          ICON    DISCARDABLE     "res\\IDR_FLIP.ico"
 IDI_PREPLAY             ICON    DISCARDABLE     "shared-data/play-icon.ico"

 

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

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 194, 78

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About T42"

 FONT 8, "MS Sans Serif"

 BEGIN

-    LTEXT           "T42, Version 1.5",IDC_STATIC,37,10,119,8,SS_NOPREFIX

-    LTEXT           "Copyright © 1998-2004 Klever Group",IDC_STATIC,37,25,119,8

+    LTEXT           "T42, Version 1.5.1",IDC_STATIC,37,10,119,8,SS_NOPREFIX

+    LTEXT           "Copyright © 1998-2005 Klever Group",IDC_STATIC,37,25,119,8

     ICON            IDR_MAINFRAME,IDC_STATIC,7,34,18,20

     ICON            IDR_FLIPPEDCUP,IDC_STATIC,166,34,18,20

     DEFPUSHBUTTON   "OK",IDOK,81,40,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,107,59,80,12

 END

 

 IDD_T42_DIALOG DIALOGEX 0, 0, 221, 200

 STYLE DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | 

     WS_EX_APPWINDOW

 CAPTION "  Tea For Two  "

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

@@ -289,49 +289,49 @@ BEGIN
     LTEXT           "Note: you will need to restart T42 if you change ntalk demon port number.",

                     IDC_STATIC,40,20,163,20

 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", "T42, unix talk/ntalk implementation\0"

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

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

             VALUE "InternalName", "T42\0"

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

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

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

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

             VALUE "ProductName", "T42\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/T42.rtf b/help/T42.rtf
index 5768d8f..5032e72 100644
--- a/help/T42.rtf
+++ b/help/T42.rtf
@@ -13,36 +13,38 @@ DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
 #{\footnote About}

 ${\footnote About T42}

 { \f1\fs18\b\sb120 About {\b T42}}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b T42} is our {\i Win32} implementation of {\b\cf6 unix}{\b\cf6 ntalk} protocol.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 It features:\pard

 \par \fi0\li0 \bullet   {\b Multihoming} - works properly on multihomed machines (ie. accepts connections/issues requests on all interfaces);

 \par \fi0\li0 \bullet   {\b Your personal secretary} - technically speaking, something like answering machine;

 \par \fi0\li0 \bullet   {\b Sleep function} - be notified of activities in backgrounded windows;\pard

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Designed to be compatible with our {\i TFTP} client/server, {\uldb {\b PumpKIN}}{\v %!ExecFile("http://kin.klever.net/pumpkin/")}, that allows you to exchange files with your party while having talk sessions.

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

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-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  Change of license and opening the source

 \page

 

 \pard\plain\keepn

 #{\footnote Using}

 ${\footnote Using T42}

 { \f1\fs18\b\sb120 Using {\b T42}}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Once you've installed {\b T42}, run it from {\i Programs/Klever Group} menu. A small cup icon will appear in the notification tray area.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 Left-click on the icon will get you to the {\uldb Main Window}{\v MainWindow}, right-click  brings up the following menu:\pard

 \par \fi0\li0 \bullet   {\b Order some tea} - Initiates talk session. This will open new {\uldb Conversation Window}{\v ConversationWindow} and prompt you for request details.

 \par \fi0\li0 \bullet   {\b Away} - Toggle your away mode. It affects the way {\b T42} handles incoming calls. See {\uldb Main Window}{\v Mainwindow} for details.

diff --git a/help/T42.xml b/help/T42.xml
index affe7c0..8973ee7 100644
--- a/help/T42.xml
+++ b/help/T42.xml
@@ -3,28 +3,31 @@
  <topic id="About" title="About T42">

   <heading scroll="no">About <kin>T42</kin></heading>

   <p><kin>T42</kin> is our <term>Win32</term> implementation of <product>unix</product> <product>ntalk</product> protocol.</p>

   <p>It features:</p>

   <ul>

    <li><b>Multihoming</b> - works properly on multihomed machines (ie. accepts connections/issues requests on all interfaces);</li>

    <li><b>Your personal secretary</b> - technically speaking, something like answering machine;</li>

    <li><b>Sleep function</b> - be notified of activities in backgrounded windows;</li>

   </ul>

   <p>Designed to be compatible with our <term>TFTP</term> client/server, <kin href="http://kin.klever.net/pumpkin/">PumpKIN</kin>, that allows you to exchange files with your party while having talk sessions.</p>

   <p/>

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

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

+  <license years="1998-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>Change of license and opening the source</ni>

   </newsfor>

  </topic>

  <topic id="Using" title="Using T42">

   <heading scroll="no">Using <kin>T42</kin></heading>

   <p>Once you've installed <kin>T42</kin>, run it from <i>Programs/Klever Group</i> menu. A small cup icon will appear in the notification tray area.</p>

   <p>Left-click on the icon will get you to the <a href="#MainWindow">Main Window</a>, right-click  brings up the following menu:</p>

   <ul>

    <li><b>Order some tea</b> - Initiates talk session. This will open new <a href="#ConversationWindow">Conversation Window</a> and prompt you for request details.</li>

    <li><b>Away</b> - Toggle your away mode. It affects the way <kin>T42</kin> handles incoming calls. See <a href="#Mainwindow">Main Window</a> for details.</li>

    <li><b>Show Main Window</b> - Toggle visibility of the <a href="#MainWindow">Main Window</a> from which you can control some of <kin>T42</kin> options and read/maintain your recorded messages.</li>

diff --git a/install/install.cpp b/install/install.cpp
index 8b8c61f..35717bd 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,16 +1,17 @@
 #include "resource.h"
 #include "../shared-code/install.h"

 

-        #defineKINAME "T42 1.5"

+#define VERSION "1.5.1"

+        #defineKINAME "T42 " VERSION

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

 LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");

 STRING path = REQUESTPATH("  " KINAME,"\nEnter destination path:",qPath);

         if(!path)

                 return NULL;

 

         #ifdefK_ANNED

@@ -52,17 +53,23 @@ FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
         INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe");

         INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME);

         INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf");

         INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".Calls");

         INF_FILE_SECTION(inf,"kReg");

         INF_UNINSTALL_REG(inf,SKINAME);

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

 

         MessageBox(NULL,KINAME " 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 1516122..6ff3614 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: T42, unix talk/ntalk implementation\0"

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

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

             VALUE "InternalName", "INSTALL\0"

-            VALUE "LegalCopyright", "Copyright © 1998-2004 Klever Group (http://www.klever.net/)\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", "T42\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

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