summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2005-07-06 21:49:03 (UTC)
committer Michael Krelin <hacker@klever.net>2005-07-06 21:49:03 (UTC)
commitbdbe0e4fff764357d0bb6236f22d6f1dcc0548ba (patch) (unidiff)
tree346c632a5308885dc657de9b724256c62c80f3b8
parentc8fe0207895827e5533f4100d203a187f021ebe8 (diff)
downloadklog-bdbe0e4fff764357d0bb6236f22d6f1dcc0548ba.zip
klog-bdbe0e4fff764357d0bb6236f22d6f1dcc0548ba.tar.gz
klog-bdbe0e4fff764357d0bb6236f22d6f1dcc0548ba.tar.bz2
added vertical resizability and changed version to trunk
git-svn-id: http://svn.klever.net/kin/klog/trunk@115 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--KLogDlg.cpp30
-rw-r--r--KLogDlg.h3
-rw-r--r--help/klog.rtf4
-rw-r--r--help/klog.xml5
-rw-r--r--install/install.cpp2
-rw-r--r--install/install.rc10
-rw-r--r--klog.clw2
-rw-r--r--klog.mak39
-rw-r--r--klog.rc32
-rw-r--r--resource.h2
11 files changed, 83 insertions, 48 deletions
diff --git a/COPYING b/COPYING
index 9abe63f..b71fe11 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
1Copyright (c) 1998-2004 Klever Group (http://www.klever.net/) 1Copyright (c) 1998-2005 Klever Group (http://www.klever.net/)
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy of 3Permission is hereby granted, free of charge, to any person obtaining a copy of
4this software and associated documentation files (the "Software"), to deal in 4this software and associated documentation files (the "Software"), to deal in
diff --git a/KLogDlg.cpp b/KLogDlg.cpp
index 5f1c6c0..bdcb881 100644
--- a/KLogDlg.cpp
+++ b/KLogDlg.cpp
@@ -102,6 +102,7 @@ void CKLogDlg::DoDataExchange(CDataExchange* pDX)
102{ 102{
103 CDialog::DoDataExchange(pDX); 103 CDialog::DoDataExchange(pDX);
104 //{{AFX_DATA_MAP(CKLogDlg) 104 //{{AFX_DATA_MAP(CKLogDlg)
105 DDX_Control(pDX, IDCANCEL, m_CancelCtl);
105 DDX_Control(pDX, IDC_LOGPATTERN, m_LogPatternCtl); 106 DDX_Control(pDX, IDC_LOGPATTERN, m_LogPatternCtl);
106 DDX_Control(pDX, IDC_FILES, m_FilesCtl); 107 DDX_Control(pDX, IDC_FILES, m_FilesCtl);
107 DDX_Control(pDX, IDC_LOGLENSPIN, m_LogLenSpinCtl); 108 DDX_Control(pDX, IDC_LOGLENSPIN, m_LogLenSpinCtl);
@@ -181,6 +182,7 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog)
181 ON_COMMAND(ID_TRAY_SHOWKLOGWINDOW, OnTrayShowklogwindow) 182 ON_COMMAND(ID_TRAY_SHOWKLOGWINDOW, OnTrayShowklogwindow)
182 ON_WM_WINDOWPOSCHANGING() 183 ON_WM_WINDOWPOSCHANGING()
183 ON_BN_CLICKED(IDC_LOGPATTERN, OnLogpattern) 184 ON_BN_CLICKED(IDC_LOGPATTERN, OnLogpattern)
185 ON_WM_GETMINMAXINFO()
184 ON_BN_CLICKED(IDC_CRIT, OnPriority) 186 ON_BN_CLICKED(IDC_CRIT, OnPriority)
185 ON_BN_CLICKED(IDC_DEBUG, OnPriority) 187 ON_BN_CLICKED(IDC_DEBUG, OnPriority)
186 ON_BN_CLICKED(IDC_EMERG, OnPriority) 188 ON_BN_CLICKED(IDC_EMERG, OnPriority)
@@ -190,6 +192,7 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog)
190 ON_BN_CLICKED(IDC_WARNING, OnPriority) 192 ON_BN_CLICKED(IDC_WARNING, OnPriority)
191 ON_BN_CLICKED(IDC_TYPE_HOST, OnLogto) 193 ON_BN_CLICKED(IDC_TYPE_HOST, OnLogto)
192 ON_BN_CLICKED(IDC_TYPE_NONE, OnLogto) 194 ON_BN_CLICKED(IDC_TYPE_NONE, OnLogto)
195 ON_WM_SIZE()
193 //}}AFX_MSG_MAP 196 //}}AFX_MSG_MAP
194END_MESSAGE_MAP() 197END_MESSAGE_MAP()
195 198
@@ -1365,3 +1368,30 @@ void CLogger::LookupHost(CKLogDlg *daddy)
1365 } 1368 }
1366 } 1369 }
1367} 1370}
1371
1372void CKLogDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
1373{
1374 CDialog::OnGetMinMaxInfo(lpMMI);
1375 WINDOWPLACEMENT wp;
1376 if(IsWindow(m_CancelCtl.m_hWnd) && m_CancelCtl.GetWindowPlacement(&wp)) {
1377 CRect wr; GetWindowRect(wr);
1378 CRect cr; GetClientRect(cr);
1379 CSize ncs = (wr-cr).Size();
1380 CRect ctlr = wp.rcNormalPosition;
1381 CSize corner = ctlr.BottomRight()+ncs;
1382 lpMMI->ptMaxTrackSize.x = lpMMI->ptMinTrackSize.x = corner.cx;
1383 lpMMI->ptMinTrackSize.y = corner.cy;
1384 }
1385}
1386
1387void CKLogDlg::OnSize(UINT nType, int cx, int cy)
1388{
1389 CDialog::OnSize(nType, cx, cy);
1390 if(!IsWindow(m_Log.m_hWnd))
1391 return;
1392 WINDOWPLACEMENT lp; m_Log.GetWindowPlacement(&lp);
1393 CRect lr = lp.rcNormalPosition;
1394 lr.bottom = cy-2;
1395 CSize ls = lr.Size();
1396 m_Log.SetWindowPos(0,0,0,ls.cx,ls.cy,SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOOWNERZORDER|SWP_NOZORDER);
1397}
diff --git a/KLogDlg.h b/KLogDlg.h
index f6fed53..043fd30 100644
--- a/KLogDlg.h
+++ b/KLogDlg.h
@@ -105,6 +105,7 @@ public:
105// Dialog Data 105// Dialog Data
106 //{{AFX_DATA(CKLogDlg) 106 //{{AFX_DATA(CKLogDlg)
107 enum { IDD = IDD_KLOG_DIALOG }; 107 enum { IDD = IDD_KLOG_DIALOG };
108 CButtonm_CancelCtl;
108 CButtonm_LogPatternCtl; 109 CButtonm_LogPatternCtl;
109 CButtonm_FilesCtl; 110 CButtonm_FilesCtl;
110 CSpinButtonCtrlm_LogLenSpinCtl; 111 CSpinButtonCtrlm_LogLenSpinCtl;
@@ -193,6 +194,8 @@ protected:
193 afx_msg void OnTrayShowklogwindow(); 194 afx_msg void OnTrayShowklogwindow();
194 afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos); 195 afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos);
195 afx_msg void OnLogpattern(); 196 afx_msg void OnLogpattern();
197 afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
198 afx_msg void OnSize(UINT nType, int cx, int cy);
196 //}}AFX_MSG 199 //}}AFX_MSG
197 DECLARE_MESSAGE_MAP() 200 DECLARE_MESSAGE_MAP()
198}; 201};
diff --git a/help/klog.rtf b/help/klog.rtf
index 9531c73..0f72570 100644
--- a/help/klog.rtf
+++ b/help/klog.rtf
@@ -17,7 +17,7 @@ ${\footnote About KLog}
17\par\sa120\sb120\qj\pard \f1\fs18\sb120 17\par\sa120\sb120\qj\pard \f1\fs18\sb120
18\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}} 18\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}
19{ 19{
20\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/")} 20\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/")}
21\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: 21\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:
22\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 22\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
23\par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 23\par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -29,6 +29,8 @@ ${\footnote About KLog}
29\pard\plain 29\pard\plain
30#{\footnote News} 30#{\footnote News}
31${\footnote What's New} 31${\footnote What's New}
32\par\pard\plain\f1\fs24\qc\cf2\b 1.1.1-trunk -
33\par\pard\plain\fi0\li0\f1\fs18 \bullet Added vertical resizability
32\par\pard\plain\f1\fs24\qc\cf2\b 1.1 - July 11th, 2004 34\par\pard\plain\f1\fs24\qc\cf2\b 1.1 - July 11th, 2004
33\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source code 35\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source code
34\par\pard\plain\fi0\li0\f1\fs18 \bullet Minor changes in code, mostly bugfixes 36\par\pard\plain\fi0\li0\f1\fs18 \bullet Minor changes in code, mostly bugfixes
diff --git a/help/klog.xml b/help/klog.xml
index 830b297..08daf61 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -5,10 +5,13 @@
5 <p><kin>KLog</kin> is our <term>Win32</term> implementation of <product>*nix</product> <term>syslog</term> daemon to support remote logging of messages from <product>unix</product> servers, routers, terminal servers and other syslog-enabled devices/applications.</p> 5 <p><kin>KLog</kin> is our <term>Win32</term> implementation of <product>*nix</product> <term>syslog</term> daemon to support remote logging of messages from <product>unix</product> servers, routers, terminal servers and other syslog-enabled devices/applications.</p>
6 <p/> 6 <p/>
7 <p><b><i>Enjoy!</i></b></p> 7 <p><b><i>Enjoy!</i></b></p>
8 <license years="1998-2004"/> 8 <license years="1998-2005"/>
9 <credits/> 9 <credits/>
10 </topic> 10 </topic>
11 <topic id="News" title="What's New"> 11 <topic id="News" title="What's New">
12 <newsfor version="1.1.1-trunk">
13 <ni>Added vertical resizability</ni>
14 </newsfor>
12 <newsfor version="1.1" date="July 11th, 2004"> 15 <newsfor version="1.1" date="July 11th, 2004">
13 <ni>Change of license and opening the source code</ni> 16 <ni>Change of license and opening the source code</ni>
14 <ni>Minor changes in code, mostly bugfixes</ni> 17 <ni>Minor changes in code, mostly bugfixes</ni>
diff --git a/install/install.cpp b/install/install.cpp
index c0e0bb8..81d5a7e 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,7 +1,7 @@
1#include "resource.h" 1#include "resource.h"
2#include "../shared-code/install.h" 2#include "../shared-code/install.h"
3 3
4 #define KINAME"KLog 1.1" 4 #define KINAME"KLog 1.1.1-trunk"
5 #define SKINAME"KLog" 5 #define SKINAME"KLog"
6 6
7BOOL Install(void) 7BOOL Install(void)
diff --git a/install/install.rc b/install/install.rc
index 6a3fd3e..cee7f66 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -131,8 +131,8 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico
131// 131//
132 132
133VS_VERSION_INFO VERSIONINFO 133VS_VERSION_INFO VERSIONINFO
134 FILEVERSION 1,1,0,0 134 FILEVERSION 1,1,1,0
135 PRODUCTVERSION 1,1,0,0 135 PRODUCTVERSION 1,1,1,0
136 FILEFLAGSMASK 0x3fL 136 FILEFLAGSMASK 0x3fL
137#ifdef _DEBUG 137#ifdef _DEBUG
138 FILEFLAGS 0x1L 138 FILEFLAGS 0x1L
@@ -149,13 +149,13 @@ BEGIN
149 BEGIN 149 BEGIN
150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151 VALUE "FileDescription", "INSTALL: KLog, logging daemon\0" 151 VALUE "FileDescription", "INSTALL: KLog, logging daemon\0"
152 VALUE "FileVersion", "1, 1, 0, 0\0" 152 VALUE "FileVersion", "1, 1, 1, 0\0"
153 VALUE "InternalName", "INSTALL\0" 153 VALUE "InternalName", "INSTALL\0"
154 VALUE "LegalCopyright", "Copyright © 1998-2004 Klever Group (http://www.klever.net/)\0" 154 VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156 VALUE "OriginalFilename", "INSTALL.EXE\0" 156 VALUE "OriginalFilename", "INSTALL.EXE\0"
157 VALUE "ProductName", "KLog\0" 157 VALUE "ProductName", "KLog\0"
158 VALUE "ProductVersion", "1, 1, 0, 0\0" 158 VALUE "ProductVersion", "1, 1, 1, 0\0"
159 END 159 END
160 END 160 END
161 BLOCK "VarFileInfo" 161 BLOCK "VarFileInfo"
diff --git a/klog.clw b/klog.clw
index 81ae255..0dfdb8f 100644
--- a/klog.clw
+++ b/klog.clw
@@ -40,7 +40,7 @@ ImplementationFile=KLogDlg.cpp
40Filter=W 40Filter=W
41BaseClass=CDialog 41BaseClass=CDialog
42VirtualFilter=dWC 42VirtualFilter=dWC
43LastObject=IDC_HL_ADD 43LastObject=IDC_LOG
44 44
45[CLS:CAboutDlg] 45[CLS:CAboutDlg]
46Type=0 46Type=0
diff --git a/klog.mak b/klog.mak
index 23ac3fe..323d0a4 100644
--- a/klog.mak
+++ b/klog.mak
@@ -72,7 +72,7 @@ CLEAN :
72 -@erase "$(INTDIR)\klog.hlp" 72 -@erase "$(INTDIR)\klog.hlp"
73 -@erase "$(INTDIR)\KLog.obj" 73 -@erase "$(INTDIR)\KLog.obj"
74 -@erase "$(INTDIR)\klog.pch" 74 -@erase "$(INTDIR)\klog.pch"
75 -@erase "$(INTDIR)\KLog.res" 75 -@erase "$(INTDIR)\klog.res"
76 -@erase "$(INTDIR)\KLogDlg.obj" 76 -@erase "$(INTDIR)\KLogDlg.obj"
77 -@erase "$(INTDIR)\LogPattern.obj" 77 -@erase "$(INTDIR)\LogPattern.obj"
78 -@erase "$(INTDIR)\LogPatternLocal.obj" 78 -@erase "$(INTDIR)\LogPatternLocal.obj"
@@ -99,7 +99,7 @@ CPP_SBRS=.\.
99MTL_PROJ=/nologo /D "NDEBUG" /win32 99MTL_PROJ=/nologo /D "NDEBUG" /win32
100# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" 100# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
101# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" 101# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
102RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "NDEBUG" /d "_AFXDLL" 102RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "NDEBUG" /d "_AFXDLL"
103BSC32=bscmake.exe 103BSC32=bscmake.exe
104# ADD BASE BSC32 /nologo 104# ADD BASE BSC32 /nologo
105# ADD BSC32 /nologo 105# ADD BSC32 /nologo
@@ -113,7 +113,7 @@ LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
113 /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe" 113 /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
114LINK32_OBJS= \ 114LINK32_OBJS= \
115 "$(INTDIR)\KLog.obj" \ 115 "$(INTDIR)\KLog.obj" \
116 "$(INTDIR)\KLog.res" \ 116 "$(INTDIR)\klog.res" \
117 "$(INTDIR)\KLogDlg.obj" \ 117 "$(INTDIR)\KLogDlg.obj" \
118 "$(INTDIR)\LogPattern.obj" \ 118 "$(INTDIR)\LogPattern.obj" \
119 "$(INTDIR)\LogPatternLocal.obj" \ 119 "$(INTDIR)\LogPatternLocal.obj" \
@@ -169,7 +169,7 @@ CLEAN :
169 -@erase "$(INTDIR)\klog.hlp" 169 -@erase "$(INTDIR)\klog.hlp"
170 -@erase "$(INTDIR)\KLog.obj" 170 -@erase "$(INTDIR)\KLog.obj"
171 -@erase "$(INTDIR)\klog.pch" 171 -@erase "$(INTDIR)\klog.pch"
172 -@erase "$(INTDIR)\KLog.res" 172 -@erase "$(INTDIR)\klog.res"
173 -@erase "$(INTDIR)\KLogDlg.obj" 173 -@erase "$(INTDIR)\KLogDlg.obj"
174 -@erase "$(INTDIR)\LogPattern.obj" 174 -@erase "$(INTDIR)\LogPattern.obj"
175 -@erase "$(INTDIR)\LogPatternLocal.obj" 175 -@erase "$(INTDIR)\LogPatternLocal.obj"
@@ -201,7 +201,7 @@ CPP_SBRS=.\.
201MTL_PROJ=/nologo /D "_DEBUG" /win32 201MTL_PROJ=/nologo /D "_DEBUG" /win32
202# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" 202# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
203# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" 203# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
204RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "_DEBUG" /d "_AFXDLL" 204RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "_DEBUG" /d "_AFXDLL"
205BSC32=bscmake.exe 205BSC32=bscmake.exe
206# ADD BASE BSC32 /nologo 206# ADD BASE BSC32 /nologo
207# ADD BSC32 /nologo 207# ADD BSC32 /nologo
@@ -215,7 +215,7 @@ LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
215 /pdb:"$(OUTDIR)/klog.pdb" /debug /machine:I386 /out:"$(OUTDIR)/klog.exe" 215 /pdb:"$(OUTDIR)/klog.pdb" /debug /machine:I386 /out:"$(OUTDIR)/klog.exe"
216LINK32_OBJS= \ 216LINK32_OBJS= \
217 "$(INTDIR)\KLog.obj" \ 217 "$(INTDIR)\KLog.obj" \
218 "$(INTDIR)\KLog.res" \ 218 "$(INTDIR)\klog.res" \
219 "$(INTDIR)\KLogDlg.obj" \ 219 "$(INTDIR)\KLogDlg.obj" \
220 "$(INTDIR)\LogPattern.obj" \ 220 "$(INTDIR)\LogPattern.obj" \
221 "$(INTDIR)\LogPatternLocal.obj" \ 221 "$(INTDIR)\LogPatternLocal.obj" \
@@ -261,8 +261,8 @@ OutDir=.\Releast
261TargetName=klog 261TargetName=klog
262# End Custom Macros 262# End Custom Macros
263 263
264ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.hlp" "$(OUTDIR)\klog.cnt"\ 264ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\
265 "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_" "$(OUTDIR)\klog.ex_" 265 "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"
266 266
267CLEAN : 267CLEAN :
268 -@erase "$(INTDIR)\klog.cn_" 268 -@erase "$(INTDIR)\klog.cn_"
@@ -271,7 +271,7 @@ CLEAN :
271 -@erase "$(INTDIR)\klog.hlp" 271 -@erase "$(INTDIR)\klog.hlp"
272 -@erase "$(INTDIR)\KLog.obj" 272 -@erase "$(INTDIR)\KLog.obj"
273 -@erase "$(INTDIR)\klog.pch" 273 -@erase "$(INTDIR)\klog.pch"
274 -@erase "$(INTDIR)\KLog.res" 274 -@erase "$(INTDIR)\klog.res"
275 -@erase "$(INTDIR)\KLogDlg.obj" 275 -@erase "$(INTDIR)\KLogDlg.obj"
276 -@erase "$(INTDIR)\LogPattern.obj" 276 -@erase "$(INTDIR)\LogPattern.obj"
277 -@erase "$(INTDIR)\LogPatternLocal.obj" 277 -@erase "$(INTDIR)\LogPatternLocal.obj"
@@ -298,7 +298,7 @@ CPP_SBRS=.\.
298MTL_PROJ=/nologo /D "NDEBUG" /win32 298MTL_PROJ=/nologo /D "NDEBUG" /win32
299# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" 299# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
300# ADD RSC /l 0x409 /d "NDEBUG" 300# ADD RSC /l 0x409 /d "NDEBUG"
301RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "NDEBUG" 301RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "NDEBUG"
302BSC32=bscmake.exe 302BSC32=bscmake.exe
303# ADD BASE BSC32 /nologo 303# ADD BASE BSC32 /nologo
304# ADD BSC32 /nologo 304# ADD BSC32 /nologo
@@ -312,7 +312,7 @@ LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
312 /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe" 312 /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
313LINK32_OBJS= \ 313LINK32_OBJS= \
314 "$(INTDIR)\KLog.obj" \ 314 "$(INTDIR)\KLog.obj" \
315 "$(INTDIR)\KLog.res" \ 315 "$(INTDIR)\klog.res" \
316 "$(INTDIR)\KLogDlg.obj" \ 316 "$(INTDIR)\KLogDlg.obj" \
317 "$(INTDIR)\LogPattern.obj" \ 317 "$(INTDIR)\LogPattern.obj" \
318 "$(INTDIR)\LogPatternLocal.obj" \ 318 "$(INTDIR)\LogPatternLocal.obj" \
@@ -769,21 +769,21 @@ DEP_RSC_KLOG_R=\
769!IF "$(CFG)" == "KLog - Win32 Release" 769!IF "$(CFG)" == "KLog - Win32 Release"
770 770
771 771
772"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)" 772"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
773 $(RSC) $(RSC_PROJ) $(SOURCE) 773 $(RSC) $(RSC_PROJ) $(SOURCE)
774 774
775 775
776!ELSEIF "$(CFG)" == "KLog - Win32 Debug" 776!ELSEIF "$(CFG)" == "KLog - Win32 Debug"
777 777
778 778
779"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)" 779"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
780 $(RSC) $(RSC_PROJ) $(SOURCE) 780 $(RSC) $(RSC_PROJ) $(SOURCE)
781 781
782 782
783!ELSEIF "$(CFG)" == "KLog - Win32 Static Release" 783!ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
784 784
785 785
786"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)" 786"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
787 $(RSC) $(RSC_PROJ) $(SOURCE) 787 $(RSC) $(RSC_PROJ) $(SOURCE)
788 788
789 789
@@ -1195,35 +1195,32 @@ DEP_RSC_INSTA=\
1195# Begin Source File 1195# Begin Source File
1196 1196
1197SOURCE=.\Install\install.cpp 1197SOURCE=.\Install\install.cpp
1198DEP_CPP_INSTAL=\
1199 ".\shared-code\install.h"\
1200
1201 1198
1202!IF "$(CFG)" == "Install - Win32 Debug" 1199!IF "$(CFG)" == "Install - Win32 Debug"
1203 1200
1204 1201
1205"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1202"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
1206 $(CPP) $(CPP_PROJ) $(SOURCE) 1203 $(CPP) $(CPP_PROJ) $(SOURCE)
1207 1204
1208 1205
1209!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1206!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1210 1207
1211 1208
1212"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1209"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
1213 $(CPP) $(CPP_PROJ) $(SOURCE) 1210 $(CPP) $(CPP_PROJ) $(SOURCE)
1214 1211
1215 1212
1216!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1213!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1217 1214
1218 1215
1219"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1216"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
1220 $(CPP) $(CPP_PROJ) $(SOURCE) 1217 $(CPP) $(CPP_PROJ) $(SOURCE)
1221 1218
1222 1219
1223!ELSEIF "$(CFG)" == "Install - Win32 Static" 1220!ELSEIF "$(CFG)" == "Install - Win32 Static"
1224 1221
1225 1222
1226"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1223"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
1227 $(CPP) $(CPP_PROJ) $(SOURCE) 1224 $(CPP) $(CPP_PROJ) $(SOURCE)
1228 1225
1229 1226
diff --git a/klog.rc b/klog.rc
index 92755ed..6685059 100644
--- a/klog.rc
+++ b/klog.rc
@@ -50,7 +50,7 @@ BEGIN
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\\KLog.rc2"" // non-Microsoft Visual C++ edited resources\r\n" 53 "#include ""res\\klog.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"
56END 56END
@@ -83,18 +83,18 @@ CAPTION "About KLog"
83FONT 8, "MS Sans Serif" 83FONT 8, "MS Sans Serif"
84BEGIN 84BEGIN
85 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 85 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
86 LTEXT "KLog, Version 1.1",IDC_STATIC,40,16,119,8, 86 LTEXT "KLog, Version 1.1.1-trunk",IDC_STATIC,40,16,119,8,SS_NOPREFIX
87 SS_NOPREFIX 87 LTEXT "Copyright © 1998-2005 Klever Group",IDC_STATIC,40,31,
88 LTEXT "Copyright © 1998-2004 Klever Group",IDC_STATIC,40,31,119,8 88 119,8
89 DEFPUSHBUTTON "OK",IDOK,178,13,32,14,WS_GROUP 89 DEFPUSHBUTTON "OK",IDOK,178,13,32,14,WS_GROUP
90 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14 90 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14
91END 91END
92 92
93IDD_KLOG_DIALOG DIALOGEX 0, 0, 291, 286 93IDD_KLOG_DIALOG DIALOGEX 0, 0, 293, 286
94STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU 94STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
95EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW 95EXSTYLE WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | WS_EX_APPWINDOW
96CAPTION "KLog" 96CAPTION "KLog"
97FONT 8, "MS Sans Serif", 0, 0, 0x1 97FONT 8, "MS Sans Serif"
98BEGIN 98BEGIN
99 CTEXT "Short de&scription:",IDC_STATIC,11,48,78,8,SS_NOTIFY 99 CTEXT "Short de&scription:",IDC_STATIC,11,48,78,8,SS_NOTIFY
100 EDITTEXT IDC_DESC,91,46,187,13,ES_AUTOHSCROLL,WS_EX_STATICEDGE 100 EDITTEXT IDC_DESC,91,46,187,13,ES_AUTOHSCROLL,WS_EX_STATICEDGE
@@ -155,13 +155,13 @@ BEGIN
155 BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE 155 BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
156 PUSHBUTTON "..",IDC_PLAYSOUND,264,173,12,12,BS_ICON | BS_CENTER | 156 PUSHBUTTON "..",IDC_PLAYSOUND,264,173,12,12,BS_ICON | BS_CENTER |
157 BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE 157 BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
158 LISTBOX IDC_LOG,7,192,277,87,LBS_USETABSTOPS | LBS_NOSEL | 158 LISTBOX IDC_LOG,7,192,279,87,LBS_USETABSTOPS | LBS_NOSEL |
159 WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME | 159 WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME |
160 WS_EX_CLIENTEDGE | WS_EX_STATICEDGE 160 WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
161 PUSHBUTTON "&Add",IDC_ADD,7,7,39,18,BS_NOTIFY,WS_EX_CLIENTEDGE 161 PUSHBUTTON "&Add",IDC_ADD,7,7,39,18,BS_NOTIFY,WS_EX_CLIENTEDGE
162 PUSHBUTTON "&Remove",IDC_REMOVE,48,7,39,18,0,WS_EX_CLIENTEDGE 162 PUSHBUTTON "&Remove",IDC_REMOVE,48,7,39,18,0,WS_EX_CLIENTEDGE
163 PUSHBUTTON "E&xit",IDC_EXIT,245,7,39,18,0,WS_EX_CLIENTEDGE 163 PUSHBUTTON "E&xit",IDC_EXIT,247,7,39,18,0,WS_EX_CLIENTEDGE
164 CONTROL "Tab1",IDC_TABS,"SysTabControl32",TCS_TOOLTIPS,7,31,277, 164 CONTROL "Tab1",IDC_TABS,"SysTabControl32",TCS_TOOLTIPS,7,31,279,
165 161,WS_EX_CLIENTEDGE 165 161,WS_EX_CLIENTEDGE
166 CTEXT "10",IDC_LOGLENGTH,166,11,33,12,SS_NOPREFIX | SS_NOTIFY, 166 CTEXT "10",IDC_LOGLENGTH,166,11,33,12,SS_NOPREFIX | SS_NOTIFY,
167 WS_EX_DLGMODALFRAME 167 WS_EX_DLGMODALFRAME
@@ -171,7 +171,7 @@ BEGIN
171 CTEXT "Log window length:",IDC_STATIC_LOGLENGTH,89,11,77,12, 171 CTEXT "Log window length:",IDC_STATIC_LOGLENGTH,89,11,77,12,
172 SS_NOPREFIX | SS_NOTIFY,WS_EX_DLGMODALFRAME 172 SS_NOPREFIX | SS_NOTIFY,WS_EX_DLGMODALFRAME
173 DEFPUSHBUTTON "",IDOK,0,279,6,7,NOT WS_VISIBLE 173 DEFPUSHBUTTON "",IDOK,0,279,6,7,NOT WS_VISIBLE
174 PUSHBUTTON "",IDCANCEL,285,279,6,7,NOT WS_VISIBLE | WS_DISABLED 174 PUSHBUTTON "",IDCANCEL,286,279,6,7,NOT WS_VISIBLE | WS_DISABLED
175 PUSHBUTTON "Files",IDC_FILES,204,7,39,18,BS_CENTER | BS_VCENTER | 175 PUSHBUTTON "Files",IDC_FILES,204,7,39,18,BS_CENTER | BS_VCENTER |
176 BS_NOTIFY | NOT WS_TABSTOP,WS_EX_CLIENTEDGE 176 BS_NOTIFY | NOT WS_TABSTOP,WS_EX_CLIENTEDGE
177END 177END
@@ -804,7 +804,7 @@ END
804// 804//
805 805
806VS_VERSION_INFO VERSIONINFO 806VS_VERSION_INFO VERSIONINFO
807 FILEVERSION 1,1,0,0 807 FILEVERSION 1,1,1,0
808 PRODUCTVERSION 1,1,0,0 808 PRODUCTVERSION 1,1,0,0
809 FILEFLAGSMASK 0x3fL 809 FILEFLAGSMASK 0x3fL
810#ifdef _DEBUG 810#ifdef _DEBUG
@@ -822,13 +822,13 @@ BEGIN
822 BEGIN 822 BEGIN
823 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 823 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
824 VALUE "FileDescription", "KLog, logging daemon\0" 824 VALUE "FileDescription", "KLog, logging daemon\0"
825 VALUE "FileVersion", "1, 1, 0, 0\0" 825 VALUE "FileVersion", "1, 1, 1, 0\0"
826 VALUE "InternalName", "KLOG\0" 826 VALUE "InternalName", "KLOG\0"
827 VALUE "LegalCopyright", "Copyright © 1998-2004 Klever Group (http://www.klever.net/)\0" 827 VALUE "LegalCopyright", "Copyright © 1998-2005 Klever Group (http://www.klever.net/)\0"
828 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 828 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
829 VALUE "OriginalFilename", "KLOG.EXE\0" 829 VALUE "OriginalFilename", "KLOG.EXE\0"
830 VALUE "ProductName", "KLog\0" 830 VALUE "ProductName", "KLog\0"
831 VALUE "ProductVersion", "1, 0, 0, 2\0" 831 VALUE "ProductVersion", "1, 1, 1, 0\0"
832 END 832 END
833 END 833 END
834 BLOCK "VarFileInfo" 834 BLOCK "VarFileInfo"
@@ -859,7 +859,7 @@ BEGIN
859 IDD_KLOG_DIALOG, DIALOG 859 IDD_KLOG_DIALOG, DIALOG
860 BEGIN 860 BEGIN
861 LEFTMARGIN, 7 861 LEFTMARGIN, 7
862 RIGHTMARGIN, 284 862 RIGHTMARGIN, 286
863 VERTGUIDE, 12 863 VERTGUIDE, 12
864 VERTGUIDE, 278 864 VERTGUIDE, 278
865 TOPMARGIN, 7 865 TOPMARGIN, 7
diff --git a/resource.h b/resource.h
index 33cf881..3c04188 100644
--- a/resource.h
+++ b/resource.h
@@ -1,6 +1,6 @@
1//{{NO_DEPENDENCIES}} 1//{{NO_DEPENDENCIES}}
2// Microsoft Developer Studio generated include file. 2// Microsoft Developer Studio generated include file.
3// Used by KLog.rc 3// Used by klog.rc
4// 4//
5#define IDM_ABOUTBOX 0x0010 5#define IDM_ABOUTBOX 0x0010
6#define IDD_ABOUTBOX 100 6#define IDD_ABOUTBOX 100