1 files changed, 7 insertions, 7 deletions
diff --git a/pumpkin.rc b/pumpkin.rc
index 1bf0fd3..7dafe04 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -37,99 +37,99 @@ BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
 END
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
    "#define _AFX_NO_OLE_RESOURCES\r\n"
    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
    "\r\n"
    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
    "#ifdef _WIN32\r\n"
    "LANGUAGE 9, 1\r\n"
    "#pragma code_page(1252)\r\n"
    "#endif\r\n"
    "#include ""res\\PumpKIN.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
    "#include ""afxres.rc""         // Standard components\r\n"
    "#endif\0"
 END
 #endif    // APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_RRQ                 ICON    DISCARDABLE     "res\\wrq.ico"
 IDI_WRQ                 ICON    DISCARDABLE     "res\\rrq.ico"
 IDI_BROWSE              ICON    DISCARDABLE     "shared-data/browse-icon.ico"
 IDR_MAINFRAME           ICON    DISCARDABLE     "res\\pumpkin.ico"
 IDI_PLAY                ICON    DISCARDABLE     "shared-data/play-icon.ico"
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PumpKIN"
 FONT 8, "MS Sans Serif"
 BEGIN
    ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20
-    LTEXT           "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,
+    LTEXT           "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
                    SS_NOPREFIX
-    LTEXT           "Copyright � 1997-2004 Klever Group",IDC_STATIC,40,30,
+    LTEXT           "Copyright � 1997-2005 Klever Group",IDC_STATIC,40,30,
                    170,8
    DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP
    PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
 END
 IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
    WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW
 CAPTION "  PumpKIN"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
    CONTROL         "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | 
                    LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108,
                    WS_EX_DLGMODALFRAME
    PUSHBUTTON      "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,
                    WS_EX_CLIENTEDGE
    PUSHBUTTON      "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,
                    WS_EX_CLIENTEDGE
    PUSHBUTTON      "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,
                    WS_EX_CLIENTEDGE
    PUSHBUTTON      "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,
                    WS_EX_CLIENTEDGE
    PUSHBUTTON      "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
    PUSHBUTTON      "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
    LISTBOX         IDC_LOG,7,115,348,69,LBS_USETABSTOPS | LBS_NOSEL | 
                    WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME
    PUSHBUTTON      "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP
 END
 IDD_PROPS_SERVER DIALOG DISCARDABLE  0, 0, 210, 154
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Server"
 FONT 8, "MS Sans Serif"
 BEGIN
    GROUPBOX        "TFTP filesystem &root (download path)",IDC_STATIC,7,7,
                    196,38
    EDITTEXT        IDC_TFTPROOT,13,16,170,13,ES_AUTOHSCROLL
    PUSHBUTTON      "&B",IDC_BROWSE,186,16,13,13,BS_ICON
    CONTROL         "Allow access to &subdirectories",IDC_TFTPSUBDIRS,
                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,111,10
    GROUPBOX        "Read Request Behavior",IDC_STATIC,7,48,153,42
    CONTROL         "Give &all files",IDC_RRQ_GIVEALL,"Button",
                    BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,57,53,10
    CONTROL         "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,
                    "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,23,67,91,10
    CONTROL         "&Deny all requests",IDC_RRQ_DENYALL,"Button",
                    BS_AUTORADIOBUTTON | BS_NOTIFY,33,77,70,10
