author | Michael Krelin <hacker@klever.net> | 2006-02-03 01:05:14 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2006-02-03 01:05:14 (UTC) |
commit | 51d59e6f7f45b8f4a60d2933e50bb8ee0c2ea20d (patch) (unidiff) | |
tree | a6693752131aaa39e56ebbca841179a8df4230ef | |
parent | a772d9f284b4c2a909c30ea33a132a487d932600 (diff) | |
download | pumpkin-51d59e6f7f45b8f4a60d2933e50bb8ee0c2ea20d.zip pumpkin-51d59e6f7f45b8f4a60d2933e50bb8ee0c2ea20d.tar.gz pumpkin-51d59e6f7f45b8f4a60d2933e50bb8ee0c2ea20d.tar.bz2 |
made main window resizable
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@146 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | PumpKINDlg.cpp | 84 | ||||
-rw-r--r-- | PumpKINDlg.h | 13 | ||||
-rw-r--r-- | help/pumpkin.rtf | 1 | ||||
-rw-r--r-- | help/pumpkin.xml | 1 | ||||
-rw-r--r-- | pumpkin.clw | 12 | ||||
-rw-r--r-- | pumpkin.mak | 76 | ||||
-rw-r--r-- | pumpkin.rc | 10 |
7 files changed, 124 insertions, 73 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index 4cb1633..9786ef0 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp | |||
@@ -124,16 +124,20 @@ CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/) | |||
124 | /* -- */ | 124 | /* -- */ |
125 | LoadSettings(); | 125 | LoadSettings(); |
126 | } | 126 | } |
127 | 127 | ||
128 | void CPumpKINDlg::DoDataExchange(CDataExchange* pDX) | 128 | void CPumpKINDlg::DoDataExchange(CDataExchange* pDX) |
129 | { | 129 | { |
130 | CDialog::DoDataExchange(pDX); | 130 | CDialog::DoDataExchange(pDX); |
131 | //{{AFX_DATA_MAP(CPumpKINDlg) | 131 | //{{AFX_DATA_MAP(CPumpKINDlg) |
132 | DDX_Control(pDX, ID_HELP, m_HelpCtl); | ||
133 | DDX_Control(pDX, IDC_PUT, m_PutCtl); | ||
134 | DDX_Control(pDX, IDC_GET, m_GetCtl); | ||
135 | DDX_Control(pDX, IDC_EXIT, m_ExitCtl); | ||
132 | DDX_Control(pDX, IDC_LISTENING, m_ListenCtl); | 136 | DDX_Control(pDX, IDC_LISTENING, m_ListenCtl); |
133 | DDX_Control(pDX, IDC_ABORT, m_AbortCtl); | 137 | DDX_Control(pDX, IDC_ABORT, m_AbortCtl); |
134 | DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl); | 138 | DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl); |
135 | DDX_Control(pDX, IDC_LOG, m_Log); | 139 | DDX_Control(pDX, IDC_LOG, m_Log); |
136 | DDX_Control(pDX, IDC_CONNECTIONS, m_List); | 140 | DDX_Control(pDX, IDC_CONNECTIONS, m_List); |
137 | //}}AFX_DATA_MAP | 141 | //}}AFX_DATA_MAP |
138 | } | 142 | } |
139 | 143 | ||
@@ -151,29 +155,31 @@ BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog) | |||
151 | ON_BN_CLICKED(IDC_GET, OnGet) | 155 | ON_BN_CLICKED(IDC_GET, OnGet) |
152 | ON_NOTIFY(LVN_DELETEALLITEMS, IDC_CONNECTIONS, OnDeleteallitemsConnections) | 156 | ON_NOTIFY(LVN_DELETEALLITEMS, IDC_CONNECTIONS, OnDeleteallitemsConnections) |
153 | ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections) | 157 | ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections) |
154 | ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections) | 158 | ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections) |
155 | ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections) | 159 | ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections) |
156 | ON_BN_CLICKED(IDC_ABORT, OnAbort) | 160 | ON_BN_CLICKED(IDC_ABORT, OnAbort) |
157 | ON_WM_CLOSE() | 161 | ON_WM_CLOSE() |
158 | ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow) | 162 | ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow) |
163 | ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen) | ||
159 | ON_COMMAND(ID_TRAY_EXIT, OnTrayExit) | 164 | ON_COMMAND(ID_TRAY_EXIT, OnTrayExit) |
160 | ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin) | 165 | ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin) |
161 | ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile) | 166 | ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile) |
162 | ON_COMMAND(ID_TRAY_HELP, OnTrayHelp) | 167 | ON_COMMAND(ID_TRAY_HELP, OnTrayHelp) |
163 | ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions) | 168 | ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions) |
164 | ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile) | 169 | ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile) |
165 | ON_WM_WINDOWPOSCHANGING() | 170 | ON_WM_WINDOWPOSCHANGING() |
166 | ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog) | 171 | ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog) |
167 | ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder) | 172 | ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder) |
168 | ON_WM_DROPFILES() | 173 | ON_WM_DROPFILES() |
169 | ON_BN_CLICKED(ID_HELP, OnHelp) | 174 | ON_BN_CLICKED(ID_HELP, OnHelp) |
170 | ON_BN_CLICKED(IDC_LISTENING, OnListening) | 175 | ON_BN_CLICKED(IDC_LISTENING, OnListening) |
171 | ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen) | 176 | ON_WM_GETMINMAXINFO() |
177 | ON_WM_SIZE() | ||
172 | //}}AFX_MSG_MAP | 178 | //}}AFX_MSG_MAP |
173 | END_MESSAGE_MAP() | 179 | END_MESSAGE_MAP() |
174 | 180 | ||
175 | ///////////////////////////////////////////////////////////////////////////// | 181 | ///////////////////////////////////////////////////////////////////////////// |
176 | // CPumpKINDlg message handlers | 182 | // CPumpKINDlg message handlers |
177 | 183 | ||
178 | BOOL CPumpKINDlg::OnInitDialog() | 184 | BOOL CPumpKINDlg::OnInitDialog() |
179 | { | 185 | { |
@@ -196,17 +202,16 @@ BOOL CPumpKINDlg::OnInitDialog() | |||
196 | 202 | ||
197 | // Set the icon for this dialog. The framework does this automatically | 203 | // Set the icon for this dialog. The framework does this automatically |
198 | // when the application's main window is not a dialog | 204 | // when the application's main window is not a dialog |
199 | SetIcon(m_hIcon, TRUE); // Set big icon | 205 | SetIcon(m_hIcon, TRUE); // Set big icon |
200 | SetIcon(m_hIcon, FALSE); // Set small icon | 206 | SetIcon(m_hIcon, FALSE); // Set small icon |
201 | 207 | ||
202 | VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0)); | 208 | VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0)); |
203 | 209 | ||
204 | |||
205 | m_Images.Create(16,16,TRUE,2,1); | 210 | m_Images.Create(16,16,TRUE,2,1); |
206 | m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ)); | 211 | m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ)); |
207 | m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ)); | 212 | m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ)); |
208 | ASSERT(m_iRRQ>=0); | 213 | ASSERT(m_iRRQ>=0); |
209 | ASSERT(m_iWRQ>=0); | 214 | ASSERT(m_iWRQ>=0); |
210 | m_List.SetImageList(&m_Images,LVSIL_NORMAL); | 215 | m_List.SetImageList(&m_Images,LVSIL_NORMAL); |
211 | m_List.SetImageList(&m_Images,LVSIL_SMALL); | 216 | m_List.SetImageList(&m_Images,LVSIL_SMALL); |
212 | m_List.SetImageList(&m_Images,LVSIL_STATE); | 217 | m_List.SetImageList(&m_Images,LVSIL_STATE); |
@@ -220,16 +225,30 @@ CRect listrc; | |||
220 | m_List.InsertColumn(2,"peer",LVCFMT_LEFT,listrc.Width()*2/7,subitemPeer); | 225 | m_List.InsertColumn(2,"peer",LVCFMT_LEFT,listrc.Width()*2/7,subitemPeer); |
221 | m_List.InsertColumn(3,"ACK",LVCFMT_RIGHT,listrc.Width()/7,subitemBytes); | 226 | m_List.InsertColumn(3,"ACK",LVCFMT_RIGHT,listrc.Width()/7,subitemBytes); |
222 | m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize); | 227 | m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize); |
223 | 228 | ||
224 | LogLine(IDS_LOG_START); | 229 | LogLine(IDS_LOG_START); |
225 | 230 | ||
226 | SetupButtons(); | 231 | SetupButtons(); |
227 | 232 | ||
233 | CRect wrci, wrco; | ||
234 | GetWindowRect(&wrco); | ||
235 | GetClientRect(&wrci); | ||
236 | CRect brc; | ||
237 | m_GetCtl.GetWindowRect(&brc); ScreenToClient(&brc); | ||
238 | m_rightGapButtons = wrci.right-brc.right; | ||
239 | m_List.GetWindowRect(&brc); ScreenToClient(&brc); | ||
240 | m_rightGapList = wrci.right-brc.right; | ||
241 | m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc); | ||
242 | m_bottomGapListen = wrci.bottom-brc.bottom; | ||
243 | m_Log.GetWindowRect(&brc);ScreenToClient(&brc); | ||
244 | m_bottomGapLog = wrci.bottom-brc.bottom; | ||
245 | m_MinSize.cx = wrco.Width(); m_MinSize.cy=wrco.Height(); | ||
246 | |||
228 | CRect rc, drc; | 247 | CRect rc, drc; |
229 | GetWindowRect(rc); | 248 | GetWindowRect(rc); |
230 | GetDesktopWindow()->GetWindowRect(drc); | 249 | GetDesktopWindow()->GetWindowRect(drc); |
231 | SetWindowPos(NULL,drc.right-6-rc.Width(),6,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER); | 250 | SetWindowPos(NULL,drc.right-6-rc.Width(),6,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER); |
232 | 251 | ||
233 | if(m_bShown) | 252 | if(m_bShown) |
234 | ShowWindow(SW_SHOW); | 253 | ShowWindow(SW_SHOW); |
235 | else | 254 | else |
@@ -2072,8 +2091,69 @@ void CPumpKINDlg::LogLine(LPCTSTR str) | |||
2072 | CString tmp; | 2091 | CString tmp; |
2073 | tmp.Format(IDS_LOG_LOGERROR,m_LogFile); | 2092 | tmp.Format(IDS_LOG_LOGERROR,m_LogFile); |
2074 | LogLineToScreen(tmp); | 2093 | LogLineToScreen(tmp); |
2075 | m_lastlogerr=m_LogFile; | 2094 | m_lastlogerr=m_LogFile; |
2076 | } | 2095 | } |
2077 | } | 2096 | } |
2078 | } | 2097 | } |
2079 | } | 2098 | } |
2099 | |||
2100 | void CPumpKINDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) | ||
2101 | { | ||
2102 | CDialog::OnGetMinMaxInfo(lpMMI); | ||
2103 | if(m_MinSize.cx>0 && m_MinSize.cy>0){ | ||
2104 | lpMMI->ptMinTrackSize.x = m_MinSize.cx; | ||
2105 | lpMMI->ptMinTrackSize.y = m_MinSize.cy; | ||
2106 | } | ||
2107 | } | ||
2108 | |||
2109 | void CPumpKINDlg::OnSize(UINT nType, int cx, int cy) | ||
2110 | { | ||
2111 | CDialog::OnSize(nType, cx, cy); | ||
2112 | if(nType==SIZE_RESTORED) | ||
2113 | RecalcLayout(cx,cy); | ||
2114 | } | ||
2115 | |||
2116 | void CPumpKINDlg::RecalcLayout(int,int) | ||
2117 | { | ||
2118 | CRect wrc; | ||
2119 | GetClientRect(&wrc); | ||
2120 | AdjustButton(m_GetCtl,wrc); | ||
2121 | AdjustButton(m_PutCtl,wrc); | ||
2122 | AdjustButton(m_AbortCtl,wrc); | ||
2123 | AdjustButton(m_HelpCtl,wrc); | ||
2124 | AdjustButton(m_ExitCtl,wrc); | ||
2125 | AdjustButton(m_OptionsCtl,wrc); | ||
2126 | CRect brc; | ||
2127 | m_List.GetWindowRect(&brc); ScreenToClient(&brc); | ||
2128 | m_List.SetWindowPos( | ||
2129 | 0, | ||
2130 | brc.left, brc.top, | ||
2131 | wrc.right-m_rightGapList-brc.left, brc.bottom-brc.top, | ||
2132 | SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS ); | ||
2133 | m_Log.GetWindowRect(&brc); ScreenToClient(&brc); | ||
2134 | m_Log.SetWindowPos( | ||
2135 | 0, | ||
2136 | brc.left, brc.top, | ||
2137 | wrc.right-m_rightGapButtons-brc.left, wrc.bottom-m_bottomGapLog-brc.top, | ||
2138 | SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS ); | ||
2139 | m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc); | ||
2140 | m_ListenCtl.SetWindowPos( | ||
2141 | 0, | ||
2142 | wrc.right-brc.Width()-m_rightGapButtons, wrc.bottom-brc.Height()-m_bottomGapListen, | ||
2143 | 0,0, | ||
2144 | SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS ); | ||
2145 | int i = m_Log.GetCount(); | ||
2146 | if(i!=LB_ERR) | ||
2147 | m_Log.SetCurSel(i-1); | ||
2148 | } | ||
2149 | |||
2150 | void CPumpKINDlg::AdjustButton(CWnd& w,CRect& wrc) | ||
2151 | { | ||
2152 | CRect brc; | ||
2153 | w.GetWindowRect(&brc); ScreenToClient(&brc); | ||
2154 | w.SetWindowPos( | ||
2155 | 0, | ||
2156 | wrc.right-brc.Width()-m_rightGapButtons, brc.top, | ||
2157 | 0, 0, | ||
2158 | SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS ); | ||
2159 | } | ||
diff --git a/PumpKINDlg.h b/PumpKINDlg.h index b247c56..c5469f1 100644 --- a/PumpKINDlg.h +++ b/PumpKINDlg.h | |||
@@ -362,16 +362,23 @@ typedef CMap<CTime*,CTime*,CTime*,CTime*> CTimeMap; | |||
362 | // CPumpKINDlg dialog | 362 | // CPumpKINDlg dialog |
363 | 363 | ||
364 | class CTrayer; | 364 | class CTrayer; |
365 | class CRetrier; | 365 | class CRetrier; |
366 | class CPumpKINDlg : public CDialog | 366 | class CPumpKINDlg : public CDialog |
367 | { | 367 | { |
368 | // Construction | 368 | // Construction |
369 | public: | 369 | public: |
370 | void AdjustButton(CWnd& w,CRect& wrc); | ||
371 | void RecalcLayout(int,int); | ||
372 | CSize m_MinSize; | ||
373 | UINT m_bottomGapLog; | ||
374 | UINT m_bottomGapListen; | ||
375 | UINT m_rightGapList; | ||
376 | UINT m_rightGapButtons; | ||
370 | CString m_lastlogerr; | 377 | CString m_lastlogerr; |
371 | void LogLine(LPCTSTR str); | 378 | void LogLine(LPCTSTR str); |
372 | CString m_LogFile; | 379 | CString m_LogFile; |
373 | BOOL m_bListen; | 380 | BOOL m_bListen; |
374 | acl_rules_t m_aclRules; | 381 | acl_rules_t m_aclRules; |
375 | CString m_bnwRequest; | 382 | CString m_bnwRequest; |
376 | CString m_bnwSuccess; | 383 | CString m_bnwSuccess; |
377 | CString m_bnwAbort; | 384 | CString m_bnwAbort; |
@@ -425,16 +432,20 @@ public: | |||
425 | UINT m_ListenPort; | 432 | UINT m_ListenPort; |
426 | UINT m_BlockSize; | 433 | UINT m_BlockSize; |
427 | CListenSocket m_Listener; | 434 | CListenSocket m_Listener; |
428 | CPumpKINDlg(CWnd* pParent = NULL);// standard constructor | 435 | CPumpKINDlg(CWnd* pParent = NULL);// standard constructor |
429 | 436 | ||
430 | // Dialog Data | 437 | // Dialog Data |
431 | //{{AFX_DATA(CPumpKINDlg) | 438 | //{{AFX_DATA(CPumpKINDlg) |
432 | enum { IDD = IDD_PUMPKIN_DIALOG }; | 439 | enum { IDD = IDD_PUMPKIN_DIALOG }; |
440 | CButtonm_HelpCtl; | ||
441 | CButtonm_PutCtl; | ||
442 | CButtonm_GetCtl; | ||
443 | CButtonm_ExitCtl; | ||
433 | CButtonm_ListenCtl; | 444 | CButtonm_ListenCtl; |
434 | CButtonm_AbortCtl; | 445 | CButtonm_AbortCtl; |
435 | CButtonm_OptionsCtl; | 446 | CButtonm_OptionsCtl; |
436 | CListBoxm_Log; | 447 | CListBoxm_Log; |
437 | CListCtrlm_List; | 448 | CListCtrlm_List; |
438 | //}}AFX_DATA | 449 | //}}AFX_DATA |
439 | 450 | ||
440 | // ClassWizard generated virtual function overrides | 451 | // ClassWizard generated virtual function overrides |
@@ -477,11 +488,13 @@ protected: | |||
477 | afx_msg void OnTraySendfile(); | 488 | afx_msg void OnTraySendfile(); |
478 | afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos); | 489 | afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos); |
479 | afx_msg void OnSelchangeLog(); | 490 | afx_msg void OnSelchangeLog(); |
480 | afx_msg void OnTrayOpenfilesfolder(); | 491 | afx_msg void OnTrayOpenfilesfolder(); |
481 | afx_msg void OnDropFiles(HDROP hDropInfo); | 492 | afx_msg void OnDropFiles(HDROP hDropInfo); |
482 | virtual void OnCancel(); | 493 | virtual void OnCancel(); |
483 | afx_msg void OnHelp(); | 494 | afx_msg void OnHelp(); |
484 | afx_msg void OnListening(); | 495 | afx_msg void OnListening(); |
496 | afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); | ||
497 | afx_msg void OnSize(UINT nType, int cx, int cy); | ||
485 | //}}AFX_MSG | 498 | //}}AFX_MSG |
486 | DECLARE_MESSAGE_MAP() | 499 | DECLARE_MESSAGE_MAP() |
487 | }; | 500 | }; |
diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf index abdca4f..505cbf2 100644 --- a/help/pumpkin.rtf +++ b/help/pumpkin.rtf | |||
@@ -27,16 +27,17 @@ K{\footnote about} | |||
27 | 27 | ||
28 | \pard\plain | 28 | \pard\plain |
29 | #{\footnote News} | 29 | #{\footnote News} |
30 | ${\footnote What's New} | 30 | ${\footnote What's New} |
31 | \par\pard\plain\f1\fs24\qc\cf2\b 2.7 - | 31 | \par\pard\plain\f1\fs24\qc\cf2\b 2.7 - |
32 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Added acess lists based on request IP address and TFTP opcode for automating access policy | 32 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Added acess lists based on request IP address and TFTP opcode for automating access policy |
33 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Added possibility to start/stop TFTP server, while keeping client functionality intact | 33 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Added possibility to start/stop TFTP server, while keeping client functionality intact |
34 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Logging to file | 34 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Logging to file |
35 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Resizable main window | ||
35 | \par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005 | 36 | \par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005 |
36 | \par\pard\plain\fi0\li0\f1\fs18 \bullet more robust solution to the backslash/slash dilemma | 37 | \par\pard\plain\fi0\li0\f1\fs18 \bullet more robust solution to the backslash/slash dilemma |
37 | \par\pard\plain\fi0\li0\f1\fs18 \bullet A bit more elaborate error reporting | 38 | \par\pard\plain\fi0\li0\f1\fs18 \bullet A bit more elaborate error reporting |
38 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP | 39 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Fixed uninstall procedure so that it works on XP |
39 | \par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004 | 40 | \par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004 |
40 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Change of {\uldb license}{\v About} and opening the source. | 41 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Change of {\uldb license}{\v About} and opening the source. |
41 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Minor cosmetic changes | 42 | \par\pard\plain\fi0\li0\f1\fs18 \bullet Minor cosmetic changes |
42 | \par\pard\plain\f1\fs24\qc\cf2\b 2.0 - June 13th, 1998 | 43 | \par\pard\plain\f1\fs24\qc\cf2\b 2.0 - June 13th, 1998 |
diff --git a/help/pumpkin.xml b/help/pumpkin.xml index 46e3bbc..5c951bb 100644 --- a/help/pumpkin.xml +++ b/help/pumpkin.xml | |||
@@ -8,16 +8,17 @@ | |||
8 | <license years="1997-2006"/> | 8 | <license years="1997-2006"/> |
9 | <credist/> | 9 | <credist/> |
10 | </topic> | 10 | </topic> |
11 | <topic id="News" title="What's New"> | 11 | <topic id="News" title="What's New"> |
12 | <newsfor version="2.7" date=""> | 12 | <newsfor version="2.7" date=""> |
13 | <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni> | 13 | <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni> |
14 | <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni> | 14 | <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni> |
15 | <ni>Logging to file</ni> | 15 | <ni>Logging to file</ni> |
16 | <ni>Resizable main window</ni> | ||
16 | </newsfor> | 17 | </newsfor> |
17 | <newsfor version="2.6" date="August 6th, 2005"> | 18 | <newsfor version="2.6" date="August 6th, 2005"> |
18 | <ni>more robust solution to the backslash/slash dilemma</ni> | 19 | <ni>more robust solution to the backslash/slash dilemma</ni> |
19 | <ni>A bit more elaborate error reporting</ni> | 20 | <ni>A bit more elaborate error reporting</ni> |
20 | <ni>Fixed uninstall procedure so that it works on XP</ni> | 21 | <ni>Fixed uninstall procedure so that it works on XP</ni> |
21 | </newsfor> | 22 | </newsfor> |
22 | <newsfor version="2.5" date="July 11th, 2004"> | 23 | <newsfor version="2.5" date="July 11th, 2004"> |
23 | <ni>Change of <a href="#About">license</a> and opening the source.</ni> | 24 | <ni>Change of <a href="#About">license</a> and opening the source.</ni> |
diff --git a/pumpkin.clw b/pumpkin.clw index 5344bfd..213d8c1 100644 --- a/pumpkin.clw +++ b/pumpkin.clw | |||
@@ -1,44 +1,44 @@ | |||
1 | ; CLW file contains information for the MFC ClassWizard | 1 | ; CLW file contains information for the MFC ClassWizard |
2 | 2 | ||
3 | [General Info] | 3 | [General Info] |
4 | Version=1 | 4 | Version=1 |
5 | LastClass=CPropsServer | 5 | LastClass=CPumpKINDlg |
6 | LastTemplate=CComboBox | 6 | LastTemplate=CComboBox |
7 | NewFileInclude1=#include "stdafx.h" | 7 | NewFileInclude1=#include "stdafx.h" |
8 | NewFileInclude2=#include "PumpKIN.h" | 8 | NewFileInclude2=#include "PumpKIN.h" |
9 | 9 | ||
10 | ClassCount=14 | 10 | ClassCount=14 |
11 | Class1=CPumpKINApp | 11 | Class1=CPumpKINApp |
12 | Class2=CPumpKINDlg | 12 | Class2=CPumpKINDlg |
13 | Class3=CAboutDlg | 13 | Class3=CAboutDlg |
14 | 14 | ||
15 | ResourceCount=10 | 15 | ResourceCount=10 |
16 | Resource1=IDD_REQUEST | 16 | Resource1=IDD_REQUEST |
17 | Resource2=IDD_PROPS_NETWORK | 17 | Resource2=IDD_PROPS_NETWORK |
18 | Resource3=IDD_CONFIRM_RRQ | 18 | Resource3=IDD_CONFIRM_RRQ |
19 | Resource4=IDD_ABOUTBOX | 19 | Resource4=IDD_PROPS_SERVER |
20 | Class4=CPropsServer | 20 | Class4=CPropsServer |
21 | Class5=CPropsNetwork | 21 | Class5=CPropsNetwork |
22 | Resource5=IDD_CONFIRM_WRQ | 22 | Resource5=IDD_CONFIRM_WRQ |
23 | Resource6=IDD_PROPS_ACL | 23 | Resource6=IDD_PROPS_ACL |
24 | Class6=CConfirmRRQDlg | 24 | Class6=CConfirmRRQDlg |
25 | Class7=CConfirmWRQDlg | 25 | Class7=CConfirmWRQDlg |
26 | Resource7=IDD_PUMPKIN_DIALOG | 26 | Resource7=IDD_ABOUTBOX |
27 | Class8=CRequestDlg | 27 | Class8=CRequestDlg |
28 | Class9=CResolver | 28 | Class9=CResolver |
29 | Class10=CRetrier | 29 | Class10=CRetrier |
30 | Class11=CTrayer | 30 | Class11=CTrayer |
31 | Resource8=IDD_PROPS_SOUNDS | 31 | Resource8=IDD_PROPS_SOUNDS |
32 | Class12=CPropsSounds | 32 | Class12=CPropsSounds |
33 | Resource9=IDM_POPUPS | 33 | Resource9=IDM_POPUPS |
34 | Class13=CPropsACL | 34 | Class13=CPropsACL |
35 | Class14=CACLTargetCombo | 35 | Class14=CACLTargetCombo |
36 | Resource10=IDD_PROPS_SERVER | 36 | Resource10=IDD_PUMPKIN_DIALOG |
37 | 37 | ||
38 | [CLS:CPumpKINApp] | 38 | [CLS:CPumpKINApp] |
39 | Type=0 | 39 | Type=0 |
40 | HeaderFile=PumpKIN.h | 40 | HeaderFile=PumpKIN.h |
41 | ImplementationFile=PumpKIN.cpp | 41 | ImplementationFile=PumpKIN.cpp |
42 | Filter=N | 42 | Filter=N |
43 | 43 | ||
44 | [CLS:CPumpKINDlg] | 44 | [CLS:CPumpKINDlg] |
@@ -75,17 +75,17 @@ Class=CPumpKINDlg | |||
75 | ControlCount=10 | 75 | ControlCount=10 |
76 | Control1=IDC_CONNECTIONS,SysListView32,1350631681 | 76 | Control1=IDC_CONNECTIONS,SysListView32,1350631681 |
77 | Control2=IDC_GET,button,1342259200 | 77 | Control2=IDC_GET,button,1342259200 |
78 | Control3=IDC_PUT,button,1342259200 | 78 | Control3=IDC_PUT,button,1342259200 |
79 | Control4=IDC_ABORT,button,1342259200 | 79 | Control4=IDC_ABORT,button,1342259200 |
80 | Control5=IDC_OPTIONS,button,1342259200 | 80 | Control5=IDC_OPTIONS,button,1342259200 |
81 | Control6=IDC_EXIT,button,1342259200 | 81 | Control6=IDC_EXIT,button,1342259200 |
82 | Control7=ID_HELP,button,1342259200 | 82 | Control7=ID_HELP,button,1342259200 |
83 | Control8=IDC_LOG,listbox,1353728129 | 83 | Control8=IDC_LOG,listbox,1353728385 |
84 | Control9=IDCANCEL,button,1073741824 | 84 | Control9=IDCANCEL,button,1073741824 |
85 | Control10=IDC_LISTENING,button,1342275619 | 85 | Control10=IDC_LISTENING,button,1342275619 |
86 | 86 | ||
87 | [DLG:IDD_PROPS_SERVER] | 87 | [DLG:IDD_PROPS_SERVER] |
88 | Type=1 | 88 | Type=1 |
89 | Class=CPropsServer | 89 | Class=CPropsServer |
90 | ControlCount=18 | 90 | ControlCount=18 |
91 | Control1=IDC_STATIC,button,1342177287 | 91 | Control1=IDC_STATIC,button,1342177287 |
@@ -129,17 +129,17 @@ Control15=IDC_BSIZESPIN,msctls_updown32,1342177463 | |||
129 | 129 | ||
130 | [CLS:CPropsServer] | 130 | [CLS:CPropsServer] |
131 | Type=0 | 131 | Type=0 |
132 | HeaderFile=PropsServer.h | 132 | HeaderFile=PropsServer.h |
133 | ImplementationFile=PropsServer.cpp | 133 | ImplementationFile=PropsServer.cpp |
134 | BaseClass=CPropertyPage | 134 | BaseClass=CPropertyPage |
135 | Filter=D | 135 | Filter=D |
136 | VirtualFilter=idWC | 136 | VirtualFilter=idWC |
137 | LastObject=IDC_LOGFILE_BROWSE | 137 | LastObject=CPropsServer |
138 | 138 | ||
139 | [CLS:CPropsNetwork] | 139 | [CLS:CPropsNetwork] |
140 | Type=0 | 140 | Type=0 |
141 | HeaderFile=PropsNetwork.h | 141 | HeaderFile=PropsNetwork.h |
142 | ImplementationFile=PropsNetwork.cpp | 142 | ImplementationFile=PropsNetwork.cpp |
143 | BaseClass=CPropertyPage | 143 | BaseClass=CPropertyPage |
144 | Filter=D | 144 | Filter=D |
145 | VirtualFilter=idWC | 145 | VirtualFilter=idWC |
diff --git a/pumpkin.mak b/pumpkin.mak index 7d2ec22..a22a6fa 100644 --- a/pumpkin.mak +++ b/pumpkin.mak | |||
@@ -33,17 +33,17 @@ CFG=Install - Win32 Debug | |||
33 | 33 | ||
34 | !IF "$(OS)" == "Windows_NT" | 34 | !IF "$(OS)" == "Windows_NT" |
35 | NULL= | 35 | NULL= |
36 | !ELSE | 36 | !ELSE |
37 | NULL=nul | 37 | NULL=nul |
38 | !ENDIF | 38 | !ENDIF |
39 | ################################################################################ | 39 | ################################################################################ |
40 | # Begin Project | 40 | # Begin Project |
41 | # PROP Target_Last_Scanned "Install - Win32 Canned" | 41 | # PROP Target_Last_Scanned "PumpKIN - Win32 Debug" |
42 | CPP=cl.exe | 42 | CPP=cl.exe |
43 | RSC=rc.exe | 43 | RSC=rc.exe |
44 | MTL=mktyplib.exe | 44 | MTL=mktyplib.exe |
45 | 45 | ||
46 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | 46 | !IF "$(CFG)" == "PumpKIN - Win32 Release" |
47 | 47 | ||
48 | # PROP BASE Use_MFC 6 | 48 | # PROP BASE Use_MFC 6 |
49 | # PROP BASE Use_Debug_Libraries 0 | 49 | # PROP BASE Use_Debug_Libraries 0 |
@@ -701,16 +701,17 @@ DEP_CPP_PUMPK=\ | |||
701 | "$(INTDIR)\pumpkin.pch" | 701 | "$(INTDIR)\pumpkin.pch" |
702 | 702 | ||
703 | 703 | ||
704 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 704 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
705 | 705 | ||
706 | DEP_CPP_PUMPK=\ | 706 | DEP_CPP_PUMPK=\ |
707 | ".\pumpkin.h"\ | 707 | ".\pumpkin.h"\ |
708 | ".\PumpKINDlg.h"\ | 708 | ".\PumpKINDlg.h"\ |
709 | ".\shared-code\BellsNWhistles.h"\ | ||
709 | ".\shared-code\kHelpers.h"\ | 710 | ".\shared-code\kHelpers.h"\ |
710 | ".\stdafx.h"\ | 711 | ".\stdafx.h"\ |
711 | 712 | ||
712 | 713 | ||
713 | "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ | 714 | "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ |
714 | "$(INTDIR)\pumpkin.pch" | 715 | "$(INTDIR)\pumpkin.pch" |
715 | 716 | ||
716 | "$(INTDIR)\PumpKIN.sbr" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ | 717 | "$(INTDIR)\PumpKIN.sbr" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ |
@@ -733,19 +734,16 @@ DEP_CPP_PUMPK=\ | |||
733 | 734 | ||
734 | !ENDIF | 735 | !ENDIF |
735 | 736 | ||
736 | # End Source File | 737 | # End Source File |
737 | ################################################################################ | 738 | ################################################################################ |
738 | # Begin Source File | 739 | # Begin Source File |
739 | 740 | ||
740 | SOURCE=.\PumpKINDlg.cpp | 741 | SOURCE=.\PumpKINDlg.cpp |
741 | |||
742 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
743 | |||
744 | DEP_CPP_PUMPKI=\ | 742 | DEP_CPP_PUMPKI=\ |
745 | ".\ACLTargetCombo.h"\ | 743 | ".\ACLTargetCombo.h"\ |
746 | ".\ConfirmRRQDlg.h"\ | 744 | ".\ConfirmRRQDlg.h"\ |
747 | ".\ConfirmWRQDlg.h"\ | 745 | ".\ConfirmWRQDlg.h"\ |
748 | ".\PropsACL.h"\ | 746 | ".\PropsACL.h"\ |
749 | ".\PropsNetwork.h"\ | 747 | ".\PropsNetwork.h"\ |
750 | ".\PropsServer.h"\ | 748 | ".\PropsServer.h"\ |
751 | ".\PropsSounds.h"\ | 749 | ".\PropsSounds.h"\ |
@@ -755,68 +753,35 @@ DEP_CPP_PUMPKI=\ | |||
755 | ".\Resolver.h"\ | 753 | ".\Resolver.h"\ |
756 | ".\Retrier.h"\ | 754 | ".\Retrier.h"\ |
757 | ".\shared-code\BellsNWhistles.h"\ | 755 | ".\shared-code\BellsNWhistles.h"\ |
758 | ".\shared-code\kHelpers.h"\ | 756 | ".\shared-code\kHelpers.h"\ |
759 | ".\stdafx.h"\ | 757 | ".\stdafx.h"\ |
760 | ".\Trayer.h"\ | 758 | ".\Trayer.h"\ |
761 | 759 | ||
762 | 760 | ||
761 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
762 | |||
763 | |||
763 | "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ | 764 | "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ |
764 | "$(INTDIR)\pumpkin.pch" | 765 | "$(INTDIR)\pumpkin.pch" |
765 | 766 | ||
766 | 767 | ||
767 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 768 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
768 | 769 | ||
769 | DEP_CPP_PUMPKI=\ | ||
770 | ".\ACLTargetCombo.h"\ | ||
771 | ".\ConfirmRRQDlg.h"\ | ||
772 | ".\ConfirmWRQDlg.h"\ | ||
773 | ".\PropsACL.h"\ | ||
774 | ".\PropsNetwork.h"\ | ||
775 | ".\PropsServer.h"\ | ||
776 | ".\PropsSounds.h"\ | ||
777 | ".\pumpkin.h"\ | ||
778 | ".\PumpKINDlg.h"\ | ||
779 | ".\RequestDlg.h"\ | ||
780 | ".\Resolver.h"\ | ||
781 | ".\Retrier.h"\ | ||
782 | ".\shared-code\BellsNWhistles.h"\ | ||
783 | ".\shared-code\kHelpers.h"\ | ||
784 | ".\stdafx.h"\ | ||
785 | ".\Trayer.h"\ | ||
786 | |||
787 | 770 | ||
788 | "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ | 771 | "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ |
789 | "$(INTDIR)\pumpkin.pch" | 772 | "$(INTDIR)\pumpkin.pch" |
790 | 773 | ||
791 | "$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ | 774 | "$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ |
792 | "$(INTDIR)\pumpkin.pch" | 775 | "$(INTDIR)\pumpkin.pch" |
793 | 776 | ||
794 | 777 | ||
795 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 778 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
796 | 779 | ||
797 | DEP_CPP_PUMPKI=\ | ||
798 | ".\ACLTargetCombo.h"\ | ||
799 | ".\ConfirmRRQDlg.h"\ | ||
800 | ".\ConfirmWRQDlg.h"\ | ||
801 | ".\PropsACL.h"\ | ||
802 | ".\PropsNetwork.h"\ | ||
803 | ".\PropsServer.h"\ | ||
804 | ".\PropsSounds.h"\ | ||
805 | ".\pumpkin.h"\ | ||
806 | ".\PumpKINDlg.h"\ | ||
807 | ".\RequestDlg.h"\ | ||
808 | ".\Resolver.h"\ | ||
809 | ".\Retrier.h"\ | ||
810 | ".\shared-code\BellsNWhistles.h"\ | ||
811 | ".\shared-code\kHelpers.h"\ | ||
812 | ".\stdafx.h"\ | ||
813 | ".\Trayer.h"\ | ||
814 | |||
815 | 780 | ||
816 | "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ | 781 | "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ |
817 | "$(INTDIR)\pumpkin.pch" | 782 | "$(INTDIR)\pumpkin.pch" |
818 | 783 | ||
819 | 784 | ||
820 | !ENDIF | 785 | !ENDIF |
821 | 786 | ||
822 | # End Source File | 787 | # End Source File |
@@ -1036,16 +1001,17 @@ DEP_CPP_PROPS=\ | |||
1036 | "$(INTDIR)\pumpkin.pch" | 1001 | "$(INTDIR)\pumpkin.pch" |
1037 | 1002 | ||
1038 | 1003 | ||
1039 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1004 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1040 | 1005 | ||
1041 | DEP_CPP_PROPS=\ | 1006 | DEP_CPP_PROPS=\ |
1042 | ".\PropsServer.h"\ | 1007 | ".\PropsServer.h"\ |
1043 | ".\pumpkin.h"\ | 1008 | ".\pumpkin.h"\ |
1009 | ".\shared-code\BellsNWhistles.h"\ | ||
1044 | ".\shared-code\kHelpers.h"\ | 1010 | ".\shared-code\kHelpers.h"\ |
1045 | ".\stdafx.h"\ | 1011 | ".\stdafx.h"\ |
1046 | 1012 | ||
1047 | 1013 | ||
1048 | "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ | 1014 | "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ |
1049 | "$(INTDIR)\pumpkin.pch" | 1015 | "$(INTDIR)\pumpkin.pch" |
1050 | 1016 | ||
1051 | "$(INTDIR)\PropsServer.sbr" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ | 1017 | "$(INTDIR)\PropsServer.sbr" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ |
@@ -1129,16 +1095,17 @@ DEP_CPP_CONFI=\ | |||
1129 | 1095 | ||
1130 | 1096 | ||
1131 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1097 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1132 | 1098 | ||
1133 | DEP_CPP_CONFI=\ | 1099 | DEP_CPP_CONFI=\ |
1134 | ".\ConfirmRRQDlg.h"\ | 1100 | ".\ConfirmRRQDlg.h"\ |
1135 | ".\pumpkin.h"\ | 1101 | ".\pumpkin.h"\ |
1136 | ".\PumpKINDlg.h"\ | 1102 | ".\PumpKINDlg.h"\ |
1103 | ".\shared-code\BellsNWhistles.h"\ | ||
1137 | ".\shared-code\kHelpers.h"\ | 1104 | ".\shared-code\kHelpers.h"\ |
1138 | ".\stdafx.h"\ | 1105 | ".\stdafx.h"\ |
1139 | 1106 | ||
1140 | 1107 | ||
1141 | "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ | 1108 | "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ |
1142 | "$(INTDIR)\pumpkin.pch" | 1109 | "$(INTDIR)\pumpkin.pch" |
1143 | 1110 | ||
1144 | "$(INTDIR)\ConfirmRRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ | 1111 | "$(INTDIR)\ConfirmRRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ |
@@ -1184,16 +1151,17 @@ DEP_CPP_CONFIR=\ | |||
1184 | 1151 | ||
1185 | 1152 | ||
1186 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1153 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1187 | 1154 | ||
1188 | DEP_CPP_CONFIR=\ | 1155 | DEP_CPP_CONFIR=\ |
1189 | ".\ConfirmWRQDlg.h"\ | 1156 | ".\ConfirmWRQDlg.h"\ |
1190 | ".\pumpkin.h"\ | 1157 | ".\pumpkin.h"\ |
1191 | ".\PumpKINDlg.h"\ | 1158 | ".\PumpKINDlg.h"\ |
1159 | ".\shared-code\BellsNWhistles.h"\ | ||
1192 | ".\shared-code\kHelpers.h"\ | 1160 | ".\shared-code\kHelpers.h"\ |
1193 | ".\stdafx.h"\ | 1161 | ".\stdafx.h"\ |
1194 | 1162 | ||
1195 | 1163 | ||
1196 | "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ | 1164 | "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ |
1197 | "$(INTDIR)\pumpkin.pch" | 1165 | "$(INTDIR)\pumpkin.pch" |
1198 | 1166 | ||
1199 | "$(INTDIR)\ConfirmWRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ | 1167 | "$(INTDIR)\ConfirmWRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ |
@@ -1278,16 +1246,17 @@ DEP_CPP_RESOL=\ | |||
1278 | 1246 | ||
1279 | 1247 | ||
1280 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1248 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1281 | 1249 | ||
1282 | DEP_CPP_RESOL=\ | 1250 | DEP_CPP_RESOL=\ |
1283 | ".\pumpkin.h"\ | 1251 | ".\pumpkin.h"\ |
1284 | ".\PumpKINDlg.h"\ | 1252 | ".\PumpKINDlg.h"\ |
1285 | ".\Resolver.h"\ | 1253 | ".\Resolver.h"\ |
1254 | ".\shared-code\BellsNWhistles.h"\ | ||
1286 | ".\shared-code\kHelpers.h"\ | 1255 | ".\shared-code\kHelpers.h"\ |
1287 | ".\stdafx.h"\ | 1256 | ".\stdafx.h"\ |
1288 | 1257 | ||
1289 | 1258 | ||
1290 | "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ | 1259 | "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ |
1291 | "$(INTDIR)\pumpkin.pch" | 1260 | "$(INTDIR)\pumpkin.pch" |
1292 | 1261 | ||
1293 | "$(INTDIR)\Resolver.sbr" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ | 1262 | "$(INTDIR)\Resolver.sbr" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ |
@@ -1333,16 +1302,17 @@ DEP_CPP_RETRI=\ | |||
1333 | 1302 | ||
1334 | 1303 | ||
1335 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1304 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1336 | 1305 | ||
1337 | DEP_CPP_RETRI=\ | 1306 | DEP_CPP_RETRI=\ |
1338 | ".\pumpkin.h"\ | 1307 | ".\pumpkin.h"\ |
1339 | ".\PumpKINDlg.h"\ | 1308 | ".\PumpKINDlg.h"\ |
1340 | ".\Retrier.h"\ | 1309 | ".\Retrier.h"\ |
1310 | ".\shared-code\BellsNWhistles.h"\ | ||
1341 | ".\shared-code\kHelpers.h"\ | 1311 | ".\shared-code\kHelpers.h"\ |
1342 | ".\stdafx.h"\ | 1312 | ".\stdafx.h"\ |
1343 | 1313 | ||
1344 | 1314 | ||
1345 | "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ | 1315 | "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ |
1346 | "$(INTDIR)\pumpkin.pch" | 1316 | "$(INTDIR)\pumpkin.pch" |
1347 | 1317 | ||
1348 | "$(INTDIR)\Retrier.sbr" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ | 1318 | "$(INTDIR)\Retrier.sbr" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ |
@@ -1387,16 +1357,17 @@ DEP_CPP_TRAYE=\ | |||
1387 | "$(INTDIR)\pumpkin.pch" | 1357 | "$(INTDIR)\pumpkin.pch" |
1388 | 1358 | ||
1389 | 1359 | ||
1390 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1360 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1391 | 1361 | ||
1392 | DEP_CPP_TRAYE=\ | 1362 | DEP_CPP_TRAYE=\ |
1393 | ".\pumpkin.h"\ | 1363 | ".\pumpkin.h"\ |
1394 | ".\PumpKINDlg.h"\ | 1364 | ".\PumpKINDlg.h"\ |
1365 | ".\shared-code\BellsNWhistles.h"\ | ||
1395 | ".\shared-code\kHelpers.h"\ | 1366 | ".\shared-code\kHelpers.h"\ |
1396 | ".\stdafx.h"\ | 1367 | ".\stdafx.h"\ |
1397 | ".\Trayer.h"\ | 1368 | ".\Trayer.h"\ |
1398 | 1369 | ||
1399 | 1370 | ||
1400 | "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ | 1371 | "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ |
1401 | "$(INTDIR)\pumpkin.pch" | 1372 | "$(INTDIR)\pumpkin.pch" |
1402 | 1373 | ||
@@ -1463,16 +1434,17 @@ DEP_CPP_PROPSS=\ | |||
1463 | 1434 | ||
1464 | 1435 | ||
1465 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1436 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1466 | 1437 | ||
1467 | DEP_CPP_PROPSS=\ | 1438 | DEP_CPP_PROPSS=\ |
1468 | ".\PropsSounds.h"\ | 1439 | ".\PropsSounds.h"\ |
1469 | ".\pumpkin.h"\ | 1440 | ".\pumpkin.h"\ |
1470 | ".\PumpKINDlg.h"\ | 1441 | ".\PumpKINDlg.h"\ |
1442 | ".\shared-code\BellsNWhistles.h"\ | ||
1471 | ".\shared-code\kHelpers.h"\ | 1443 | ".\shared-code\kHelpers.h"\ |
1472 | ".\stdafx.h"\ | 1444 | ".\stdafx.h"\ |
1473 | 1445 | ||
1474 | 1446 | ||
1475 | "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ | 1447 | "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ |
1476 | "$(INTDIR)\pumpkin.pch" | 1448 | "$(INTDIR)\pumpkin.pch" |
1477 | 1449 | ||
1478 | "$(INTDIR)\PropsSounds.sbr" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ | 1450 | "$(INTDIR)\PropsSounds.sbr" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ |
@@ -1496,62 +1468,45 @@ DEP_CPP_PROPSS=\ | |||
1496 | 1468 | ||
1497 | !ENDIF | 1469 | !ENDIF |
1498 | 1470 | ||
1499 | # End Source File | 1471 | # End Source File |
1500 | ################################################################################ | 1472 | ################################################################################ |
1501 | # Begin Source File | 1473 | # Begin Source File |
1502 | 1474 | ||
1503 | SOURCE=.\PropsACL.cpp | 1475 | SOURCE=.\PropsACL.cpp |
1504 | |||
1505 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1506 | |||
1507 | DEP_CPP_PROPSA=\ | 1476 | DEP_CPP_PROPSA=\ |
1508 | ".\ACLTargetCombo.h"\ | 1477 | ".\ACLTargetCombo.h"\ |
1509 | ".\PropsACL.h"\ | 1478 | ".\PropsACL.h"\ |
1510 | ".\pumpkin.h"\ | 1479 | ".\pumpkin.h"\ |
1511 | ".\PumpKINDlg.h"\ | 1480 | ".\PumpKINDlg.h"\ |
1512 | ".\shared-code\BellsNWhistles.h"\ | 1481 | ".\shared-code\BellsNWhistles.h"\ |
1513 | ".\shared-code\kHelpers.h"\ | 1482 | ".\shared-code\kHelpers.h"\ |
1514 | ".\stdafx.h"\ | 1483 | ".\stdafx.h"\ |
1515 | 1484 | ||
1516 | 1485 | ||
1486 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1487 | |||
1488 | |||
1517 | "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ | 1489 | "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ |
1518 | "$(INTDIR)\pumpkin.pch" | 1490 | "$(INTDIR)\pumpkin.pch" |
1519 | 1491 | ||
1520 | 1492 | ||
1521 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1493 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1522 | 1494 | ||
1523 | DEP_CPP_PROPSA=\ | ||
1524 | ".\ACLTargetCombo.h"\ | ||
1525 | ".\PropsACL.h"\ | ||
1526 | ".\pumpkin.h"\ | ||
1527 | ".\PumpKINDlg.h"\ | ||
1528 | ".\shared-code\kHelpers.h"\ | ||
1529 | ".\stdafx.h"\ | ||
1530 | |||
1531 | 1495 | ||
1532 | "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ | 1496 | "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ |
1533 | "$(INTDIR)\pumpkin.pch" | 1497 | "$(INTDIR)\pumpkin.pch" |
1534 | 1498 | ||
1535 | "$(INTDIR)\PropsACL.sbr" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ | 1499 | "$(INTDIR)\PropsACL.sbr" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ |
1536 | "$(INTDIR)\pumpkin.pch" | 1500 | "$(INTDIR)\pumpkin.pch" |
1537 | 1501 | ||
1538 | 1502 | ||
1539 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1503 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1540 | 1504 | ||
1541 | DEP_CPP_PROPSA=\ | ||
1542 | ".\ACLTargetCombo.h"\ | ||
1543 | ".\PropsACL.h"\ | ||
1544 | ".\pumpkin.h"\ | ||
1545 | ".\PumpKINDlg.h"\ | ||
1546 | ".\shared-code\BellsNWhistles.h"\ | ||
1547 | ".\shared-code\kHelpers.h"\ | ||
1548 | ".\stdafx.h"\ | ||
1549 | |||
1550 | 1505 | ||
1551 | "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ | 1506 | "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ |
1552 | "$(INTDIR)\pumpkin.pch" | 1507 | "$(INTDIR)\pumpkin.pch" |
1553 | 1508 | ||
1554 | 1509 | ||
1555 | !ENDIF | 1510 | !ENDIF |
1556 | 1511 | ||
1557 | # End Source File | 1512 | # End Source File |
@@ -1576,16 +1531,17 @@ DEP_CPP_ACLTA=\ | |||
1576 | 1531 | ||
1577 | 1532 | ||
1578 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1533 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1579 | 1534 | ||
1580 | DEP_CPP_ACLTA=\ | 1535 | DEP_CPP_ACLTA=\ |
1581 | ".\ACLTargetCombo.h"\ | 1536 | ".\ACLTargetCombo.h"\ |
1582 | ".\pumpkin.h"\ | 1537 | ".\pumpkin.h"\ |
1583 | ".\PumpKINDlg.h"\ | 1538 | ".\PumpKINDlg.h"\ |
1539 | ".\shared-code\BellsNWhistles.h"\ | ||
1584 | ".\shared-code\kHelpers.h"\ | 1540 | ".\shared-code\kHelpers.h"\ |
1585 | ".\stdafx.h"\ | 1541 | ".\stdafx.h"\ |
1586 | 1542 | ||
1587 | 1543 | ||
1588 | "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ | 1544 | "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ |
1589 | "$(INTDIR)\pumpkin.pch" | 1545 | "$(INTDIR)\pumpkin.pch" |
1590 | 1546 | ||
1591 | "$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ | 1547 | "$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ |
@@ -89,18 +89,17 @@ BEGIN | |||
89 | SS_NOPREFIX | 89 | SS_NOPREFIX |
90 | LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30, | 90 | LTEXT "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30, |
91 | 170,8 | 91 | 170,8 |
92 | DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP | 92 | DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP |
93 | PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 | 93 | PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 |
94 | END | 94 | END |
95 | 95 | ||
96 | IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193 | 96 | IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193 |
97 | STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | | 97 | STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME |
98 | WS_SYSMENU | ||
99 | EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW | 98 | EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW |
100 | CAPTION " PumpKIN" | 99 | CAPTION " PumpKIN" |
101 | FONT 8, "MS Sans Serif" | 100 | FONT 8, "MS Sans Serif" |
102 | BEGIN | 101 | BEGIN |
103 | CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | | 102 | CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | |
104 | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108, | 103 | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108, |
105 | WS_EX_DLGMODALFRAME | 104 | WS_EX_DLGMODALFRAME |
106 | PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY, | 105 | PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY, |
@@ -108,22 +107,23 @@ BEGIN | |||
108 | PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY, | 107 | PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY, |
109 | WS_EX_CLIENTEDGE | 108 | WS_EX_CLIENTEDGE |
110 | PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY, | 109 | PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY, |
111 | WS_EX_CLIENTEDGE | 110 | WS_EX_CLIENTEDGE |
112 | PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY, | 111 | PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY, |
113 | WS_EX_CLIENTEDGE | 112 | WS_EX_CLIENTEDGE |
114 | PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE | 113 | PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE |
115 | PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE | 114 | PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE |
116 | LISTBOX IDC_LOG,7,115,348,65,LBS_USETABSTOPS | LBS_NOSEL | | 115 | LISTBOX IDC_LOG,7,115,348,64,LBS_USETABSTOPS | |
117 | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | 116 | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | |
117 | WS_HSCROLL,WS_EX_DLGMODALFRAME | ||
118 | PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP | 118 | PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP |
119 | CONTROL "&Server is running",IDC_LISTENING,"Button", | 119 | CONTROL "&Server is running",IDC_LISTENING,"Button", |
120 | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286, | 120 | BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286, |
121 | 180,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE | 121 | 181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE |
122 | END | 122 | END |
123 | 123 | ||
124 | IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201 | 124 | IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201 |
125 | STYLE WS_CHILD | WS_DISABLED | WS_CAPTION | 125 | STYLE WS_CHILD | WS_DISABLED | WS_CAPTION |
126 | CAPTION "Server" | 126 | CAPTION "Server" |
127 | FONT 8, "MS Sans Serif" | 127 | FONT 8, "MS Sans Serif" |
128 | BEGIN | 128 | BEGIN |
129 | GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7, | 129 | GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7, |