made main window resizable

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

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
@@ -126,12 +126,16 @@ CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/)
 }

 

 void CPumpKINDlg::DoDataExchange(CDataExchange* pDX)

 {

 	CDialog::DoDataExchange(pDX);

 	//{{AFX_DATA_MAP(CPumpKINDlg)

+	DDX_Control(pDX, ID_HELP, m_HelpCtl);

+	DDX_Control(pDX, IDC_PUT, m_PutCtl);

+	DDX_Control(pDX, IDC_GET, m_GetCtl);

+	DDX_Control(pDX, IDC_EXIT, m_ExitCtl);

 	DDX_Control(pDX, IDC_LISTENING, m_ListenCtl);

 	DDX_Control(pDX, IDC_ABORT, m_AbortCtl);

 	DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl);

 	DDX_Control(pDX, IDC_LOG, m_Log);

 	DDX_Control(pDX, IDC_CONNECTIONS, m_List);

 	//}}AFX_DATA_MAP

@@ -153,25 +157,27 @@ BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog)
 	ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections)

 	ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections)

 	ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections)

 	ON_BN_CLICKED(IDC_ABORT, OnAbort)

 	ON_WM_CLOSE()

 	ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow)

+	ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)

 	ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)

 	ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin)

 	ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile)

 	ON_COMMAND(ID_TRAY_HELP, OnTrayHelp)

 	ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions)

 	ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile)

 	ON_WM_WINDOWPOSCHANGING()

 	ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)

 	ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder)

 	ON_WM_DROPFILES()

 	ON_BN_CLICKED(ID_HELP, OnHelp)

 	ON_BN_CLICKED(IDC_LISTENING, OnListening)

-	ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)

+	ON_WM_GETMINMAXINFO()

+	ON_WM_SIZE()

 	//}}AFX_MSG_MAP

 END_MESSAGE_MAP()

 

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

 // CPumpKINDlg message handlers

 

@@ -198,13 +204,12 @@ BOOL CPumpKINDlg::OnInitDialog()
 	//  when the application's main window is not a dialog

 	SetIcon(m_hIcon, TRUE);			// Set big icon

 	SetIcon(m_hIcon, FALSE);		// Set small icon

 

 	VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0));

 

-

 	m_Images.Create(16,16,TRUE,2,1);

 	m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ));

 	m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ));

 	ASSERT(m_iRRQ>=0);

 	ASSERT(m_iWRQ>=0);

 	m_List.SetImageList(&m_Images,LVSIL_NORMAL);

@@ -222,12 +227,26 @@ CRect listrc;
 	m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize);

 

 	LogLine(IDS_LOG_START);

 

 	SetupButtons();

 

+CRect wrci, wrco;

+	GetWindowRect(&wrco);

+	GetClientRect(&wrci);

+CRect brc;

+	m_GetCtl.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_rightGapButtons = wrci.right-brc.right;

+	m_List.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_rightGapList = wrci.right-brc.right;

+	m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_bottomGapListen = wrci.bottom-brc.bottom;

+	m_Log.GetWindowRect(&brc);	ScreenToClient(&brc);

+	m_bottomGapLog = wrci.bottom-brc.bottom;

+	m_MinSize.cx = wrco.Width(); m_MinSize.cy=wrco.Height();

+

 CRect rc, drc;

 	GetWindowRect(rc);

 	GetDesktopWindow()->GetWindowRect(drc);

 	SetWindowPos(NULL,drc.right-6-rc.Width(),6,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);

 

 	if(m_bShown)

@@ -2074,6 +2093,67 @@ void CPumpKINDlg::LogLine(LPCTSTR str)
 				LogLineToScreen(tmp);

 				m_lastlogerr=m_LogFile;

 			}

 		}

 	}

 }

+

+void CPumpKINDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) 

+{

+	CDialog::OnGetMinMaxInfo(lpMMI);

+	if(m_MinSize.cx>0 && m_MinSize.cy>0){

+		lpMMI->ptMinTrackSize.x = m_MinSize.cx;

+		lpMMI->ptMinTrackSize.y = m_MinSize.cy;

+	}

+}

+

+void CPumpKINDlg::OnSize(UINT nType, int cx, int cy) 