@@ -242,121 +242,121 @@ BEGIN
    LTEXT           "Remote &host:",IDC_STATIC,7,61,43,8,SS_NOTIFY
    COMBOBOX        IDC_TALKS,7,72,157,66,CBS_SIMPLE | CBS_AUTOHSCROLL | 
                    CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                    WS_TABSTOP,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
    PUSHBUTTON      "R\nE\n&F\nR\nE\nS\nH",IDC_REFRESH,165,72,19,66,
                    BS_CENTER | BS_VCENTER | BS_MULTILINE | BS_NOTIFY,
                    WS_EX_CLIENTEDGE
    LTEXT           "&Type:",IDC_STATIC,58,34,19,8
    COMBOBOX        IDC_TYPE,80,31,43,41,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
                    CBS_LOWERCASE | WS_VSCROLL | WS_TABSTOP
    LTEXT           "&Block:",IDC_STATIC,127,34,21,8
    COMBOBOX        IDC_BSIZE,149,31,35,53,CBS_DROPDOWN | WS_VSCROLL | 
                    WS_TABSTOP
    DEFPUSHBUTTON   "OK",IDOK,35,140,50,14
    PUSHBUTTON      "Cancel",IDCANCEL,101,140,50,14
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDVERT,52,32,1,11
 END
 IDD_PROPS_SOUNDS DIALOG DISCARDABLE  0, 0, 210, 154
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Sounds"
 FONT 8, "MS Sans Serif"
 BEGIN
    LTEXT           "&Incoming request:",IDC_STATIC,7,9,57,8
    COMBOBOX        IDC_RING,70,7,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON      "browse",IDC_RING_BROWSE,175,7,13,13,BS_ICON
    PUSHBUTTON      "play",IDC_RING_PLAY,190,7,13,13,BS_ICON
    LTEXT           "xfer &finished:",IDC_STATIC,7,25,57,8
    COMBOBOX        IDC_FINISHED,70,22,103,100,CBS_DROPDOWN | 
                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON      "browse",IDC_FINISHED_BROWSE,175,22,13,13,BS_ICON
    PUSHBUTTON      "play",IDC_FINISHED_PLAY,190,22,13,13,BS_ICON
    LTEXT           "xfer &aborted:",IDC_STATIC,7,40,57,8
    COMBOBOX        IDC_ABORTED,70,37,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON      "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON
    PUSHBUTTON      "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON
 END
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
+ FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,5,1,0
+ PRODUCTVERSION 2,6,0,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", "PumpKIN, tftp client/daemon\0"
-            VALUE "FileVersion", "2, 5, 1, 0\0"
+            VALUE "FileVersion", "2, 6, 0, 0\0"
            VALUE "InternalName", "PUMPKIN\0"
-            VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net)\0"
+            VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net)\0"
            VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
            VALUE "OriginalFilename", "PUMPKIN.EXE\0"
            VALUE "ProductName", "PumpKIN\0"
-            VALUE "ProductVersion", "2, 5, 1, 0\0"
+            VALUE "ProductVersion", "2, 6, 0, 0\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1200
    END
 END
 #endif    // !_MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
 //
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO DISCARDABLE 
 BEGIN
    IDD_ABOUTBOX, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 210
        TOPMARGIN, 7
        BOTTOMMARGIN, 67
    END
    IDD_PUMPKIN_DIALOG, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 355
        TOPMARGIN, 7
        BOTTOMMARGIN, 184
        HORZGUIDE, 115
    END
    IDD_PROPS_SERVER, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 203
        TOPMARGIN, 7
        BOTTOMMARGIN, 147
    END
    IDD_PROPS_NETWORK, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 203

