added vertical resizability and changed version to trunk

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

11 files changed, 83 insertions, 48 deletions

diff --git a/COPYING b/COPYING
index 9abe63f..b71fe11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,2 +1,2 @@
-Copyright (c) 1998-2004 Klever Group (http://www.klever.net/)
+Copyright (c) 1998-2005 Klever Group (http://www.klever.net/)
 
diff --git a/KLogDlg.cpp b/KLogDlg.cpp
index 5f1c6c0..bdcb881 100644
--- a/KLogDlg.cpp
+++ b/KLogDlg.cpp
@@ -104,2 +104,3 @@ void CKLogDlg::DoDataExchange(CDataExchange* pDX)
 	//{{AFX_DATA_MAP(CKLogDlg)

+	DDX_Control(pDX, IDCANCEL, m_CancelCtl);

 	DDX_Control(pDX, IDC_LOGPATTERN, m_LogPatternCtl);

@@ -183,2 +184,3 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog)
 	ON_BN_CLICKED(IDC_LOGPATTERN, OnLogpattern)

+	ON_WM_GETMINMAXINFO()

 	ON_BN_CLICKED(IDC_CRIT, OnPriority)

@@ -192,2 +194,3 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog)
 	ON_BN_CLICKED(IDC_TYPE_NONE, OnLogto)

+	ON_WM_SIZE()

 	//}}AFX_MSG_MAP

@@ -1367 +1370,28 @@ void CLogger::LookupHost(CKLogDlg *daddy)
 }
+

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

+{

+	CDialog::OnGetMinMaxInfo(lpMMI);

+	WINDOWPLACEMENT wp;

+	if(IsWindow(m_CancelCtl.m_hWnd) && m_CancelCtl.GetWindowPlacement(&wp)) {

+		CRect wr; GetWindowRect(wr);

+		CRect cr; GetClientRect(cr);

+		CSize ncs = (wr-cr).Size();

+		CRect ctlr = wp.rcNormalPosition;

+		CSize corner = ctlr.BottomRight()+ncs;

+		lpMMI->ptMaxTrackSize.x = lpMMI->ptMinTrackSize.x = corner.cx;

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

+	}

+}

+

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

+{

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

+	if(!IsWindow(m_Log.m_hWnd))

+		return;

+	WINDOWPLACEMENT lp; m_Log.GetWindowPlacement(&lp);

+	CRect lr = lp.rcNormalPosition;

+	lr.bottom = cy-2;

+	CSize ls = lr.Size();

+	m_Log.SetWindowPos(0,0,0,ls.cx,ls.cy,SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOOWNERZORDER|SWP_NOZORDER);

+}

diff --git a/KLogDlg.h b/KLogDlg.h
index f6fed53..043fd30 100644
--- a/KLogDlg.h
+++ b/KLogDlg.h
@@ -107,2 +107,3 @@ public:
 	enum { IDD = IDD_KLOG_DIALOG };

+	CButton	m_CancelCtl;

 	CButton	m_LogPatternCtl;

@@ -195,2 +196,4 @@ protected:
 	afx_msg void OnLogpattern();

+	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);

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

 	//}}AFX_MSG

