summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--KTAGS2
-rw-r--r--T42.rc14
-rw-r--r--help/T42.rtf4
-rw-r--r--help/T42.xml5
-rw-r--r--install/install.cpp9
-rw-r--r--install/install.rc10
7 files changed, 29 insertions, 17 deletions
diff --git a/COPYING b/COPYING
index 9abe63f..b71fe11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,19 @@
1Copyright (c) 1998-2004 Klever Group (http://www.klever.net/) 1Copyright (c) 1998-2005 Klever Group (http://www.klever.net/)
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy of 3Permission is hereby granted, free of charge, to any person obtaining a copy of
4this software and associated documentation files (the "Software"), to deal in 4this software and associated documentation files (the "Software"), to deal in
5the Software without restriction, including without limitation the rights to 5the Software without restriction, including without limitation the rights to
6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7of the Software, and to permit persons to whom the Software is furnished to do 7of the Software, and to permit persons to whom the Software is furnished to do
8so, subject to the following conditions: 8so, subject to the following conditions:
9 9
10The above copyright notice and this permission notice shall be included in all 10The above copyright notice and this permission notice shall be included in all
11copies or substantial portions of the Software. 11copies or substantial portions of the Software.
12 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19SOFTWARE. 19SOFTWARE.
diff --git a/KTAGS b/KTAGS
index 53a4c56..51936ef 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,12 +1,12 @@
1 about-date T42.rc /LTEXT\s\+"Copyright /;"kind:d 1 about-date T42.rc /LTEXT\s\+"Copyright /;"kind:d
2 about-version T42.rc /LTEXT\s\+"T42, Version/;"kind:v 2 about-version T42.rc /LTEXT\s\+"T42, Version/;"kind:v
3 help-license-date ./help/T42.xml /<license\s/;"kind:d 3 help-license-date ./help/T42.xml /<license\s/;"kind:d
4 help-news ./help/T42.xml/<newsfor\s/ 4 help-news ./help/T42.xml/<newsfor\s/
5 install-version ./install/install.cpp /^#define\s\+KINAME\s\+"/;"kind:v 5 install-version ./install/install.cpp /^#define\s\+VERSION\s\+"/;"kind:v
6 install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d 6 install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d
7 install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v 7 install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v
8 install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v 8 install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v
9 license-date COPYING :1;"kind:d 9 license-date COPYING :1;"kind:d
10 vsinfo-date T42.rc /VALUE\s\+"LegalCopyright",/;"kind:d 10 vsinfo-date T42.rc /VALUE\s\+"LegalCopyright",/;"kind:d
11 vsinfo-numeric-version T42.rc /^\s\+FILEVERSION\s\+/;"kind:v 11 vsinfo-numeric-version T42.rc /^\s\+FILEVERSION\s\+/;"kind:v
12 vsinfo-string-version T42.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v 12 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
@@ -56,66 +56,66 @@ BEGIN
56END 56END
57 57
58#endif // APSTUDIO_INVOKED 58#endif // APSTUDIO_INVOKED
59 59
60 60
61///////////////////////////////////////////////////////////////////////////// 61/////////////////////////////////////////////////////////////////////////////
62// 62//
63// Icon 63// Icon
64// 64//
65 65
66// Icon with lowest ID value placed first to ensure application icon 66// Icon with lowest ID value placed first to ensure application icon
67// remains consistent on all systems. 67// remains consistent on all systems.
68IDR_MAINFRAME ICON DISCARDABLE "res\\T42.ico" 68IDR_MAINFRAME ICON DISCARDABLE "res\\T42.ico"
69IDR_T42FRAME ICON DISCARDABLE "res\\IDR_T42F.ico" 69IDR_T42FRAME ICON DISCARDABLE "res\\IDR_T42F.ico"
70IDI_FULLCUP ICON DISCARDABLE "res\\fullcup.ico" 70IDI_FULLCUP ICON DISCARDABLE "res\\fullcup.ico"
71IDR_FULLT42 ICON DISCARDABLE "res\\IDR_FULL.ico" 71IDR_FULLT42 ICON DISCARDABLE "res\\IDR_FULL.ico"
72IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico" 72IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico"
73IDI_T42CALLNEW ICON DISCARDABLE "res\\T42calln.ico" 73IDI_T42CALLNEW ICON DISCARDABLE "res\\T42calln.ico"
74IDI_T42CALLPROCESSED ICON DISCARDABLE "res\\T42callp.ico" 74IDI_T42CALLPROCESSED ICON DISCARDABLE "res\\T42callp.ico"
75IDR_FLIPPEDCUP ICON DISCARDABLE "res\\IDR_FLIP.ico" 75IDR_FLIPPEDCUP ICON DISCARDABLE "res\\IDR_FLIP.ico"
76IDI_PREPLAY ICON DISCARDABLE "shared-data/play-icon.ico" 76IDI_PREPLAY ICON DISCARDABLE "shared-data/play-icon.ico"
77 77
78///////////////////////////////////////////////////////////////////////////// 78/////////////////////////////////////////////////////////////////////////////
79// 79//
80// Dialog 80// Dialog
81// 81//
82 82
83IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 194, 78 83IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 194, 78
84STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 84STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
85CAPTION "About T42" 85CAPTION "About T42"
86FONT 8, "MS Sans Serif" 86FONT 8, "MS Sans Serif"
87BEGIN 87BEGIN
88 LTEXT "T42, Version 1.5",IDC_STATIC,37,10,119,8,SS_NOPREFIX 88 LTEXT "T42, Version 1.5.1",IDC_STATIC,37,10,119,8,SS_NOPREFIX
89 LTEXT "Copyright © 1998-2004 Klever Group",IDC_STATIC,37,25,119,8 89 LTEXT "Copyright © 1998-2005 Klever Group",IDC_STATIC,37,25,119,8
90 ICON IDR_MAINFRAME,IDC_STATIC,7,34,18,20 90 ICON IDR_MAINFRAME,IDC_STATIC,7,34,18,20
91 ICON IDR_FLIPPEDCUP,IDC_STATIC,166,34,18,20 91 ICON IDR_FLIPPEDCUP,IDC_STATIC,166,34,18,20
92 DEFPUSHBUTTON "OK",IDOK,81,40,32,14,WS_GROUP 92 DEFPUSHBUTTON "OK",IDOK,81,40,32,14,WS_GROUP
93 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,107,59,80,12 93 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,107,59,80,12
94END 94END
95 95
96IDD_T42_DIALOG DIALOGEX 0, 0, 221, 200 96IDD_T42_DIALOG DIALOGEX 0, 0, 221, 200
97STYLE DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME 97STYLE DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
98EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | 98EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP |
99 WS_EX_APPWINDOW 99 WS_EX_APPWINDOW
100CAPTION " Tea For Two " 100CAPTION " Tea For Two "
101FONT 8, "MS Sans Serif", 0, 0, 0x1 101FONT 8, "MS Sans Serif", 0, 0, 0x1
102BEGIN 102BEGIN
103 CTEXT "On &Call:",IDC_STATIC,7,7,93,56,0,WS_EX_DLGMODALFRAME | 103 CTEXT "On &Call:",IDC_STATIC,7,7,93,56,0,WS_EX_DLGMODALFRAME |
104 WS_EX_CLIENTEDGE 104 WS_EX_CLIENTEDGE
105 COMBOBOX IDC_ONCALL,13,19,81,76,CBS_DROPDOWNLIST | WS_VSCROLL | 105 COMBOBOX IDC_ONCALL,13,19,81,76,CBS_DROPDOWNLIST | WS_VSCROLL |
106 WS_TABSTOP 106 WS_TABSTOP
107 CTEXT "When &Away:",IDC_STATIC,13,33,81,8 107 CTEXT "When &Away:",IDC_STATIC,13,33,81,8
108 COMBOBOX IDC_ONCALLAWAY,13,43,81,76,CBS_DROPDOWNLIST | WS_VSCROLL | 108 COMBOBOX IDC_ONCALLAWAY,13,43,81,76,CBS_DROPDOWNLIST | WS_VSCROLL |
109 WS_TABSTOP 109 WS_TABSTOP
110 CONTROL "Calls",IDC_CALLS,"SysListView32",LVS_REPORT | WS_BORDER | 110 CONTROL "Calls",IDC_CALLS,"SysListView32",LVS_REPORT | WS_BORDER |
111 WS_TABSTOP,7,66,207,67 111 WS_TABSTOP,7,66,207,67
112 CONTROL "Recorded Message..",IDC_PREVIEW,"RICHEDIT",WS_VSCROLL | 112 CONTROL "Recorded Message..",IDC_PREVIEW,"RICHEDIT",WS_VSCROLL |
113 WS_TABSTOP | 0xc184,7,134,207,59 113 WS_TABSTOP | 0xc184,7,134,207,59
114 PUSHBUTTON "&Tea",IDC_TALK,173,7,41,13 114 PUSHBUTTON "&Tea",IDC_TALK,173,7,41,13
115 PUSHBUTTON "&Options",IDC_OPTIONS,173,21,41,13 115 PUSHBUTTON "&Options",IDC_OPTIONS,173,21,41,13
116 PUSHBUTTON "E&xit",IDOK,173,35,41,13 116 PUSHBUTTON "E&xit",IDOK,173,35,41,13
117 PUSHBUTTON "&Help",ID_HELP,173,49,41,13 117 PUSHBUTTON "&Help",ID_HELP,173,49,41,13
118 DEFPUSHBUTTON "",IDCANCEL,0,0,6,6,NOT WS_VISIBLE 118 DEFPUSHBUTTON "",IDCANCEL,0,0,6,6,NOT WS_VISIBLE
119 CONTROL "A&way",IDC_AWAY,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 119 CONTROL "A&way",IDC_AWAY,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE |
120 BS_MULTILINE | WS_TABSTOP,101,7,41,56, 120 BS_MULTILINE | WS_TABSTOP,101,7,41,56,
121 WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE | 121 WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE |
@@ -269,89 +269,89 @@ BEGIN
269 115,140,12 269 115,140,12
270 LTEXT "calls in &progress",IDC_STATIC,97,129,54,8 270 LTEXT "calls in &progress",IDC_STATIC,97,129,54,8
271 EDITTEXT IDC_WINLIMIT,55,127,40,12,ES_AUTOHSCROLL | ES_NUMBER 271 EDITTEXT IDC_WINLIMIT,55,127,40,12,ES_AUTOHSCROLL | ES_NUMBER
272 CONTROL "Spin1",IDC_WINSPIN,"msctls_updown32",UDS_WRAP | 272 CONTROL "Spin1",IDC_WINSPIN,"msctls_updown32",UDS_WRAP |
273 UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 273 UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
274 UDS_ARROWKEYS | UDS_NOTHOUSANDS,85,127,10,12 274 UDS_ARROWKEYS | UDS_NOTHOUSANDS,85,127,10,12
275 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,196,1 275 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,196,1
276END 276END
277 277
278IDD_OPTIONS_GENERAL DIALOG DISCARDABLE 0, 0, 210, 154 278IDD_OPTIONS_GENERAL DIALOG DISCARDABLE 0, 0, 210, 154
279STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 279STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
280CAPTION "General" 280CAPTION "General"
281FONT 8, "MS Sans Serif" 281FONT 8, "MS Sans Serif"
282BEGIN 282BEGIN
283 LTEXT "T42 '&ntalk' daemon listening on port ",IDC_STATIC,7,7, 283 LTEXT "T42 '&ntalk' daemon listening on port ",IDC_STATIC,7,7,
284 114,8 284 114,8
285 EDITTEXT IDC_NTALKPORT,123,5,80,12,ES_LOWERCASE | ES_AUTOHSCROLL 285 EDITTEXT IDC_NTALKPORT,123,5,80,12,ES_LOWERCASE | ES_AUTOHSCROLL
286 CONTROL "Spin1",IDC_NTALKPORTSPIN,"msctls_updown32", 286 CONTROL "Spin1",IDC_NTALKPORTSPIN,"msctls_updown32",
287 UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,193,5,10, 287 UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,193,5,10,
288 12 288 12
289 LTEXT "Note: you will need to restart T42 if you change ntalk demon port number.", 289 LTEXT "Note: you will need to restart T42 if you change ntalk demon port number.",
290 IDC_STATIC,40,20,163,20 290 IDC_STATIC,40,20,163,20
291END 291END
292 292
293 293
294#ifndef _MAC 294#ifndef _MAC
295///////////////////////////////////////////////////////////////////////////// 295/////////////////////////////////////////////////////////////////////////////
296// 296//
297// Version 297// Version
298// 298//
299 299
300VS_VERSION_INFO VERSIONINFO 300VS_VERSION_INFO VERSIONINFO
301 FILEVERSION 1,5,0,0 301 FILEVERSION 1,5,1,0
302 PRODUCTVERSION 1,5,0,0 302 PRODUCTVERSION 1,5,1,0
303 FILEFLAGSMASK 0x3fL 303 FILEFLAGSMASK 0x3fL
304#ifdef _DEBUG 304#ifdef _DEBUG
305 FILEFLAGS 0x1L 305 FILEFLAGS 0x1L
306#else 306#else
307 FILEFLAGS 0x0L 307 FILEFLAGS 0x0L
308#endif 308#endif
309 FILEOS 0x4L 309 FILEOS 0x4L
310 FILETYPE 0x1L 310 FILETYPE 0x1L
311 FILESUBTYPE 0x0L 311 FILESUBTYPE 0x0L
312BEGIN 312BEGIN
313 BLOCK "StringFileInfo" 313 BLOCK "StringFileInfo"
314 BEGIN 314 BEGIN
315 BLOCK "040904b0" 315 BLOCK "040904b0"
316 BEGIN 316 BEGIN
317 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 317 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
318 VALUE "FileDescription", "T42, unix talk/ntalk implementation\0" 318 VALUE "FileDescription", "T42, unix talk/ntalk implementation\0"
319 VALUE "FileVersion", "1, 5, 0, 0\0" 319 VALUE "FileVersion", "1, 5, 1, 0\0"
320 VALUE "InternalName", "T42\0" 320 VALUE "InternalName", "T42\0"
321 VALUE "LegalCopyright", "Copyright © 1998-2004 Klever Group (http://www.klever.net/)\0" 321 VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
322 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 322 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
323 VALUE "OriginalFilename", "T42.EXE\0" 323 VALUE "OriginalFilename", "T42.EXE\0"
324 VALUE "ProductName", "T42\0" 324 VALUE "ProductName", "T42\0"
325 VALUE "ProductVersion", "1, 5, 0, 0\0" 325 VALUE "ProductVersion", "1, 5, 1, 0\0"
326 END 326 END
327 END 327 END
328 BLOCK "VarFileInfo" 328 BLOCK "VarFileInfo"
329 BEGIN 329 BEGIN
330 VALUE "Translation", 0x409, 1200 330 VALUE "Translation", 0x409, 1200
331 END 331 END
332END 332END
333 333
334#endif // !_MAC 334#endif // !_MAC
335 335
336 336
337///////////////////////////////////////////////////////////////////////////// 337/////////////////////////////////////////////////////////////////////////////
338// 338//
339// DESIGNINFO 339// DESIGNINFO
340// 340//
341 341
342#ifdef APSTUDIO_INVOKED 342#ifdef APSTUDIO_INVOKED
343GUIDELINES DESIGNINFO DISCARDABLE 343GUIDELINES DESIGNINFO DISCARDABLE
344BEGIN 344BEGIN
345 IDD_ABOUTBOX, DIALOG 345 IDD_ABOUTBOX, DIALOG
346 BEGIN 346 BEGIN
347 LEFTMARGIN, 7 347 LEFTMARGIN, 7
348 RIGHTMARGIN, 187 348 RIGHTMARGIN, 187
349 TOPMARGIN, 7 349 TOPMARGIN, 7
350 BOTTOMMARGIN, 71 350 BOTTOMMARGIN, 71
351 END 351 END
352 352
353 IDD_T42_DIALOG, DIALOG 353 IDD_T42_DIALOG, DIALOG
354 BEGIN 354 BEGIN
355 LEFTMARGIN, 7 355 LEFTMARGIN, 7
356 RIGHTMARGIN, 214 356 RIGHTMARGIN, 214
357 TOPMARGIN, 7 357 TOPMARGIN, 7
diff --git a/help/T42.rtf b/help/T42.rtf
index 5768d8f..5032e72 100644
--- a/help/T42.rtf
+++ b/help/T42.rtf
@@ -1,68 +1,70 @@
1{\rtf1\ansi 1{\rtf1\ansi
2@{\footnote 2@{\footnote
3THIS FILE WAS AUTOMATICALLY GENERATED FROM XML DOCUMENT. 3THIS FILE WAS AUTOMATICALLY GENERATED FROM XML DOCUMENT.
4DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD 4DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
5} 5}
6{\fonttbl{\f0\froman Times New Roman;}{\f1\fswiss Arial;}{\f3\froman Symbol;}}{\colortbl; 6{\fonttbl{\f0\froman Times New Roman;}{\f1\fswiss Arial;}{\f3\froman Symbol;}}{\colortbl;
7 \red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0; 7 \red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
8 \red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255; 8 \red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
9 \red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; 9 \red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
10 \red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;} 10 \red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
11 11
12\pard\plain\keepn 12\pard\plain\keepn
13#{\footnote About} 13#{\footnote About}
14${\footnote About T42} 14${\footnote About T42}
15{ \f1\fs18\b\sb120 About {\b T42}} 15{ \f1\fs18\b\sb120 About {\b T42}}
16\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b T42} is our {\i Win32} implementation of {\b\cf6 unix}{\b\cf6 ntalk} protocol. 16\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b T42} is our {\i Win32} implementation of {\b\cf6 unix}{\b\cf6 ntalk} protocol.
17\par\sa120\sb120\qj\pard \f1\fs18\sb120 It features:\pard 17\par\sa120\sb120\qj\pard \f1\fs18\sb120 It features:\pard
18\par \fi0\li0 \bullet {\b Multihoming} - works properly on multihomed machines (ie. accepts connections/issues requests on all interfaces); 18\par \fi0\li0 \bullet {\b Multihoming} - works properly on multihomed machines (ie. accepts connections/issues requests on all interfaces);
19\par \fi0\li0 \bullet {\b Your personal secretary} - technically speaking, something like answering machine; 19\par \fi0\li0 \bullet {\b Your personal secretary} - technically speaking, something like answering machine;
20\par \fi0\li0 \bullet {\b Sleep function} - be notified of activities in backgrounded windows;\pard 20\par \fi0\li0 \bullet {\b Sleep function} - be notified of activities in backgrounded windows;\pard
21\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. 21\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.
22\par\sa120\sb120\qj\pard \f1\fs18\sb120 22\par\sa120\sb120\qj\pard \f1\fs18\sb120
23\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}} 23\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}
24{ 24{
25\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/")} 25\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/")}
26\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: 26\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:
27\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 27\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
28\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. 28\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.
29} 29}
30\par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")} 30\par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")}
31\par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")} 31\par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")}
32\page 32\page
33 33
34\pard\plain 34\pard\plain
35#{\footnote News} 35#{\footnote News}
36${\footnote What's New} 36${\footnote What's New}
37\par\pard\plain\f1\fs24\qc\cf2\b 1.5.1 - August 6th, 2005
38\par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP
37\par\pard\plain\f1\fs24\qc\cf2\b 1.5 - July 11th, 2004 39\par\pard\plain\f1\fs24\qc\cf2\b 1.5 - July 11th, 2004
38\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source 40\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source
39\page 41\page
40 42
41\pard\plain\keepn 43\pard\plain\keepn
42#{\footnote Using} 44#{\footnote Using}
43${\footnote Using T42} 45${\footnote Using T42}
44{ \f1\fs18\b\sb120 Using {\b T42}} 46{ \f1\fs18\b\sb120 Using {\b T42}}
45\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. 47\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.
46\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 48\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
47\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. 49\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.
48\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. 50\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.
49\par \fi0\li0 \bullet {\b Show Main Window} - Toggle visibility of the {\uldb Main Window}{\v MainWindow} from which you can control some of {\b T42} options and read/maintain your recorded messages. 51\par \fi0\li0 \bullet {\b Show Main Window} - Toggle visibility of the {\uldb Main Window}{\v MainWindow} from which you can control some of {\b T42} options and read/maintain your recorded messages.
50\par \fi0\li0 \bullet {\b Options} - Select this to bring up {\uldb Options dialog}{\v Options} so that you can customize {\b T42} to suit your needs. 52\par \fi0\li0 \bullet {\b Options} - Select this to bring up {\uldb Options dialog}{\v Options} so that you can customize {\b T42} to suit your needs.
51\par \fi0\li0 \bullet {\b Exit} - This is not likely to happen, but if you want to exit {\b T42} and unload it from memory - that's what {\b Exit} is for.\pard 53\par \fi0\li0 \bullet {\b Exit} - This is not likely to happen, but if you want to exit {\b T42} and unload it from memory - that's what {\b Exit} is for.\pard
52\page 54\page
53 55
54\pard\plain\keepn 56\pard\plain\keepn
55#{\footnote MainWindow} 57#{\footnote MainWindow}
56${\footnote Main Window} 58${\footnote Main Window}
57{ \f1\fs18\b\sb120 Main {\b T42} Window} 59{ \f1\fs18\b\sb120 Main {\b T42} Window}
58\par\sa120\sb120\qj\pard \f1\fs18\sb120 Main Window is a {\b T42} Control Center, it's exactly mouse-click away from most of {\b T42} functions. It consists of\pard 60\par\sa120\sb120\qj\pard \f1\fs18\sb120 Main Window is a {\b T42} Control Center, it's exactly mouse-click away from most of {\b T42} functions. It consists of\pard
59\par \fi0\li0 \bullet {\b On Call} and {\b On Call when away} dropdown lists let you select the action to take when incoming call occurs in 'normal' and 'away' mode. Chose one of 61\par \fi0\li0 \bullet {\b On Call} and {\b On Call when away} dropdown lists let you select the action to take when incoming call occurs in 'normal' and 'away' mode. Chose one of
60 \pard 62 \pard
61\par \fi0\li0 \bullet {\i Prompt} - Ask you what to do before taking any actions; 63\par \fi0\li0 \bullet {\i Prompt} - Ask you what to do before taking any actions;
62\par \fi0\li0 \bullet {\i Secretary} - Relay incoming calls to your {\uldb personal secretary}{\v SecretaryOptions}. Some prefer to call it answering machine. 64\par \fi0\li0 \bullet {\i Secretary} - Relay incoming calls to your {\uldb personal secretary}{\v SecretaryOptions}. Some prefer to call it answering machine.
63\par \fi0\li0 \bullet {\i Not here} - Tell the caller you're not here ({\i not logged in}) and terminate connection. 65\par \fi0\li0 \bullet {\i Not here} - Tell the caller you're not here ({\i not logged in}) and terminate connection.
64\par \fi0\li0 \bullet {\i Refuse} - Tell the caller you're not accepting messages and terminate connection. 66\par \fi0\li0 \bullet {\i Refuse} - Tell the caller you're not accepting messages and terminate connection.
65\par \fi0\li0 \bullet {\i Ignore} - Pretend that you didn't notice.\pard 67\par \fi0\li0 \bullet {\i Ignore} - Pretend that you didn't notice.\pard
66\par \fi0\li0 \bullet {\b Away} button toggles your away mode. When an incoming call occurs {\b T42} takes action based upon away mode and options selected in {\b On Call} and {\b On Call when away} dropdown lists. 68\par \fi0\li0 \bullet {\b Away} button toggles your away mode. When an incoming call occurs {\b T42} takes action based upon away mode and options selected in {\b On Call} and {\b On Call when away} dropdown lists.
67\par \fi0\li0 \bullet {\b Tea} button initiates new talk session. This will open new {\uldb Conversation Window}{\v ConversationWindow} and prompt you for {\uldb request details}{\v RemoteDialog}. 69\par \fi0\li0 \bullet {\b Tea} button initiates new talk session. This will open new {\uldb Conversation Window}{\v ConversationWindow} and prompt you for {\uldb request details}{\v RemoteDialog}.
68\par \fi0\li0 \bullet {\b Options} button brings up {\uldb Configuration Dialog}{\v Options} that lets you customize {\b T42} according to your needs. 70\par \fi0\li0 \bullet {\b Options} button brings up {\uldb Configuration Dialog}{\v Options} that lets you customize {\b T42} according to your needs.
diff --git a/help/T42.xml b/help/T42.xml
index affe7c0..8973ee7 100644
--- a/help/T42.xml
+++ b/help/T42.xml
@@ -1,50 +1,53 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<winhelp> 2<winhelp>
3 <topic id="About" title="About T42"> 3 <topic id="About" title="About T42">
4 <heading scroll="no">About <kin>T42</kin></heading> 4 <heading scroll="no">About <kin>T42</kin></heading>
5 <p><kin>T42</kin> is our <term>Win32</term> implementation of <product>unix</product> <product>ntalk</product> protocol.</p> 5 <p><kin>T42</kin> is our <term>Win32</term> implementation of <product>unix</product> <product>ntalk</product> protocol.</p>
6 <p>It features:</p> 6 <p>It features:</p>
7 <ul> 7 <ul>
8 <li><b>Multihoming</b> - works properly on multihomed machines (ie. accepts connections/issues requests on all interfaces);</li> 8 <li><b>Multihoming</b> - works properly on multihomed machines (ie. accepts connections/issues requests on all interfaces);</li>
9 <li><b>Your personal secretary</b> - technically speaking, something like answering machine;</li> 9 <li><b>Your personal secretary</b> - technically speaking, something like answering machine;</li>
10 <li><b>Sleep function</b> - be notified of activities in backgrounded windows;</li> 10 <li><b>Sleep function</b> - be notified of activities in backgrounded windows;</li>
11 </ul> 11 </ul>
12 <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> 12 <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>
13 <p/> 13 <p/>
14 <p><b><i>Enjoy!</i></b></p> 14 <p><b><i>Enjoy!</i></b></p>
15 <license years="1998-2004"/> 15 <license years="1998-2005"/>
16 <credits/> 16 <credits/>
17 </topic> 17 </topic>
18 <topic id="News" title="What's New"> 18 <topic id="News" title="What's New">
19 <newsfor version="1.5.1" date="August 6th, 2005">
20 <ni>Fixed uninstall procedure so that it works on XP</ni>
21 </newsfor>
19 <newsfor version="1.5" date="July 11th, 2004"> 22 <newsfor version="1.5" date="July 11th, 2004">
20 <ni>Change of license and opening the source</ni> 23 <ni>Change of license and opening the source</ni>
21 </newsfor> 24 </newsfor>
22 </topic> 25 </topic>
23 <topic id="Using" title="Using T42"> 26 <topic id="Using" title="Using T42">
24 <heading scroll="no">Using <kin>T42</kin></heading> 27 <heading scroll="no">Using <kin>T42</kin></heading>
25 <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> 28 <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>
26 <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> 29 <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>
27 <ul> 30 <ul>
28 <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> 31 <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>
29 <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> 32 <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>
30 <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> 33 <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>
31 <li><b>Options</b> - Select this to bring up <a href="#Options">Options dialog</a> so that you can customize <kin>T42</kin> to suit your needs.</li> 34 <li><b>Options</b> - Select this to bring up <a href="#Options">Options dialog</a> so that you can customize <kin>T42</kin> to suit your needs.</li>
32 <li><b>Exit</b> - This is not likely to happen, but if you want to exit <kin>T42</kin> and unload it from memory - that's what <b>Exit</b> is for.</li> 35 <li><b>Exit</b> - This is not likely to happen, but if you want to exit <kin>T42</kin> and unload it from memory - that's what <b>Exit</b> is for.</li>
33 </ul> 36 </ul>
34 </topic> 37 </topic>
35 <topic id="MainWindow" title="Main Window"> 38 <topic id="MainWindow" title="Main Window">
36 <heading scroll="no">Main <kin>T42</kin> Window</heading> 39 <heading scroll="no">Main <kin>T42</kin> Window</heading>
37 <p>Main Window is a <kin>T42</kin> Control Center, it's exactly mouse-click away from most of <kin>T42</kin> functions. It consists of</p> 40 <p>Main Window is a <kin>T42</kin> Control Center, it's exactly mouse-click away from most of <kin>T42</kin> functions. It consists of</p>
38 <ul> 41 <ul>
39 <li><b>On Call</b> and <b>On Call when away</b> dropdown lists let you select the action to take when incoming call occurs in 'normal' and 'away' mode. Chose one of 42 <li><b>On Call</b> and <b>On Call when away</b> dropdown lists let you select the action to take when incoming call occurs in 'normal' and 'away' mode. Chose one of
40 <ul> 43 <ul>
41 <li><i>Prompt</i> - Ask you what to do before taking any actions;</li> 44 <li><i>Prompt</i> - Ask you what to do before taking any actions;</li>
42 <li><i>Secretary</i> - Relay incoming calls to your <a href="#SecretaryOptions">personal secretary</a>. Some prefer to call it answering machine.</li> 45 <li><i>Secretary</i> - Relay incoming calls to your <a href="#SecretaryOptions">personal secretary</a>. Some prefer to call it answering machine.</li>
43 <li><i>Not here</i> - Tell the caller you're not here (<i>not logged in</i>) and terminate connection.</li> 46 <li><i>Not here</i> - Tell the caller you're not here (<i>not logged in</i>) and terminate connection.</li>
44 <li><i>Refuse</i> - Tell the caller you're not accepting messages and terminate connection.</li> 47 <li><i>Refuse</i> - Tell the caller you're not accepting messages and terminate connection.</li>
45 <li><i>Ignore</i> - Pretend that you didn't notice.</li> 48 <li><i>Ignore</i> - Pretend that you didn't notice.</li>
46 </ul> 49 </ul>
47 </li> 50 </li>
48 <li><b>Away</b> button toggles your away mode. When an incoming call occurs <kin>T42</kin> takes action based upon away mode and options selected in <b>On Call</b> and <b>On Call when away</b> dropdown lists.</li> 51 <li><b>Away</b> button toggles your away mode. When an incoming call occurs <kin>T42</kin> takes action based upon away mode and options selected in <b>On Call</b> and <b>On Call when away</b> dropdown lists.</li>
49 <li><b>Tea</b> button initiates new talk session. This will open new <a href="#ConversationWindow">Conversation Window</a> and prompt you for <a href="#RemoteDialog">request details</a>.</li> 52 <li><b>Tea</b> button initiates new talk session. This will open new <a href="#ConversationWindow">Conversation Window</a> and prompt you for <a href="#RemoteDialog">request details</a>.</li>
50 <li><b>Options</b> button brings up <a href="#Options">Configuration Dialog</a> that lets you customize <kin>T42</kin> according to your needs.</li> 53 <li><b>Options</b> button brings up <a href="#Options">Configuration Dialog</a> that lets you customize <kin>T42</kin> according to your needs.</li>
diff --git a/install/install.cpp b/install/install.cpp
index 8b8c61f..35717bd 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,68 +1,75 @@
1#include "resource.h" 1#include "resource.h"
2#include "../shared-code/install.h" 2#include "../shared-code/install.h"
3 3
4 #defineKINAME "T42 1.5" 4#define VERSION "1.5.1"
5 #defineKINAME "T42 " VERSION
5#define SKINAME "T42" 6#define SKINAME "T42"
6 7
7BOOL Install(void) 8BOOL Install(void)
8{ 9{
9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path"); 10STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");
10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); 11STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
11LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); 12LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");
12STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); 13STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath);
13 if(!path) 14 if(!path)
14 return NULL; 15 return NULL;
15 16
16 #ifdefK_ANNED 17 #ifdefK_ANNED
17STRING sysDir(_MAX_PATH); 18STRING sysDir(_MAX_PATH);
18 GetSystemDirectory(sysDir,_MAX_PATH); 19 GetSystemDirectory(sysDir,_MAX_PATH);
19 INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); 20 INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");
20#endif 21#endif
21 22
22 MAKE_PATH(path); 23 MAKE_PATH(path);
23STRING shortPath = GET_SHORT_PATH(path); 24STRING shortPath = GET_SHORT_PATH(path);
24 if(!shortPath){ 25 if(!shortPath){
25 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); 26 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);
26 return FALSE; 27 return FALSE;
27 } 28 }
28 29
29 if(!( 30 if(!(
30 INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") && 31 INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") &&
31 INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") && 32 INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") &&
32 INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt") 33 INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt")
33 )){ 34 )){
34 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); 35 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);
35 return FALSE; 36 return FALSE;
36 } 37 }
37 ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe"); 38 ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe");
38 39
39 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path); 40 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path);
40 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path); 41 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);
41 42
42FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF"); 43FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
43 if(!inf){ 44 if(!inf){
44 MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK); 45 MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK);
45 return FALSE; 46 return FALSE;
46 } 47 }
47 INF_FILE_HEADER(inf); 48 INF_FILE_HEADER(inf);
48 INF_FILE_SECTION(inf,"Uninstall"); 49 INF_FILE_SECTION(inf,"Uninstall");
49 fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n"); 50 fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");
50 INF_FILE_SECTION(inf,"kFiles"); 51 INF_FILE_SECTION(inf,"kFiles");
51 INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath); 52 INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath);
52 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe"); 53 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe");
53 INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME); 54 INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME);
54 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf"); 55 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf");
55 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".Calls"); 56 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".Calls");
56 INF_FILE_SECTION(inf,"kReg"); 57 INF_FILE_SECTION(inf,"kReg");
57 INF_UNINSTALL_REG(inf,SKINAME); 58 INF_UNINSTALL_REG(inf,SKINAME);
58 INF_FILE_SECTION(inf,"kMenu"); 59 INF_FILE_SECTION(inf,"kMenu");
59 INF_MENU_GROUP(inf,1,"Klever Group"); 60 INF_MENU_GROUP(inf,1,"Klever Group");
60 INF_MENU_ITEM(inf,1,SKINAME); 61 INF_MENU_ITEM(inf,1,SKINAME);
61 fclose(inf); 62 fclose(inf);
62 63
63 REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall"); 64 REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
65 REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
66 REG_UNINSTALL_COMMENT(SKINAME,"Klever " KINAME);
67 REG_UNINSTALL_VERSION(SKINAME,VERSION);
68 REG_UNINSTALL_LOCATION(SKINAME,path);
69 REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
70 REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/T42/");
64 71
65 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); 72 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);
66 73
67 return TRUE; 74 return TRUE;
68} 75}
diff --git a/install/install.rc b/install/install.rc
index 1516122..6ff3614 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -102,81 +102,81 @@ BEGIN
102END 102END
103 103
1042 TEXTINCLUDE DISCARDABLE 1042 TEXTINCLUDE DISCARDABLE
105BEGIN 105BEGIN
106 "#include ""afxres.h""\r\n" 106 "#include ""afxres.h""\r\n"
107 "\0" 107 "\0"
108END 108END
109 109
1103 TEXTINCLUDE DISCARDABLE 1103 TEXTINCLUDE DISCARDABLE
111BEGIN 111BEGIN
112 "#include ""custom.rch""\0" 112 "#include ""custom.rch""\0"
113END 113END
114 114
115#endif // APSTUDIO_INVOKED 115#endif // APSTUDIO_INVOKED
116 116
117 117
118///////////////////////////////////////////////////////////////////////////// 118/////////////////////////////////////////////////////////////////////////////
119// 119//
120// Icon 120// Icon
121// 121//
122 122
123// Icon with lowest ID value placed first to ensure application icon 123// Icon with lowest ID value placed first to ensure application icon
124// remains consistent on all systems. 124// remains consistent on all systems.
125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" 125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico"
126 126
127#ifndef _MAC 127#ifndef _MAC
128///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
129// 129//
130// Version 130// Version
131// 131//
132 132
133VS_VERSION_INFO VERSIONINFO 133VS_VERSION_INFO VERSIONINFO
134 FILEVERSION 1,5,0,0 134 FILEVERSION 1,5,1,0
135 PRODUCTVERSION 1,5,0,0 135 PRODUCTVERSION 1,5,1,0
136 FILEFLAGSMASK 0x3fL 136 FILEFLAGSMASK 0x3fL
137#ifdef _DEBUG 137#ifdef _DEBUG
138 FILEFLAGS 0x1L 138 FILEFLAGS 0x1L
139#else 139#else
140 FILEFLAGS 0x0L 140 FILEFLAGS 0x0L
141#endif 141#endif
142 FILEOS 0x40004L 142 FILEOS 0x40004L
143 FILETYPE 0x1L 143 FILETYPE 0x1L
144 FILESUBTYPE 0x0L 144 FILESUBTYPE 0x0L
145BEGIN 145BEGIN
146 BLOCK "StringFileInfo" 146 BLOCK "StringFileInfo"
147 BEGIN 147 BEGIN
148 BLOCK "040904b0" 148 BLOCK "040904b0"
149 BEGIN 149 BEGIN
150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151 VALUE "FileDescription", "INSTALL: T42, unix talk/ntalk implementation\0" 151 VALUE "FileDescription", "INSTALL: T42, unix talk/ntalk implementation\0"
152 VALUE "FileVersion", "1, 5, 0, 0\0" 152 VALUE "FileVersion", "1, 5, 1, 0\0"
153 VALUE "InternalName", "INSTALL\0" 153 VALUE "InternalName", "INSTALL\0"
154 VALUE "LegalCopyright", "Copyright © 1998-2004 Klever Group (http://www.klever.net/)\0" 154 VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156 VALUE "OriginalFilename", "INSTALL.EXE\0" 156 VALUE "OriginalFilename", "INSTALL.EXE\0"
157 VALUE "ProductName", "T42\0" 157 VALUE "ProductName", "T42\0"
158 VALUE "ProductVersion", "1, 5, 0, 0\0" 158 VALUE "ProductVersion", "1, 5, 1, 0\0"
159 END 159 END
160 END 160 END
161 BLOCK "VarFileInfo" 161 BLOCK "VarFileInfo"
162 BEGIN 162 BEGIN
163 VALUE "Translation", 0x409, 1200 163 VALUE "Translation", 0x409, 1200
164 END 164 END
165END 165END
166 166
167#endif // !_MAC 167#endif // !_MAC
168 168
169#endif // English (U.S.) resources 169#endif // English (U.S.) resources
170///////////////////////////////////////////////////////////////////////////// 170/////////////////////////////////////////////////////////////////////////////
171 171
172 172
173 173
174#ifndef APSTUDIO_INVOKED 174#ifndef APSTUDIO_INVOKED
175///////////////////////////////////////////////////////////////////////////// 175/////////////////////////////////////////////////////////////////////////////
176// 176//
177// Generated from the TEXTINCLUDE 3 resource. 177// Generated from the TEXTINCLUDE 3 resource.
178// 178//
179#include "custom.rch" 179#include "custom.rch"
180///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
181#endif // not APSTUDIO_INVOKED 181#endif // not APSTUDIO_INVOKED
182 182