| -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,7 +1,7 @@ -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 diff --git a/KLogDlg.cpp b/KLogDlg.cpp index 5f1c6c0..bdcb881 100644 --- a/KLogDlg.cpp +++ b/KLogDlg.cpp @@ -99,12 +99,13 @@ CKLogDlg::CKLogDlg(CWnd* pParent /*=NULL*/) }
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);
@@ -178,21 +179,23 @@ BEGIN_MESSAGE_MAP(CKLogDlg, CDialog) 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
@@ -1362,6 +1365,33 @@ void CLogger::LookupHost(CKLogDlg *daddy) 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);
+}
@@ -102,12 +102,13 @@ public: 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;
@@ -190,9 +191,11 @@ protected: 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 @@ -14,24 +14,26 @@ DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD ${\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
diff --git a/help/klog.xml b/help/klog.xml index 830b297..08daf61 100644 --- a/help/klog.xml +++ b/help/klog.xml @@ -2,16 +2,19 @@ <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">
diff --git a/install/install.cpp b/install/install.cpp index c0e0bb8..81d5a7e 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -1,10 +1,10 @@ #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");
diff --git a/install/install.rc b/install/install.rc index 6a3fd3e..cee7f66 100644 --- a/install/install.rc +++ b/install/install.rc @@ -128,14 +128,14 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico /////////////////////////////////////////////////////////////////////////////
//
// 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
@@ -146,19 +146,19 @@ 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
@@ -37,13 +37,13 @@ Filter=N 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
@@ -69,13 +69,13 @@ 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"
@@ -96,13 +96,13 @@ 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= \
@@ -110,13 +110,13 @@ 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" \
@@ -166,13 +166,13 @@ 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"
@@ -198,13 +198,13 @@ 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= \
@@ -212,13 +212,13 @@ 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" \
@@ -258,23 +258,23 @@ 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"
@@ -295,13 +295,13 @@ 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= \
@@ -309,13 +309,13 @@ 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" \
@@ -766,27 +766,27 @@ DEP_RSC_KLOG_R=\ ".\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
@@ -1192,41 +1192,38 @@ DEP_RSC_INSTA=\ # 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
@@ -47,13 +47,13 @@ BEGIN "\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
@@ -80,24 +80,24 @@ IDI_LOGPATTERN ICON DISCARDABLE "res\\log-pattern.ico" 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 |
@@ -152,29 +152,29 @@ BEGIN 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
@@ -801,13 +801,13 @@ END /////////////////////////////////////////////////////////////////////////////
//
// 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
@@ -819,19 +819,19 @@ 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
@@ -856,13 +856,13 @@ BEGIN 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
@@ -1,9 +1,9 @@ //{{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
|