diff --git a/help/klog.rtf b/help/klog.rtf
index 9531c73..0f72570 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -19,3 +19,3 @@ ${\footnote About KLog}
 {

-\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2004 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

+\par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1998-2005 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

 \par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

@@ -31,2 +31,4 @@ ${\footnote About KLog}
 ${\footnote What's New}

+\par\pard\plain\f1\fs24\qc\cf2\b 1.1.1-trunk - 

+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Added vertical resizability

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

diff --git a/help/klog.xml b/help/klog.xml
index 830b297..08daf61 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -7,3 +7,3 @@
   <p><b><i>Enjoy!</i></b></p>

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

+  <license years="1998-2005"/>

   <credits/>

@@ -11,2 +11,5 @@
  <topic id="News" title="What's New">

+  <newsfor version="1.1.1-trunk">

+   <ni>Added vertical resizability</ni>

+  </newsfor>

   <newsfor version="1.1" date="July 11th, 2004">

diff --git a/install/install.cpp b/install/install.cpp
index c0e0bb8..81d5a7e 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,3 +3,3 @@
 

-#define	KINAME	"KLog 1.1"

+#define	KINAME	"KLog 1.1.1-trunk"

 #define SKINAME	"KLog"

diff --git a/install/install.rc b/install/install.rc
index 6a3fd3e..cee7f66 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -133,4 +133,4 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,0,0

- PRODUCTVERSION 1,1,0,0

+ FILEVERSION 1,1,1,0

+ PRODUCTVERSION 1,1,1,0

  FILEFLAGSMASK 0x3fL

@@ -151,5 +151,5 @@ BEGIN
             VALUE "FileDescription", "INSTALL: KLog, logging daemon\0"

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

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

             VALUE "InternalName", "INSTALL\0"

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

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

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

@@ -157,3 +157,3 @@ BEGIN
             VALUE "ProductName", "KLog\0"

-            VALUE "ProductVersion", "1, 1, 0, 0\0"

+            VALUE "ProductVersion", "1, 1, 1, 0\0"

         END

diff --git a/klog.clw b/klog.clw
index 81ae255..0dfdb8f 100644
--- a/klog.clw
+++ b/klog.clw
@@ -42,3 +42,3 @@ BaseClass=CDialog
 VirtualFilter=dWC

-LastObject=IDC_HL_ADD

+LastObject=IDC_LOG

 

diff --git a/klog.mak b/klog.mak
index 23ac3fe..323d0a4 100644
--- a/klog.mak
+++ b/klog.mak
@@ -74,3 +74,3 @@ CLEAN :
 	-@erase "$(INTDIR)\klog.pch"

-	-@erase "$(INTDIR)\KLog.res"

+	-@erase "$(INTDIR)\klog.res"

 	-@erase "$(INTDIR)\KLogDlg.obj"

@@ -101,3 +101,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
 # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "NDEBUG" /d "_AFXDLL" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "NDEBUG" /d "_AFXDLL" 

 BSC32=bscmake.exe

@@ -115,3 +115,3 @@ LINK32_OBJS= \
 	"$(INTDIR)\KLog.obj" \

-	"$(INTDIR)\KLog.res" \

+	"$(INTDIR)\klog.res" \

 	"$(INTDIR)\KLogDlg.obj" \

@@ -171,3 +171,3 @@ CLEAN :
 	-@erase "$(INTDIR)\klog.pch"

-	-@erase "$(INTDIR)\KLog.res"

+	-@erase "$(INTDIR)\klog.res"

 	-@erase "$(INTDIR)\KLogDlg.obj"

@@ -203,3 +203,3 @@ MTL_PROJ=/nologo /D "_DEBUG" /win32
 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "_DEBUG" /d "_AFXDLL" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "_DEBUG" /d "_AFXDLL" 

 BSC32=bscmake.exe

@@ -217,3 +217,3 @@ LINK32_OBJS= \
 	"$(INTDIR)\KLog.obj" \

-	"$(INTDIR)\KLog.res" \

+	"$(INTDIR)\klog.res" \

 	"$(INTDIR)\KLogDlg.obj" \

@@ -263,4 +263,4 @@ TargetName=klog
 

-ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.hlp" "$(OUTDIR)\klog.cnt"\

- "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_" "$(OUTDIR)\klog.ex_"

+ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\

+ "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"

 

@@ -273,3 +273,3 @@ CLEAN :
 	-@erase "$(INTDIR)\klog.pch"

-	-@erase "$(INTDIR)\KLog.res"

+	-@erase "$(INTDIR)\klog.res"

 	-@erase "$(INTDIR)\KLogDlg.obj"

@@ -300,3 +300,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32
 # ADD RSC /l 0x409 /d "NDEBUG"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "NDEBUG" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "NDEBUG" 

 BSC32=bscmake.exe

@@ -314,3 +314,3 @@ LINK32_OBJS= \
 	"$(INTDIR)\KLog.obj" \

-	"$(INTDIR)\KLog.res" \

+	"$(INTDIR)\klog.res" \

 	"$(INTDIR)\KLogDlg.obj" \

@@ -771,3 +771,3 @@ DEP_RSC_KLOG_R=\
 

-"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"

+"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

@@ -778,3 +778,3 @@ DEP_RSC_KLOG_R=\
 

-"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"

+"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

@@ -785,3 +785,3 @@ DEP_RSC_KLOG_R=\
 

-"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"

+"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

@@ -1197,5 +1197,2 @@ DEP_RSC_INSTA=\
 SOURCE=.\Install\install.cpp

-DEP_CPP_INSTAL=\

-	".\shared-code\install.h"\

-	

 

@@ -1204,3 +1201,3 @@ DEP_CPP_INSTAL=\
 

-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

@@ -1211,3 +1208,3 @@ DEP_CPP_INSTAL=\
 

-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

@@ -1218,3 +1215,3 @@ DEP_CPP_INSTAL=\
 

-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

@@ -1225,3 +1222,3 @@ DEP_CPP_INSTAL=\
 

-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)

diff --git a/klog.rc b/klog.rc
index 92755ed..6685059 100644
--- a/klog.rc
+++ b/klog.rc
@@ -52,3 +52,3 @@ BEGIN
     "#endif\r\n"

-    "#include ""res\\KLog.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

+    "#include ""res\\klog.rc2""  // non-Microsoft Visual C++ edited resources\r\n"

     "#include ""afxres.rc""         // Standard components\r\n"

@@ -85,5 +85,5 @@ BEGIN
     ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20

-    LTEXT           "KLog, Version 1.1",IDC_STATIC,40,16,119,8,

-                    SS_NOPREFIX

-    LTEXT           "Copyright © 1998-2004 Klever Group",IDC_STATIC,40,31,119,8

+    LTEXT           "KLog, Version 1.1.1-trunk",IDC_STATIC,40,16,119,8,SS_NOPREFIX

+    LTEXT           "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31,

+                    119,8

     DEFPUSHBUTTON   "OK",IDOK,178,13,32,14,WS_GROUP

@@ -92,7 +92,7 @@ END
 

-IDD_KLOG_DIALOG DIALOGEX 0, 0, 291, 286

-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

+IDD_KLOG_DIALOG DIALOGEX 0, 0, 293, 286

+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW

 CAPTION "KLog"

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

+FONT 8, "MS Sans Serif"

 BEGIN

@@ -157,3 +157,3 @@ BEGIN
                     BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE

-    LISTBOX         IDC_LOG,7,192,277,87,LBS_USETABSTOPS | LBS_NOSEL | 

+    LISTBOX         IDC_LOG,7,192,279,87,LBS_USETABSTOPS | LBS_NOSEL | 

                     WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME | 

@@ -162,4 +162,4 @@ BEGIN
     PUSHBUTTON      "&Remove",IDC_REMOVE,48,7,39,18,0,WS_EX_CLIENTEDGE

-    PUSHBUTTON      "E&xit",IDC_EXIT,245,7,39,18,0,WS_EX_CLIENTEDGE

-    CONTROL         "Tab1",IDC_TABS,"SysTabControl32",TCS_TOOLTIPS,7,31,277,

+    PUSHBUTTON      "E&xit",IDC_EXIT,247,7,39,18,0,WS_EX_CLIENTEDGE

+    CONTROL         "Tab1",IDC_TABS,"SysTabControl32",TCS_TOOLTIPS,7,31,279,

                     161,WS_EX_CLIENTEDGE

@@ -173,3 +173,3 @@ BEGIN
     DEFPUSHBUTTON   "",IDOK,0,279,6,7,NOT WS_VISIBLE

-    PUSHBUTTON      "",IDCANCEL,285,279,6,7,NOT WS_VISIBLE | WS_DISABLED

+    PUSHBUTTON      "",IDCANCEL,286,279,6,7,NOT WS_VISIBLE | WS_DISABLED

     PUSHBUTTON      "Files",IDC_FILES,204,7,39,18,BS_CENTER | BS_VCENTER | 

@@ -806,3 +806,3 @@ END
 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,1,0,0

+ FILEVERSION 1,1,1,0

  PRODUCTVERSION 1,1,0,0

@@ -824,5 +824,5 @@ BEGIN
             VALUE "FileDescription", "KLog, logging daemon\0"

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

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

             VALUE "InternalName", "KLOG\0"

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

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

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

@@ -830,3 +830,3 @@ BEGIN
             VALUE "ProductName", "KLog\0"

-            VALUE "ProductVersion", "1, 0, 0, 2\0"

+            VALUE "ProductVersion", "1, 1, 1, 0\0"

         END

@@ -861,3 +861,3 @@ BEGIN
         LEFTMARGIN, 7

-        RIGHTMARGIN, 284

+        RIGHTMARGIN, 286

         VERTGUIDE, 12

diff --git a/resource.h b/resource.h
index 33cf881..3c04188 100644
--- a/resource.h
+++ b/resource.h
@@ -2,3 +2,3 @@
 // Microsoft Developer Studio generated include file.

-// Used by KLog.rc

+// Used by klog.rc

 //