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,13 +1,13 @@
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
5the Software without restriction, including without limitation the rights to 5the Software without restriction, including without limitation the rights to
6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7of the Software, and to permit persons to whom the Software is furnished to do 7of the Software, and to permit persons to whom the Software is furnished to do
8so, subject to the following conditions: 8so, subject to the following conditions:
9 9
10The above copyright notice and this permission notice shall be included in all 10The above copyright notice and this permission notice shall be included in all
11copies or substantial portions of the Software. 11copies or substantial portions of the Software.
12 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
diff --git a/KLogDlg.cpp b/KLogDlg.cpp
index 5f1c6c0..bdcb881 100644
--- a/KLogDlg.cpp
+++ b/KLogDlg.cpp
@@ -93,24 +93,25 @@ CKLogDlg::CKLogDlg(CWnd* pParent /*=NULL*/)
93 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); 93 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
94 m_bmpBack.LoadBitmap(IDB_BACKGROUND); 94 m_bmpBack.LoadBitmap(IDB_BACKGROUND);
95 m_bmpBack.GetBitmap(&m_bitmapBack); 95 m_bmpBack.GetBitmap(&m_bitmapBack);
96 m_Trayer = new CTrayer(this); 96 m_Trayer = new CTrayer(this);
97 ASSERT(m_Trayer); 97 ASSERT(m_Trayer);
98 LoadSettings(); 98 LoadSettings();
99} 99}
100 100
101void CKLogDlg::DoDataExchange(CDataExchange* pDX) 101void 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);
108 DDX_Control(pDX, IDC_LOGLENGTH, m_LogLengthCtl); 109 DDX_Control(pDX, IDC_LOGLENGTH, m_LogLengthCtl);
109 DDX_Control(pDX, IDC_INVERT, m_PriInvertCtl); 110 DDX_Control(pDX, IDC_INVERT, m_PriInvertCtl);
110 DDX_Control(pDX, IDC_TYPE_FILE, m_LogtoFileCtl); 111 DDX_Control(pDX, IDC_TYPE_FILE, m_LogtoFileCtl);
111 DDX_Control(pDX, IDC_TYPE_HOST, m_LogtoHostCtl); 112 DDX_Control(pDX, IDC_TYPE_HOST, m_LogtoHostCtl);
112 DDX_Control(pDX, IDC_TYPE_NONE, m_LogtoNoneCtl); 113 DDX_Control(pDX, IDC_TYPE_NONE, m_LogtoNoneCtl);
113 DDX_Control(pDX, IDC_HOSTORFILE, m_HFNameCaptionCtl); 114 DDX_Control(pDX, IDC_HOSTORFILE, m_HFNameCaptionCtl);
114 DDX_Control(pDX, IDC_HOSTS, m_hlCtl); 115 DDX_Control(pDX, IDC_HOSTS, m_hlCtl);
115 DDX_Control(pDX, IDC_BROWSESOUND, m_BrowseSoundCtl); 116 DDX_Control(pDX, IDC_BROWSESOUND, m_BrowseSoundCtl);
116 DDX_Control(pDX, IDC_NONE, m_PriNoneCtl); 117 DDX_Control(pDX, IDC_NONE, m_PriNoneCtl);
@@ -172,33 +173,35 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog)
172 ON_BN_CLICKED(IDC_BROWSESOUND, OnBrowsesound) 173 ON_BN_CLICKED(IDC_BROWSESOUND, OnBrowsesound)
173 ON_EN_KILLFOCUS(IDC_HOSTFILE, OnKillfocusHostfile) 174 ON_EN_KILLFOCUS(IDC_HOSTFILE, OnKillfocusHostfile)
174 ON_BN_CLICKED(IDC_BROWSE, OnBrowse) 175 ON_BN_CLICKED(IDC_BROWSE, OnBrowse)
175 ON_COMMAND(ID_FILES_RESET, OnFilesReset) 176 ON_COMMAND(ID_FILES_RESET, OnFilesReset)
176 ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog) 177 ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)
177 ON_WM_CREATE() 178 ON_WM_CREATE()
178 ON_WM_CLOSE() 179 ON_WM_CLOSE()
179 ON_COMMAND(ID_TRAY_ABOUTKLOG, OnTrayAboutklog) 180 ON_COMMAND(ID_TRAY_ABOUTKLOG, OnTrayAboutklog)
180 ON_COMMAND(ID_TRAY_EXIT, OnTrayExit) 181 ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)
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)
187 ON_BN_CLICKED(IDC_ERR, OnPriority) 189 ON_BN_CLICKED(IDC_ERR, OnPriority)
188 ON_BN_CLICKED(IDC_INFO, OnPriority) 190 ON_BN_CLICKED(IDC_INFO, OnPriority)
189 ON_BN_CLICKED(IDC_NOTICE, OnPriority) 191 ON_BN_CLICKED(IDC_NOTICE, OnPriority)
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
196///////////////////////////////////////////////////////////////////////////// 199/////////////////////////////////////////////////////////////////////////////
197// CKLogDlg message handlers 200// CKLogDlg message handlers
198 201
199BOOL CKLogDlg::OnInitDialog() 202BOOL CKLogDlg::OnInitDialog()
200{ 203{
201 CDialog::OnInitDialog(); 204 CDialog::OnInitDialog();
202 205
203 // Add "About..." menu item to system menu. 206 // Add "About..." menu item to system menu.
204 207
@@ -1356,12 +1359,39 @@ void CLogger::LookupHost(CKLogDlg *daddy)
1356 m_LogToHost.sin_addr.s_addr = *(DWORD*)he->h_addr; 1359 m_LogToHost.sin_addr.s_addr = *(DWORD*)he->h_addr;
1357 }else{ 1360 }else{
1358 m_LogToHost.sin_addr.s_addr = INADDR_NONE; 1361 m_LogToHost.sin_addr.s_addr = INADDR_NONE;
1359 if(daddy->m_bWarnBlocking){ 1362 if(daddy->m_bWarnBlocking){
1360 CString sux; 1363 CString sux;
1361 sux.Format(IDS_MSG_LOOKUPFAILED,(LPCTSTR)m_LogToName); 1364 sux.Format(IDS_MSG_LOOKUPFAILED,(LPCTSTR)m_LogToName);
1362 daddy->MessageBox(sux,NULL,MB_ICONSTOP|MB_OK); 1365 daddy->MessageBox(sux,NULL,MB_ICONSTOP|MB_OK);
1363 }else 1366 }else
1364 MessageBeep(MB_ICONHAND); 1367 MessageBeep(MB_ICONHAND);
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
@@ -96,24 +96,25 @@ public:
96 void SetTab(CLogger* l); 96 void SetTab(CLogger* l);
97 int m_iTriggered; 97 int m_iTriggered;
98 int m_iNormal; 98 int m_iNormal;
99 CImageList m_Images; 99 CImageList m_Images;
100 CLoggers m_Logs; 100 CLoggers m_Logs;
101 CKLogDlg(CWnd* pParent = NULL);// standard constructor 101 CKLogDlg(CWnd* pParent = NULL);// standard constructor
102 102
103 DECLARE_SERIAL( CKLogDlg ) 103 DECLARE_SERIAL( CKLogDlg )
104 104
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;
111 CStaticm_LogLengthCtl; 112 CStaticm_LogLengthCtl;
112 CButtonm_PriInvertCtl; 113 CButtonm_PriInvertCtl;
113 CButtonm_LogtoFileCtl; 114 CButtonm_LogtoFileCtl;
114 CButtonm_LogtoHostCtl; 115 CButtonm_LogtoHostCtl;
115 CButtonm_LogtoNoneCtl; 116 CButtonm_LogtoNoneCtl;
116 CStaticm_HFNameCaptionCtl; 117 CStaticm_HFNameCaptionCtl;
117 CListBoxm_hlCtl; 118 CListBoxm_hlCtl;
118 CButtonm_BrowseSoundCtl; 119 CButtonm_BrowseSoundCtl;
119 CButtonm_PriNoneCtl; 120 CButtonm_PriNoneCtl;
@@ -184,15 +185,17 @@ protected:
184 afx_msg void OnKillfocusHostfile(); 185 afx_msg void OnKillfocusHostfile();
185 virtual void OnOK(); 186 virtual void OnOK();
186 afx_msg void OnBrowse(); 187 afx_msg void OnBrowse();
187 afx_msg void OnFilesReset(); 188 afx_msg void OnFilesReset();
188 afx_msg void OnSelchangeLog(); 189 afx_msg void OnSelchangeLog();
189 afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); 190 afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
190 afx_msg void OnClose(); 191 afx_msg void OnClose();
191 afx_msg void OnTrayAboutklog(); 192 afx_msg void OnTrayAboutklog();
192 afx_msg void OnTrayExit(); 193 afx_msg void OnTrayExit();
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
@@ -8,36 +8,38 @@ DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
8 \red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255; 8 \red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
9 \red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; 9 \red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
10 \red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;} 10 \red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
11 11
12\pard\plain\keepn 12\pard\plain\keepn
13#{\footnote About} 13#{\footnote About}
14${\footnote About KLog} 14${\footnote About KLog}
15{ \f1\fs18\b\sb120 Abotu {\b KLog}} 15{ \f1\fs18\b\sb120 Abotu {\b KLog}}
16\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b KLog} is our {\i Win32} implementation of {\b\cf6 *nix}{\i syslog} daemon to support remote logging of messages from {\b\cf6 unix} servers, routers, terminal servers and other syslog-enabled devices/applications. 16\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b KLog} is our {\i Win32} implementation of {\b\cf6 *nix}{\i syslog} daemon to support remote logging of messages from {\b\cf6 unix} servers, routers, terminal servers and other syslog-enabled devices/applications.
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.
24} 24}
25\par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")} 25\par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")}
26\par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")} 26\par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")}
27\page 27\page
28 28
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
35\page 37\page
36 38
37\pard\plain\keepn 39\pard\plain\keepn
38#{\footnote Using} 40#{\footnote Using}
39${\footnote Using KLog} 41${\footnote Using KLog}
40{ \f1\fs18\b\sb120 Using {\b KLog}} 42{ \f1\fs18\b\sb120 Using {\b KLog}}
41\par\sa120\sb120\qj\pard \f1\fs18\sb120 When you start {\b KLog} for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the {\uldb Main Window}{\v MainWindow} section. 43\par\sa120\sb120\qj\pard \f1\fs18\sb120 When you start {\b KLog} for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the {\uldb Main Window}{\v MainWindow} section.
42\page 44\page
43 45
diff --git a/help/klog.xml b/help/klog.xml
index 830b297..08daf61 100644
--- a/help/klog.xml
+++ b/help/klog.xml
@@ -1,23 +1,26 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<winhelp> 2<winhelp>
3 <topic id="About" title="About KLog"> 3 <topic id="About" title="About KLog">
4 <heading scroll="no">Abotu <kin>KLog</kin></heading> 4 <heading scroll="no">Abotu <kin>KLog</kin></heading>
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>
15 </newsfor> 18 </newsfor>
16 </topic> 19 </topic>
17 <topic id="Using" title="Using KLog"> 20 <topic id="Using" title="Using KLog">
18 <heading scroll="no">Using <kin>KLog</kin></heading> 21 <heading scroll="no">Using <kin>KLog</kin></heading>
19 <p>When you start <kin>KLog</kin> for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the <a href="#MainWindow">Main Window</a> section.</p> 22 <p>When you start <kin>KLog</kin> for the first time it is set to the configuration in which it will silently catch all incoming messages and display them in the log window. Scroll length in initial configuration is set to 15 lines. To learn how to modify this initial configuration you may want to proceed to the <a href="#MainWindow">Main Window</a> section.</p>
20 </topic> 23 </topic>
21 <topic id="MainWindow" title="Main Window"> 24 <topic id="MainWindow" title="Main Window">
22 <heading scroll="no">Main Window</heading> 25 <heading scroll="no">Main Window</heading>
23 <p>Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound <kin>KLog</kin> will produce when triggered by event matching criteria.</p> 26 <p>Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound <kin>KLog</kin> will produce when triggered by event matching criteria.</p>
diff --git a/install/install.cpp b/install/install.cpp
index c0e0bb8..81d5a7e 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,16 +1,16 @@
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)
8{ 8{
9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path"); 9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path");
10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); 10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
11LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); 11LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");
12STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); 12STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath);
13 if(!path) 13 if(!path)
14 return NULL; 14 return NULL;
15 #ifdefK_ANNED 15 #ifdefK_ANNED
16STRING sysDir(_MAX_PATH); 16STRING sysDir(_MAX_PATH);
diff --git a/install/install.rc b/install/install.rc
index 6a3fd3e..cee7f66 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -122,49 +122,49 @@ END
122 122
123// Icon with lowest ID value placed first to ensure application icon 123// Icon with lowest ID value placed first to ensure application icon
124// remains consistent on all systems. 124// remains consistent on all systems.
125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" 125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico"
126 126
127#ifndef _MAC 127#ifndef _MAC
128///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
129// 129//
130// Version 130// Version
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
139#else 139#else
140 FILEFLAGS 0x0L 140 FILEFLAGS 0x0L
141#endif 141#endif
142 FILEOS 0x40004L 142 FILEOS 0x40004L
143 FILETYPE 0x1L 143 FILETYPE 0x1L
144 FILESUBTYPE 0x0L 144 FILESUBTYPE 0x0L
145BEGIN 145BEGIN
146 BLOCK "StringFileInfo" 146 BLOCK "StringFileInfo"
147 BEGIN 147 BEGIN
148 BLOCK "040904b0" 148 BLOCK "040904b0"
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"
162 BEGIN 162 BEGIN
163 VALUE "Translation", 0x409, 1200 163 VALUE "Translation", 0x409, 1200
164 END 164 END
165END 165END
166 166
167#endif // !_MAC 167#endif // !_MAC
168 168
169#endif // English (U.S.) resources 169#endif // English (U.S.) resources
170///////////////////////////////////////////////////////////////////////////// 170/////////////////////////////////////////////////////////////////////////////
diff --git a/klog.clw b/klog.clw
index 81ae255..0dfdb8f 100644
--- a/klog.clw
+++ b/klog.clw
@@ -31,25 +31,25 @@ Resource7=IDD_KLOG_DIALOG
31Type=0 31Type=0
32HeaderFile=KLog.h 32HeaderFile=KLog.h
33ImplementationFile=KLog.cpp 33ImplementationFile=KLog.cpp
34Filter=N 34Filter=N
35 35
36[CLS:CKLogDlg] 36[CLS:CKLogDlg]
37Type=0 37Type=0
38HeaderFile=KLogDlg.h 38HeaderFile=KLogDlg.h
39ImplementationFile=KLogDlg.cpp 39ImplementationFile=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
47HeaderFile=KLogDlg.h 47HeaderFile=KLogDlg.h
48ImplementationFile=KLogDlg.cpp 48ImplementationFile=KLogDlg.cpp
49Filter=D 49Filter=D
50BaseClass=CDialog 50BaseClass=CDialog
51VirtualFilter=dWC 51VirtualFilter=dWC
52LastObject=IDC_KLEVERNET 52LastObject=IDC_KLEVERNET
53 53
54[DLG:IDD_ABOUTBOX] 54[DLG:IDD_ABOUTBOX]
55Type=1 55Type=1
diff --git a/klog.mak b/klog.mak
index 23ac3fe..323d0a4 100644
--- a/klog.mak
+++ b/klog.mak
@@ -63,25 +63,25 @@ TargetName=klog
63# End Custom Macros 63# End Custom Macros
64 64
65ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\ 65ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\
66 "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_" 66 "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"
67 67
68CLEAN : 68CLEAN :
69 -@erase "$(INTDIR)\klog.cn_" 69 -@erase "$(INTDIR)\klog.cn_"
70 -@erase "$(INTDIR)\klog.cnt" 70 -@erase "$(INTDIR)\klog.cnt"
71 -@erase "$(INTDIR)\klog.hl_" 71 -@erase "$(INTDIR)\klog.hl_"
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"
79 -@erase "$(INTDIR)\LogPatternReserved.obj" 79 -@erase "$(INTDIR)\LogPatternReserved.obj"
80 -@erase "$(INTDIR)\LogPatternUnix.obj" 80 -@erase "$(INTDIR)\LogPatternUnix.obj"
81 -@erase "$(INTDIR)\StdAfx.obj" 81 -@erase "$(INTDIR)\StdAfx.obj"
82 -@erase "$(INTDIR)\SyslogSocket.obj" 82 -@erase "$(INTDIR)\SyslogSocket.obj"
83 -@erase "$(INTDIR)\Trayer.obj" 83 -@erase "$(INTDIR)\Trayer.obj"
84 -@erase "$(INTDIR)\WarnBlocking.obj" 84 -@erase "$(INTDIR)\WarnBlocking.obj"
85 -@erase "$(OUTDIR)\klog.ex_" 85 -@erase "$(OUTDIR)\klog.ex_"
86 -@erase "$(OUTDIR)\klog.exe" 86 -@erase "$(OUTDIR)\klog.exe"
87 87
@@ -90,39 +90,39 @@ CLEAN :
90 90
91# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 91# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
92# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 92# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
93CPP_PROJ=/nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 93CPP_PROJ=/nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
94 "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c 94 "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c
95CPP_OBJS=.\Release/ 95CPP_OBJS=.\Release/
96CPP_SBRS=.\. 96CPP_SBRS=.\.
97# ADD BASE MTL /nologo /D "NDEBUG" /win32 97# ADD BASE MTL /nologo /D "NDEBUG" /win32
98# ADD MTL /nologo /D "NDEBUG" /win32 98# ADD MTL /nologo /D "NDEBUG" /win32
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
106BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc" 106BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
107BSC32_SBRS= \ 107BSC32_SBRS= \
108 108
109LINK32=link.exe 109LINK32=link.exe
110# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 110# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
111# ADD LINK32 /nologo /subsystem:windows /machine:I386 111# ADD LINK32 /nologo /subsystem:windows /machine:I386
112LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\ 112LINK32_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" \
120 "$(INTDIR)\LogPatternReserved.obj" \ 120 "$(INTDIR)\LogPatternReserved.obj" \
121 "$(INTDIR)\LogPatternUnix.obj" \ 121 "$(INTDIR)\LogPatternUnix.obj" \
122 "$(INTDIR)\StdAfx.obj" \ 122 "$(INTDIR)\StdAfx.obj" \
123 "$(INTDIR)\SyslogSocket.obj" \ 123 "$(INTDIR)\SyslogSocket.obj" \
124 "$(INTDIR)\Trayer.obj" \ 124 "$(INTDIR)\Trayer.obj" \
125 "$(INTDIR)\WarnBlocking.obj" 125 "$(INTDIR)\WarnBlocking.obj"
126 126
127"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 127"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
128 $(LINK32) @<< 128 $(LINK32) @<<
@@ -160,25 +160,25 @@ TargetName=klog
160# End Custom Macros 160# End Custom Macros
161 161
162ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\ 162ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\
163 "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_" 163 "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"
164 164
165CLEAN : 165CLEAN :
166 -@erase "$(INTDIR)\klog.cn_" 166 -@erase "$(INTDIR)\klog.cn_"
167 -@erase "$(INTDIR)\klog.cnt" 167 -@erase "$(INTDIR)\klog.cnt"
168 -@erase "$(INTDIR)\klog.hl_" 168 -@erase "$(INTDIR)\klog.hl_"
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"
176 -@erase "$(INTDIR)\LogPatternReserved.obj" 176 -@erase "$(INTDIR)\LogPatternReserved.obj"
177 -@erase "$(INTDIR)\LogPatternUnix.obj" 177 -@erase "$(INTDIR)\LogPatternUnix.obj"
178 -@erase "$(INTDIR)\StdAfx.obj" 178 -@erase "$(INTDIR)\StdAfx.obj"
179 -@erase "$(INTDIR)\SyslogSocket.obj" 179 -@erase "$(INTDIR)\SyslogSocket.obj"
180 -@erase "$(INTDIR)\Trayer.obj" 180 -@erase "$(INTDIR)\Trayer.obj"
181 -@erase "$(INTDIR)\vc40.idb" 181 -@erase "$(INTDIR)\vc40.idb"
182 -@erase "$(INTDIR)\vc40.pdb" 182 -@erase "$(INTDIR)\vc40.pdb"
183 -@erase "$(INTDIR)\WarnBlocking.obj" 183 -@erase "$(INTDIR)\WarnBlocking.obj"
184 -@erase "$(OUTDIR)\klog.ex_" 184 -@erase "$(OUTDIR)\klog.ex_"
@@ -192,39 +192,39 @@ CLEAN :
192# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 192# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
193# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 193# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
194CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ 194CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
195 /D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/"\ 195 /D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/"\
196 /Fd"$(INTDIR)/" /c 196 /Fd"$(INTDIR)/" /c
197CPP_OBJS=.\Debug/ 197CPP_OBJS=.\Debug/
198CPP_SBRS=.\. 198CPP_SBRS=.\.
199# ADD BASE MTL /nologo /D "_DEBUG" /win32 199# ADD BASE MTL /nologo /D "_DEBUG" /win32
200# ADD MTL /nologo /D "_DEBUG" /win32 200# ADD MTL /nologo /D "_DEBUG" /win32
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
208BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc" 208BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
209BSC32_SBRS= \ 209BSC32_SBRS= \
210 210
211LINK32=link.exe 211LINK32=link.exe
212# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 212# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
213# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 213# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386
214LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\ 214LINK32_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" \
222 "$(INTDIR)\LogPatternReserved.obj" \ 222 "$(INTDIR)\LogPatternReserved.obj" \
223 "$(INTDIR)\LogPatternUnix.obj" \ 223 "$(INTDIR)\LogPatternUnix.obj" \
224 "$(INTDIR)\StdAfx.obj" \ 224 "$(INTDIR)\StdAfx.obj" \
225 "$(INTDIR)\SyslogSocket.obj" \ 225 "$(INTDIR)\SyslogSocket.obj" \
226 "$(INTDIR)\Trayer.obj" \ 226 "$(INTDIR)\Trayer.obj" \
227 "$(INTDIR)\WarnBlocking.obj" 227 "$(INTDIR)\WarnBlocking.obj"
228 228
229"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 229"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
230 $(LINK32) @<< 230 $(LINK32) @<<
@@ -252,35 +252,35 @@ SOURCE=$(InputPath)
252# PROP Use_MFC 5 252# PROP Use_MFC 5
253# PROP Use_Debug_Libraries 0 253# PROP Use_Debug_Libraries 0
254# PROP Output_Dir "Releast" 254# PROP Output_Dir "Releast"
255# PROP Intermediate_Dir "Releast" 255# PROP Intermediate_Dir "Releast"
256# PROP Target_Dir "" 256# PROP Target_Dir ""
257OUTDIR=.\Releast 257OUTDIR=.\Releast
258INTDIR=.\Releast 258INTDIR=.\Releast
259# Begin Custom Macros 259# Begin Custom Macros
260OutDir=.\Releast 260OutDir=.\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_"
269 -@erase "$(INTDIR)\klog.cnt" 269 -@erase "$(INTDIR)\klog.cnt"
270 -@erase "$(INTDIR)\klog.hl_" 270 -@erase "$(INTDIR)\klog.hl_"
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"
278 -@erase "$(INTDIR)\LogPatternReserved.obj" 278 -@erase "$(INTDIR)\LogPatternReserved.obj"
279 -@erase "$(INTDIR)\LogPatternUnix.obj" 279 -@erase "$(INTDIR)\LogPatternUnix.obj"
280 -@erase "$(INTDIR)\StdAfx.obj" 280 -@erase "$(INTDIR)\StdAfx.obj"
281 -@erase "$(INTDIR)\SyslogSocket.obj" 281 -@erase "$(INTDIR)\SyslogSocket.obj"
282 -@erase "$(INTDIR)\Trayer.obj" 282 -@erase "$(INTDIR)\Trayer.obj"
283 -@erase "$(INTDIR)\WarnBlocking.obj" 283 -@erase "$(INTDIR)\WarnBlocking.obj"
284 -@erase "$(OUTDIR)\klog.ex_" 284 -@erase "$(OUTDIR)\klog.ex_"
285 -@erase "$(OUTDIR)\klog.exe" 285 -@erase "$(OUTDIR)\klog.exe"
286 286
@@ -289,39 +289,39 @@ CLEAN :
289 289
290# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 290# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
291# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /c 291# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /c
292CPP_PROJ=/nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 292CPP_PROJ=/nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
293 "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c 293 "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c
294CPP_OBJS=.\Releast/ 294CPP_OBJS=.\Releast/
295CPP_SBRS=.\. 295CPP_SBRS=.\.
296# ADD BASE MTL /nologo /D "NDEBUG" /win32 296# ADD BASE MTL /nologo /D "NDEBUG" /win32
297# ADD MTL /nologo /D "NDEBUG" /win32 297# ADD MTL /nologo /D "NDEBUG" /win32
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
305BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc" 305BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
306BSC32_SBRS= \ 306BSC32_SBRS= \
307 307
308LINK32=link.exe 308LINK32=link.exe
309# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 309# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
310# ADD LINK32 /nologo /subsystem:windows /machine:I386 310# ADD LINK32 /nologo /subsystem:windows /machine:I386
311LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\ 311LINK32_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" \
319 "$(INTDIR)\LogPatternReserved.obj" \ 319 "$(INTDIR)\LogPatternReserved.obj" \
320 "$(INTDIR)\LogPatternUnix.obj" \ 320 "$(INTDIR)\LogPatternUnix.obj" \
321 "$(INTDIR)\StdAfx.obj" \ 321 "$(INTDIR)\StdAfx.obj" \
322 "$(INTDIR)\SyslogSocket.obj" \ 322 "$(INTDIR)\SyslogSocket.obj" \
323 "$(INTDIR)\Trayer.obj" \ 323 "$(INTDIR)\Trayer.obj" \
324 "$(INTDIR)\WarnBlocking.obj" 324 "$(INTDIR)\WarnBlocking.obj"
325 325
326"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 326"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
327 $(LINK32) @<< 327 $(LINK32) @<<
@@ -760,39 +760,39 @@ DEP_RSC_KLOG_R=\
760 ".\res\KLog.ico"\ 760 ".\res\KLog.ico"\
761 ".\res\klog.rc2"\ 761 ".\res\klog.rc2"\
762 ".\res\log-pattern.ico"\ 762 ".\res\log-pattern.ico"\
763 ".\res\meow.wav"\ 763 ".\res\meow.wav"\
764 ".\shared-data\browse-icon.ico"\ 764 ".\shared-data\browse-icon.ico"\
765 ".\shared-data\klever-background.bmp"\ 765 ".\shared-data\klever-background.bmp"\
766 ".\shared-data\play-icon.ico"\ 766 ".\shared-data\play-icon.ico"\
767 767
768 768
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
790!ENDIF 790!ENDIF
791 791
792# End Source File 792# End Source File
793################################################################################ 793################################################################################
794# Begin Source File 794# Begin Source File
795 795
796SOURCE=.\help\klog.hpj 796SOURCE=.\help\klog.hpj
797 797
798!IF "$(CFG)" == "KLog - Win32 Release" 798!IF "$(CFG)" == "KLog - Win32 Release"
@@ -1186,53 +1186,50 @@ DEP_RSC_INSTA=\
1186"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1186"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1187 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ 1187 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
1188 "_AFXDLL" /d "STATI_K" $(SOURCE) 1188 "_AFXDLL" /d "STATI_K" $(SOURCE)
1189 1189
1190 1190
1191!ENDIF 1191!ENDIF
1192 1192
1193# End Source File 1193# End Source File
1194################################################################################ 1194################################################################################
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
1230!ENDIF 1227!ENDIF
1231 1228
1232# End Source File 1229# End Source File
1233################################################################################ 1230################################################################################
1234# Begin Project Dependency 1231# Begin Project Dependency
1235 1232
1236# Project_Dep_Name "KLog" 1233# Project_Dep_Name "KLog"
1237 1234
1238!IF "$(CFG)" == "Install - Win32 Debug" 1235!IF "$(CFG)" == "Install - Win32 Debug"
diff --git a/klog.rc b/klog.rc
index 92755ed..6685059 100644
--- a/klog.rc
+++ b/klog.rc
@@ -41,25 +41,25 @@ END
413 TEXTINCLUDE DISCARDABLE 413 TEXTINCLUDE DISCARDABLE
42BEGIN 42BEGIN
43 "#define _AFX_NO_SPLITTER_RESOURCES\r\n" 43 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
44 "#define _AFX_NO_OLE_RESOURCES\r\n" 44 "#define _AFX_NO_OLE_RESOURCES\r\n"
45 "#define _AFX_NO_TRACKER_RESOURCES\r\n" 45 "#define _AFX_NO_TRACKER_RESOURCES\r\n"
46 "#define _AFX_NO_PROPERTY_RESOURCES\r\n" 46 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
47 "\r\n" 47 "\r\n"
48 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" 48 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
49 "#ifdef _WIN32\r\n" 49 "#ifdef _WIN32\r\n"
50 "LANGUAGE 9, 1\r\n" 50 "LANGUAGE 9, 1\r\n"
51 "#pragma code_page(1252)\r\n" 51 "#pragma code_page(1252)\r\n"
52 "#endif\r\n" 52 "#endif\r\n"
53 "#include ""res\\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
57 57
58#endif // APSTUDIO_INVOKED 58#endif // APSTUDIO_INVOKED
59 59
60 60
61///////////////////////////////////////////////////////////////////////////// 61/////////////////////////////////////////////////////////////////////////////
62// 62//
63// Icon 63// Icon
64// 64//
65 65
@@ -74,36 +74,36 @@ IDI_LOGPATTERN ICON DISCARDABLE "res\\log-pattern.ico"
74 74
75///////////////////////////////////////////////////////////////////////////// 75/////////////////////////////////////////////////////////////////////////////
76// 76//
77// Dialog 77// Dialog
78// 78//
79 79
80IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 70 80IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 70
81STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 81STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
82CAPTION "About KLog" 82CAPTION "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
101 CONTROL "Log to &File",IDC_TYPE_FILE,"Button",BS_AUTORADIOBUTTON | 101 CONTROL "Log to &File",IDC_TYPE_FILE,"Button",BS_AUTORADIOBUTTON |
102 BS_PUSHLIKE | WS_GROUP,11,60,87,19,WS_EX_STATICEDGE 102 BS_PUSHLIKE | WS_GROUP,11,60,87,19,WS_EX_STATICEDGE
103 CONTROL "Log to &Host",IDC_TYPE_HOST,"Button",BS_AUTORADIOBUTTON | 103 CONTROL "Log to &Host",IDC_TYPE_HOST,"Button",BS_AUTORADIOBUTTON |
104 BS_PUSHLIKE,101,60,87,19,WS_EX_STATICEDGE 104 BS_PUSHLIKE,101,60,87,19,WS_EX_STATICEDGE
105 CONTROL "&Don't Log",IDC_TYPE_NONE,"Button",BS_AUTORADIOBUTTON | 105 CONTROL "&Don't Log",IDC_TYPE_NONE,"Button",BS_AUTORADIOBUTTON |
106 BS_PUSHLIKE,191,60,87,19,WS_EX_STATICEDGE 106 BS_PUSHLIKE,191,60,87,19,WS_EX_STATICEDGE
107 CTEXT "File &name:",IDC_HOSTORFILE,12,84,40,8 107 CTEXT "File &name:",IDC_HOSTORFILE,12,84,40,8
108 EDITTEXT IDC_HOSTFILE,56,82,201,12,ES_AUTOHSCROLL 108 EDITTEXT IDC_HOSTFILE,56,82,201,12,ES_AUTOHSCROLL
109 PUSHBUTTON "...",IDC_BROWSE,262,82,17,13,0,WS_EX_STATICEDGE 109 PUSHBUTTON "...",IDC_BROWSE,262,82,17,13,0,WS_EX_STATICEDGE
@@ -146,41 +146,41 @@ BEGIN
146 PUSHBUTTON "remove",IDC_HL_REMOVE,111,140,30,12,0,WS_EX_STATICEDGE 146 PUSHBUTTON "remove",IDC_HL_REMOVE,111,140,30,12,0,WS_EX_STATICEDGE
147 LISTBOX IDC_HOSTS,12,154,140,33,LBS_USETABSTOPS | 147 LISTBOX IDC_HOSTS,12,154,140,33,LBS_USETABSTOPS |
148 LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_VSCROLL | 148 LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_VSCROLL |
149 WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE 149 WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE
150 GROUPBOX "When &triggered play:",IDC_STATIC,161,154,117,33,0, 150 GROUPBOX "When &triggered play:",IDC_STATIC,161,154,117,33,0,
151 WS_EX_TRANSPARENT 151 WS_EX_TRANSPARENT
152 COMBOBOX IDC_SOUND,170,167,92,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | 152 COMBOBOX IDC_SOUND,170,167,92,66,CBS_DROPDOWN | CBS_AUTOHSCROLL |
153 WS_VSCROLL | WS_TABSTOP 153 WS_VSCROLL | WS_TABSTOP
154 PUSHBUTTON "..",IDC_BROWSESOUND,264,160,12,12,BS_ICON | BS_CENTER | 154 PUSHBUTTON "..",IDC_BROWSESOUND,264,160,12,12,BS_ICON | BS_CENTER |
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
168 CONTROL "Spin4",IDC_LOGLENSPIN,"msctls_updown32",UDS_WRAP | 168 CONTROL "Spin4",IDC_LOGLENSPIN,"msctls_updown32",UDS_WRAP |
169 UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 169 UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
170 UDS_ARROWKEYS | UDS_NOTHOUSANDS,189,11,10,12 170 UDS_ARROWKEYS | UDS_NOTHOUSANDS,189,11,10,12
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
178 178
179IDD_LOG_UNIX DIALOG DISCARDABLE 0, 0, 394, 143 179IDD_LOG_UNIX DIALOG DISCARDABLE 0, 0, 394, 143
180STYLE DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION 180STYLE DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION
181CAPTION "Unix" 181CAPTION "Unix"
182FONT 8, "MS Sans Serif" 182FONT 8, "MS Sans Serif"
183BEGIN 183BEGIN
184 PUSHBUTTON "emerg",IDC_EMERG_ON,7,20,25,13,BS_CENTER | BS_VCENTER | 184 PUSHBUTTON "emerg",IDC_EMERG_ON,7,20,25,13,BS_CENTER | BS_VCENTER |
185 BS_NOTIFY 185 BS_NOTIFY
186 PUSHBUTTON "alert",IDC_ALERT_ON,7,33,25,13,BS_CENTER | BS_VCENTER | 186 PUSHBUTTON "alert",IDC_ALERT_ON,7,33,25,13,BS_CENTER | BS_VCENTER |
@@ -795,49 +795,49 @@ BEGIN
795 BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22, 795 BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22,
796 WS_EX_STATICEDGE 796 WS_EX_STATICEDGE
797END 797END
798 798
799 799
800#ifndef _MAC 800#ifndef _MAC
801///////////////////////////////////////////////////////////////////////////// 801/////////////////////////////////////////////////////////////////////////////
802// 802//
803// Version 803// Version
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
811 FILEFLAGS 0x1L 811 FILEFLAGS 0x1L
812#else 812#else
813 FILEFLAGS 0x0L 813 FILEFLAGS 0x0L
814#endif 814#endif
815 FILEOS 0x4L 815 FILEOS 0x4L
816 FILETYPE 0x1L 816 FILETYPE 0x1L
817 FILESUBTYPE 0x0L 817 FILESUBTYPE 0x0L
818BEGIN 818BEGIN
819 BLOCK "StringFileInfo" 819 BLOCK "StringFileInfo"
820 BEGIN 820 BEGIN
821 BLOCK "040904b0" 821 BLOCK "040904b0"
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"
835 BEGIN 835 BEGIN
836 VALUE "Translation", 0x409, 1200 836 VALUE "Translation", 0x409, 1200
837 END 837 END
838END 838END
839 839
840#endif // !_MAC 840#endif // !_MAC
841 841
842 842
843///////////////////////////////////////////////////////////////////////////// 843/////////////////////////////////////////////////////////////////////////////
@@ -850,25 +850,25 @@ GUIDELINES DESIGNINFO DISCARDABLE
850BEGIN 850BEGIN
851 IDD_ABOUTBOX, DIALOG 851 IDD_ABOUTBOX, DIALOG
852 BEGIN 852 BEGIN
853 LEFTMARGIN, 7 853 LEFTMARGIN, 7
854 RIGHTMARGIN, 210 854 RIGHTMARGIN, 210
855 TOPMARGIN, 7 855 TOPMARGIN, 7
856 BOTTOMMARGIN, 63 856 BOTTOMMARGIN, 63
857 END 857 END
858 858
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
866 BOTTOMMARGIN, 279 866 BOTTOMMARGIN, 279
867 HORZGUIDE, 31 867 HORZGUIDE, 31
868 HORZGUIDE, 192 868 HORZGUIDE, 192
869 END 869 END
870 870
871 IDD_LOG_UNIX, DIALOG 871 IDD_LOG_UNIX, DIALOG
872 BEGIN 872 BEGIN
873 LEFTMARGIN, 7 873 LEFTMARGIN, 7
874 RIGHTMARGIN, 387 874 RIGHTMARGIN, 387
diff --git a/resource.h b/resource.h
index 33cf881..3c04188 100644
--- a/resource.h
+++ b/resource.h
@@ -1,15 +1,15 @@
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
7#define IDS_ABOUTBOX 101 7#define IDS_ABOUTBOX 101
8#define IDC_TRAYICON 101 8#define IDC_TRAYICON 101
9#define IDD_KLOG_DIALOG 102 9#define IDD_KLOG_DIALOG 102
10#define IDS_LOGTO_HOST 102 10#define IDS_LOGTO_HOST 102
11#define IDP_SOCKETS_INIT_FAILED 103 11#define IDP_SOCKETS_INIT_FAILED 103
12#define IDS_LOGTO_FILE 104 12#define IDS_LOGTO_FILE 104
13#define IDS_SOUND_MEOW 105 13#define IDS_SOUND_MEOW 105
14#define IDS_SOUND_GLASS 106 14#define IDS_SOUND_GLASS 106
15#define IDS_SOUND_FEAR 107 15#define IDS_SOUND_FEAR 107