| author | Michael Krelin <hacker@klever.net> | 2005-07-06 21:49:03 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2005-07-06 21:49:03 (UTC) |
| commit | bdbe0e4fff764357d0bb6236f22d6f1dcc0548ba (patch) (side-by-side diff) | |
| tree | 346c632a5308885dc657de9b724256c62c80f3b8 | |
| parent | c8fe0207895827e5533f4100d203a187f021ebe8 (diff) | |
| download | klog-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
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | KLogDlg.cpp | 30 | ||||
| -rw-r--r-- | KLogDlg.h | 3 | ||||
| -rw-r--r-- | help/klog.rtf | 4 | ||||
| -rw-r--r-- | help/klog.xml | 5 | ||||
| -rw-r--r-- | install/install.cpp | 2 | ||||
| -rw-r--r-- | install/install.rc | 10 | ||||
| -rw-r--r-- | klog.clw | 2 | ||||
| -rw-r--r-- | klog.mak | 39 | ||||
| -rw-r--r-- | klog.rc | 32 | ||||
| -rw-r--r-- | resource.h | 2 |
11 files changed, 83 insertions, 48 deletions
@@ -1,19 +1,19 @@ -Copyright (c) 1998-2004 Klever Group (http://www.klever.net/) +Copyright (c) 1998-2005 Klever Group (http://www.klever.net/) Permission 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: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 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. diff --git a/KLogDlg.cpp b/KLogDlg.cpp index 5f1c6c0..bdcb881 100644 --- a/KLogDlg.cpp +++ b/KLogDlg.cpp @@ -81,48 +81,49 @@ CKLogDlg::CKLogDlg(CWnd* pParent /*=NULL*/) m_bDontWarn=TRUE;
//{{AFX_DATA_INIT(CKLogDlg)
m_Logto = -1;
m_Desc = _T("");
m_Facility = _T("");
m_HFName = _T("");
m_HFNameCaption = _T("");
m_hlIP = _T("");
m_hlMask = _T("");
m_Sound = _T("");
//}}AFX_DATA_INIT
// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
m_bmpBack.LoadBitmap(IDB_BACKGROUND);
m_bmpBack.GetBitmap(&m_bitmapBack);
m_Trayer = new CTrayer(this);
ASSERT(m_Trayer);
LoadSettings();
}
void CKLogDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CKLogDlg)
+ DDX_Control(pDX, IDCANCEL, m_CancelCtl);
DDX_Control(pDX, IDC_LOGPATTERN, m_LogPatternCtl);
DDX_Control(pDX, IDC_FILES, m_FilesCtl);
DDX_Control(pDX, IDC_LOGLENSPIN, m_LogLenSpinCtl);
DDX_Control(pDX, IDC_LOGLENGTH, m_LogLengthCtl);
DDX_Control(pDX, IDC_INVERT, m_PriInvertCtl);
DDX_Control(pDX, IDC_TYPE_FILE, m_LogtoFileCtl);
DDX_Control(pDX, IDC_TYPE_HOST, m_LogtoHostCtl);
DDX_Control(pDX, IDC_TYPE_NONE, m_LogtoNoneCtl);
DDX_Control(pDX, IDC_HOSTORFILE, m_HFNameCaptionCtl);
DDX_Control(pDX, IDC_HOSTS, m_hlCtl);
DDX_Control(pDX, IDC_BROWSESOUND, m_BrowseSoundCtl);
DDX_Control(pDX, IDC_NONE, m_PriNoneCtl);
DDX_Control(pDX, IDC_HL_REMOVE, m_hlRemoveCtl);
DDX_Control(pDX, IDC_HL_MASK, m_hlMaskCtl);
DDX_Control(pDX, IDC_HL_IP, m_hlIPCtl);
DDX_Control(pDX, IDC_HL_ADD, m_hlAddCtl);
DDX_Control(pDX, IDC_ALL, m_PriAllCtl);
DDX_Control(pDX, IDC_SOUND, m_SoundCtl);
DDX_Control(pDX, IDC_REMOVE, m_RemoveCtl);
DDX_Control(pDX, IDC_PLAYSOUND, m_PlaySoundCtl);
DDX_Control(pDX, IDC_LOG, m_Log);
DDX_Control(pDX, IDC_HOSTFILE, m_HFNameCtl);
DDX_Control(pDX, IDC_FACILITY, m_FacilityCtl);
DDX_Control(pDX, IDC_BROWSE, m_BrowseCtl);
@@ -160,57 +161,59 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog) ON_BN_CLICKED(IDC_HL_ADD, OnHlAdd)
ON_LBN_SELCHANGE(IDC_HOSTS, OnSelchangeHosts)
ON_BN_CLICKED(IDC_HL_REMOVE, OnHlRemove)
ON_BN_CLICKED(IDC_REMOVE, OnRemove)
ON_BN_CLICKED(IDC_PLAYSOUND, OnPlaysound)
ON_CBN_EDITCHANGE(IDC_SOUND, OnEditchangeSound)
ON_CBN_KILLFOCUS(IDC_SOUND, OnKillfocusSound)
ON_NOTIFY(UDN_DELTAPOS, IDC_LOGLENSPIN, OnDeltaposLoglenspin)
ON_BN_CLICKED(IDC_EXIT, OnExit)
ON_BN_CLICKED(IDC_FILES, OnFiles)
ON_COMMAND(ID_FILES_EXPORT, OnFilesExport)
ON_COMMAND(ID_FILES_IMPORT, OnFilesImport)
ON_BN_CLICKED(IDC_BROWSESOUND, OnBrowsesound)
ON_EN_KILLFOCUS(IDC_HOSTFILE, OnKillfocusHostfile)
ON_BN_CLICKED(IDC_BROWSE, OnBrowse)
ON_COMMAND(ID_FILES_RESET, OnFilesReset)
ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)
ON_WM_CREATE()
ON_WM_CLOSE()
ON_COMMAND(ID_TRAY_ABOUTKLOG, OnTrayAboutklog)
ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)
ON_COMMAND(ID_TRAY_SHOWKLOGWINDOW, OnTrayShowklogwindow)
ON_WM_WINDOWPOSCHANGING()
ON_BN_CLICKED(IDC_LOGPATTERN, OnLogpattern)
+ ON_WM_GETMINMAXINFO()
ON_BN_CLICKED(IDC_CRIT, OnPriority)
ON_BN_CLICKED(IDC_DEBUG, OnPriority)
ON_BN_CLICKED(IDC_EMERG, OnPriority)
ON_BN_CLICKED(IDC_ERR, OnPriority)
ON_BN_CLICKED(IDC_INFO, OnPriority)
ON_BN_CLICKED(IDC_NOTICE, OnPriority)
ON_BN_CLICKED(IDC_WARNING, OnPriority)
ON_BN_CLICKED(IDC_TYPE_HOST, OnLogto)
ON_BN_CLICKED(IDC_TYPE_NONE, OnLogto)
+ ON_WM_SIZE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CKLogDlg message handlers
BOOL CKLogDlg::OnInitDialog()
{
CDialog::OnInitDialog();
// Add "About..." menu item to system menu.
// IDM_ABOUTBOX must be in the system command range.
ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
ASSERT(IDM_ABOUTBOX < 0xF000);
CMenu* pSysMenu = GetSystemMenu(FALSE);
CString strAboutMenu;
strAboutMenu.LoadString(IDS_ABOUTBOX);
if (!strAboutMenu.IsEmpty())
{
pSysMenu->AppendMenu(MF_SEPARATOR);
pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
}
@@ -1344,24 +1347,51 @@ void CLogger::LookupHost(CKLogDlg *daddy) if(daddy->m_bWarnBlocking){
CWarnBlocking wb(::IsWindow(daddy->m_hWnd)?daddy:NULL);
wb.m_bDontWarn = daddy->m_bDontWarn;
if(wb.DoModal()!=IDOK)
return;
daddy->m_bDontWarn=wb.m_bDontWarn;
daddy->m_bWarnBlocking=!wb.m_bDontWarn;
}
daddy->BeginWaitCursor();
hostent *he = gethostbyname(m_LogToName);
daddy->EndWaitCursor();
if(he){
m_LogToHost.sin_addr.s_addr = *(DWORD*)he->h_addr;
}else{
m_LogToHost.sin_addr.s_addr = INADDR_NONE;
if(daddy->m_bWarnBlocking){
CString sux;
sux.Format(IDS_MSG_LOOKUPFAILED,(LPCTSTR)m_LogToName);
daddy->MessageBox(sux,NULL,MB_ICONSTOP|MB_OK);
}else
MessageBeep(MB_ICONHAND);
}
} } +
+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);
+}
@@ -84,48 +84,49 @@ public: void LogMessage(UINT pri,UINT fac,LPCTSTR line,SOCKADDR_IN *sin); CKLogSocket m_KLS; virtual void Serialize(CArchive& ar); void TotalCleanUp(); BITMAP m_bitmapBack;
CBitmap m_bmpBack;
void UpdateLogLength(BOOL bSave=TRUE,BOOL update=FALSE); int m_LogItems; void UpdateLogto(BOOL bSave=TRUE,BOOL update=TRUE); void UpdatePriface(BOOL bSave=TRUE,BOOL update=TRUE); static UINT m_PriorityCtls[CSyslogSocket::totalPriorities]; CLogger* m_Logger; void SetTab(CLogger* l); int m_iTriggered; int m_iNormal; CImageList m_Images; CLoggers m_Logs; CKLogDlg(CWnd* pParent = NULL); // standard constructor
DECLARE_SERIAL( CKLogDlg )
// Dialog Data
//{{AFX_DATA(CKLogDlg)
enum { IDD = IDD_KLOG_DIALOG };
+ CButton m_CancelCtl;
CButton m_LogPatternCtl;
CButton m_FilesCtl;
CSpinButtonCtrl m_LogLenSpinCtl;
CStatic m_LogLengthCtl;
CButton m_PriInvertCtl;
CButton m_LogtoFileCtl;
CButton m_LogtoHostCtl;
CButton m_LogtoNoneCtl;
CStatic m_HFNameCaptionCtl;
CListBox m_hlCtl;
CButton m_BrowseSoundCtl;
CButton m_PriNoneCtl;
CButton m_hlRemoveCtl;
CEdit m_hlMaskCtl;
CEdit m_hlIPCtl;
CButton m_hlAddCtl;
CButton m_PriAllCtl;
CComboBox m_SoundCtl;
CButton m_RemoveCtl;
CButton m_PlaySoundCtl;
CListBox m_Log;
CEdit m_HFNameCtl;
CComboBox m_FacilityCtl;
CButton m_BrowseCtl;
@@ -172,27 +173,29 @@ protected: afx_msg void OnSelchangeHosts();
afx_msg void OnHlRemove();
afx_msg void OnRemove();
afx_msg void OnPlaysound();
afx_msg void OnEditchangeSound();
afx_msg void OnKillfocusSound();
afx_msg void OnDeltaposLoglenspin(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnExit();
afx_msg void OnFiles();
afx_msg void OnFilesExport();
afx_msg void OnFilesImport();
afx_msg void OnBrowsesound();
afx_msg void OnKillfocusHostfile();
virtual void OnOK();
afx_msg void OnBrowse();
afx_msg void OnFilesReset();
afx_msg void OnSelchangeLog();
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnClose();
afx_msg void OnTrayAboutklog();
afx_msg void OnTrayExit();
afx_msg void OnTrayShowklogwindow();
afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos);
afx_msg void OnLogpattern();
+ afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
+ afx_msg void OnSize(UINT nType, int cx, int cy);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
diff --git a/help/klog.rtf b/help/klog.rtf index 9531c73..0f72570 100644 --- a/help/klog.rtf +++ b/help/klog.rtf @@ -1,55 +1,57 @@ {\rtf1\ansi
@{\footnote
THIS FILE WAS AUTOMATICALLY GENERATED FROM XML DOCUMENT.
DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
}
{\fonttbl{\f0\froman Times New Roman;}{\f1\fswiss Arial;}{\f3\froman Symbol;}}{\colortbl;
\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
\pard\plain\keepn
#{\footnote About}
${\footnote About KLog}
{ \f1\fs18\b\sb120 Abotu {\b KLog}}
\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.
\par\sa120\sb120\qj\pard \f1\fs18\sb120
\par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}
{
-\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:
\par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
\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.
}
\par \sa0\sb120\ql \f1\fs16 Author: {\b\uldb\cf11 Michael Krelin ({\i hacker@klever.net})}{\v %!ExecFile("mailto:hacker@klever.net")}
\par \sa0\sb0 Fan mail send to {\i\uldb gefilte@klever.net}{\v %!ExecFile("mailto:gefilte@klever.net")}
\page
\pard\plain
#{\footnote News}
${\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
\par\pard\plain\fi0\li0\f1\fs18 \bullet Change of license and opening the source code
\par\pard\plain\fi0\li0\f1\fs18 \bullet Minor changes in code, mostly bugfixes
\page
\pard\plain\keepn
#{\footnote Using}
${\footnote Using KLog}
{ \f1\fs18\b\sb120 Using {\b KLog}}
\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.
\page
\pard\plain\keepn
#{\footnote MainWindow}
${\footnote Main Window}
{ \f1\fs18\b\sb120 Main Window}
\par\sa120\sb120\qj\pard \f1\fs18\sb120 Essentially, main window is a tabbed collection of 'Destinations'. For each destination you can set the destination itself, events criteria and sound {\b KLog} will produce when triggered by event matching criteria.
\par\sa120\sb120\qj\pard \f1\fs18\sb120 Each tab consists of following fields:\pard
\par \fi0\li0 \bullet {\b Short description} - short descriptive text appearing on the tab on top of window.
\par \fi0\li0 \bullet {\b Log to File/Log to Host/Don't Log radio buttons} - let you specify where to forward the events matching criteria below.
\par \fi0\li0 \bullet {\b File/Host name} - Either file name for logging or host name to forward syslog messages to. (note: host address lookups are performed by blocking call, so if you it takes time to resolve host from it's name {\b Klog} may seem to lock up for a while)
\par \fi0\li0 \bullet {\b IP/mask pairs list} - lets you enter ip address/netmask pairs to specify access list for this destination. If none are entered \endash all hosts activities are logged into selected destination.
\par \fi0\li0 \bullet {\b Facility/priority pattern} - may be set in two ways: either by selecting desired facility from the dropdown list and check appropriate priorities and repeat this procedure for every facility or by clicking '{\uldb edit logging pattern}{\v Pattern}' button and use the dialog box to edit logging pattern. If you have experience with logging you don't need any explanation about logging facilities/priorities what are they all about and why do you need them. If you don't, then you, probably, don't need {\b KLog}.
\par \fi0\li0 \bullet {\b Sound to play when triggered} - whenever event is logged using current destination {\b KLog} may produce the sound to make you aware of its activity. You can select any preset sound or specify your own wave file.
diff --git a/help/klog.xml b/help/klog.xml index 830b297..08daf61 100644 --- a/help/klog.xml +++ b/help/klog.xml @@ -1,35 +1,38 @@ <?xml version="1.0"?>
<winhelp>
<topic id="About" title="About KLog">
<heading scroll="no">Abotu <kin>KLog</kin></heading>
<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>
<p/>
<p><b><i>Enjoy!</i></b></p>
- <license years="1998-2004"/>
+ <license years="1998-2005"/>
<credits/>
</topic>
<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">
<ni>Change of license and opening the source code</ni>
<ni>Minor changes in code, mostly bugfixes</ni>
</newsfor>
</topic>
<topic id="Using" title="Using KLog">
<heading scroll="no">Using <kin>KLog</kin></heading>
<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>
</topic>
<topic id="MainWindow" title="Main Window">
<heading scroll="no">Main Window</heading>
<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>
<p>Each tab consists of following fields:</p>
<ul>
<li><b>Short description</b> - short descriptive text appearing on the tab on top of window.</li>
<li><b>Log to File/Log to Host/Don't Log radio buttons</b> - let you specify where to forward the events matching criteria below.</li>
<li><b>File/Host name</b> - Either file name for logging or host name to forward syslog messages to. (note: host address lookups are performed by blocking call, so if you it takes time to resolve host from it's name <kin>Klog</kin> may seem to lock up for a while)</li>
<li><b>IP/mask pairs list</b> - lets you enter ip address/netmask pairs to specify access list for this destination. If none are entered \endash all hosts activities are logged into selected destination.</li>
<li><b>Facility/priority pattern</b> - may be set in two ways: either by selecting desired facility from the dropdown list and check appropriate priorities and repeat this procedure for every facility or by clicking '<a href="#Pattern">edit logging pattern</a>' button and use the dialog box to edit logging pattern. If you have experience with logging you don't need any explanation about logging facilities/priorities what are they all about and why do you need them. If you don't, then you, probably, don't need <kin>KLog</kin>.</li>
<li><b>Sound to play when triggered</b> - whenever event is logged using current destination <kin>KLog</kin> may produce the sound to make you aware of its activity. You can select any preset sound or specify your own wave file.</li>
<li><b>Log window</b> - shows recent activity.</li>
</ul>
</topic>
<topic id="Pattern" title="Edit Logging Pattern">
diff --git a/install/install.cpp b/install/install.cpp index c0e0bb8..81d5a7e 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -1,28 +1,28 @@ #include "resource.h" #include "../shared-code/install.h" -#define KINAME "KLog 1.1"
+#define KINAME "KLog 1.1.1-trunk"
#define SKINAME "KLog"
BOOL Install(void) { STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group", SKINAME "Path");
STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");
STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath);
if(!path)
return NULL;
#ifdef K_ANNED
STRING sysDir(_MAX_PATH);
GetSystemDirectory(sysDir,_MAX_PATH);
INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");
#endif
MAKE_PATH(path);
STRING shortPath = GET_SHORT_PATH(path);
if(!shortPath){
MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);
return FALSE;
}
if(!(
diff --git a/install/install.rc b/install/install.rc index 6a3fd3e..cee7f66 100644 --- a/install/install.rc +++ b/install/install.rc @@ -110,73 +110,73 @@ END 3 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""custom.rch""\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico"
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
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
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
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"
VALUE "OriginalFilename", "INSTALL.EXE\0"
VALUE "ProductName", "KLog\0"
- VALUE "ProductVersion", "1, 1, 0, 0\0"
+ VALUE "ProductVersion", "1, 1, 1, 0\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "custom.rch"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
@@ -19,49 +19,49 @@ Class4=CTrayer Resource3=IDD_LOG_RESERVED
Resource4=IDD_WARNBLOCKING
Resource5=IDD_LOG_UNIX
Class5=CLogPattern
Class6=CLogPatternUnix
Class7=CLogPatternReserved
Class8=CLogPatternLocal
Resource6=IDD_ABOUTBOX
Class9=CWarnBlocking
Resource7=IDD_KLOG_DIALOG
[CLS:CKLogApp]
Type=0
HeaderFile=KLog.h
ImplementationFile=KLog.cpp
Filter=N
[CLS:CKLogDlg]
Type=0
HeaderFile=KLogDlg.h
ImplementationFile=KLogDlg.cpp
Filter=W
BaseClass=CDialog
VirtualFilter=dWC
-LastObject=IDC_HL_ADD
+LastObject=IDC_LOG
[CLS:CAboutDlg]
Type=0
HeaderFile=KLogDlg.h
ImplementationFile=KLogDlg.cpp
Filter=D
BaseClass=CDialog
VirtualFilter=dWC
LastObject=IDC_KLEVERNET
[DLG:IDD_ABOUTBOX]
Type=1
Class=CAboutDlg
ControlCount=5
Control1=IDC_STATIC,static,1342177283
Control2=IDC_STATIC,static,1342308480
Control3=IDC_STATIC,static,1342308352
Control4=IDOK,button,1342373889
Control5=IDC_KLEVERNET,button,1342242816
[DLG:IDD_KLOG_DIALOG]
Type=1
Class=CKLogDlg
ControlCount=48
@@ -51,90 +51,90 @@ MTL=mktyplib.exe # PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 6
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
OUTDIR=.\Release
INTDIR=.\Release
# Begin Custom Macros
OutDir=.\Release
TargetName=klog
# End Custom Macros
ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\
"$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"
CLEAN :
-@erase "$(INTDIR)\klog.cn_"
-@erase "$(INTDIR)\klog.cnt"
-@erase "$(INTDIR)\klog.hl_"
-@erase "$(INTDIR)\klog.hlp"
-@erase "$(INTDIR)\KLog.obj"
-@erase "$(INTDIR)\klog.pch"
- -@erase "$(INTDIR)\KLog.res"
+ -@erase "$(INTDIR)\klog.res"
-@erase "$(INTDIR)\KLogDlg.obj"
-@erase "$(INTDIR)\LogPattern.obj"
-@erase "$(INTDIR)\LogPatternLocal.obj"
-@erase "$(INTDIR)\LogPatternReserved.obj"
-@erase "$(INTDIR)\LogPatternUnix.obj"
-@erase "$(INTDIR)\StdAfx.obj"
-@erase "$(INTDIR)\SyslogSocket.obj"
-@erase "$(INTDIR)\Trayer.obj"
-@erase "$(INTDIR)\WarnBlocking.obj"
-@erase "$(OUTDIR)\klog.ex_"
-@erase "$(OUTDIR)\klog.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
CPP_PROJ=/nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
"_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
# 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
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 /nologo /subsystem:windows /machine:I386
LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
/pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
LINK32_OBJS= \
"$(INTDIR)\KLog.obj" \
- "$(INTDIR)\KLog.res" \
+ "$(INTDIR)\klog.res" \
"$(INTDIR)\KLogDlg.obj" \
"$(INTDIR)\LogPattern.obj" \
"$(INTDIR)\LogPatternLocal.obj" \
"$(INTDIR)\LogPatternReserved.obj" \
"$(INTDIR)\LogPatternUnix.obj" \
"$(INTDIR)\StdAfx.obj" \
"$(INTDIR)\SyslogSocket.obj" \
"$(INTDIR)\Trayer.obj" \
"$(INTDIR)\WarnBlocking.obj"
"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
# Begin Custom Build
OutDir=.\Release
TargetName=klog
InputPath=.\Release\klog.exe
SOURCE=$(InputPath)
"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_
@@ -148,192 +148,192 @@ SOURCE=$(InputPath) # PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 6
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
OUTDIR=.\Debug
INTDIR=.\Debug
# Begin Custom Macros
OutDir=.\Debug
TargetName=klog
# End Custom Macros
ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\
"$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"
CLEAN :
-@erase "$(INTDIR)\klog.cn_"
-@erase "$(INTDIR)\klog.cnt"
-@erase "$(INTDIR)\klog.hl_"
-@erase "$(INTDIR)\klog.hlp"
-@erase "$(INTDIR)\KLog.obj"
-@erase "$(INTDIR)\klog.pch"
- -@erase "$(INTDIR)\KLog.res"
+ -@erase "$(INTDIR)\klog.res"
-@erase "$(INTDIR)\KLogDlg.obj"
-@erase "$(INTDIR)\LogPattern.obj"
-@erase "$(INTDIR)\LogPatternLocal.obj"
-@erase "$(INTDIR)\LogPatternReserved.obj"
-@erase "$(INTDIR)\LogPatternUnix.obj"
-@erase "$(INTDIR)\StdAfx.obj"
-@erase "$(INTDIR)\SyslogSocket.obj"
-@erase "$(INTDIR)\Trayer.obj"
-@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb"
-@erase "$(INTDIR)\WarnBlocking.obj"
-@erase "$(OUTDIR)\klog.ex_"
-@erase "$(OUTDIR)\klog.exe"
-@erase "$(OUTDIR)\klog.ilk"
-@erase "$(OUTDIR)\klog.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
/D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/"\
/Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
# 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
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386
LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
/pdb:"$(OUTDIR)/klog.pdb" /debug /machine:I386 /out:"$(OUTDIR)/klog.exe"
LINK32_OBJS= \
"$(INTDIR)\KLog.obj" \
- "$(INTDIR)\KLog.res" \
+ "$(INTDIR)\klog.res" \
"$(INTDIR)\KLogDlg.obj" \
"$(INTDIR)\LogPattern.obj" \
"$(INTDIR)\LogPatternLocal.obj" \
"$(INTDIR)\LogPatternReserved.obj" \
"$(INTDIR)\LogPatternUnix.obj" \
"$(INTDIR)\StdAfx.obj" \
"$(INTDIR)\SyslogSocket.obj" \
"$(INTDIR)\Trayer.obj" \
"$(INTDIR)\WarnBlocking.obj"
"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
# Begin Custom Build
OutDir=.\Debug
TargetName=klog
InputPath=.\Debug\klog.exe
SOURCE=$(InputPath)
"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_
# End Custom Build
!ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
# PROP BASE Use_MFC 6
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "KLog___W"
# PROP BASE Intermediate_Dir "KLog___W"
# PROP BASE Target_Dir ""
# PROP Use_MFC 5
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Releast"
# PROP Intermediate_Dir "Releast"
# PROP Target_Dir ""
OUTDIR=.\Releast
INTDIR=.\Releast
# Begin Custom Macros
OutDir=.\Releast
TargetName=klog
# End Custom Macros
-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_"
CLEAN :
-@erase "$(INTDIR)\klog.cn_"
-@erase "$(INTDIR)\klog.cnt"
-@erase "$(INTDIR)\klog.hl_"
-@erase "$(INTDIR)\klog.hlp"
-@erase "$(INTDIR)\KLog.obj"
-@erase "$(INTDIR)\klog.pch"
- -@erase "$(INTDIR)\KLog.res"
+ -@erase "$(INTDIR)\klog.res"
-@erase "$(INTDIR)\KLogDlg.obj"
-@erase "$(INTDIR)\LogPattern.obj"
-@erase "$(INTDIR)\LogPatternLocal.obj"
-@erase "$(INTDIR)\LogPatternReserved.obj"
-@erase "$(INTDIR)\LogPatternUnix.obj"
-@erase "$(INTDIR)\StdAfx.obj"
-@erase "$(INTDIR)\SyslogSocket.obj"
-@erase "$(INTDIR)\Trayer.obj"
-@erase "$(INTDIR)\WarnBlocking.obj"
-@erase "$(OUTDIR)\klog.ex_"
-@erase "$(OUTDIR)\klog.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /c
CPP_PROJ=/nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
"_MBCS" /Fp"$(INTDIR)/klog.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Releast/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
# 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
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 /nologo /subsystem:windows /machine:I386
LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
/pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
LINK32_OBJS= \
"$(INTDIR)\KLog.obj" \
- "$(INTDIR)\KLog.res" \
+ "$(INTDIR)\klog.res" \
"$(INTDIR)\KLogDlg.obj" \
"$(INTDIR)\LogPattern.obj" \
"$(INTDIR)\LogPatternLocal.obj" \
"$(INTDIR)\LogPatternReserved.obj" \
"$(INTDIR)\LogPatternUnix.obj" \
"$(INTDIR)\StdAfx.obj" \
"$(INTDIR)\SyslogSocket.obj" \
"$(INTDIR)\Trayer.obj" \
"$(INTDIR)\WarnBlocking.obj"
"$(OUTDIR)\klog.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
# Begin Custom Build
OutDir=.\Releast
TargetName=klog
InputPath=.\Releast\klog.exe
SOURCE=$(InputPath)
"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_
@@ -748,63 +748,63 @@ BuildCmds= \ # End Source File
################################################################################
# Begin Source File
SOURCE=.\klog.rc
DEP_RSC_KLOG_R=\
".\res\fear.wav"\
".\res\glass.wav"\
".\res\kick.wav"\
".\res\klog-icon.ico"\
".\res\klog-triggered-icon.ico"\
".\res\KLog.ico"\
".\res\klog.rc2"\
".\res\log-pattern.ico"\
".\res\meow.wav"\
".\shared-data\browse-icon.ico"\
".\shared-data\klever-background.bmp"\
".\shared-data\play-icon.ico"\
!IF "$(CFG)" == "KLog - Win32 Release"
-"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
+"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "KLog - Win32 Debug"
-"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
+"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
-"$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
+"$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\help\klog.hpj
!IF "$(CFG)" == "KLog - Win32 Release"
# Begin Custom Build - Making help file...
OutDir=.\Release
ProjDir=.
TargetName=klog
InputPath=.\help\klog.hpj
BuildCmds= \
"$(ProjDir)\makehelp.bat" \
compress $(OutDir)\$(TargetName).hlp $(OutDir)\$(TargetName).hl_ \
compress $(OutDir)\$(TargetName).cnt $(OutDir)\$(TargetName).cn_ \
@@ -1174,77 +1174,74 @@ DEP_RSC_INSTA=\ !ELSEIF "$(CFG)" == "Install - Win32 Canned"
"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
$(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
"_AFXDLL" /d "K_ANNED" $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Static"
"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
$(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
"_AFXDLL" /d "STATI_K" $(SOURCE)
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\Install\install.cpp
-DEP_CPP_INSTAL=\
- ".\shared-code\install.h"\
-
!IF "$(CFG)" == "Install - Win32 Debug"
-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Pure"
-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Canned"
-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "Install - Win32 Static"
-"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
+"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File
################################################################################
# Begin Project Dependency
# Project_Dep_Name "KLog"
!IF "$(CFG)" == "Install - Win32 Debug"
"KLog - Win32 Debug" :
$(MAKE) /$(MAKEFLAGS) /F ".\klog.mak" CFG="KLog - Win32 Debug"
!ELSEIF "$(CFG)" == "Install - Win32 Pure"
!ELSEIF "$(CFG)" == "Install - Win32 Canned"
!ELSEIF "$(CFG)" == "Install - Win32 Static"
!ENDIF
@@ -29,93 +29,93 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
"\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
"#ifdef _WIN32\r\n"
"LANGUAGE 9, 1\r\n"
"#pragma code_page(1252)\r\n"
"#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"
"#endif\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME ICON DISCARDABLE "res\\klog.ico"
IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico"
IDI_PREPLAY ICON DISCARDABLE "shared-data/play-icon.ico"
IDI_KLOG ICON DISCARDABLE "res\\klog-icon.ico"
IDI_KLOG_TRIGGERED ICON DISCARDABLE "res\\klog-triggered-icon.ico"
IDI_LOGPATTERN ICON DISCARDABLE "res\\log-pattern.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 70
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About KLog"
FONT 8, "MS Sans Serif"
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
PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,125,49,85,14
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
CTEXT "Short de&scription:",IDC_STATIC,11,48,78,8,SS_NOTIFY
EDITTEXT IDC_DESC,91,46,187,13,ES_AUTOHSCROLL,WS_EX_STATICEDGE
CONTROL "Log to &File",IDC_TYPE_FILE,"Button",BS_AUTORADIOBUTTON |
BS_PUSHLIKE | WS_GROUP,11,60,87,19,WS_EX_STATICEDGE
CONTROL "Log to &Host",IDC_TYPE_HOST,"Button",BS_AUTORADIOBUTTON |
BS_PUSHLIKE,101,60,87,19,WS_EX_STATICEDGE
CONTROL "&Don't Log",IDC_TYPE_NONE,"Button",BS_AUTORADIOBUTTON |
BS_PUSHLIKE,191,60,87,19,WS_EX_STATICEDGE
CTEXT "File &name:",IDC_HOSTORFILE,12,84,40,8
EDITTEXT IDC_HOSTFILE,56,82,201,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_BROWSE,262,82,17,13,0,WS_EX_STATICEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,12,99,13,1
LTEXT "Log data:",IDC_STATIC,27,95,31,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,60,99,218,1
LTEXT "Fa&cility:",IDC_STATIC,19,108,27,8
COMBOBOX IDC_FACILITY,48,106,85,104,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "[::]",IDC_LOGPATTERN,136,106,23,12,BS_ICON | BS_CENTER |
BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
GROUPBOX " &Priorities: ",IDC_STATIC,162,100,92,53,BS_CENTER |
BS_NOTIFY,WS_EX_TRANSPARENT
CONTROL "emerg",IDC_EMERG,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT |
BS_RIGHT | BS_NOTIFY | WS_TABSTOP,169,110,36,10
@@ -134,65 +134,65 @@ BEGIN CONTROL "debug",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | BS_LEFT |
BS_NOTIFY | WS_TABSTOP,209,140,36,10
PUSHBUTTON "all",IDC_ALL,256,105,23,12,0,WS_EX_STATICEDGE
PUSHBUTTON "none",IDC_NONE,256,119,23,12,0,WS_EX_STATICEDGE
PUSHBUTTON "invert",IDC_INVERT,256,132,23,14,BS_NOTIFY,
WS_EX_STATICEDGE
LTEXT "IP:",IDC_STATIC,20,126,10,8,SS_NOTIFY
EDITTEXT IDC_HL_IP,43,124,65,13,ES_AUTOHSCROLL
LTEXT "mask:",IDC_STATIC,20,140,20,8,SS_NOTIFY
EDITTEXT IDC_HL_MASK,43,139,65,13,ES_AUTOHSCROLL
PUSHBUTTON "add",IDC_HL_ADD,111,124,30,12,BS_NOTIFY,
WS_EX_STATICEDGE
PUSHBUTTON "remove",IDC_HL_REMOVE,111,140,30,12,0,WS_EX_STATICEDGE
LISTBOX IDC_HOSTS,12,154,140,33,LBS_USETABSTOPS |
LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_VSCROLL |
WS_HSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE
GROUPBOX "When &triggered play:",IDC_STATIC,161,154,117,33,0,
WS_EX_TRANSPARENT
COMBOBOX IDC_SOUND,170,167,92,66,CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "..",IDC_BROWSESOUND,264,160,12,12,BS_ICON | BS_CENTER |
BS_VCENTER | BS_NOTIFY,WS_EX_STATICEDGE
PUSHBUTTON "..",IDC_PLAYSOUND,264,173,12,12,BS_ICON | BS_CENTER |
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 |
WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
PUSHBUTTON "&Add",IDC_ADD,7,7,39,18,BS_NOTIFY,WS_EX_CLIENTEDGE
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
CTEXT "10",IDC_LOGLENGTH,166,11,33,12,SS_NOPREFIX | SS_NOTIFY,
WS_EX_DLGMODALFRAME
CONTROL "Spin4",IDC_LOGLENSPIN,"msctls_updown32",UDS_WRAP |
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS | UDS_NOTHOUSANDS,189,11,10,12
CTEXT "Log window length:",IDC_STATIC_LOGLENGTH,89,11,77,12,
SS_NOPREFIX | SS_NOTIFY,WS_EX_DLGMODALFRAME
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 |
BS_NOTIFY | NOT WS_TABSTOP,WS_EX_CLIENTEDGE
END
IDD_LOG_UNIX DIALOG DISCARDABLE 0, 0, 394, 143
STYLE DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Unix"
FONT 8, "MS Sans Serif"
BEGIN
PUSHBUTTON "emerg",IDC_EMERG_ON,7,20,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "alert",IDC_ALERT_ON,7,33,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "crit",IDC_CRIT_ON,7,46,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "err",IDC_ERR_ON,7,59,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "warn",IDC_WARN_ON,7,72,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "notice",IDC_NOTICE_ON,7,85,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "info",IDC_INFO_ON,7,98,25,13,BS_CENTER | BS_VCENTER |
BS_NOTIFY
PUSHBUTTON "debug",IDC_DEBUG_ON,7,111,25,13,BS_CENTER | BS_VCENTER |
@@ -783,104 +783,104 @@ IDD_WARNBLOCKING DIALOGEX 0, 0, 195, 88 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE
CAPTION " Blocking call warning"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,39,67,50,14
PUSHBUTTON "Cancel",IDCANCEL,105,67,50,14
LTEXT "WARNING: ",IDC_STATIC,7,7,38,8
LTEXT "All host address lookups are performed in a blocking mode, so KLog may temporarily stop responding until host address is resolved or operation failed.",
IDC_STATIC,46,7,142,35
CONTROL "Enough is said, no need to remind me again. Thanks.",
IDC_WARNBLOCKING,"Button",BS_AUTOCHECKBOX | BS_RIGHT |
BS_VCENTER | BS_MULTILINE | WS_TABSTOP,7,42,123,22,
WS_EX_STATICEDGE
END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
+ FILEVERSION 1,1,1,0
PRODUCTVERSION 1,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
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"
VALUE "OriginalFilename", "KLOG.EXE\0"
VALUE "ProductName", "KLog\0"
- VALUE "ProductVersion", "1, 0, 0, 2\0"
+ VALUE "ProductVersion", "1, 1, 1, 0\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 210
TOPMARGIN, 7
BOTTOMMARGIN, 63
END
IDD_KLOG_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 284
+ RIGHTMARGIN, 286
VERTGUIDE, 12
VERTGUIDE, 278
TOPMARGIN, 7
BOTTOMMARGIN, 279
HORZGUIDE, 31
HORZGUIDE, 192
END
IDD_LOG_UNIX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 387
VERTGUIDE, 32
VERTGUIDE, 362
TOPMARGIN, 7
BOTTOMMARGIN, 136
HORZGUIDE, 20
HORZGUIDE, 124
END
IDD_LOG_RESERVED, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 387
@@ -1,27 +1,27 @@ //{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
-// Used by KLog.rc
+// Used by klog.rc
//
#define IDM_ABOUTBOX 0x0010
#define IDD_ABOUTBOX 100
#define IDS_ABOUTBOX 101
#define IDC_TRAYICON 101
#define IDD_KLOG_DIALOG 102
#define IDS_LOGTO_HOST 102
#define IDP_SOCKETS_INIT_FAILED 103
#define IDS_LOGTO_FILE 104
#define IDS_SOUND_MEOW 105
#define IDS_SOUND_GLASS 106
#define IDS_SOUND_FEAR 107
#define IDS_SOUND_KICK 108
#define IDS_WAVFILTER 109
#define IDS_SOUND_SELECT 110
#define IDS_LOGFILTER 111
#define IDS_LOG_SELECT 112
#define IDS_LOG_EXT 113
#define IDS_KLOGFILTER 114
#define IDS_KLOG_EXPORT 115
#define IDS_KLOG_IMPORT 116
#define IDS_KLOG_EXT 117
#define IDS_REGISTRYKEY 118
#define IDS_KLEVERNET_URL 119
|