diff --git a/pumpkin.rc b/pumpkin.rc index 1bf0fd3..7dafe04 100644 --- a/pumpkin.rc +++ b/pumpkin.rc
@@ -37,99 +37,99 @@ BEGIN
37	"#include ""afxres.h""\r\n"	37	"#include ""afxres.h""\r\n"
38	"\0"	38	"\0"
39	END	39	END
40		40
41	3 TEXTINCLUDE DISCARDABLE	41	3 TEXTINCLUDE DISCARDABLE
42	BEGIN	42	BEGIN
43	"#define _AFX_NO_SPLITTER_RESOURCES\r\n"	43	"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
44	"#define _AFX_NO_OLE_RESOURCES\r\n"	44	"#define _AFX_NO_OLE_RESOURCES\r\n"
45	"#define _AFX_NO_TRACKER_RESOURCES\r\n"	45	"#define _AFX_NO_TRACKER_RESOURCES\r\n"
46	"#define _AFX_NO_PROPERTY_RESOURCES\r\n"	46	"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
47	"\r\n"	47	"\r\n"
48	"#if !defined(AFX_RESOURCE_DLL) \|\| defined(AFX_TARG_ENU)\r\n"	48	"#if !defined(AFX_RESOURCE_DLL) \|\| defined(AFX_TARG_ENU)\r\n"
49	"#ifdef _WIN32\r\n"	49	"#ifdef _WIN32\r\n"
50	"LANGUAGE 9, 1\r\n"	50	"LANGUAGE 9, 1\r\n"
51	"#pragma code_page(1252)\r\n"	51	"#pragma code_page(1252)\r\n"
52	"#endif\r\n"	52	"#endif\r\n"
53	"#include ""res\\PumpKIN.rc2"" // non-Microsoft Visual C++ edited resources\r\n"	53	"#include ""res\\PumpKIN.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
54	"#include ""afxres.rc"" // Standard components\r\n"	54	"#include ""afxres.rc"" // Standard components\r\n"
55	"#endif\0"	55	"#endif\0"
56	END	56	END
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.
68	IDI_RRQ ICON DISCARDABLE "res\\wrq.ico"	68	IDI_RRQ ICON DISCARDABLE "res\\wrq.ico"
69	IDI_WRQ ICON DISCARDABLE "res\\rrq.ico"	69	IDI_WRQ ICON DISCARDABLE "res\\rrq.ico"
70	IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico"	70	IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico"
71	IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico"	71	IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico"
72	IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico"	72	IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico"
73		73
74	/////////////////////////////////////////////////////////////////////////////	74	/////////////////////////////////////////////////////////////////////////////
75	//	75	//
76	// Dialog	76	// Dialog
77	//	77	//
78		78
79	IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74	79	IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74
80	STYLE DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU	80	STYLE DS_MODALFRAME \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
81	CAPTION "About PumpKIN"	81	CAPTION "About PumpKIN"
82	FONT 8, "MS Sans Serif"	82	FONT 8, "MS Sans Serif"
83	BEGIN	83	BEGIN
84	ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20	84	ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
85	LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,	85	LTEXT "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
86	SS_NOPREFIX	86	SS_NOPREFIX
87	LTEXT "Copyright � 1997-2004 Klever Group",IDC_STATIC,40,30,	87	LTEXT "Copyright � 1997-2005 Klever Group",IDC_STATIC,40,30,
88	170,8	88	170,8
89	DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP	89	DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP
90	PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14	90	PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
91	END	91	END
92		92
93	IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191	93	IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191
94	STYLE DS_MODALFRAME \| DS_3DLOOK \| WS_POPUP \| WS_VISIBLE \| WS_CAPTION \|	94	STYLE DS_MODALFRAME \| DS_3DLOOK \| WS_POPUP \| WS_VISIBLE \| WS_CAPTION \|
95	WS_SYSMENU	95	WS_SYSMENU
96	EXSTYLE WS_EX_ACCEPTFILES \| WS_EX_APPWINDOW	96	EXSTYLE WS_EX_ACCEPTFILES \| WS_EX_APPWINDOW
97	CAPTION " PumpKIN"	97	CAPTION " PumpKIN"
98	FONT 8, "MS Sans Serif", 0, 0, 0x1	98	FONT 8, "MS Sans Serif", 0, 0, 0x1
99	BEGIN	99	BEGIN
100	CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT \|	100	CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT \|
101	LVS_AUTOARRANGE \| WS_BORDER \| WS_TABSTOP,7,7,295,108,	101	LVS_AUTOARRANGE \| WS_BORDER \| WS_TABSTOP,7,7,295,108,
102	WS_EX_DLGMODALFRAME	102	WS_EX_DLGMODALFRAME
103	PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,	103	PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,
104	WS_EX_CLIENTEDGE	104	WS_EX_CLIENTEDGE
105	PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,	105	PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,
106	WS_EX_CLIENTEDGE	106	WS_EX_CLIENTEDGE
107	PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,	107	PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,
108	WS_EX_CLIENTEDGE	108	WS_EX_CLIENTEDGE
109	PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,	109	PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,
110	WS_EX_CLIENTEDGE	110	WS_EX_CLIENTEDGE
111	PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE	111	PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
112	PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE	112	PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
113	LISTBOX IDC_LOG,7,115,348,69,LBS_USETABSTOPS \| LBS_NOSEL \|	113	LISTBOX IDC_LOG,7,115,348,69,LBS_USETABSTOPS \| LBS_NOSEL \|
114	WS_VSCROLL \| WS_HSCROLL,WS_EX_DLGMODALFRAME	114	WS_VSCROLL \| WS_HSCROLL,WS_EX_DLGMODALFRAME
115	PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE \| NOT WS_TABSTOP	115	PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE \| NOT WS_TABSTOP
116	END	116	END
117		117
118	IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 210, 154	118	IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 210, 154
119	STYLE WS_CHILD \| WS_DISABLED \| WS_CAPTION	119	STYLE WS_CHILD \| WS_DISABLED \| WS_CAPTION
120	CAPTION "Server"	120	CAPTION "Server"
121	FONT 8, "MS Sans Serif"	121	FONT 8, "MS Sans Serif"
122	BEGIN	122	BEGIN
123	GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7,	123	GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7,
124	196,38	124	196,38
125	EDITTEXT IDC_TFTPROOT,13,16,170,13,ES_AUTOHSCROLL	125	EDITTEXT IDC_TFTPROOT,13,16,170,13,ES_AUTOHSCROLL
126	PUSHBUTTON "&B",IDC_BROWSE,186,16,13,13,BS_ICON	126	PUSHBUTTON "&B",IDC_BROWSE,186,16,13,13,BS_ICON
127	CONTROL "Allow access to &subdirectories",IDC_TFTPSUBDIRS,	127	CONTROL "Allow access to &subdirectories",IDC_TFTPSUBDIRS,
128	"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,13,31,111,10	128	"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,13,31,111,10
129	GROUPBOX "Read Request Behavior",IDC_STATIC,7,48,153,42	129	GROUPBOX "Read Request Behavior",IDC_STATIC,7,48,153,42
130	CONTROL "Give &all files",IDC_RRQ_GIVEALL,"Button",	130	CONTROL "Give &all files",IDC_RRQ_GIVEALL,"Button",
131	BS_AUTORADIOBUTTON \| BS_NOTIFY \| WS_GROUP,13,57,53,10	131	BS_AUTORADIOBUTTON \| BS_NOTIFY \| WS_GROUP,13,57,53,10
132	CONTROL "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,	132	CONTROL "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,
133	"Button",BS_AUTORADIOBUTTON \| BS_NOTIFY,23,67,91,10	133	"Button",BS_AUTORADIOBUTTON \| BS_NOTIFY,23,67,91,10
134	CONTROL "&Deny all requests",IDC_RRQ_DENYALL,"Button",	134	CONTROL "&Deny all requests",IDC_RRQ_DENYALL,"Button",
135	BS_AUTORADIOBUTTON \| BS_NOTIFY,33,77,70,10	135	BS_AUTORADIOBUTTON \| BS_NOTIFY,33,77,70,10
@@ -242,121 +242,121 @@ BEGIN
242	LTEXT "Remote &host:",IDC_STATIC,7,61,43,8,SS_NOTIFY	242	LTEXT "Remote &host:",IDC_STATIC,7,61,43,8,SS_NOTIFY
243	COMBOBOX IDC_TALKS,7,72,157,66,CBS_SIMPLE \| CBS_AUTOHSCROLL \|	243	COMBOBOX IDC_TALKS,7,72,157,66,CBS_SIMPLE \| CBS_AUTOHSCROLL \|
244	CBS_SORT \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \|	244	CBS_SORT \| CBS_NOINTEGRALHEIGHT \| WS_VSCROLL \|
245	WS_TABSTOP,WS_EX_CLIENTEDGE \| WS_EX_STATICEDGE	245	WS_TABSTOP,WS_EX_CLIENTEDGE \| WS_EX_STATICEDGE
246	PUSHBUTTON "R\nE\n&F\nR\nE\nS\nH",IDC_REFRESH,165,72,19,66,	246	PUSHBUTTON "R\nE\n&F\nR\nE\nS\nH",IDC_REFRESH,165,72,19,66,
247	BS_CENTER \| BS_VCENTER \| BS_MULTILINE \| BS_NOTIFY,	247	BS_CENTER \| BS_VCENTER \| BS_MULTILINE \| BS_NOTIFY,
248	WS_EX_CLIENTEDGE	248	WS_EX_CLIENTEDGE
249	LTEXT "&Type:",IDC_STATIC,58,34,19,8	249	LTEXT "&Type:",IDC_STATIC,58,34,19,8
250	COMBOBOX IDC_TYPE,80,31,43,41,CBS_DROPDOWN \| CBS_AUTOHSCROLL \|	250	COMBOBOX IDC_TYPE,80,31,43,41,CBS_DROPDOWN \| CBS_AUTOHSCROLL \|
251	CBS_LOWERCASE \| WS_VSCROLL \| WS_TABSTOP	251	CBS_LOWERCASE \| WS_VSCROLL \| WS_TABSTOP
252	LTEXT "&Block:",IDC_STATIC,127,34,21,8	252	LTEXT "&Block:",IDC_STATIC,127,34,21,8
253	COMBOBOX IDC_BSIZE,149,31,35,53,CBS_DROPDOWN \| WS_VSCROLL \|	253	COMBOBOX IDC_BSIZE,149,31,35,53,CBS_DROPDOWN \| WS_VSCROLL \|
254	WS_TABSTOP	254	WS_TABSTOP
255	DEFPUSHBUTTON "OK",IDOK,35,140,50,14	255	DEFPUSHBUTTON "OK",IDOK,35,140,50,14
256	PUSHBUTTON "Cancel",IDCANCEL,101,140,50,14	256	PUSHBUTTON "Cancel",IDCANCEL,101,140,50,14
257	CONTROL "",IDC_STATIC,"Static",SS_ETCHEDVERT,52,32,1,11	257	CONTROL "",IDC_STATIC,"Static",SS_ETCHEDVERT,52,32,1,11
258	END	258	END
259		259
260	IDD_PROPS_SOUNDS DIALOG DISCARDABLE 0, 0, 210, 154	260	IDD_PROPS_SOUNDS DIALOG DISCARDABLE 0, 0, 210, 154
261	STYLE WS_CHILD \| WS_DISABLED \| WS_CAPTION	261	STYLE WS_CHILD \| WS_DISABLED \| WS_CAPTION
262	CAPTION "Sounds"	262	CAPTION "Sounds"
263	FONT 8, "MS Sans Serif"	263	FONT 8, "MS Sans Serif"
264	BEGIN	264	BEGIN
265	LTEXT "&Incoming request:",IDC_STATIC,7,9,57,8	265	LTEXT "&Incoming request:",IDC_STATIC,7,9,57,8
266	COMBOBOX IDC_RING,70,7,103,100,CBS_DROPDOWN \| CBS_AUTOHSCROLL \|	266	COMBOBOX IDC_RING,70,7,103,100,CBS_DROPDOWN \| CBS_AUTOHSCROLL \|
267	CBS_SORT \| WS_VSCROLL \| WS_TABSTOP	267	CBS_SORT \| WS_VSCROLL \| WS_TABSTOP
268	PUSHBUTTON "browse",IDC_RING_BROWSE,175,7,13,13,BS_ICON	268	PUSHBUTTON "browse",IDC_RING_BROWSE,175,7,13,13,BS_ICON
269	PUSHBUTTON "play",IDC_RING_PLAY,190,7,13,13,BS_ICON	269	PUSHBUTTON "play",IDC_RING_PLAY,190,7,13,13,BS_ICON
270	LTEXT "xfer &finished:",IDC_STATIC,7,25,57,8	270	LTEXT "xfer &finished:",IDC_STATIC,7,25,57,8
271	COMBOBOX IDC_FINISHED,70,22,103,100,CBS_DROPDOWN \|	271	COMBOBOX IDC_FINISHED,70,22,103,100,CBS_DROPDOWN \|
272	CBS_AUTOHSCROLL \| CBS_SORT \| WS_VSCROLL \| WS_TABSTOP	272	CBS_AUTOHSCROLL \| CBS_SORT \| WS_VSCROLL \| WS_TABSTOP
273	PUSHBUTTON "browse",IDC_FINISHED_BROWSE,175,22,13,13,BS_ICON	273	PUSHBUTTON "browse",IDC_FINISHED_BROWSE,175,22,13,13,BS_ICON
274	PUSHBUTTON "play",IDC_FINISHED_PLAY,190,22,13,13,BS_ICON	274	PUSHBUTTON "play",IDC_FINISHED_PLAY,190,22,13,13,BS_ICON
275	LTEXT "xfer &aborted:",IDC_STATIC,7,40,57,8	275	LTEXT "xfer &aborted:",IDC_STATIC,7,40,57,8
276	COMBOBOX IDC_ABORTED,70,37,103,100,CBS_DROPDOWN \| CBS_AUTOHSCROLL \|	276	COMBOBOX IDC_ABORTED,70,37,103,100,CBS_DROPDOWN \| CBS_AUTOHSCROLL \|
277	CBS_SORT \| WS_VSCROLL \| WS_TABSTOP	277	CBS_SORT \| WS_VSCROLL \| WS_TABSTOP
278	PUSHBUTTON "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON	278	PUSHBUTTON "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON
279	PUSHBUTTON "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON	279	PUSHBUTTON "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON
280	END	280	END
281		281
282		282
283	#ifndef _MAC	283	#ifndef _MAC
284	/////////////////////////////////////////////////////////////////////////////	284	/////////////////////////////////////////////////////////////////////////////
285	//	285	//
286	// Version	286	// Version
287	//	287	//
288		288
289	VS_VERSION_INFO VERSIONINFO	289	VS_VERSION_INFO VERSIONINFO
290	FILEVERSION 2,5,1,0	290	FILEVERSION 2,6,0,0
291	PRODUCTVERSION 2,5,1,0	291	PRODUCTVERSION 2,6,0,0
292	FILEFLAGSMASK 0x3fL	292	FILEFLAGSMASK 0x3fL
293	#ifdef _DEBUG	293	#ifdef _DEBUG
294	FILEFLAGS 0x1L	294	FILEFLAGS 0x1L
295	#else	295	#else
296	FILEFLAGS 0x0L	296	FILEFLAGS 0x0L
297	#endif	297	#endif
298	FILEOS 0x4L	298	FILEOS 0x4L
299	FILETYPE 0x1L	299	FILETYPE 0x1L
300	FILESUBTYPE 0x0L	300	FILESUBTYPE 0x0L
301	BEGIN	301	BEGIN
302	BLOCK "StringFileInfo"	302	BLOCK "StringFileInfo"
303	BEGIN	303	BEGIN
304	BLOCK "040904b0"	304	BLOCK "040904b0"
305	BEGIN	305	BEGIN
306	VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"	306	VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
307	VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"	307	VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
308	VALUE "FileVersion", "2, 5, 1, 0\0"	308	VALUE "FileVersion", "2, 6, 0, 0\0"
309	VALUE "InternalName", "PUMPKIN\0"	309	VALUE "InternalName", "PUMPKIN\0"
310	VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net)\0"	310	VALUE "LegalCopyright", "Copyright � 1997-2005 Klever Group (http://www.klever.net)\0"
311	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"	311	VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
312	VALUE "OriginalFilename", "PUMPKIN.EXE\0"	312	VALUE "OriginalFilename", "PUMPKIN.EXE\0"
313	VALUE "ProductName", "PumpKIN\0"	313	VALUE "ProductName", "PumpKIN\0"
314	VALUE "ProductVersion", "2, 5, 1, 0\0"	314	VALUE "ProductVersion", "2, 6, 0, 0\0"
315	END	315	END
316	END	316	END
317	BLOCK "VarFileInfo"	317	BLOCK "VarFileInfo"
318	BEGIN	318	BEGIN
319	VALUE "Translation", 0x409, 1200	319	VALUE "Translation", 0x409, 1200
320	END	320	END
321	END	321	END
322		322
323	#endif // !_MAC	323	#endif // !_MAC
324		324
325		325
326	/////////////////////////////////////////////////////////////////////////////	326	/////////////////////////////////////////////////////////////////////////////
327	//	327	//
328	// DESIGNINFO	328	// DESIGNINFO
329	//	329	//
330		330
331	#ifdef APSTUDIO_INVOKED	331	#ifdef APSTUDIO_INVOKED
332	GUIDELINES DESIGNINFO DISCARDABLE	332	GUIDELINES DESIGNINFO DISCARDABLE
333	BEGIN	333	BEGIN
334	IDD_ABOUTBOX, DIALOG	334	IDD_ABOUTBOX, DIALOG
335	BEGIN	335	BEGIN
336	LEFTMARGIN, 7	336	LEFTMARGIN, 7
337	RIGHTMARGIN, 210	337	RIGHTMARGIN, 210
338	TOPMARGIN, 7	338	TOPMARGIN, 7
339	BOTTOMMARGIN, 67	339	BOTTOMMARGIN, 67
340	END	340	END
341		341
342	IDD_PUMPKIN_DIALOG, DIALOG	342	IDD_PUMPKIN_DIALOG, DIALOG
343	BEGIN	343	BEGIN
344	LEFTMARGIN, 7	344	LEFTMARGIN, 7
345	RIGHTMARGIN, 355	345	RIGHTMARGIN, 355
346	TOPMARGIN, 7	346	TOPMARGIN, 7
347	BOTTOMMARGIN, 184	347	BOTTOMMARGIN, 184
348	HORZGUIDE, 115	348	HORZGUIDE, 115
349	END	349	END
350		350
351	IDD_PROPS_SERVER, DIALOG	351	IDD_PROPS_SERVER, DIALOG
352	BEGIN	352	BEGIN
353	LEFTMARGIN, 7	353	LEFTMARGIN, 7
354	RIGHTMARGIN, 203	354	RIGHTMARGIN, 203
355	TOPMARGIN, 7	355	TOPMARGIN, 7
356	BOTTOMMARGIN, 147	356	BOTTOMMARGIN, 147
357	END	357	END
358		358
359	IDD_PROPS_NETWORK, DIALOG	359	IDD_PROPS_NETWORK, DIALOG
360	BEGIN	360	BEGIN
361	LEFTMARGIN, 7	361	LEFTMARGIN, 7
362	RIGHTMARGIN, 203	362	RIGHTMARGIN, 203