+{

+	CDialog::OnSize(nType, cx, cy);

+	if(nType==SIZE_RESTORED)

+		RecalcLayout(cx,cy);

+}

+

+void CPumpKINDlg::RecalcLayout(int,int)

+{

+	CRect wrc;

+	GetClientRect(&wrc);

+	AdjustButton(m_GetCtl,wrc);

+	AdjustButton(m_PutCtl,wrc);

+	AdjustButton(m_AbortCtl,wrc);

+	AdjustButton(m_HelpCtl,wrc);

+	AdjustButton(m_ExitCtl,wrc);

+	AdjustButton(m_OptionsCtl,wrc);

+	CRect brc;

+	m_List.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_List.SetWindowPos(

+		0,

+		brc.left, brc.top,

+		wrc.right-m_rightGapList-brc.left, brc.bottom-brc.top,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );

+	m_Log.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_Log.SetWindowPos(

+		0,

+		brc.left, brc.top,

+		wrc.right-m_rightGapButtons-brc.left, wrc.bottom-m_bottomGapLog-brc.top,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );

+	m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_ListenCtl.SetWindowPos(

+		0,

+		wrc.right-brc.Width()-m_rightGapButtons, wrc.bottom-brc.Height()-m_bottomGapListen,

+		0,0,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );

+	int i = m_Log.GetCount();

+	if(i!=LB_ERR)

+		m_Log.SetCurSel(i-1);

+}

+

+void CPumpKINDlg::AdjustButton(CWnd& w,CRect& wrc)

+{

+	CRect brc;

+	w.GetWindowRect(&brc); ScreenToClient(&brc);

+	w.SetWindowPos(

+		0,

+		wrc.right-brc.Width()-m_rightGapButtons, brc.top,

+		0, 0,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );

+}

diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index b247c56..c5469f1 100644
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -364,12 +364,19 @@ typedef CMap<CTime*,CTime*,CTime*,CTime*> CTimeMap;
 class CTrayer;

 class CRetrier;

 class CPumpKINDlg : public CDialog

 {

 // Construction

 public:

+	void AdjustButton(CWnd& w,CRect& wrc);

+	void RecalcLayout(int,int);

+	CSize m_MinSize;

+	UINT m_bottomGapLog;

+	UINT m_bottomGapListen;

+	UINT m_rightGapList;

+	UINT m_rightGapButtons;

 	CString m_lastlogerr;

 	void LogLine(LPCTSTR str);

 	CString m_LogFile;

 	BOOL m_bListen;

 	acl_rules_t m_aclRules;

 	CString m_bnwRequest;

@@ -427,12 +434,16 @@ public:
 	CListenSocket m_Listener;

 	CPumpKINDlg(CWnd* pParent = NULL);	// standard constructor

 

 // Dialog Data

 	//{{AFX_DATA(CPumpKINDlg)

 	enum { IDD = IDD_PUMPKIN_DIALOG };

+	CButton	m_HelpCtl;

+	CButton	m_PutCtl;

+	CButton	m_GetCtl;

+	CButton	m_ExitCtl;

 	CButton	m_ListenCtl;

 	CButton	m_AbortCtl;

 	CButton	m_OptionsCtl;

 	CListBox	m_Log;

 	CListCtrl	m_List;

 	//}}AFX_DATA

@@ -479,9 +490,11 @@ protected:
 	afx_msg void OnSelchangeLog();

 	afx_msg void OnTrayOpenfilesfolder();

 	afx_msg void OnDropFiles(HDROP hDropInfo);

 	virtual void OnCancel();

 	afx_msg void OnHelp();

 	afx_msg void OnListening();

+	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);

+	afx_msg void OnSize(UINT nType, int cx, int cy);

 	//}}AFX_MSG

 	DECLARE_MESSAGE_MAP()

 };

diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf
index abdca4f..505cbf2 100644
--- a/help/pumpkin.rtf
+++ b/help/pumpkin.rtf
@@ -29,12 +29,13 @@ K{\footnote about}
 #{\footnote News}

 ${\footnote What's New}

 \par\pard\plain\f1\fs24\qc\cf2\b 2.7 - 

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added acess lists based on request IP address and TFTP opcode for automating access policy

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added possibility to start/stop TFTP server, while keeping client functionality intact

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Logging to file

+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Resizable main window

 \par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  more robust solution to the backslash/slash dilemma

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  A bit more elaborate error reporting

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed uninstall procedure so that it works on XP

 \par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Change of {\uldb license}{\v About} and opening the source.

diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 46e3bbc..5c951bb 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -10,12 +10,13 @@
  </topic>

  <topic id="News" title="What's New">

   <newsfor version="2.7" date="">

    <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni>

    <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni>

    <ni>Logging to file</ni>

+   <ni>Resizable main window</ni>

   </newsfor>

   <newsfor version="2.6" date="August 6th, 2005">

    <ni>more robust solution to the backslash/slash dilemma</ni>

    <ni>A bit more elaborate error reporting</ni>

    <ni>Fixed uninstall procedure so that it works on XP</ni>

   </newsfor>

diff --git a/pumpkin.clw b/pumpkin.clw
index 5344bfd..213d8c1 100644
--- a/pumpkin.clw
+++ b/pumpkin.clw
@@ -1,11 +1,11 @@
 ; CLW file contains information for the MFC ClassWizard

 

 [General Info]

 Version=1

-LastClass=CPropsServer

+LastClass=CPumpKINDlg

 LastTemplate=CComboBox

 NewFileInclude1=#include "stdafx.h"

 NewFileInclude2=#include "PumpKIN.h"

 

 ClassCount=14

 Class1=CPumpKINApp

@@ -13,30 +13,30 @@ Class2=CPumpKINDlg
 Class3=CAboutDlg

 

 ResourceCount=10

 Resource1=IDD_REQUEST

 Resource2=IDD_PROPS_NETWORK

 Resource3=IDD_CONFIRM_RRQ

-Resource4=IDD_ABOUTBOX

+Resource4=IDD_PROPS_SERVER

 Class4=CPropsServer

 Class5=CPropsNetwork

 Resource5=IDD_CONFIRM_WRQ

 Resource6=IDD_PROPS_ACL

 Class6=CConfirmRRQDlg

 Class7=CConfirmWRQDlg

-Resource7=IDD_PUMPKIN_DIALOG

+Resource7=IDD_ABOUTBOX

 Class8=CRequestDlg

 Class9=CResolver

 Class10=CRetrier

 Class11=CTrayer

 Resource8=IDD_PROPS_SOUNDS

 Class12=CPropsSounds

 Resource9=IDM_POPUPS

 Class13=CPropsACL

 Class14=CACLTargetCombo

-Resource10=IDD_PROPS_SERVER

+Resource10=IDD_PUMPKIN_DIALOG

 

 [CLS:CPumpKINApp]

 Type=0

 HeaderFile=PumpKIN.h

 ImplementationFile=PumpKIN.cpp

 Filter=N

@@ -77,13 +77,13 @@ Control1=IDC_CONNECTIONS,SysListView32,1350631681
 Control2=IDC_GET,button,1342259200

 Control3=IDC_PUT,button,1342259200

 Control4=IDC_ABORT,button,1342259200

 Control5=IDC_OPTIONS,button,1342259200

 Control6=IDC_EXIT,button,1342259200

 Control7=ID_HELP,button,1342259200

-Control8=IDC_LOG,listbox,1353728129

+Control8=IDC_LOG,listbox,1353728385

 Control9=IDCANCEL,button,1073741824

 Control10=IDC_LISTENING,button,1342275619

 

 [DLG:IDD_PROPS_SERVER]

 Type=1

 Class=CPropsServer

@@ -131,13 +131,13 @@ Control15=IDC_BSIZESPIN,msctls_updown32,1342177463
 Type=0

 HeaderFile=PropsServer.h

 ImplementationFile=PropsServer.cpp

 BaseClass=CPropertyPage

 Filter=D

 VirtualFilter=idWC

-LastObject=IDC_LOGFILE_BROWSE

+LastObject=CPropsServer

 

 [CLS:CPropsNetwork]

 Type=0

 HeaderFile=PropsNetwork.h

 ImplementationFile=PropsNetwork.cpp

 BaseClass=CPropertyPage

diff --git a/pumpkin.mak b/pumpkin.mak
index 7d2ec22..a22a6fa 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -35,13 +35,13 @@ CFG=Install - Win32 Debug
 NULL=

 !ELSE 

 NULL=nul

 !ENDIF 

 ################################################################################

 # Begin Project

-# PROP Target_Last_Scanned "Install - Win32 Canned"

+# PROP Target_Last_Scanned "PumpKIN - Win32 Debug"

 CPP=cl.exe

 RSC=rc.exe

 MTL=mktyplib.exe

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

@@ -703,12 +703,13 @@ DEP_CPP_PUMPK=\
 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_PUMPK=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -735,15 +736,12 @@ DEP_CPP_PUMPK=\
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PumpKINDlg.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PUMPKI=\

 	".\ACLTargetCombo.h"\

 	".\ConfirmRRQDlg.h"\

 	".\ConfirmWRQDlg.h"\

 	".\PropsACL.h"\

 	".\PropsNetwork.h"\

@@ -757,64 +755,31 @@ DEP_CPP_PUMPKI=\
 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PUMPKI=\

-	".\ACLTargetCombo.h"\

-	".\ConfirmRRQDlg.h"\

-	".\ConfirmWRQDlg.h"\

-	".\PropsACL.h"\

-	".\PropsNetwork.h"\

-	".\PropsServer.h"\

-	".\PropsSounds.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\RequestDlg.h"\

-	".\Resolver.h"\

-	".\Retrier.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	".\Trayer.h"\

-	

 

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PUMPKI=\

-	".\ACLTargetCombo.h"\

-	".\ConfirmRRQDlg.h"\

-	".\ConfirmWRQDlg.h"\

-	".\PropsACL.h"\

-	".\PropsNetwork.h"\

-	".\PropsServer.h"\

-	".\PropsSounds.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\RequestDlg.h"\

-	".\Resolver.h"\

-	".\Retrier.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	".\Trayer.h"\

-	

 

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -1038,12 +1003,13 @@ DEP_CPP_PROPS=\
 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_PROPS=\

 	".\PropsServer.h"\

 	".\pumpkin.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1131,12 +1097,13 @@ DEP_CPP_CONFI=\
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_CONFI=\

 	".\ConfirmRRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1186,12 +1153,13 @@ DEP_CPP_CONFIR=\
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_CONFIR=\

 	".\ConfirmWRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1280,12 +1248,13 @@ DEP_CPP_RESOL=\
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_RESOL=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Resolver.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1335,12 +1304,13 @@ DEP_CPP_RETRI=\
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_RETRI=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Retrier.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1389,12 +1359,13 @@ DEP_CPP_TRAYE=\
 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_TRAYE=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

@@ -1465,12 +1436,13 @@ DEP_CPP_PROPSS=\
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_PROPSS=\

 	".\PropsSounds.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1498,58 +1470,41 @@ DEP_CPP_PROPSS=\
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PropsACL.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PROPSA=\

 	".\ACLTargetCombo.h"\

 	".\PropsACL.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PROPSA=\

-	".\ACLTargetCombo.h"\

-	".\PropsACL.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PropsACL.sbr" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PROPSA=\

-	".\ACLTargetCombo.h"\

-	".\PropsACL.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -1578,12 +1533,13 @@ DEP_CPP_ACLTA=\
 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_ACLTA=\

 	".\ACLTargetCombo.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

diff --git a/pumpkin.rc b/pumpkin.rc
index 87745db..9933454 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -91,14 +91,13 @@ BEGIN
                     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, 193

-STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 

-    WS_SYSMENU

+STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW

 CAPTION "  PumpKIN"

 FONT 8, "MS Sans Serif"

 BEGIN

     CONTROL         "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | 

                     LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108,

@@ -110,18 +109,19 @@ BEGIN
     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,65,LBS_USETABSTOPS | LBS_NOSEL | 

-                    WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME

+    LISTBOX         IDC_LOG,7,115,348,64,LBS_USETABSTOPS | 

+                    LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | 

+                    WS_HSCROLL,WS_EX_DLGMODALFRAME

     PUSHBUTTON      "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP

     CONTROL         "&Server is running",IDC_LISTENING,"Button",

                     BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286,

-                    180,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE

+                    181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE

 END

 

 IDD_PROPS_SERVER DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Server"

 FONT 8, "MS Sans Serif"