|
From: <ki...@us...> - 2008-04-14 20:39:21
|
Revision: 5297
http://winmerge.svn.sourceforge.net/winmerge/?rev=5297&view=rev
Author: kimmov
Date: 2008-04-14 13:39:12 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Trivial cleanups for the command line parsing code. Adding and fixing doxygen comments.
Modified Paths:
--------------
trunk/Src/ClearCaseCmdLineParser.cpp
trunk/Src/ClearCaseCmdLineParser.h
trunk/Src/CmdLineParser.h
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
trunk/Src/WinMergeCmdLineParser.cpp
trunk/Src/WinMergeCmdLineParser.h
Modified: trunk/Src/ClearCaseCmdLineParser.cpp
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.cpp 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/ClearCaseCmdLineParser.cpp 2008-04-14 20:39:12 UTC (rev 5297)
@@ -26,7 +26,7 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "StdAfx.h"
@@ -36,21 +36,28 @@
#include "MergeCmdLineInfo.h"
#include "Paths.h"
-ClearCaseCmdLineParser::ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName) :
- CmdLineParser(CmdLineInfo),
- m_bDesc(false),
- m_bBaseFile(false),
- m_bOutFile(false)
+/**
+ * @brief Constructor.
+ * @param [out] cmdLineInfo Class which gets info about parsed parameters.
+ * @param [in] szExeName Executable file name. Required in order to
+ * know which external tool was executed.
+ */
+ClearCaseCmdLineParser::ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo,
+ const TCHAR *szExeName)
+: CmdLineParser(CmdLineInfo),
+m_bDesc(false),
+m_bBaseFile(false),
+m_bOutFile(false)
{
- m_CmdLineInfo.m_bEscShutdown = true;
+ m_cmdLineInfo.m_bEscShutdown = true;
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY | FFILEOPEN_NOMRU;
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY | FFILEOPEN_NOMRU;
+ m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
// szFileName is either "xmerge" or "xcompare".
- if (lstrcmpi(szFileName, _T("xmerge")))
+ if (lstrcmpi(szExeName, _T("xmerge")))
{
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
+ m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
// Compare tool doesn't have a common ancestor file description. We
// put a phony description so the command line parser will skip it.
@@ -58,7 +65,14 @@
}
}
-void ClearCaseCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+/**
+ * @brief Parser function for command line parameters.
+ * @param [in] pszParam The parameter or flag to parse.
+ * @param [in] bFlag Is the item to parse a flag?
+ * @param [in] bLast Is the item to parse a last of items?
+ */
+void ClearCaseCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag,
+ BOOL bLast)
{
if (TRUE == bFlag)
{
@@ -93,20 +107,20 @@
m_sBaseDesc = pszParam;
m_bDesc = false;
}
- else if ((m_bDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
+ else if ((m_bDesc == true) && m_cmdLineInfo.m_sLeftDesc.IsEmpty())
{
- m_CmdLineInfo.m_sLeftDesc = pszParam;
+ m_cmdLineInfo.m_sLeftDesc = pszParam;
m_bDesc = false;
}
- else if ((m_bDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
+ else if ((m_bDesc == true) && m_cmdLineInfo.m_sRightDesc.IsEmpty())
{
- m_CmdLineInfo.m_sRightDesc = pszParam;
+ m_cmdLineInfo.m_sRightDesc = pszParam;
}
else
{
String sFile = paths_GetLongPath(pszParam);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile.c_str());
- m_CmdLineInfo.m_nFiles += 1;
+ m_cmdLineInfo.m_Files.SetAtGrow(m_cmdLineInfo.m_nFiles, sFile.c_str());
+ m_cmdLineInfo.m_nFiles += 1;
}
}
@@ -115,8 +129,8 @@
if (FALSE == m_sOutFile.empty())
{
String sFile = paths_GetLongPath(m_sOutFile.c_str());
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile.c_str());
- m_CmdLineInfo.m_nFiles += 1;
+ m_cmdLineInfo.m_Files.SetAtGrow(m_cmdLineInfo.m_nFiles, sFile.c_str());
+ m_cmdLineInfo.m_nFiles += 1;
}
}
}
Modified: trunk/Src/ClearCaseCmdLineParser.h
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.h 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/ClearCaseCmdLineParser.h 2008-04-14 20:39:12 UTC (rev 5297)
@@ -29,7 +29,7 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "CmdLineParser.h"
@@ -40,33 +40,23 @@
*
* This parser is able to parse ClearCase external tools' command line, both
* compare and merge.
- *
*/
class ClearCaseCmdLineParser : public CmdLineParser
{
public:
-
- /** @brief ClearCaseCmdLineParser's constructor.
- *
- * @param [in] szFileName Executable file name. Required in order to
- * know which external tool was executed.
- *
- */
- ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szFileName);
-
+ ClearCaseCmdLineParser(MergeCmdLineInfo& CmdLineInfo, const TCHAR *szExeName);
virtual ~ClearCaseCmdLineParser() { }
virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
private:
-
- bool m_bDesc;
+ bool m_bDesc; /**< File's description text given? */
bool m_bBaseFile; /**< Files' common ancestor. Used till we'll have a 3-ways merge. */
- bool m_bOutFile;
+ bool m_bOutFile; /**< Out file given? */
- String m_sBaseFile;
- String m_sBaseDesc;
- String m_sOutFile;
+ String m_sBaseFile; /**< Base file path. */
+ String m_sBaseDesc; /**< Base file description. */
+ String m_sOutFile; /**< Out file path. */
};
#endif // _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
Modified: trunk/Src/CmdLineParser.h
===================================================================
--- trunk/Src/CmdLineParser.h 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/CmdLineParser.h 2008-04-14 20:39:12 UTC (rev 5297)
@@ -29,7 +29,7 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
class MergeCmdLineInfo;
@@ -50,18 +50,15 @@
*
* @param [in] CmdLineInfo A class which hold the information obtained
* from the command line arguments.
- *
*/
- CmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
- m_CmdLineInfo(CmdLineInfo)
+ CmdLineParser(MergeCmdLineInfo& cmdLineInfo) :
+ m_cmdLineInfo(cmdLineInfo)
{
-
}
/** @brief CmdLineParser's destructor. */
virtual ~CmdLineParser() { }
-
/** @brief The command line argument parser.
*
* This method should be implemented by the derived class and do the
@@ -76,8 +73,7 @@
virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) = 0;
protected:
-
- MergeCmdLineInfo& m_CmdLineInfo;
+ MergeCmdLineInfo& m_cmdLineInfo; /**< Gets the command line information. */
};
#endif // _CMD_LINE_PARSER_INCLUDED_
Modified: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/MergeCmdLineInfo.cpp 2008-04-14 20:39:12 UTC (rev 5297)
@@ -26,7 +26,7 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "StdAfx.h"
@@ -40,6 +40,11 @@
// MergeCmdLineInfo
+/**
+ * @brief ClearCaseCmdLineParser's constructor.
+ * @param [in] szExeName Executable file name. Required in order to
+ * know which command line parser to create and use.
+ */
MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(),
m_nCmdShow(SW_SHOWNORMAL),
m_bClearCaseTool(false),
@@ -79,11 +84,22 @@
}
}
+/**
+ * @brief Destructor.
+ */
MergeCmdLineInfo::~MergeCmdLineInfo()
{
delete m_pCmdLineParser;
}
+/**
+ * @brief Parser function.
+ * This functino overrides CCommandLineInfo's parser function and calls
+ * WinMerge's parser function.
+ * @param [in] pszParam The parameter or flag to parse.
+ * @param [in] bFlag Is the item to parse a flag?
+ * @param [in] bLast Is the item to parse a last of items?
+ */
void MergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
{
// Give our base class a chance to figure out what is the parameter.
Modified: trunk/Src/MergeCmdLineInfo.h
===================================================================
--- trunk/Src/MergeCmdLineInfo.h 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/MergeCmdLineInfo.h 2008-04-14 20:39:12 UTC (rev 5297)
@@ -29,30 +29,22 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
class CmdLineParser;
/**
* @brief WinMerge's command line handler.
- *
+ * This class calls command line parser(s) and allows reading parsed values
+ * from public member variables.
*/
class MergeCmdLineInfo : public CCommandLineInfo
{
public:
-
- /** @brief ClearCaseCmdLineParser's constructor.
- *
- * @param [in] szFileName Executable file name. Required in order to
- * know which command line parser to create and use.
- *
- */
MergeCmdLineInfo(const TCHAR *szExeName);
-
~MergeCmdLineInfo();
- /** @brief Override CCommandLineInfo's method. */
virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
public:
@@ -75,9 +67,9 @@
CString m_sRightDesc; /**< Right side file's description. */
CString m_sFileFilter; /**< File filter mask. */
- CString m_sPreDiffer;
+ CString m_sPreDiffer; /**< Pre-differ name. */
- /**< Command line arguments which are mapped to WinMerge's preferences. */
+ /** Command line arguments which are mapped to WinMerge's preferences. */
CMapStringToString m_Settings;
CStringArray m_Files; /**< Files (or directories) to compare. */
@@ -86,7 +78,7 @@
private:
- /**< operator= is not implemented. */
+ /** Operator= is not implemented. */
MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
CmdLineParser *m_pCmdLineParser; /**< The command line parser instance. */
Modified: trunk/Src/WinMergeCmdLineParser.cpp
===================================================================
--- trunk/Src/WinMergeCmdLineParser.cpp 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/WinMergeCmdLineParser.cpp 2008-04-14 20:39:12 UTC (rev 5297)
@@ -26,7 +26,7 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "StdAfx.h"
@@ -36,24 +36,35 @@
#include "WinMergeCmdLineParser.h"
#include "Paths.h"
-WinMergeCmdLineParser::WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo) :
- CmdLineParser(CmdLineInfo),
+
+/**
+ * @brief Constructor.
+ * @param [out] cmdLineInfo Class which gets info about parsed parameters.
+ */
+WinMergeCmdLineParser::WinMergeCmdLineParser(MergeCmdLineInfo& cmdLineInfo) :
+ CmdLineParser(cmdLineInfo),
m_bPreDiff(false),
m_bFileFilter(false),
m_bLeftDesc(false),
m_bRightDesc(false)
{
-
}
-void WinMergeCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast)
+/**
+ * @brief Parser function for command line parameters.
+ * @param [in] pszParam The parameter or flag to parse.
+ * @param [in] bFlag Is the item to parse a flag?
+ * @param [in] bLast Is the item to parse a last of items?
+ */
+void WinMergeCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag,
+ BOOL bLast)
{
if (TRUE == bFlag)
{
if (!lstrcmp(pszParam, _T("?")))
{
// -? to show common command line arguments.
- m_CmdLineInfo.m_bShowUsage = true;
+ m_cmdLineInfo.m_bShowUsage = true;
}
else if (!lstrcmpi(pszParam, _T("dl")))
{
@@ -68,7 +79,7 @@
else if (!lstrcmpi(pszParam, _T("e")))
{
// -e to allow closing with single esc press
- m_CmdLineInfo.m_bEscShutdown = true;
+ m_cmdLineInfo.m_bEscShutdown = true;
}
else if (!lstrcmpi(pszParam, _T("f")))
{
@@ -78,32 +89,32 @@
else if (!lstrcmpi(pszParam, _T("r")))
{
// -r to compare recursively
- m_CmdLineInfo.m_bRecurse = true;
+ m_cmdLineInfo.m_bRecurse = true;
}
else if (!lstrcmpi(pszParam, _T("s")))
{
// -s to allow only one instance
- m_CmdLineInfo.m_bSingleInstance = true;
+ m_cmdLineInfo.m_bSingleInstance = true;
}
else if (!lstrcmpi(pszParam, _T("noninteractive")))
{
// -noninteractive to suppress message boxes & close with result code
- m_CmdLineInfo.m_bNonInteractive = true;
+ m_cmdLineInfo.m_bNonInteractive = true;
}
else if (!lstrcmpi(pszParam, _T("noprefs")))
{
// -noprefs means do not load or remember options (preferences)
- m_CmdLineInfo.m_bNoPrefs = true;
+ m_cmdLineInfo.m_bNoPrefs = true;
}
else if (!lstrcmpi(pszParam, _T("minimize")))
{
// -minimize means minimize the main window.
- m_CmdLineInfo.m_nCmdShow = SW_MINIMIZE;
+ m_cmdLineInfo.m_nCmdShow = SW_MINIMIZE;
}
else if (!lstrcmpi(pszParam, _T("maximize")))
{
// -maximize means maximize the main window.
- m_CmdLineInfo.m_nCmdShow = SW_MAXIMIZE;
+ m_cmdLineInfo.m_nCmdShow = SW_MAXIMIZE;
}
else if (!lstrcmpi(pszParam, _T("prediffer")))
{
@@ -113,33 +124,33 @@
else if (!lstrcmpi(pszParam, _T("wl")))
{
// -wl to open left path as read-only
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY;
+ m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_READONLY;
}
else if (!lstrcmpi(pszParam, _T("wr")))
{
// -wr to open right path as read-only
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
+ m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_READONLY;
}
else if (!lstrcmpi(pszParam, _T("ul")))
{
// -ul to not add left path to MRU
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
+ m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
}
else if (!lstrcmpi(pszParam, _T("ur")))
{
// -ur to not add right path to MRU
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
}
else if (!lstrcmpi(pszParam, _T("ub")))
{
// -ub to add neither right nor left path to MRU
- m_CmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
- m_CmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
+ m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
+ m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
}
else if (!lstrcmpi(pszParam, _T("x")))
{
// -x to close application if files are identical.
- m_CmdLineInfo.m_bExitIfNoDiff = true;
+ m_cmdLineInfo.m_bExitIfNoDiff = true;
}
else
{
@@ -158,62 +169,62 @@
sValue = _T("1");
}
- m_CmdLineInfo.m_Settings[sParam] = sValue;
+ m_cmdLineInfo.m_Settings[sParam] = sValue;
}
}
else
{
- if ((m_bPreDiff == true) && m_CmdLineInfo.m_sPreDiffer.IsEmpty())
+ if ((m_bPreDiff == true) && m_cmdLineInfo.m_sPreDiffer.IsEmpty())
{
- m_CmdLineInfo.m_sPreDiffer = pszParam;
+ m_cmdLineInfo.m_sPreDiffer = pszParam;
}
- else if ((m_bFileFilter == true) && m_CmdLineInfo.m_sFileFilter.IsEmpty())
+ else if ((m_bFileFilter == true) && m_cmdLineInfo.m_sFileFilter.IsEmpty())
{
- m_CmdLineInfo.m_sFileFilter = pszParam;
+ m_cmdLineInfo.m_sFileFilter = pszParam;
}
- else if ((m_bRightDesc == true) && m_CmdLineInfo.m_sRightDesc.IsEmpty())
+ else if ((m_bRightDesc == true) && m_cmdLineInfo.m_sRightDesc.IsEmpty())
{
- m_CmdLineInfo.m_sRightDesc = pszParam;
+ m_cmdLineInfo.m_sRightDesc = pszParam;
}
- else if ((m_bLeftDesc == true) && m_CmdLineInfo.m_sLeftDesc.IsEmpty())
+ else if ((m_bLeftDesc == true) && m_cmdLineInfo.m_sLeftDesc.IsEmpty())
{
- m_CmdLineInfo.m_sLeftDesc = pszParam;
+ m_cmdLineInfo.m_sLeftDesc = pszParam;
}
else
{
String sFile = paths_GetLongPath(pszParam);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile.c_str());
- m_CmdLineInfo.m_nFiles += 1;
+ m_cmdLineInfo.m_Files.SetAtGrow(m_cmdLineInfo.m_nFiles, sFile.c_str());
+ m_cmdLineInfo.m_nFiles += 1;
}
}
if (TRUE == bLast)
{
// If "compare file dir" make it "compare file dir\file".
- if (m_CmdLineInfo.m_nFiles >= 2)
+ if (m_cmdLineInfo.m_nFiles >= 2)
{
- PATH_EXISTENCE p1 = paths_DoesPathExist(m_CmdLineInfo.m_Files[0]);
- PATH_EXISTENCE p2 = paths_DoesPathExist(m_CmdLineInfo.m_Files[1]);
+ PATH_EXISTENCE p1 = paths_DoesPathExist(m_cmdLineInfo.m_Files[0]);
+ PATH_EXISTENCE p2 = paths_DoesPathExist(m_cmdLineInfo.m_Files[1]);
if ((p1 == IS_EXISTING_FILE) && (p2 == IS_EXISTING_DIR))
{
TCHAR fname[_MAX_PATH];
TCHAR fext[_MAX_PATH];
- _tsplitpath(m_CmdLineInfo.m_Files[0], NULL, NULL, fname, fext);
+ _tsplitpath(m_cmdLineInfo.m_Files[0], NULL, NULL, fname, fext);
- if (m_CmdLineInfo.m_Files[1].Right(1) != _T('\\'))
+ if (m_cmdLineInfo.m_Files[1].Right(1) != _T('\\'))
{
- m_CmdLineInfo.m_Files[1] += _T('\\');
+ m_cmdLineInfo.m_Files[1] += _T('\\');
}
- m_CmdLineInfo.m_Files[1] = m_CmdLineInfo.m_Files[1] + fname + fext;
+ m_cmdLineInfo.m_Files[1] = m_cmdLineInfo.m_Files[1] + fname + fext;
}
}
- if (m_CmdLineInfo.m_bShowUsage)
+ if (m_cmdLineInfo.m_bShowUsage)
{
- m_CmdLineInfo.m_bNonInteractive = false;
+ m_cmdLineInfo.m_bNonInteractive = false;
}
}
}
Modified: trunk/Src/WinMergeCmdLineParser.h
===================================================================
--- trunk/Src/WinMergeCmdLineParser.h 2008-04-14 15:55:47 UTC (rev 5296)
+++ trunk/Src/WinMergeCmdLineParser.h 2008-04-14 20:39:12 UTC (rev 5297)
@@ -20,37 +20,38 @@
/////////////////////////////////////////////////////////////////////////////
/**
-* @file WinMergeCmdLineParser.h
-*
-* @brief WinMergeCmdLineParser class decleration.
-*
-*/
+ * @file WinMergeCmdLineParser.h
+ *
+ * @brief WinMergeCmdLineParser class declaration.
+ */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
-#pragma once
+#ifndef _WINMERGE_CMDLINE_PARSER_H_
+#define __WINMERGE_CMDLINE_PARSER_H_
#include "CmdLineParser.h"
/**
-* @brief WinMerge's default command line parser.
-*
-*/
+ * @brief WinMerge's default command line parser.
+ * This class parses all command line parameters WinMerge (core code) knows
+ * of. Paths get some special handling if needed:
+ * - if file (as first param) and folder (as second param) are given, that is
+ * expanded to file (first path) and folder/file (second path).
+ */
class WinMergeCmdLineParser : public CmdLineParser
{
- public:
+public:
+ WinMergeCmdLineParser(MergeCmdLineInfo& cmdLineInfo);
+ virtual ~WinMergeCmdLineParser() { }
+ virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
- WinMergeCmdLineParser(MergeCmdLineInfo& CmdLineInfo);
+private:
+ bool m_bPreDiff; /**< Have prediffer? */
+ bool m_bFileFilter; /**< Have file filter? */
+ bool m_bLeftDesc; /**< Have left-side description? */
+ bool m_bRightDesc; /**< Have right-side description? */
+};
- virtual ~WinMergeCmdLineParser() { }
-
- virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
-
- private:
-
- bool m_bPreDiff;
- bool m_bFileFilter;
- bool m_bLeftDesc;
- bool m_bRightDesc;
-};
+#endif // _WINMERGE_CMDLINE_PARSER_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-15 17:39:42
|
Revision: 5298
http://winmerge.svn.sourceforge.net/winmerge/?rev=5298&view=rev
Author: kimmov
Date: 2008-04-15 10:38:51 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
PATCH: [ 1942985 ] Remove four unused files from Src
Modified Paths:
--------------
trunk/Src/Merge.dsp
trunk/Src/Merge.vcproj
Removed Paths:
-------------
trunk/Src/Common/HScrollListBox.cpp
trunk/Src/Common/HScrollListBox.h
trunk/Src/Common/WindowStyle.cpp
trunk/Src/Common/WindowStyle.h
Deleted: trunk/Src/Common/HScrollListBox.cpp
===================================================================
--- trunk/Src/Common/HScrollListBox.cpp 2008-04-14 20:39:12 UTC (rev 5297)
+++ trunk/Src/Common/HScrollListBox.cpp 2008-04-15 17:38:51 UTC (rev 5298)
@@ -1,175 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// HScrollListBox.cpp : implementation file
-//
-// Copyright (c) 2002, Nebula Technologies, Inc.
-// www.nebutech.com
-//
-// Nebula Technologies, Inc. grants you a royalty free
-// license to use, modify and distribute this code
-// provided that this copyright notice appears on all
-// copies. This code is provided "AS IS," without a
-// warranty of any kind.
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-#include "HScrollListBox.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-BEGIN_MESSAGE_MAP(CHScrollListBox, CListBox)
- //{{AFX_MSG_MAP(CHScrollListBox)
- // NOTE - the ClassWizard will add and remove mapping macros here.
- //}}AFX_MSG_MAP
- ON_MESSAGE(LB_ADDSTRING, OnAddString)
- ON_MESSAGE(LB_INSERTSTRING, OnInsertString)
- ON_MESSAGE(LB_DELETESTRING, OnDeleteString)
- ON_MESSAGE(LB_DIR, OnDir)
- ON_MESSAGE(LB_RESETCONTENT, OnResetContent)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CHScrollListBox
-/////////////////////////////////////////////////////////////////////////////
-CHScrollListBox::CHScrollListBox()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-CHScrollListBox::~CHScrollListBox()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-void CHScrollListBox::PreSubclassWindow()
-{
- CListBox::PreSubclassWindow();
-
-#ifdef _DEBUG
- // NOTE: this list box is designed to work as a single column, system-drawn
- // list box. The asserts below will ensure of that.
- DWORD dwStyle = GetStyle();
- ASSERT((dwStyle & LBS_MULTICOLUMN) == 0);
- ASSERT((dwStyle & LBS_OWNERDRAWFIXED) == 0);
- ASSERT((dwStyle & LBS_OWNERDRAWVARIABLE) == 0);
-#endif
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CHScrollListBox message handlers
-///////////////////////////////////////////////////////////////////////////////
-int CHScrollListBox::GetTextLen(LPCTSTR lpszText)
-{
- ASSERT(AfxIsValidString(lpszText));
-
- CDC *pDC = GetDC();
- ASSERT(pDC);
-
- CSize size;
- CFont* pOldFont = pDC->SelectObject(GetFont());
- if ((GetStyle() & LBS_USETABSTOPS) == 0)
- {
- size = pDC->GetTextExtent(lpszText, (int) _tcslen(lpszText));
- size.cx += 3;
- }
- else
- {
- // Expand tabs as well
- size = pDC->GetTabbedTextExtent(lpszText, (int) _tcslen(lpszText), 0, NULL);
- size.cx += 2;
- }
- pDC->SelectObject(pOldFont);
- ReleaseDC(pDC);
-
- return size.cx;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CHScrollListBox::ResetHExtent()
-{
- if (GetCount() == 0)
- {
- SetHorizontalExtent(0);
- return;
- }
-
- CWaitCursor cwc;
- int iMaxHExtent = 0;
- for (int i = 0; i < GetCount(); i++)
- {
- CString csText;
- GetText(i, csText);
- int iExt = GetTextLen(csText);
- if (iExt > iMaxHExtent)
- iMaxHExtent = iExt;
- }
- SetHorizontalExtent(iMaxHExtent);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void CHScrollListBox::SetNewHExtent(LPCTSTR lpszNewString)
-{
- int iExt = GetTextLen(lpszNewString);
- if (iExt > GetHorizontalExtent())
- SetHorizontalExtent(iExt);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OnAddString: wParam - none, lParam - string, returns - int
-///////////////////////////////////////////////////////////////////////////////
-LRESULT CHScrollListBox::OnAddString(WPARAM wParam, LPARAM lParam)
-{
- LRESULT lResult = Default();
- if (!((lResult == LB_ERR) || (lResult == LB_ERRSPACE)))
- SetNewHExtent((LPCTSTR) lParam);
- return lResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OnInsertString: wParam - index, lParam - string, returns - int
-///////////////////////////////////////////////////////////////////////////////
-LRESULT CHScrollListBox::OnInsertString(WPARAM wParam, LPARAM lParam)
-{
- LRESULT lResult = Default();
- if (!((lResult == LB_ERR) || (lResult == LB_ERRSPACE)))
- SetNewHExtent((LPCTSTR) lParam);
- return lResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OnDeleteString: wParam - index, lParam - none, returns - int
-///////////////////////////////////////////////////////////////////////////////
-LRESULT CHScrollListBox::OnDeleteString(WPARAM wParam, LPARAM lParam)
-{
- LRESULT lResult = Default();
- if (!((lResult == LB_ERR) || (lResult == LB_ERRSPACE)))
- ResetHExtent();
- return lResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OnDir: wParam - attr, lParam - wildcard, returns - int
-///////////////////////////////////////////////////////////////////////////////
-LRESULT CHScrollListBox::OnDir(WPARAM wParam, LPARAM lParam)
-{
- LRESULT lResult = Default();
- if (!((lResult == LB_ERR) || (lResult == LB_ERRSPACE)))
- ResetHExtent();
- return lResult;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OnResetContent: wParam - none, lParam - none, returns - int
-///////////////////////////////////////////////////////////////////////////////
-LRESULT CHScrollListBox::OnResetContent(WPARAM wParam, LPARAM lParam)
-{
- LRESULT lResult = Default();
- SetHorizontalExtent(0);
- return lResult;
-}
-
Deleted: trunk/Src/Common/HScrollListBox.h
===================================================================
--- trunk/Src/Common/HScrollListBox.h 2008-04-14 20:39:12 UTC (rev 5297)
+++ trunk/Src/Common/HScrollListBox.h 2008-04-15 17:38:51 UTC (rev 5298)
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// HScrollListBox.h : header file
-//
-// Copyright (c) 2002, Nebula Technologies, Inc.
-// www.nebutech.com
-//
-// Nebula Technologies, Inc. grants you a royalty free
-// license to use, modify and distribute this code
-// provided that this copyright notice appears on all
-// copies. This code is provided "AS IS," without a
-// warranty of any kind.
-//
-/////////////////////////////////////////////////////////////////////////////
-#if !defined(AFX_HSCROLLLISTBOX_H__E9948720_F12B_11D4_93CF_00105AC9B942__INCLUDED_)
-#define AFX_HSCROLLLISTBOX_H__E9948720_F12B_11D4_93CF_00105AC9B942__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-/////////////////////////////////////////////////////////////////////////////
-// CHScrollListBox window
-/////////////////////////////////////////////////////////////////////////////
-class CHScrollListBox : public CListBox
-{
-// Construction
-public:
- CHScrollListBox();
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CHScrollListBox)
- protected:
- virtual void PreSubclassWindow();
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- virtual ~CHScrollListBox();
-
- // Generated message map functions
-protected:
- //{{AFX_MSG(CHScrollListBox)
- // NOTE - the ClassWizard will add and remove member functions here.
- //}}AFX_MSG
-
- afx_msg LRESULT OnAddString(WPARAM wParam, LPARAM lParam); // wParam - none, lParam - string, returns - int
- afx_msg LRESULT OnInsertString(WPARAM wParam, LPARAM lParam); // wParam - index, lParam - string, returns - int
- afx_msg LRESULT OnDeleteString(WPARAM wParam, LPARAM lParam); // wParam - index, lParam - none, returns - int
- afx_msg LRESULT OnResetContent(WPARAM wParam, LPARAM lParam); // wParam - none, lParam - none, returns - int
- afx_msg LRESULT OnDir(WPARAM wParam, LPARAM lParam); // wParam - attr, lParam - wildcard, returns - int
-
- DECLARE_MESSAGE_MAP()
-
-private:
- void ResetHExtent();
- void SetNewHExtent(LPCTSTR lpszNewString);
- int GetTextLen(LPCTSTR lpszText);
-
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_HSCROLLLISTBOX_H__E9948720_F12B_11D4_93CF_00105AC9B942__INCLUDED_)
Deleted: trunk/Src/Common/WindowStyle.cpp
===================================================================
--- trunk/Src/Common/WindowStyle.cpp 2008-04-14 20:39:12 UTC (rev 5297)
+++ trunk/Src/Common/WindowStyle.cpp 2008-04-15 17:38:51 UTC (rev 5298)
@@ -1,27 +0,0 @@
-/**
- * @file WindowStyle.cpp
- *
- * @brief Utilities (trivial) for manipulating window style
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "StdAfx.h"
-#include "WindowStyle.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-
-/**
- * @brief Add requested style(s) to windows current style
- */
-void
-WindowStyle_Add(CWnd * pwnd, DWORD newStyle)
-{
- DWORD removeStyle = 0;
- pwnd->ModifyStyle(removeStyle, newStyle, 0);
-}
Deleted: trunk/Src/Common/WindowStyle.h
===================================================================
--- trunk/Src/Common/WindowStyle.h 2008-04-14 20:39:12 UTC (rev 5297)
+++ trunk/Src/Common/WindowStyle.h 2008-04-15 17:38:51 UTC (rev 5298)
@@ -1,6 +0,0 @@
-#ifndef WindowStyle_h_included
-#define WindowStyle_h_included
-
-void WindowStyle_Add(CWnd * pwnd, DWORD newStyle);
-
-#endif // WindowStyle_h_included
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2008-04-14 20:39:12 UTC (rev 5297)
+++ trunk/Src/Merge.dsp 2008-04-15 17:38:51 UTC (rev 5298)
@@ -515,10 +515,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\HScrollListBox.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Common\LanguageSelect.cpp
# End Source File
# Begin Source File
@@ -715,7 +711,6 @@
SOURCE=.\paths.cpp
# ADD CPP /YX
-
# End Source File
# Begin Source File
@@ -1025,10 +1020,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\WindowStyle.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\WinMergeCmdLineParser.cpp
# End Source File
# Begin Source File
@@ -1313,10 +1304,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\HScrollListBox.h
-# End Source File
-# Begin Source File
-
SOURCE=.\IAbortable.h
# End Source File
# Begin Source File
@@ -1669,10 +1656,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\WindowStyle.h
-# End Source File
-# Begin Source File
-
SOURCE=.\WinMergeCmdLineParser.h
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-04-14 20:39:12 UTC (rev 5297)
+++ trunk/Src/Merge.vcproj 2008-04-15 17:38:51 UTC (rev 5298)
@@ -2701,43 +2701,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="Common\HScrollListBox.cpp">
- <FileConfiguration
- Name="UnicodeRelease|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="Common\LanguageSelect.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -5860,43 +5823,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="Common\WindowStyle.cpp">
- <FileConfiguration
- Name="UnicodeRelease|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="WinMergeCmdLineParser.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -6179,9 +6105,6 @@
RelativePath="GhostTextView.h">
</File>
<File
- RelativePath="Common\HScrollListBox.h">
- </File>
- <File
RelativePath="IAbortable.h">
</File>
<File
@@ -6446,9 +6369,6 @@
RelativePath="Common\WinClasses.h">
</File>
<File
- RelativePath="Common\WindowStyle.h">
- </File>
- <File
RelativePath="WinMergeCmdLineParser.h">
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-16 12:52:14
|
Revision: 5301
http://winmerge.svn.sourceforge.net/winmerge/?rev=5301&view=rev
Author: kimmov
Date: 2008-04-16 05:51:56 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
PATCH: [ 1943424 ] Check if path points to shortcut before expanding
Modified Paths:
--------------
trunk/Src/MainFrm.cpp
trunk/Src/paths.cpp
trunk/Src/paths.h
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-04-15 22:00:55 UTC (rev 5300)
+++ trunk/Src/MainFrm.cpp 2008-04-16 12:51:56 UTC (rev 5301)
@@ -2161,12 +2161,15 @@
for (UINT i = 0; i < fileCount; i++)
{
- // if this was a shortcut, we need to expand it to the target path
- CString expandedFile = ExpandShortcut((LPCTSTR)files[i]).c_str();
+ if (paths_IsShortcut((LPCTSTR)files[i]))
+ {
+ // if this was a shortcut, we need to expand it to the target path
+ CString expandedFile = ExpandShortcut((LPCTSTR)files[i]).c_str();
- // if that worked, we should have a real file name
- if (!expandedFile.IsEmpty())
- files[i] = expandedFile;
+ // if that worked, we should have a real file name
+ if (!expandedFile.IsEmpty())
+ files[i] = expandedFile;
+ }
}
// If Ctrl pressed, do recursive compare
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2008-04-15 22:00:55 UTC (rev 5300)
+++ trunk/Src/paths.cpp 2008-04-16 12:51:56 UTC (rev 5301)
@@ -375,6 +375,25 @@
return p1;
}
+/**
+ * @brief Check if the given path points to shotcut.
+ * Windows considers paths having a filename with extension ".lnk" as
+ * shortcuts. This function checks if the given path is shortcut.
+ * We usually want to expand shortcuts with ExpandShortcut().
+ * @param [in] inPath Path to check;
+ * @return TRUE if the path points to shortcut, FALSE otherwise.
+ */
+BOOL paths_IsShortcut(LPCTSTR inPath)
+{
+ const TCHAR ShortcutExt[] = _T(".lnk");
+ TCHAR ext[_MAX_EXT] = {0};
+ _tsplitpath(inPath, NULL, NULL, NULL, ext);
+ if (_tcsicmp(ext, ShortcutExt) == 0)
+ return TRUE;
+ else
+ return FALSE;
+}
+
//////////////////////////////////////////////////////////////////
// use IShellLink to expand the shortcut
// returns the expanded file, or "" on error
Modified: trunk/Src/paths.h
===================================================================
--- trunk/Src/paths.h 2008-04-15 22:00:55 UTC (rev 5300)
+++ trunk/Src/paths.h 2008-04-16 12:51:56 UTC (rev 5301)
@@ -29,6 +29,7 @@
String paths_GetLongPath(LPCTSTR szPath, BOOL bExpandEnvs = TRUE);
bool paths_CreateIfNeeded(LPCTSTR szPath);
PATH_EXISTENCE GetPairComparability(LPCTSTR pszLeft, LPCTSTR pszRight);
+BOOL paths_IsShortcut(LPCTSTR inPath);
String ExpandShortcut(const String &inFile);
String paths_ConcatPath(const String & path, const String & subpath);
String paths_GetParentPath(LPCTSTR path);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-17 20:30:50
|
Revision: 5307
http://winmerge.svn.sourceforge.net/winmerge/?rev=5307&view=rev
Author: kimmov
Date: 2008-04-17 13:30:49 -0700 (Thu, 17 Apr 2008)
Log Message:
-----------
Doxygen comment additions and fixes for Open dialog.
Modified Paths:
--------------
trunk/Src/OpenDlg.cpp
trunk/Src/OpenDlg.h
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2008-04-17 19:33:19 UTC (rev 5306)
+++ trunk/Src/OpenDlg.cpp 2008-04-17 20:30:49 UTC (rev 5307)
@@ -444,6 +444,9 @@
SetUnpackerStatus(IDS_OPEN_UNPACKERDISABLED);
}
+/**
+ * @brief Called when user changes selection in left path's combo box.
+ */
void COpenDlg::OnSelchangeLeftCombo()
{
int sel = m_ctlLeft.GetCurSel();
@@ -456,6 +459,9 @@
UpdateButtonStates();
}
+/**
+ * @brief Called when user changes selection in right path's combo box.
+ */
void COpenDlg::OnSelchangeRightCombo()
{
int sel = m_ctlRight.GetCurSel();
@@ -479,7 +485,12 @@
UpdateButtonStates();
}
-void COpenDlg::OnTimer(UINT_PTR nIDEvent)
+/**
+ * @brief Handle timer events.
+ * Checks if paths are valid and sets control states accordingly.
+ * @param [in] nIDEvent Timer ID that fired.
+ */
+void COpenDlg::OnTimer(UINT_PTR nIDEvent)
{
if (nIDEvent == IDT_CHECKFILES)
UpdateButtonStates();
@@ -487,7 +498,10 @@
CDialog::OnTimer(nIDEvent);
}
-void COpenDlg::OnSelectUnpacker()
+/**
+ * @brief Called when users selects plugin browse button.
+ */
+void COpenDlg::OnSelectUnpacker()
{
UpdateData(TRUE);
@@ -510,12 +524,24 @@
}
}
+/**
+ * @brief Sets the path status text.
+ * The open dialog shows a status text of selected paths. This function
+ * is used to set that status text.
+ * @param [in] msgID Resource ID of status text to set.
+ */
void COpenDlg::SetStatus(UINT msgID)
{
String msg = theApp.LoadString(msgID);
SetDlgItemText(IDC_OPEN_STATUS, msg.c_str());
}
+/**
+ * @brief Set the plugin edit box text.
+ * Plugin edit box is at the same time a plugin status view. This function
+ * sets the status text.
+ * @param [in] msgID Resource ID of status text to set.
+ */
void COpenDlg::SetUnpackerStatus(UINT msgID)
{
String msg = theApp.LoadString(msgID);
@@ -556,8 +582,14 @@
/**
* @brief Read paths and filter from project file.
+ * Reads the given project file. After the file is read, found paths and
+ * filter is updated to dialog GUI. Other possible settings found in the
+ * project file are kept in memory and used later when loading paths
+ * selected.
+ * @param [in] path Path to the project file.
+ * @return TRUE if the project file was successfully loaded, FALSE otherwise.
*/
-BOOL COpenDlg::LoadProjectFile(CString path)
+BOOL COpenDlg::LoadProjectFile(const CString &path)
{
String filterPrefix = theApp.LoadString(IDS_FILTER_PREFIX);
String err;
@@ -619,7 +651,9 @@
UpdateButtonStates();
}
-/** @brief Open help from mainframe when user presses F1*/
+/**
+ * @brief Open help from mainframe when user presses F1.
+ */
void COpenDlg::OnHelp()
{
GetMainFrame()->ShowHelp(OpenDlgHelpLocation);
Modified: trunk/Src/OpenDlg.h
===================================================================
--- trunk/Src/OpenDlg.h 2008-04-17 19:33:19 UTC (rev 5306)
+++ trunk/Src/OpenDlg.h 2008-04-17 20:30:49 UTC (rev 5307)
@@ -23,8 +23,9 @@
* @brief Declaration file for COpenDlg dialog
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
+
#if !defined(AFX_OPENDLG_H__69FB0D77_2A05_11D1_BA92_00A024706EDC__INCLUDED_)
#define AFX_OPENDLG_H__69FB0D77_2A05_11D1_BA92_00A024706EDC__INCLUDED_
#pragma once
@@ -40,7 +41,15 @@
class ProjectFile;
-/** @brief File open dialog displayed for user to choose directories or files */
+/**
+ * @brief The Open-dialog class.
+ * The Open-dialog allows user to select paths to compare. In addition to
+ * the two paths, there are controls for selecting filter and unpacker plugin.
+ * If one of the paths is a project file, that projec file is loaded,
+ * overwriting possible other values in other dialog controls.
+ * The dialog shows also a status of the selected paths (found/not found),
+ * if enabled in the options (enabled by default).
+ */
class COpenDlg : public CDialog
{
// Construction
@@ -91,7 +100,7 @@
protected:
void SetStatus(UINT msgID);
void SetUnpackerStatus(UINT msgID);
- BOOL LoadProjectFile(CString path);
+ BOOL LoadProjectFile(const CString &path);
void TrimPaths();
// Generated message map functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-14 22:47:40
|
Revision: 5341
http://winmerge.svn.sourceforge.net/winmerge/?rev=5341&view=rev
Author: kimmov
Date: 2008-05-14 15:47:37 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Refactor LocationView to use two CRects for storing bar coordinates (instead of four integers).
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-05-06 22:17:34 UTC (rev 5340)
+++ trunk/Src/LocationView.cpp 2008-05-14 22:47:37 UTC (rev 5341)
@@ -223,10 +223,10 @@
CMergeDoc *pDoc = GetDocument();
const int w = rc.Width() / 4;
- m_nLeftBarLeft = (rc.Width() - 2 * w) / 3;
- m_nLeftBarRight = m_nLeftBarLeft + w;
- m_nRightBarLeft = 2 * m_nLeftBarLeft + w;
- m_nRightBarRight = m_nRightBarLeft + w;
+ m_leftBar.left = (rc.Width() - 2 * w) / 3;
+ m_leftBar.right = m_leftBar.left + w;
+ m_rightBar.left = 2 * m_leftBar.left + w;
+ m_rightBar.right = m_rightBar.left + w;
const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
@@ -251,9 +251,12 @@
// Draw bar outlines
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- const int nBottom = (int)(LineInPix * nbLines + Y_OFFSET + 1);
- pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, nBottom);
- pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, nBottom);
+ m_leftBar.top = Y_OFFSET - 1;
+ m_rightBar.top = Y_OFFSET - 1;
+ m_leftBar.bottom = (LONG)(LineInPix * nbLines + Y_OFFSET + 1);
+ m_rightBar.bottom = m_leftBar.bottom;
+ pDC->Rectangle(m_leftBar);
+ pDC->Rectangle(m_rightBar);
pDC->SelectObject(oldObj);
// Iterate the differences list and draw differences as colored blocks.
@@ -293,12 +296,12 @@
{
// Draw left side block
m_view[MERGE_VIEW_LEFT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr0, crt, bwh);
- CRect r0(m_nLeftBarLeft, nBeginY, m_nLeftBarRight, nEndY);
+ CRect r0(m_leftBar.left, nBeginY, m_leftBar.right, nEndY);
DrawRect(pDC, r0, cr0, bInsideDiff);
// Draw right side block
m_view[MERGE_VIEW_RIGHT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr1, crt, bwh);
- CRect r1(m_nRightBarLeft, nBeginY, m_nRightBarRight, nEndY);
+ CRect r1(m_rightBar.left, nBeginY, m_rightBar.right, nEndY);
DrawRect(pDC, r1, cr1, bInsideDiff);
}
nPrevEndY = nEndY;
@@ -338,11 +341,11 @@
apparent0 = pView->GetSubLineIndex(apparent0);
apparent1 = pView->GetSubLineIndex(apparent1);
- start.x = m_nLeftBarRight;
+ start.x = m_leftBar.right;
int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
- end.x = m_nRightBarLeft;
+ end.x = m_rightBar.left;
int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
@@ -365,11 +368,11 @@
apparent0 = pView->GetSubLineIndex(apparent0);
apparent1 = pView->GetSubLineIndex(apparent1);
- start.x = m_nLeftBarRight;
+ start.x = m_leftBar.right;
int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
- end.x = m_nRightBarLeft;
+ end.x = m_rightBar.left;
int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
@@ -895,11 +898,11 @@
void CLocationView::DrawDiffMarker(CDC* pDC, int yCoord)
{
CPoint points[3];
- points[0].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
+ points[0].x = m_leftBar.left - DIFFMARKER_WIDTH - 1;
points[0].y = yCoord - DIFFMARKER_TOP;
- points[1].x = m_nLeftBarLeft - 1;
+ points[1].x = m_leftBar.left - 1;
points[1].y = yCoord;
- points[2].x = m_nLeftBarLeft - DIFFMARKER_WIDTH - 1;
+ points[2].x = m_leftBar.left - DIFFMARKER_WIDTH - 1;
points[2].y = yCoord + DIFFMARKER_BOTTOM;
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
@@ -909,9 +912,9 @@
pDC->SetPolyFillMode(WINDING);
pDC->Polygon(points, 3);
- points[0].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
- points[1].x = m_nRightBarRight + 1;
- points[2].x = m_nRightBarRight + 1 + DIFFMARKER_WIDTH;
+ points[0].x = m_rightBar.right + 1 + DIFFMARKER_WIDTH;
+ points[1].x = m_rightBar.right + 1;
+ points[2].x = m_rightBar.right + 1 + DIFFMARKER_WIDTH;
pDC->Polygon(points, 3);
pDC->SelectObject(pOldBrush);
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2008-05-06 22:17:34 UTC (rev 5340)
+++ trunk/Src/LocationView.h 2008-05-14 22:47:37 UTC (rev 5341)
@@ -69,10 +69,8 @@
CMergeEditView* m_view[MERGE_VIEW_COUNT]; //*< Table for view pointers */
int m_displayMovedBlocks; //*< Setting for displaying moved blocks */
double m_pixInLines; //*< How many pixels is one line in bars */
- UINT m_nLeftBarLeft; //*< Left edge of left-side bar */
- UINT m_nLeftBarRight; //*< Right edge of left-side bar */
- UINT m_nRightBarLeft; //*< Left edge of right-side bar */
- UINT m_nRightBarRight; //*< Right edge of right-side bar */
+ CRect m_leftBar; //*< Left-side file's bar.
+ CRect m_rightBar; //*< Right-side file's bar.
int m_visibleTop; //*< Top visible line for visible area indicator */
int m_visibleBottom; //*< Bottom visible line for visible area indicator */
MOVEDLINE_LIST m_movedLines; //*< List of moved block connecting lines */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-15 20:15:56
|
Revision: 5346
http://winmerge.svn.sourceforge.net/winmerge/?rev=5346&view=rev
Author: kimmov
Date: 2008-05-15 13:15:44 -0700 (Thu, 15 May 2008)
Log Message:
-----------
Refactor LocationView's bar coordinate calculation to separate function.
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-05-15 15:52:48 UTC (rev 5345)
+++ trunk/Src/LocationView.cpp 2008-05-15 20:15:44 UTC (rev 5346)
@@ -182,7 +182,38 @@
pDC->SelectObject(pOldBrush);
return TRUE;
}
-
+
+/**
+ * @brief Calculate bar coordinates and scaling factors.
+ */
+void CLocationView::CalculateBars()
+{
+ CRect rc;
+ GetClientRect(rc);
+ const int w = rc.Width() / 4;
+ m_leftBar.left = (rc.Width() - 2 * w) / 3;
+ m_leftBar.right = m_leftBar.left + w;
+ m_rightBar.left = 2 * m_leftBar.left + w;
+ m_rightBar.right = m_rightBar.left + w;
+ const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
+ const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
+ m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
+
+ m_lineInPix = hTotal / nbLines;
+ m_pixInLines = nbLines / hTotal;
+ if (m_lineInPix > MAX_LINEPIX)
+ {
+ m_lineInPix = MAX_LINEPIX;
+ m_pixInLines = 1 / MAX_LINEPIX;
+ }
+
+ m_leftBar.top = Y_OFFSET - 1;
+ m_rightBar.top = Y_OFFSET - 1;
+ m_leftBar.bottom = (LONG)(m_lineInPix * nbLines + Y_OFFSET + 1);
+ m_rightBar.bottom = m_leftBar.bottom;
+
+}
+
/**
* @brief Invalidate rect of old visible area indicator to restore background correctly
*/
@@ -218,49 +249,27 @@
if (!m_view[MERGE_VIEW_LEFT]->IsInitialized()) return;
- CRect rc;
- GetClientRect(rc);
-
- CMergeDoc *pDoc = GetDocument();
- const int w = rc.Width() / 4;
- m_leftBar.left = (rc.Width() - 2 * w) / 3;
- m_leftBar.right = m_leftBar.left + w;
- m_rightBar.left = 2 * m_leftBar.left + w;
- m_rightBar.right = m_rightBar.left + w;
- const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
- const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
- m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
-
- double LineInPix = hTotal / nbLines;
COLORREF cr0 = CLR_NONE; // Left side color
COLORREF cr1 = CLR_NONE; // Right side color
COLORREF crt = CLR_NONE; // Text color
BOOL bwh = FALSE;
- m_pixInLines = nbLines / hTotal;
- if (LineInPix > MAX_LINEPIX)
- {
- LineInPix = MAX_LINEPIX;
- m_pixInLines = 1 / MAX_LINEPIX;
- }
-
m_movedLines.RemoveAll();
// Adjust line coloring if ignoring trivials
DWORD ignoreFlags = (m_bIgnoreTrivials ? LF_TRIVIAL : 0);
+ CalculateBars();
+
// Draw bar outlines
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- m_leftBar.top = Y_OFFSET - 1;
- m_rightBar.top = Y_OFFSET - 1;
- m_leftBar.bottom = (LONG)(LineInPix * nbLines + Y_OFFSET + 1);
- m_rightBar.bottom = m_leftBar.bottom;
pDC->Rectangle(m_leftBar);
pDC->Rectangle(m_rightBar);
pDC->SelectObject(oldObj);
// Iterate the differences list and draw differences as colored blocks.
+ CMergeDoc *pDoc = GetDocument();
int nPrevEndY = -1;
const int nCurDiff = pDoc->GetCurrentDiff();
const int nDiffs = pDoc->m_diffList.GetSize();
@@ -287,8 +296,8 @@
const int nBlockHeight = nBlockEnd - nBlockStart + pView->GetSubLines(nLineEndDiff);
// Convert diff block size from lines to pixels.
- const int nBeginY = (int)(nBlockStart * LineInPix + Y_OFFSET);
- const int nEndY = (int)((nBlockStart + nBlockHeight) * LineInPix + Y_OFFSET);
+ const int nBeginY = (int)(nBlockStart * m_lineInPix + Y_OFFSET);
+ const int nEndY = (int)((nBlockStart + nBlockHeight) * m_lineInPix + Y_OFFSET);
const BOOL bInsideDiff = (nCurDiff == nDiff);
@@ -342,12 +351,12 @@
apparent1 = pView->GetSubLineIndex(apparent1);
start.x = m_leftBar.right;
- int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
- int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
+ int leftUpper = (int) (apparent0 * m_lineInPix + Y_OFFSET);
+ int leftLower = (int) ((nBlockHeight + apparent0) * m_lineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
end.x = m_rightBar.left;
- int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
- int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
+ int rightUpper = (int) (apparent1 * m_lineInPix + Y_OFFSET);
+ int rightLower = (int) ((nBlockHeight + apparent1) * m_lineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
line.ptLeft = start;
line.ptRight = end;
@@ -369,12 +378,12 @@
apparent1 = pView->GetSubLineIndex(apparent1);
start.x = m_leftBar.right;
- int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
- int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
+ int leftUpper = (int) (apparent0 * m_lineInPix + Y_OFFSET);
+ int leftLower = (int) ((nBlockHeight + apparent0) * m_lineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
end.x = m_rightBar.left;
- int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
- int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
+ int rightUpper = (int) (apparent1 * m_lineInPix + Y_OFFSET);
+ int rightLower = (int) ((nBlockHeight + apparent1) * m_lineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
line.ptLeft = start;
line.ptRight = end;
@@ -747,15 +756,12 @@
const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
- double LineInPix = hTotal / nbLines;
- if (LineInPix > MAX_LINEPIX)
- LineInPix = MAX_LINEPIX;
int nTopCoord = static_cast<int>(Y_OFFSET +
- (static_cast<double>(nTopLine * LineInPix)));
+ (static_cast<double>(nTopLine * m_lineInPix)));
int nLeftCoord = INDICATOR_MARGIN;
int nBottomCoord = static_cast<int>(Y_OFFSET +
- (static_cast<double>(nBottomLine * LineInPix)));
+ (static_cast<double>(nBottomLine * m_lineInPix)));
int nRightCoord = rc.Width() - INDICATOR_MARGIN;
// Visible area was not changed
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2008-05-15 15:52:48 UTC (rev 5345)
+++ trunk/Src/LocationView.h 2008-05-15 20:15:44 UTC (rev 5346)
@@ -61,9 +61,8 @@
virtual void OnDraw(CDC* pDC);
//}}AFX_VIRTUAL
+protected:
CMergeDoc* GetDocument();
-
-protected:
void DrawRect(CDC* pDC, const CRect& r, COLORREF cr, BOOL bSelected = FALSE);
BOOL GotoLocation(const CPoint& point, BOOL bRealLine = TRUE);
int GetLineFromYPos(int nYCoord, int bar, BOOL bRealLine = TRUE);
@@ -71,11 +70,13 @@
void DrawVisibleAreaRect(CDC* pDC, int nTopLine = -1, int nBottomLine = -1);
void DrawConnectLines(CDC* pDC);
void DrawDiffMarker(CDC* pDC, int yCoord);
+ void CalculateBars();
private:
CMergeEditView* m_view[MERGE_VIEW_COUNT]; //*< Table for view pointers */
int m_displayMovedBlocks; //*< Setting for displaying moved blocks */
double m_pixInLines; //*< How many pixels is one line in bars */
+ double m_lineInPix; //*< How many lines is one pixel?
CRect m_leftBar; //*< Left-side file's bar.
CRect m_rightBar; //*< Right-side file's bar.
int m_visibleTop; //*< Top visible line for visible area indicator */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-21 13:30:24
|
Revision: 5350
http://winmerge.svn.sourceforge.net/winmerge/?rev=5350&view=rev
Author: kimmov
Date: 2008-05-21 06:30:03 -0700 (Wed, 21 May 2008)
Log Message:
-----------
PATCH: [ 1967107 ] Use sntprintf family functions instead of stprintf
Submitted by Marcel Gosselin
Modified Paths:
--------------
trunk/Src/Common/RegKey.cpp
trunk/Src/Common/coretools.cpp
trunk/Src/Common/coretypes.h
trunk/Src/Common/version.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/Exceptions.h
trunk/Src/FileVersion.cpp
trunk/Src/Merge.dsp
trunk/Src/Merge.vcproj
trunk/Src/StdAfx.h
trunk/Src/editlib/statbar.cpp
Modified: trunk/Src/Common/RegKey.cpp
===================================================================
--- trunk/Src/Common/RegKey.cpp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Common/RegKey.cpp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -11,6 +11,7 @@
#include <tchar.h>
#include "UnicodeString.h"
#include "RegKey.h"
+#include "coretypes.h"
/**
* @brief Default constructor.
@@ -146,7 +147,7 @@
assert(m_hKey);
assert(pszKey);
TCHAR pszData[100];
- _stprintf(pszData, _T("%f"), fVal);
+ _sntprintf(pszData, countof(pszData), _T("%f"), fVal);
return RegSetValueEx(m_hKey, pszKey, 0L, REG_SZ,
(const LPBYTE) pszData, (_tcslen(pszData)+ 1)*sizeof(TCHAR) );
}
Modified: trunk/Src/Common/coretools.cpp
===================================================================
--- trunk/Src/Common/coretools.cpp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Common/coretools.cpp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -18,11 +18,8 @@
#include <assert.h>
#include "UnicodeString.h"
#include "coretools.h"
+#include "coretypes.h"
-#ifndef countof
-#define countof(array) (sizeof(array)/sizeof((array)[0]))
-#endif /* countof */
-
static String MyGetSysError(int nerr);
static BOOL MyCreateDirectoryIfNeeded(LPCTSTR lpPathName, String * perrstr);
@@ -151,7 +148,7 @@
va_list vl;
va_start( vl, fmt );
- _vstprintf(fprintf_buffer, fmt, vl);
+ _vsntprintf(fprintf_buffer, countof(fprintf_buffer), fmt, vl);
DWORD dwWritten;
WriteFile(hf, fprintf_buffer, _tcslen(fprintf_buffer)*sizeof(TCHAR), &dwWritten, NULL);
@@ -950,7 +947,7 @@
si.wShowWindow = (bMinimized) ? SW_MINIMIZE : SW_HIDE;
TCHAR args[4096];
- _stprintf(args,_T("\"%s\" %s"), szExeFile, szArgs);
+ _sntprintf(args, countof(args), _T("\"%s\" %s"), szExeFile, szArgs);
if (CreateProcess(szExeFile, args, NULL, NULL,
FALSE, NORMAL_PRIORITY_CLASS|(bNewConsole? CREATE_NEW_CONSOLE:0),
NULL, _T(".\\"), &si, &procInfo))
Modified: trunk/Src/Common/coretypes.h
===================================================================
--- trunk/Src/Common/coretypes.h 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Common/coretypes.h 2008-05-21 13:30:03 UTC (rev 5350)
@@ -1,145 +1,9 @@
#ifndef CORETYPES_H
#define CORETYPES_H
-#if !defined(COM_MODEL)
-#include "idltypes.h"
-#endif
+#ifndef countof
+#define countof(array) (sizeof(array)/sizeof((array)[0]))
+#endif /* countof */
-class FRect : public FRECT
-{
-public:
- FRect(float l = 0.f, float t = 0.f, float r = 0.f, float b = 0.f)
- {
- left = l;
- top = t;
- right = r;
- bottom = b;
- }
- FRect(const FRECT& src)
- {
- Copy(src);
- }
- void Empty() { left = top = right = bottom = 0.f; }
- FRect& Copy(const FRECT& src)
- {
- left = src.left;
- top = src.top;
- right = src.right;
- bottom = src.bottom;
- return (*this);
- }
- void Normalize()
- {
- float t;
- if (Width() < 0.f)
- {
- t = left;
- left = right;
- right = t;
- }
- if (Height() < 0.f)
- {
- t = top;
- top = bottom;
- bottom = t;
- }
- }
- float Width() { return (right>left? right-left : left-right); }
- float Height() { return (top>bottom? top-bottom : bottom-top); }
-};
-
-class FPoint : public FPOINT
-{
-public:
- FPoint(float ptx = 0.f, float pty = 0.f)
- {
- x = ptx;
- y = pty;
- }
- FPoint(const FPOINT& src)
- {
- Copy(src);
- }
- FPoint& Copy(const FPOINT& src)
- {
- x = src.x;
- y = src.y;
- return (*this);
- }
- void Empty() { x = y = 0.f; }
-};
-
-
-class FSize : public FSIZE
-{
-public:
- FSize(float w = 0.f, float h = 0.f)
- {
- width = w;
- height = h;
- }
- FSize(const FSIZE& src)
- {
- Copy(src);
- }
- FSize& Copy(const FSIZE& src)
- {
- width = src.width;
- height = src.height;
- return (*this);
- }
- void Empty() { width = height = 0.f; }
-};
-
-
-
-class FArc : public FARC
-{
-public:
- FArc()
- {
- Empty();
- }
- FArc(float x, float y, float r, float a1, float a2)
- {
- radius = r;
- start_angle = a1;
- end_angle = a2;
- center.x = x;
- center.y = y;
- }
- FArc(const FARC& src)
- {
- Copy(src);
- }
- FArc& Copy(const FARC& src)
- {
- radius = src.radius;
- start_angle = src.start_angle;
- end_angle = src.end_angle;
- center.x = src.center.x;
- center.y = src.center.y;
- return (*this);
- }
- void Empty()
- {
- radius = 0.f;
- start_angle = 0.f;
- end_angle = 0.f;
- center.x = 0.f;
- center.y = 0.f;
- }
-};
-
-
-
-
#endif
-
-
-
-
-
-
-
Modified: trunk/Src/Common/version.cpp
===================================================================
--- trunk/Src/Common/version.cpp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Common/version.cpp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -353,7 +353,7 @@
BOOL bRetCode;
TCHAR szSelector[256];
- _stprintf(szSelector,_T("\\StringFileInfo\\%s%s\\%s"),
+ _sntprintf(szSelector, countof(szSelector), _T("\\StringFileInfo\\%s%s\\%s"),
m_strLanguage, m_strCodepage, szId);
bRetCode = VerQueryValue((LPVOID)m_pVffInfo,
szSelector,
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/DirViewColItems.cpp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -159,7 +159,7 @@
}
TCHAR buffer[48];
- _stprintf(buffer, _T("%lf"), number);
+ _sntprintf(buffer, countof(buffer), _T("%lf"), number);
return locality::GetLocaleStr(buffer, ndigits) + suffix;
}
@@ -450,7 +450,7 @@
{
String s = theApp.LoadString(IDS_EOL_MIXED);
TCHAR strstats[40];
- _stprintf(strstats, _T(":%d/%d/%d"), stats.ncrlfs, stats.ncrs, stats.nlfs);
+ _sntprintf(strstats, countof(strstats), _T(":%d/%d/%d"), stats.ncrlfs, stats.ncrs, stats.nlfs);
s += strstats;
return s;
}
Modified: trunk/Src/Exceptions.h
===================================================================
--- trunk/Src/Exceptions.h 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Exceptions.h 2008-05-21 13:30:03 UTC (rev 5350)
@@ -86,7 +86,7 @@
virtual BOOL GetErrorMessage( LPTSTR lpszError, UINT nMaxError, PUINT pnHelpContext = NULL )
{
static TCHAR message[512];
- _stprintf(message, _T("Exception %s (0x%.8x)"), getSeMessage(), getSeNumber());
+ _sntprintf(message, countof(message), _T("Exception %s (0x%.8x)"), getSeMessage(), getSeNumber());
_tcsncpy(lpszError, message, nMaxError-1);
lpszError[nMaxError-1] = 0;
return TRUE;
@@ -116,3 +116,4 @@
+
Modified: trunk/Src/FileVersion.cpp
===================================================================
--- trunk/Src/FileVersion.cpp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/FileVersion.cpp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -71,7 +71,7 @@
return _T("");
TCHAR ver[30] = {0};
- _stprintf(ver, _T("%u.%u.%u.%u"), HIWORD(m_fileVersionMS),
+ _sntprintf(ver, countof(ver), _T("%u.%u.%u.%u"), HIWORD(m_fileVersionMS),
LOWORD(m_fileVersionMS), HIWORD(m_fileVersionLS),
LOWORD(m_fileVersionLS));
return ver;
@@ -87,7 +87,7 @@
return _T("0.0.0.0");
TCHAR ver[30] = {0};
- _stprintf(ver, _T("%u.%u.%u.%u"), HIWORD(m_productVersionMS),
+ _sntprintf(ver, countof(ver), _T("%u.%u.%u.%u"), HIWORD(m_productVersionMS),
LOWORD(m_productVersionMS), HIWORD(m_productVersionLS),
LOWORD(m_productVersionLS));
return ver;
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Merge.dsp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -1116,6 +1116,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Common\coretypes.h
+# End Source File
+# Begin Source File
+
SOURCE=.\common\CShellFileOp.h
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/Merge.vcproj 2008-05-21 13:30:03 UTC (rev 5350)
@@ -5964,6 +5964,10 @@
RelativePath="Common\coretools.h">
</File>
<File
+ RelativePath="Common\coretypes.h"
+ >
+ </File>
+ <File
RelativePath="common\CShellFileOp.h">
</File>
<File
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/StdAfx.h 2008-05-21 13:30:03 UTC (rev 5350)
@@ -73,12 +73,8 @@
#include "sizecbar.h"
#include "scbarg.h"
-// Miscellaneous macros
+#include "coretypes.h"
-#ifndef countof
-#define countof(array) (sizeof(array)/sizeof((array)[0]))
-#endif /* countof */
-
/**
* @name User-defined Windows-messages
*/
Modified: trunk/Src/editlib/statbar.cpp
===================================================================
--- trunk/Src/editlib/statbar.cpp 2008-05-19 20:24:12 UTC (rev 5349)
+++ trunk/Src/editlib/statbar.cpp 2008-05-21 13:30:03 UTC (rev 5350)
@@ -46,7 +46,7 @@
TCHAR buffer[256];
va_list argptr;
va_start (argptr, lpszFmt);
- _vstprintf (buffer, lpszFmt, argptr);
+ _vsntprintf (buffer, countof(buffer), lpszFmt, argptr);
va_end (argptr);
BOOL bResult = SetPaneText (nIndex, buffer, bUpdate);
UpdateWindow ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-21 14:18:31
|
Revision: 5351
http://winmerge.svn.sourceforge.net/winmerge/?rev=5351&view=rev
Author: kimmov
Date: 2008-05-21 07:18:09 -0700 (Wed, 21 May 2008)
Log Message:
-----------
Refactoring LocationPane code: create list of calculated diff blocks and then draw them in one loop.
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-05-21 13:30:03 UTC (rev 5350)
+++ trunk/Src/LocationView.cpp 2008-05-21 14:18:09 UTC (rev 5351)
@@ -211,7 +211,55 @@
m_rightBar.top = Y_OFFSET - 1;
m_leftBar.bottom = (LONG)(m_lineInPix * nbLines + Y_OFFSET + 1);
m_rightBar.bottom = m_leftBar.bottom;
+}
+/**
+ * @brief Calculate difference lines and coordinates.
+ * This function calculates begin- and end-lines of differences when word-wrap
+ * is enabled. Otherwise the value from original difflist is used. Line
+ * numbers are also converted to coordinates in the window. All calculated
+ * (and not ignored) differences are added to the new list.
+ */
+void CLocationView::CalculateBlocks()
+{
+ m_diffBlocks.RemoveAll();
+
+ CMergeDoc *pDoc = GetDocument();
+ const int nDiffs = pDoc->m_diffList.GetSize();
+
+ for (int nDiff = 0; nDiff < nDiffs; ++nDiff)
+ {
+ DIFFRANGE diff;
+ VERIFY(pDoc->m_diffList.GetDiff(nDiff, diff));
+
+ // Skip trivial differences.
+ if (m_bIgnoreTrivials && diff.op == OP_TRIVIAL)
+ {
+ continue;
+ }
+
+ // Find end of diff. If first side has blank lines use other side.
+ const int nLineEndDiff = (diff.blank0 > 0) ? diff.dend1 : diff.dend0;
+
+ CMergeEditView *pView = m_view[MERGE_VIEW_LEFT];
+
+ // Count how many line does the diff block have.
+ const int nBlockStart = pView->GetSubLineIndex(diff.dbegin0);
+ const int nBlockEnd = pView->GetSubLineIndex(nLineEndDiff);
+ const int nBlockHeight = nBlockEnd - nBlockStart + pView->GetSubLines(nLineEndDiff);
+
+ // Convert diff block size from lines to pixels.
+ const int nBeginY = (int)(nBlockStart * m_lineInPix + Y_OFFSET);
+ const int nEndY = (int)((nBlockStart + nBlockHeight) * m_lineInPix + Y_OFFSET);
+
+ DiffBlock block;
+ block.top_line = diff.dbegin0;
+ block.bottom_line = nLineEndDiff;
+ block.top_coord = nBeginY;
+ block.bottom_coord = nEndY;
+ block.diff_index = nDiff;
+ m_diffBlocks.AddTail(block);
+ }
}
/**
@@ -269,51 +317,33 @@
// Iterate the differences list and draw differences as colored blocks.
+ CalculateBlocks();
+
CMergeDoc *pDoc = GetDocument();
int nPrevEndY = -1;
const int nCurDiff = pDoc->GetCurrentDiff();
- const int nDiffs = pDoc->m_diffList.GetSize();
- for (int nDiff = 0; nDiff < nDiffs; ++nDiff)
+ POSITION pos = m_diffBlocks.GetHeadPosition();
+
+ while (pos)
{
- DIFFRANGE diff;
- VERIFY(pDoc->m_diffList.GetDiff(nDiff, diff));
-
- // Skip trivial differences.
- if (m_bIgnoreTrivials && diff.op == OP_TRIVIAL)
- {
- continue;
- }
-
- // Find end of diff. If first side has blank lines use other side.
- const int nLineEndDiff = (diff.blank0 > 0) ? diff.dend1 : diff.dend0;
-
+ const DiffBlock &block = m_diffBlocks.GetNext(pos);
CMergeEditView *pView = m_view[MERGE_VIEW_LEFT];
+ const BOOL bInsideDiff = (nCurDiff == block.diff_index);
- // Count how many line does the diff block have.
- const int nBlockStart = pView->GetSubLineIndex(diff.dbegin0);
- const int nBlockEnd = pView->GetSubLineIndex(nLineEndDiff);
- const int nBlockHeight = nBlockEnd - nBlockStart + pView->GetSubLines(nLineEndDiff);
-
- // Convert diff block size from lines to pixels.
- const int nBeginY = (int)(nBlockStart * m_lineInPix + Y_OFFSET);
- const int nEndY = (int)((nBlockStart + nBlockHeight) * m_lineInPix + Y_OFFSET);
-
- const BOOL bInsideDiff = (nCurDiff == nDiff);
-
- if ((nPrevEndY != nEndY) || bInsideDiff)
+ if ((nPrevEndY != block.bottom_coord) || bInsideDiff)
{
// Draw left side block
- m_view[MERGE_VIEW_LEFT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr0, crt, bwh);
- CRect r0(m_leftBar.left, nBeginY, m_leftBar.right, nEndY);
+ m_view[MERGE_VIEW_LEFT]->GetLineColors2(block.top_line, ignoreFlags, cr0, crt, bwh);
+ CRect r0(m_leftBar.left, block.top_coord, m_leftBar.right, block.bottom_coord);
DrawRect(pDC, r0, cr0, bInsideDiff);
// Draw right side block
- m_view[MERGE_VIEW_RIGHT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr1, crt, bwh);
- CRect r1(m_rightBar.left, nBeginY, m_rightBar.right, nEndY);
+ m_view[MERGE_VIEW_RIGHT]->GetLineColors2(block.top_line, ignoreFlags, cr1, crt, bwh);
+ CRect r1(m_rightBar.left, block.top_coord, m_rightBar.right, block.bottom_coord);
DrawRect(pDC, r1, cr1, bInsideDiff);
}
- nPrevEndY = nEndY;
+ nPrevEndY = block.bottom_coord;
// Test if we draw a connector
BOOL bDisplayConnectorFromLeft = FALSE;
@@ -339,8 +369,9 @@
if (bDisplayConnectorFromLeft)
{
- int apparent0 = diff.dbegin0;
+ int apparent0 = block.top_line;
int apparent1 = pDoc->RightLineInMovedBlock(apparent0);
+ const int nBlockHeight = block.bottom_line - block.top_line;
if (apparent1 != -1)
{
MovedLine line;
@@ -366,8 +397,9 @@
if (bDisplayConnectorFromRight)
{
- int apparent1 = diff.dbegin0;
+ int apparent1 = block.top_line;
int apparent0 = pDoc->LeftLineInMovedBlock(apparent1);
+ const int nBlockHeight = block.bottom_line - block.top_line;
if (apparent0 != -1)
{
MovedLine line;
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2008-05-21 13:30:03 UTC (rev 5350)
+++ trunk/Src/LocationView.h 2008-05-21 14:18:09 UTC (rev 5351)
@@ -31,6 +31,24 @@
typedef CList<MovedLine, MovedLine&> MOVEDLINE_LIST;
+/**
+ * @brief A struct mapping difference lines to pixels in location pane.
+ * This structure maps one difference's line numbers to pixel locations in
+ * the location pane. The line numbers are "fixed" i.e. they are converted to
+ * word-wrapped absolute line numbers if needed.
+ */
+struct DiffBlock
+{
+ unsigned top_line; /**< First line of the difference. */
+ unsigned bottom_line; /**< Last line of the difference. */
+ unsigned top_coord; /**< X-coord of diff block begin. */
+ unsigned bottom_coord; /**< X-coord of diff block end. */
+ unsigned diff_index; /**< Index of difference in the original diff list. */
+};
+
+typedef CList<DiffBlock, DiffBlock&> DIFFBLOCK_LIST;
+
+
/**
* @brief Class showing map of files.
* The location is a view showing two vertical bars. Each bar depicts one file
@@ -71,6 +89,7 @@
void DrawConnectLines(CDC* pDC);
void DrawDiffMarker(CDC* pDC, int yCoord);
void CalculateBars();
+ void CalculateBlocks();
private:
CMergeEditView* m_view[MERGE_VIEW_COUNT]; //*< Table for view pointers */
@@ -87,6 +106,7 @@
UINT m_nPrevPaneWidth; //*< Previous pane width, used to track width changes */
CBitmap *m_pSavedBackgroundBitmap; //*< Saved background */
bool m_bDrawn; //*< Is already drawn in location pane? */
+ DIFFBLOCK_LIST m_diffBlocks; //*< List of pre-calculated diff blocks.
// Generated message map functions
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-22 20:36:54
|
Revision: 5355
http://winmerge.svn.sourceforge.net/winmerge/?rev=5355&view=rev
Author: kimmov
Date: 2008-05-22 13:36:24 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Optimize location pane redraws by disabling diff block calculation from cases when pane width changes.
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-05-22 16:34:35 UTC (rev 5354)
+++ trunk/Src/LocationView.cpp 2008-05-22 20:36:24 UTC (rev 5355)
@@ -84,9 +84,9 @@
// MOVEDLINE_LIST m_movedLines; //*< List of moved block connecting lines */
, m_bIgnoreTrivials(true)
, m_hwndFrame(NULL)
- , m_nPrevPaneWidth(0)
, m_pSavedBackgroundBitmap(NULL)
, m_bDrawn(false)
+ , m_bRecalculateBlocks(TRUE) // calculate for the first time
{
// NB: set m_bIgnoreTrivials to false to see trivial diffs in the LocationView
// There is no GUI to do this
@@ -159,6 +159,7 @@
m_view[MERGE_VIEW_LEFT]->SetLocationView(GetSafeHwnd(), this);
m_view[MERGE_VIEW_RIGHT]->SetLocationView(GetSafeHwnd(), this);
+ m_bRecalculateBlocks = TRUE;
Invalidate();
}
@@ -260,6 +261,7 @@
block.diff_index = nDiff;
m_diffBlocks.AddTail(block);
}
+ m_bRecalculateBlocks = FALSE;
}
/**
@@ -317,7 +319,10 @@
// Iterate the differences list and draw differences as colored blocks.
- CalculateBlocks();
+ // Don't recalculate blocks if we earlier determined it is not needed
+ // This may save lots of processing
+ if (m_bRecalculateBlocks)
+ CalculateBlocks();
CMergeDoc *pDoc = GetDocument();
int nPrevEndY = -1;
@@ -893,16 +898,27 @@
*
* When locationview size changes we want to save new size
* for new windows. But we must do it through frame window.
+ * @param [in] nType Type of resizing, SIZE_MAXIMIZED etc.
+ * @param [in] cx New panel width.
+ * @param [in] cy New panel height.
*/
void CLocationView::OnSize(UINT nType, int cx, int cy)
{
CView::OnSize(nType, cx, cy);
- if (cx != m_nPrevPaneWidth)
+
+ // Height change needs block recalculation
+ // TODO: Perhaps this should be determined from need to change bar size?
+ // And we could change bar sizes more lazily, not from every one pixel change in size?
+ if (cy != m_currentSize.cy)
+ m_bRecalculateBlocks = TRUE;
+
+ if (cx != m_currentSize.cx)
{
- m_nPrevPaneWidth = cx;
if (m_hwndFrame != NULL)
::PostMessage(m_hwndFrame, MSG_STORE_PANESIZES, 0, 0);
}
+
+ m_currentSize.SetSize(cx, cy);
}
/**
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2008-05-22 16:34:35 UTC (rev 5354)
+++ trunk/Src/LocationView.h 2008-05-22 20:36:24 UTC (rev 5355)
@@ -6,6 +6,10 @@
*/
//
//////////////////////////////////////////////////////////////////////
+
+// ID line follows -- this is updated by SVN
+// $Id$
+
#ifndef __LOCATIONVIEW_H__
#define __LOCATIONVIEW_H__
@@ -103,10 +107,11 @@
MOVEDLINE_LIST m_movedLines; //*< List of moved block connecting lines */
bool m_bIgnoreTrivials; //*< Whether to paint trivial blocks */
HWND m_hwndFrame; //*< Frame window handle */
- UINT m_nPrevPaneWidth; //*< Previous pane width, used to track width changes */
CBitmap *m_pSavedBackgroundBitmap; //*< Saved background */
bool m_bDrawn; //*< Is already drawn in location pane? */
DIFFBLOCK_LIST m_diffBlocks; //*< List of pre-calculated diff blocks.
+ BOOL m_bRecalculateBlocks; //*< Recalculate diff blocks in next repaint.
+ CSize m_currentSize; //*< Current size of the panel.
// Generated message map functions
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-23 13:29:22
|
Revision: 5356
http://winmerge.svn.sourceforge.net/winmerge/?rev=5356&view=rev
Author: kimmov
Date: 2008-05-23 06:29:03 -0700 (Fri, 23 May 2008)
Log Message:
-----------
Optimize location pane's diff list enumeration. Remove (unused) code for showing ignored differences in location pane.
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-05-22 20:36:24 UTC (rev 5355)
+++ trunk/Src/LocationView.cpp 2008-05-23 13:29:03 UTC (rev 5356)
@@ -82,7 +82,6 @@
: m_visibleTop(-1)
, m_visibleBottom(-1)
// MOVEDLINE_LIST m_movedLines; //*< List of moved block connecting lines */
- , m_bIgnoreTrivials(true)
, m_hwndFrame(NULL)
, m_pSavedBackgroundBitmap(NULL)
, m_bDrawn(false)
@@ -228,17 +227,12 @@
CMergeDoc *pDoc = GetDocument();
const int nDiffs = pDoc->m_diffList.GetSize();
- for (int nDiff = 0; nDiff < nDiffs; ++nDiff)
+ int nDiff = pDoc->m_diffList.FirstSignificantDiff();
+ while (nDiff != -1)
{
DIFFRANGE diff;
VERIFY(pDoc->m_diffList.GetDiff(nDiff, diff));
- // Skip trivial differences.
- if (m_bIgnoreTrivials && diff.op == OP_TRIVIAL)
- {
- continue;
- }
-
// Find end of diff. If first side has blank lines use other side.
const int nLineEndDiff = (diff.blank0 > 0) ? diff.dend1 : diff.dend0;
@@ -260,6 +254,8 @@
block.bottom_coord = nEndY;
block.diff_index = nDiff;
m_diffBlocks.AddTail(block);
+
+ nDiff = pDoc->m_diffList.NextSignificantDiff(nDiff);
}
m_bRecalculateBlocks = FALSE;
}
@@ -306,9 +302,6 @@
m_movedLines.RemoveAll();
- // Adjust line coloring if ignoring trivials
- DWORD ignoreFlags = (m_bIgnoreTrivials ? LF_TRIVIAL : 0);
-
CalculateBars();
// Draw bar outlines
@@ -339,12 +332,12 @@
if ((nPrevEndY != block.bottom_coord) || bInsideDiff)
{
// Draw left side block
- m_view[MERGE_VIEW_LEFT]->GetLineColors2(block.top_line, ignoreFlags, cr0, crt, bwh);
+ m_view[MERGE_VIEW_LEFT]->GetLineColors2(block.top_line, 0, cr0, crt, bwh);
CRect r0(m_leftBar.left, block.top_coord, m_leftBar.right, block.bottom_coord);
DrawRect(pDC, r0, cr0, bInsideDiff);
// Draw right side block
- m_view[MERGE_VIEW_RIGHT]->GetLineColors2(block.top_line, ignoreFlags, cr1, crt, bwh);
+ m_view[MERGE_VIEW_RIGHT]->GetLineColors2(block.top_line, 0, cr1, crt, bwh);
CRect r1(m_rightBar.left, block.top_coord, m_rightBar.right, block.bottom_coord);
DrawRect(pDC, r1, cr1, bInsideDiff);
}
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2008-05-22 20:36:24 UTC (rev 5355)
+++ trunk/Src/LocationView.h 2008-05-23 13:29:03 UTC (rev 5356)
@@ -105,7 +105,6 @@
int m_visibleTop; //*< Top visible line for visible area indicator */
int m_visibleBottom; //*< Bottom visible line for visible area indicator */
MOVEDLINE_LIST m_movedLines; //*< List of moved block connecting lines */
- bool m_bIgnoreTrivials; //*< Whether to paint trivial blocks */
HWND m_hwndFrame; //*< Frame window handle */
CBitmap *m_pSavedBackgroundBitmap; //*< Saved background */
bool m_bDrawn; //*< Is already drawn in location pane? */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-26 09:05:40
|
Revision: 5373
http://winmerge.svn.sourceforge.net/winmerge/?rev=5373&view=rev
Author: kimmov
Date: 2008-05-26 02:05:30 -0700 (Mon, 26 May 2008)
Log Message:
-----------
Doxygen file comment improvements and fixes.
Modified Paths:
--------------
trunk/Src/Common/varprop.h
trunk/Src/WaitStatusCursor.cpp
trunk/Src/WaitStatusCursor.h
Modified: trunk/Src/Common/varprop.h
===================================================================
--- trunk/Src/Common/varprop.h 2008-05-25 22:03:43 UTC (rev 5372)
+++ trunk/Src/Common/varprop.h 2008-05-26 09:05:30 UTC (rev 5373)
@@ -1,5 +1,5 @@
/**
- * @file varprop.cpp
+ * @file varprop.h
*
* @brief Declaration of generic named property classes
*/
Modified: trunk/Src/WaitStatusCursor.cpp
===================================================================
--- trunk/Src/WaitStatusCursor.cpp 2008-05-25 22:03:43 UTC (rev 5372)
+++ trunk/Src/WaitStatusCursor.cpp 2008-05-26 09:05:30 UTC (rev 5373)
@@ -3,14 +3,25 @@
// Copyright (C) 2003 Perry Rapp
// Author: Perry Rapp
//
-// This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version. This program is distributed in
+// the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+// even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+// PARTICULAR PURPOSE. See the GNU General Public License for more
+// details. You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
-// WaitStatusCursur.cpp: implementation of the WaitStatusCursur class.
-//
-//////////////////////////////////////////////////////////////////////
+/**
+ * @file WaitStatusCursor.cpp
+ *
+ * @brief Implementation of the WaitStatusCursur class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
#include "stdafx.h"
#include "WaitStatusCursor.h"
Modified: trunk/Src/WaitStatusCursor.h
===================================================================
--- trunk/Src/WaitStatusCursor.h 2008-05-25 22:03:43 UTC (rev 5372)
+++ trunk/Src/WaitStatusCursor.h 2008-05-26 09:05:30 UTC (rev 5373)
@@ -1,3 +1,11 @@
+/**
+ * @file WaitStatusCursor.h
+ *
+ * @brief Declaration WaitStatusCursor classes.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
#ifndef WaitStatusCursor_included_h
#define WaitStatusCursor_included_h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-26 13:05:03
|
Revision: 5374
http://winmerge.svn.sourceforge.net/winmerge/?rev=5374&view=rev
Author: kimmov
Date: 2008-05-26 06:04:56 -0700 (Mon, 26 May 2008)
Log Message:
-----------
Rename PropLineFilter.* files to LineFiltersDlg.*. This is consistent with other filter dialog names FileFiltersDlg.*.
Modified Paths:
--------------
trunk/Src/MainFrm.cpp
trunk/Src/Merge.vcproj
Added Paths:
-----------
trunk/Src/LineFiltersDlg.cpp
trunk/Src/LineFiltersDlg.h
Removed Paths:
-------------
trunk/Src/PropLineFilter.cpp
trunk/Src/PropLineFilter.h
Copied: trunk/Src/LineFiltersDlg.cpp (from rev 5373, trunk/Src/PropLineFilter.cpp)
===================================================================
--- trunk/Src/LineFiltersDlg.cpp (rev 0)
+++ trunk/Src/LineFiltersDlg.cpp 2008-05-26 13:04:56 UTC (rev 5374)
@@ -0,0 +1,321 @@
+/**
+ * @file PropLineFilter.cpp
+ *
+ * @brief Implementation of Line Filter dialog
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include "merge.h"
+#include "LineFiltersList.h"
+#include "MainFrm.h"
+#include "LineFiltersDlg.h"
+#include "dllver.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/** @brief Location for file compare specific help to open. */
+static TCHAR FilterHelpLocation[] = _T("::/htmlhelp/Filters.html");
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropLineFilter property page
+
+IMPLEMENT_DYNAMIC(CPropLineFilter, CPropertyPage)
+
+CPropLineFilter::CPropLineFilter()
+: CPropertyPage(CPropLineFilter::IDD)
+, m_pList(NULL)
+, m_bEditing(FALSE)
+{
+ //{{AFX_DATA_INIT(CPropLineFilter)
+ m_bIgnoreRegExp = FALSE;
+ //}}AFX_DATA_INIT
+ m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
+ m_psp.pszTitle = m_strCaption;
+ m_psp.dwFlags |= PSP_USETITLE;
+ m_psp.hIcon = AfxGetApp()->LoadIcon(IDI_LINEFILTER);
+ m_psp.dwFlags |= PSP_USEHICON;
+}
+
+CPropLineFilter::~CPropLineFilter()
+{
+}
+
+void CPropLineFilter::DoDataExchange(CDataExchange* pDX)
+{
+ CPropertyPage::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(CPropLineFilter)
+ DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
+ //}}AFX_DATA_MAP
+ DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList);
+ DDX_Control(pDX, IDC_LFILTER_EDITBOX, m_editRegexp);
+ DDX_Control(pDX, IDC_LFILTER_EDITSAVE, m_saveRegexp);
+}
+
+
+BEGIN_MESSAGE_MAP(CPropLineFilter, CPropertyPage)
+ //{{AFX_MSG_MAP(CPropLineFilter)
+ ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
+ ON_COMMAND(ID_HELP, OnHelp)
+ //}}AFX_MSG_MAP
+ ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedLfilterAddBtn)
+ ON_BN_CLICKED(IDC_LFILTER_EDITBTN, OnBnClickedLfilterEditbtn)
+ ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
+ ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
+ ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
+ ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox)
+END_MESSAGE_MAP()
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropLineFilter message handlers
+
+BOOL CPropLineFilter::OnInitDialog()
+{
+ theApp.TranslateDialog(m_hWnd);
+ CPropertyPage::OnInitDialog();
+
+ InitList();
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CPropLineFilter::InitList()
+{
+ // Show selection across entire row.
+ DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT |
+ LVS_EX_ONECLICKACTIVATE;
+ // Also enable infotips if they have new enough version for our
+ // custom draw code
+ // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
+ if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
+ newstyle |= LVS_EX_INFOTIP;
+
+ m_filtersList.ModifyStyle(0, LVS_EDITLABELS | LVS_SHOWSELALWAYS);
+
+ m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle);
+
+ String title = theApp.LoadString(IDS_FILTERLINE_REGEXP);
+ m_filtersList.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 500);
+
+ int count = m_pList->GetCount();
+ int ind = -1;
+ for (int i = 0; i < count; i++)
+ {
+ LineFilterItem item = m_pList->GetAt(i);
+ ind = AddRow(item.filterStr.c_str(), item.enabled);
+ }
+ if (count > 0)
+ {
+ m_filtersList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
+ BOOL bPartialOk = FALSE;
+ m_filtersList.EnsureVisible(0, bPartialOk);
+ CString text = m_filtersList.GetItemText(0, 0);
+ m_editRegexp.SetWindowText(text);
+ }
+ UpdateData(FALSE);
+}
+
+/// User clicked the ignore checkbox
+void CPropLineFilter::OnIgnoreregexp()
+{
+ UpdateData();
+}
+
+/** @brief Open help from mainframe when user presses F1*/
+void CPropLineFilter::OnHelp()
+{
+ GetMainFrame()->ShowHelp(FilterHelpLocation);
+}
+
+/**
+ * @brief Add new row to the list control.
+ * @param [in] Filter string to add.
+ * @param [in] enabled Is filter enabled?
+ * @return Index of added row.
+ */
+int CPropLineFilter::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
+{
+ int items = m_filtersList.GetItemCount();
+ int ind = m_filtersList.InsertItem(items + 1, filter);
+ m_filtersList.SetCheck(ind, enabled);
+ return ind;
+}
+
+/**
+ * @brief Edit currently selected filter.
+ */
+void CPropLineFilter::EditSelectedFilter()
+{
+ int sel =- 1;
+ m_filtersList.SetFocus();
+ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ if (sel > -1)
+ {
+/* CEdit * pEdit = m_filtersList.EditLabel(sel);
+ if (pEdit)
+ {
+ pEdit->SetFocus();
+ }
+*/
+ CString text = m_filtersList.GetItemText(sel, 0);
+ m_editRegexp.SetWindowText(text);
+ m_editRegexp.SetReadOnly(FALSE);
+ m_saveRegexp.EnableWindow(TRUE);
+ m_editRegexp.SetFocus();
+ m_editRegexp.SetSel(0, -1);
+ m_bEditing = TRUE;
+ }
+}
+
+/**
+ * @brief Called when Add-button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterAddBtn()
+{
+ int ind = AddRow(_T(""));
+ if (ind >= -1)
+ {
+ m_filtersList.SetItemState(ind, LVIS_SELECTED, LVIS_SELECTED);
+ BOOL bPartialOk = FALSE;
+ m_filtersList.EnsureVisible(ind, bPartialOk);
+ EditSelectedFilter();
+ }
+}
+
+/**
+ * @brief Called when Edit button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterEditbtn()
+{
+ EditSelectedFilter();
+}
+
+/**
+ * @brief Save filters to list when exiting the dialog.
+ */
+void CPropLineFilter::OnOK()
+{
+ m_pList->Empty();
+
+ for (int i = 0; i < m_filtersList.GetItemCount(); i++)
+ {
+ CString text = m_filtersList.GetItemText(i, 0);
+ BOOL enabled = m_filtersList.GetCheck(i);
+
+ m_pList->AddFilter(text, enabled);
+ }
+
+ CPropertyPage::OnClose();
+}
+
+/**
+ * @brief Sets external filter list.
+ * @param [in] list External filter list.
+ */
+void CPropLineFilter::SetList(LineFiltersList * list)
+{
+ m_pList = list;
+}
+
+/**
+ * @brief Called when Remove button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterRemovebtn()
+{
+ int sel =- 1;
+ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ if (sel != -1)
+ {
+ m_filtersList.DeleteItem(sel);
+ }
+
+ int newSel = min(m_filtersList.GetItemCount() - 1, sel);
+ if (newSel >= -1)
+ {
+ m_filtersList.SetItemState(newSel, LVIS_SELECTED, LVIS_SELECTED);
+ BOOL bPartialOk = FALSE;
+ m_filtersList.EnsureVisible(newSel, bPartialOk);
+ }
+}
+
+/**
+ * @brief Called when Save button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterEditsave()
+{
+ SaveItem();
+}
+
+/**
+ * @brief Cancel editing of filter when ESC is pressed.
+ */
+BOOL CPropLineFilter::PreTranslateMessage(MSG* pMsg)
+{
+ if (m_bEditing)
+ {
+ // Handle Esc key press
+ if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE)
+ {
+ m_saveRegexp.EnableWindow(FALSE);
+ m_editRegexp.SetReadOnly(TRUE);
+ m_bEditing = FALSE;
+ m_filtersList.SetFocus();
+ return TRUE;
+ }
+ }
+ return CPropertyPage::PreTranslateMessage(pMsg);
+}
+
+/**
+ * @brief Called when selected item in list changes.
+ */
+void CPropLineFilter::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
+{
+ LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
+ int item = pNMIA->iItem;
+ if (m_bEditing)
+ {
+ m_saveRegexp.EnableWindow(FALSE);
+ m_editRegexp.SetReadOnly(TRUE);
+ m_bEditing = FALSE;
+ }
+ CString text = m_filtersList.GetItemText(item, 0);
+ m_editRegexp.SetWindowText(text);
+ *pResult = 0;
+}
+
+/**
+ * @brief Save the current filter in edit box.
+ */
+void CPropLineFilter::SaveItem()
+{
+ if (m_bEditing)
+ {
+ int sel =- 1;
+ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ if (sel != -1)
+ {
+ CString text;
+ m_editRegexp.GetWindowText(text);
+ m_filtersList.SetItemText(sel, 0, text);
+ }
+ m_bEditing = FALSE;
+ m_editRegexp.SetReadOnly(TRUE);
+ m_saveRegexp.EnableWindow(FALSE);
+ }
+}
+
+/**
+ * @brief Called when filter edit box loses its focus.
+ */
+void CPropLineFilter::OnEnKillfocusLfilterEditbox()
+{
+ SaveItem();
+}
Copied: trunk/Src/LineFiltersDlg.h (from rev 5373, trunk/Src/PropLineFilter.h)
===================================================================
--- trunk/Src/LineFiltersDlg.h (rev 0)
+++ trunk/Src/LineFiltersDlg.h 2008-05-26 13:04:56 UTC (rev 5374)
@@ -0,0 +1,80 @@
+/**
+ * @file PropLineFilter.h
+ *
+ * @brief Declaration file for Line Filter dialog
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "afxcmn.h"
+#include "afxwin.h"
+#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
+#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
+
+class LineFiltersList;
+
+/// Class for Line filter propertypage
+class CPropLineFilter : public CPropertyPage
+{
+ DECLARE_DYNAMIC(CPropLineFilter)
+
+// Construction
+public:
+ CPropLineFilter();
+ ~CPropLineFilter();
+
+ void SetList(LineFiltersList * list);
+
+// Dialog Data
+ //{{AFX_DATA(CPropLineFilter)
+ enum { IDD = IDD_PROPPAGE_FILTER };
+ BOOL m_bIgnoreRegExp;
+ //}}AFX_DATA
+
+// Implementation
+
+// Overrides
+ // ClassWizard generate virtual function overrides
+ //{{AFX_VIRTUAL(CPropLineFilter)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+ // Generated message map functions
+ //{{AFX_MSG(CPropLineFilter)
+ virtual BOOL OnInitDialog();
+ afx_msg void OnIgnoreregexp();
+ afx_msg void OnHelp();
+ virtual void OnOK();
+ afx_msg void OnBnClickedLfilterAddBtn();
+ afx_msg void OnBnClickedLfilterEditbtn();
+ afx_msg void OnBnClickedLfilterRemovebtn();
+ virtual BOOL PreTranslateMessage(MSG* pMsg);
+ afx_msg void OnBnClickedLfilterEditsave();
+ afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnEnKillfocusLfilterEditbox();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+ void InitList();
+ int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
+ void EditSelectedFilter();
+ void SaveItem();
+
+private:
+ CListCtrl m_filtersList; /**< List control having filter strings */
+ CEdit m_editRegexp; /**< Editbox for editing filter */
+ CButton m_saveRegexp; /**< Button for saving edited filter */
+
+ LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
+ BOOL m_bEditing; /**< Are we editing a filter string? */
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-05-26 09:05:30 UTC (rev 5373)
+++ trunk/Src/MainFrm.cpp 2008-05-26 13:04:56 UTC (rev 5374)
@@ -47,7 +47,7 @@
#include "ConflictFileParser.h"
#include "coretools.h"
#include "Splash.h"
-#include "PropLineFilter.h"
+#include "LineFiltersDlg.h"
#include "logfile.h"
#include "paths.h"
#include "WaitStatusCursor.h"
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-05-26 09:05:30 UTC (rev 5373)
+++ trunk/Src/Merge.vcproj 2008-05-26 13:04:56 UTC (rev 5374)
@@ -2738,6 +2738,9 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\LineFiltersDlg.cpp">
+ </File>
+ <File
RelativePath="LineFiltersList.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -4397,43 +4400,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="PropLineFilter.cpp">
- <FileConfiguration
- Name="UnicodeRelease|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="PropRegistry.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -6120,6 +6086,9 @@
RelativePath="Common\LanguageSelect.h">
</File>
<File
+ RelativePath=".\LineFiltersDlg.h">
+ </File>
+ <File
RelativePath="LineFiltersList.h">
</File>
<File
@@ -6249,9 +6218,6 @@
RelativePath="PropGeneral.h">
</File>
<File
- RelativePath="PropLineFilter.h">
- </File>
- <File
RelativePath="PropRegistry.h">
</File>
<File
Deleted: trunk/Src/PropLineFilter.cpp
===================================================================
--- trunk/Src/PropLineFilter.cpp 2008-05-26 09:05:30 UTC (rev 5373)
+++ trunk/Src/PropLineFilter.cpp 2008-05-26 13:04:56 UTC (rev 5374)
@@ -1,321 +0,0 @@
-/**
- * @file PropLineFilter.cpp
- *
- * @brief Implementation of Line Filter dialog
- */
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#include "stdafx.h"
-#include "merge.h"
-#include "LineFiltersList.h"
-#include "MainFrm.h"
-#include "PropLineFilter.h"
-#include "dllver.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/** @brief Location for file compare specific help to open. */
-static TCHAR FilterHelpLocation[] = _T("::/htmlhelp/Filters.html");
-
-/////////////////////////////////////////////////////////////////////////////
-// CPropLineFilter property page
-
-IMPLEMENT_DYNAMIC(CPropLineFilter, CPropertyPage)
-
-CPropLineFilter::CPropLineFilter()
-: CPropertyPage(CPropLineFilter::IDD)
-, m_pList(NULL)
-, m_bEditing(FALSE)
-{
- //{{AFX_DATA_INIT(CPropLineFilter)
- m_bIgnoreRegExp = FALSE;
- //}}AFX_DATA_INIT
- m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
- m_psp.pszTitle = m_strCaption;
- m_psp.dwFlags |= PSP_USETITLE;
- m_psp.hIcon = AfxGetApp()->LoadIcon(IDI_LINEFILTER);
- m_psp.dwFlags |= PSP_USEHICON;
-}
-
-CPropLineFilter::~CPropLineFilter()
-{
-}
-
-void CPropLineFilter::DoDataExchange(CDataExchange* pDX)
-{
- CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropLineFilter)
- DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
- //}}AFX_DATA_MAP
- DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList);
- DDX_Control(pDX, IDC_LFILTER_EDITBOX, m_editRegexp);
- DDX_Control(pDX, IDC_LFILTER_EDITSAVE, m_saveRegexp);
-}
-
-
-BEGIN_MESSAGE_MAP(CPropLineFilter, CPropertyPage)
- //{{AFX_MSG_MAP(CPropLineFilter)
- ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
- ON_COMMAND(ID_HELP, OnHelp)
- //}}AFX_MSG_MAP
- ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedLfilterAddBtn)
- ON_BN_CLICKED(IDC_LFILTER_EDITBTN, OnBnClickedLfilterEditbtn)
- ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
- ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
- ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
- ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox)
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CPropLineFilter message handlers
-
-BOOL CPropLineFilter::OnInitDialog()
-{
- theApp.TranslateDialog(m_hWnd);
- CPropertyPage::OnInitDialog();
-
- InitList();
-
- return TRUE; // return TRUE unless you set the focus to a control
- // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void CPropLineFilter::InitList()
-{
- // Show selection across entire row.
- DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT |
- LVS_EX_ONECLICKACTIVATE;
- // Also enable infotips if they have new enough version for our
- // custom draw code
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
- newstyle |= LVS_EX_INFOTIP;
-
- m_filtersList.ModifyStyle(0, LVS_EDITLABELS | LVS_SHOWSELALWAYS);
-
- m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle);
-
- String title = theApp.LoadString(IDS_FILTERLINE_REGEXP);
- m_filtersList.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 500);
-
- int count = m_pList->GetCount();
- int ind = -1;
- for (int i = 0; i < count; i++)
- {
- LineFilterItem item = m_pList->GetAt(i);
- ind = AddRow(item.filterStr.c_str(), item.enabled);
- }
- if (count > 0)
- {
- m_filtersList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
- BOOL bPartialOk = FALSE;
- m_filtersList.EnsureVisible(0, bPartialOk);
- CString text = m_filtersList.GetItemText(0, 0);
- m_editRegexp.SetWindowText(text);
- }
- UpdateData(FALSE);
-}
-
-/// User clicked the ignore checkbox
-void CPropLineFilter::OnIgnoreregexp()
-{
- UpdateData();
-}
-
-/** @brief Open help from mainframe when user presses F1*/
-void CPropLineFilter::OnHelp()
-{
- GetMainFrame()->ShowHelp(FilterHelpLocation);
-}
-
-/**
- * @brief Add new row to the list control.
- * @param [in] Filter string to add.
- * @param [in] enabled Is filter enabled?
- * @return Index of added row.
- */
-int CPropLineFilter::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
-{
- int items = m_filtersList.GetItemCount();
- int ind = m_filtersList.InsertItem(items + 1, filter);
- m_filtersList.SetCheck(ind, enabled);
- return ind;
-}
-
-/**
- * @brief Edit currently selected filter.
- */
-void CPropLineFilter::EditSelectedFilter()
-{
- int sel =- 1;
- m_filtersList.SetFocus();
- sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
- if (sel > -1)
- {
-/* CEdit * pEdit = m_filtersList.EditLabel(sel);
- if (pEdit)
- {
- pEdit->SetFocus();
- }
-*/
- CString text = m_filtersList.GetItemText(sel, 0);
- m_editRegexp.SetWindowText(text);
- m_editRegexp.SetReadOnly(FALSE);
- m_saveRegexp.EnableWindow(TRUE);
- m_editRegexp.SetFocus();
- m_editRegexp.SetSel(0, -1);
- m_bEditing = TRUE;
- }
-}
-
-/**
- * @brief Called when Add-button is clicked.
- */
-void CPropLineFilter::OnBnClickedLfilterAddBtn()
-{
- int ind = AddRow(_T(""));
- if (ind >= -1)
- {
- m_filtersList.SetItemState(ind, LVIS_SELECTED, LVIS_SELECTED);
- BOOL bPartialOk = FALSE;
- m_filtersList.EnsureVisible(ind, bPartialOk);
- EditSelectedFilter();
- }
-}
-
-/**
- * @brief Called when Edit button is clicked.
- */
-void CPropLineFilter::OnBnClickedLfilterEditbtn()
-{
- EditSelectedFilter();
-}
-
-/**
- * @brief Save filters to list when exiting the dialog.
- */
-void CPropLineFilter::OnOK()
-{
- m_pList->Empty();
-
- for (int i = 0; i < m_filtersList.GetItemCount(); i++)
- {
- CString text = m_filtersList.GetItemText(i, 0);
- BOOL enabled = m_filtersList.GetCheck(i);
-
- m_pList->AddFilter(text, enabled);
- }
-
- CPropertyPage::OnClose();
-}
-
-/**
- * @brief Sets external filter list.
- * @param [in] list External filter list.
- */
-void CPropLineFilter::SetList(LineFiltersList * list)
-{
- m_pList = list;
-}
-
-/**
- * @brief Called when Remove button is clicked.
- */
-void CPropLineFilter::OnBnClickedLfilterRemovebtn()
-{
- int sel =- 1;
- sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
- if (sel != -1)
- {
- m_filtersList.DeleteItem(sel);
- }
-
- int newSel = min(m_filtersList.GetItemCount() - 1, sel);
- if (newSel >= -1)
- {
- m_filtersList.SetItemState(newSel, LVIS_SELECTED, LVIS_SELECTED);
- BOOL bPartialOk = FALSE;
- m_filtersList.EnsureVisible(newSel, bPartialOk);
- }
-}
-
-/**
- * @brief Called when Save button is clicked.
- */
-void CPropLineFilter::OnBnClickedLfilterEditsave()
-{
- SaveItem();
-}
-
-/**
- * @brief Cancel editing of filter when ESC is pressed.
- */
-BOOL CPropLineFilter::PreTranslateMessage(MSG* pMsg)
-{
- if (m_bEditing)
- {
- // Handle Esc key press
- if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE)
- {
- m_saveRegexp.EnableWindow(FALSE);
- m_editRegexp.SetReadOnly(TRUE);
- m_bEditing = FALSE;
- m_filtersList.SetFocus();
- return TRUE;
- }
- }
- return CPropertyPage::PreTranslateMessage(pMsg);
-}
-
-/**
- * @brief Called when selected item in list changes.
- */
-void CPropLineFilter::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
-{
- LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
- int item = pNMIA->iItem;
- if (m_bEditing)
- {
- m_saveRegexp.EnableWindow(FALSE);
- m_editRegexp.SetReadOnly(TRUE);
- m_bEditing = FALSE;
- }
- CString text = m_filtersList.GetItemText(item, 0);
- m_editRegexp.SetWindowText(text);
- *pResult = 0;
-}
-
-/**
- * @brief Save the current filter in edit box.
- */
-void CPropLineFilter::SaveItem()
-{
- if (m_bEditing)
- {
- int sel =- 1;
- sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
- if (sel != -1)
- {
- CString text;
- m_editRegexp.GetWindowText(text);
- m_filtersList.SetItemText(sel, 0, text);
- }
- m_bEditing = FALSE;
- m_editRegexp.SetReadOnly(TRUE);
- m_saveRegexp.EnableWindow(FALSE);
- }
-}
-
-/**
- * @brief Called when filter edit box loses its focus.
- */
-void CPropLineFilter::OnEnKillfocusLfilterEditbox()
-{
- SaveItem();
-}
Deleted: trunk/Src/PropLineFilter.h
===================================================================
--- trunk/Src/PropLineFilter.h 2008-05-26 09:05:30 UTC (rev 5373)
+++ trunk/Src/PropLineFilter.h 2008-05-26 13:04:56 UTC (rev 5374)
@@ -1,80 +0,0 @@
-/**
- * @file PropLineFilter.h
- *
- * @brief Declaration file for Line Filter dialog
- *
- */
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#include "afxcmn.h"
-#include "afxwin.h"
-#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
-#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
-
-class LineFiltersList;
-
-/// Class for Line filter propertypage
-class CPropLineFilter : public CPropertyPage
-{
- DECLARE_DYNAMIC(CPropLineFilter)
-
-// Construction
-public:
- CPropLineFilter();
- ~CPropLineFilter();
-
- void SetList(LineFiltersList * list);
-
-// Dialog Data
- //{{AFX_DATA(CPropLineFilter)
- enum { IDD = IDD_PROPPAGE_FILTER };
- BOOL m_bIgnoreRegExp;
- //}}AFX_DATA
-
-// Implementation
-
-// Overrides
- // ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropLineFilter)
- protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
- //}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
- // Generated message map functions
- //{{AFX_MSG(CPropLineFilter)
- virtual BOOL OnInitDialog();
- afx_msg void OnIgnoreregexp();
- afx_msg void OnHelp();
- virtual void OnOK();
- afx_msg void OnBnClickedLfilterAddBtn();
- afx_msg void OnBnClickedLfilterEditbtn();
- afx_msg void OnBnClickedLfilterRemovebtn();
- virtual BOOL PreTranslateMessage(MSG* pMsg);
- afx_msg void OnBnClickedLfilterEditsave();
- afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
- afx_msg void OnEnKillfocusLfilterEditbox();
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
- void InitList();
- int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
- void EditSelectedFilter();
- void SaveItem();
-
-private:
- CListCtrl m_filtersList; /**< List control having filter strings */
- CEdit m_editRegexp; /**< Editbox for editing filter */
- CButton m_saveRegexp; /**< Button for saving edited filter */
-
- LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
- BOOL m_bEditing; /**< Are we editing a filter string? */
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-26 13:42:31
|
Revision: 5375
http://winmerge.svn.sourceforge.net/winmerge/?rev=5375&view=rev
Author: kimmov
Date: 2008-05-26 06:41:56 -0700 (Mon, 26 May 2008)
Log Message:
-----------
Rename CPropLineFilter class to LineFiltersDlg - the filename was changed in previous commit.
Modified Paths:
--------------
trunk/Src/LineFiltersDlg.cpp
trunk/Src/LineFiltersDlg.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/LineFiltersDlg.cpp
===================================================================
--- trunk/Src/LineFiltersDlg.cpp 2008-05-26 13:04:56 UTC (rev 5374)
+++ trunk/Src/LineFiltersDlg.cpp 2008-05-26 13:41:56 UTC (rev 5375)
@@ -1,5 +1,5 @@
/**
- * @file PropLineFilter.cpp
+ * @file LineFiltersDlg.cpp
*
* @brief Implementation of Line Filter dialog
*/
@@ -25,14 +25,17 @@
/////////////////////////////////////////////////////////////////////////////
// CPropLineFilter property page
-IMPLEMENT_DYNAMIC(CPropLineFilter, CPropertyPage)
+IMPLEMENT_DYNAMIC(LineFiltersDlg, CPropertyPage)
-CPropLineFilter::CPropLineFilter()
-: CPropertyPage(CPropLineFilter::IDD)
+/**
+ * @brief Constructor.
+ */
+LineFiltersDlg::LineFiltersDlg()
+: CPropertyPage(LineFiltersDlg::IDD)
, m_pList(NULL)
, m_bEditing(FALSE)
{
- //{{AFX_DATA_INIT(CPropLineFilter)
+ //{{AFX_DATA_INIT(LineFiltersDlg)
m_bIgnoreRegExp = FALSE;
//}}AFX_DATA_INIT
m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
@@ -42,14 +45,10 @@
m_psp.dwFlags |= PSP_USEHICON;
}
-CPropLineFilter::~CPropLineFilter()
+void LineFiltersDlg::DoDataExchange(CDataExchange* pDX)
{
-}
-
-void CPropLineFilter::DoDataExchange(CDataExchange* pDX)
-{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropLineFilter)
+ //{{AFX_DATA_MAP(LineFiltersDlg)
DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
//}}AFX_DATA_MAP
DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList);
@@ -58,8 +57,8 @@
}
-BEGIN_MESSAGE_MAP(CPropLineFilter, CPropertyPage)
- //{{AFX_MSG_MAP(CPropLineFilter)
+BEGIN_MESSAGE_MAP(LineFiltersDlg, CPropertyPage)
+ //{{AFX_MSG_MAP(LineFiltersDlg)
ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
@@ -75,7 +74,10 @@
/////////////////////////////////////////////////////////////////////////////
// CPropLineFilter message handlers
-BOOL CPropLineFilter::OnInitDialog()
+/**
+ * @brief Initialize the dialog.
+ */
+BOOL LineFiltersDlg::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -86,7 +88,11 @@
// EXCEPTION: OCX Property Pages should return FALSE
}
-void CPropLineFilter::InitList()
+/**
+ * @brief Initialize the filter list in the dialog.
+ * This function adds current line filters to the filter list.
+ */
+void LineFiltersDlg::InitList()
{
// Show selection across entire row.
DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT |
@@ -122,14 +128,18 @@
UpdateData(FALSE);
}
-/// User clicked the ignore checkbox
-void CPropLineFilter::OnIgnoreregexp()
+/**
+ * @brief User clicked filter enable/disable checkbox.
+ */
+void LineFiltersDlg::OnIgnoreregexp()
{
UpdateData();
}
-/** @brief Open help from mainframe when user presses F1*/
-void CPropLineFilter::OnHelp()
+/**
+ * @brief Open help from mainframe when user presses F1.
+ */
+void LineFiltersDlg::OnHelp()
{
GetMainFrame()->ShowHelp(FilterHelpLocation);
}
@@ -140,7 +150,7 @@
* @param [in] enabled Is filter enabled?
* @return Index of added row.
*/
-int CPropLineFilter::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
+int LineFiltersDlg::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
{
int items = m_filtersList.GetItemCount();
int ind = m_filtersList.InsertItem(items + 1, filter);
@@ -151,7 +161,7 @@
/**
* @brief Edit currently selected filter.
*/
-void CPropLineFilter::EditSelectedFilter()
+void LineFiltersDlg::EditSelectedFilter()
{
int sel =- 1;
m_filtersList.SetFocus();
@@ -177,7 +187,7 @@
/**
* @brief Called when Add-button is clicked.
*/
-void CPropLineFilter::OnBnClickedLfilterAddBtn()
+void LineFiltersDlg::OnBnClickedLfilterAddBtn()
{
int ind = AddRow(_T(""));
if (ind >= -1)
@@ -192,7 +202,7 @@
/**
* @brief Called when Edit button is clicked.
*/
-void CPropLineFilter::OnBnClickedLfilterEditbtn()
+void LineFiltersDlg::OnBnClickedLfilterEditbtn()
{
EditSelectedFilter();
}
@@ -200,7 +210,7 @@
/**
* @brief Save filters to list when exiting the dialog.
*/
-void CPropLineFilter::OnOK()
+void LineFiltersDlg::OnOK()
{
m_pList->Empty();
@@ -219,7 +229,7 @@
* @brief Sets external filter list.
* @param [in] list External filter list.
*/
-void CPropLineFilter::SetList(LineFiltersList * list)
+void LineFiltersDlg::SetList(LineFiltersList * list)
{
m_pList = list;
}
@@ -227,7 +237,7 @@
/**
* @brief Called when Remove button is clicked.
*/
-void CPropLineFilter::OnBnClickedLfilterRemovebtn()
+void LineFiltersDlg::OnBnClickedLfilterRemovebtn()
{
int sel =- 1;
sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
@@ -248,7 +258,7 @@
/**
* @brief Called when Save button is clicked.
*/
-void CPropLineFilter::OnBnClickedLfilterEditsave()
+void LineFiltersDlg::OnBnClickedLfilterEditsave()
{
SaveItem();
}
@@ -256,7 +266,7 @@
/**
* @brief Cancel editing of filter when ESC is pressed.
*/
-BOOL CPropLineFilter::PreTranslateMessage(MSG* pMsg)
+BOOL LineFiltersDlg::PreTranslateMessage(MSG* pMsg)
{
if (m_bEditing)
{
@@ -276,7 +286,7 @@
/**
* @brief Called when selected item in list changes.
*/
-void CPropLineFilter::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
+void LineFiltersDlg::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
{
LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
int item = pNMIA->iItem;
@@ -294,7 +304,7 @@
/**
* @brief Save the current filter in edit box.
*/
-void CPropLineFilter::SaveItem()
+void LineFiltersDlg::SaveItem()
{
if (m_bEditing)
{
@@ -315,7 +325,7 @@
/**
* @brief Called when filter edit box loses its focus.
*/
-void CPropLineFilter::OnEnKillfocusLfilterEditbox()
+void LineFiltersDlg::OnEnKillfocusLfilterEditbox()
{
SaveItem();
}
Modified: trunk/Src/LineFiltersDlg.h
===================================================================
--- trunk/Src/LineFiltersDlg.h 2008-05-26 13:04:56 UTC (rev 5374)
+++ trunk/Src/LineFiltersDlg.h 2008-05-26 13:41:56 UTC (rev 5375)
@@ -1,5 +1,5 @@
/**
- * @file PropLineFilter.h
+ * @file LineFiltersDlg.h
*
* @brief Declaration file for Line Filter dialog
*
@@ -7,36 +7,35 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "afxcmn.h"
-#include "afxwin.h"
#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
class LineFiltersList;
-/// Class for Line filter propertypage
-class CPropLineFilter : public CPropertyPage
+/**
+ * @brief A dialog for editing and selecting used line filters.
+ * This dialog allows user to add, edit and remove line filters. Currently
+ * active filters are selected by enabling their checkbox.
+ */
+class LineFiltersDlg : public CPropertyPage
{
- DECLARE_DYNAMIC(CPropLineFilter)
+ DECLARE_DYNAMIC(LineFiltersDlg)
// Construction
public:
- CPropLineFilter();
- ~CPropLineFilter();
+ LineFiltersDlg();
void SetList(LineFiltersList * list);
// Dialog Data
- //{{AFX_DATA(CPropLineFilter)
+ //{{AFX_DATA(LineFiltersDlg)
enum { IDD = IDD_PROPPAGE_FILTER };
BOOL m_bIgnoreRegExp;
//}}AFX_DATA
-// Implementation
-
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropLineFilter)
+ //{{AFX_VIRTUAL(LineFiltersDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -45,7 +44,7 @@
protected:
// Generated message map functions
- //{{AFX_MSG(CPropLineFilter)
+ //{{AFX_MSG(LineFiltersDlg)
virtual BOOL OnInitDialog();
afx_msg void OnIgnoreregexp();
afx_msg void OnHelp();
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-05-26 13:04:56 UTC (rev 5374)
+++ trunk/Src/MainFrm.cpp 2008-05-26 13:41:56 UTC (rev 5375)
@@ -2522,13 +2522,13 @@
{
String title = theApp.LoadString(IDS_FILTER_TITLE);
CPropertySheet sht(title.c_str());
- CPropLineFilter filter;
+ LineFiltersDlg lineFiltersDlg;
FileFiltersDlg fileFiltersDlg;
FILEFILTER_INFOLIST fileFilters;
LineFiltersList * lineFilters = new LineFiltersList();
CString selectedFilter;
sht.AddPage(&fileFiltersDlg);
- sht.AddPage(&filter);
+ sht.AddPage(&lineFiltersDlg);
sht.m_psh.dwFlags |= PSH_NOAPPLYNOW; // Hide 'Apply' button since we don't need it
// Make sure all filters are up-to-date
@@ -2537,10 +2537,10 @@
theApp.m_globalFileFilter.GetFileFilters(&fileFilters, selectedFilter);
fileFiltersDlg.SetFilterArray(&fileFilters);
fileFiltersDlg.SetSelected(selectedFilter);
- filter.m_bIgnoreRegExp = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
+ lineFiltersDlg.m_bIgnoreRegExp = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
lineFilters->CloneFrom(m_pLineFilters);
- filter.SetList(lineFilters);
+ lineFiltersDlg.SetList(lineFilters);
if (sht.DoModal() == IDOK)
{
@@ -2563,7 +2563,7 @@
CString sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
}
- GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, filter.m_bIgnoreRegExp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, lineFiltersDlg.m_bIgnoreRegExp == TRUE);
m_pLineFilters->CloneFrom(lineFilters);
m_pLineFilters->SaveFilters();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-27 14:33:53
|
Revision: 5381
http://winmerge.svn.sourceforge.net/winmerge/?rev=5381&view=rev
Author: kimmov
Date: 2008-05-27 07:33:49 -0700 (Tue, 27 May 2008)
Log Message:
-----------
TODO: [ 1941779 ] Update PCRE to latest version
Fix include paths to WinMerge project file, fix Prelink.bat.
Modified Paths:
--------------
trunk/Src/Merge.vcproj
trunk/Src/PreLink.bat
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-05-27 14:12:36 UTC (rev 5380)
+++ trunk/Src/Merge.vcproj 2008-05-27 14:33:49 UTC (rev 5381)
@@ -25,7 +25,7 @@
AdditionalOptions="/EHa "
Optimization="1"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -100,7 +100,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHa "
Optimization="0"
- AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -172,7 +172,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHa "
Optimization="0"
- AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
@@ -244,7 +244,7 @@
AdditionalOptions="/EHa "
Optimization="1"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,.\CompareEngines,.\Common,.\editlib,.\diffutils,.\diffutils\lib,.\diffutils\src,..\Externals\expat\lib,..\Externals\expat\xmlwf,..\Externals\scew,..\Externals\pcre\pcre-6.7"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2008-05-27 14:12:36 UTC (rev 5380)
+++ trunk/Src/PreLink.bat 2008-05-27 14:33:49 UTC (rev 5381)
@@ -37,10 +37,6 @@
REM Create build directories
mkdir ..\Build\expat
mkdir ..\Build\pcre
-
-REM Configure PCRE
-cd %2\..\..\..\Externals\pcre\config_pcre
-nmake /f "configure.mak"
goto %1
:.\..\BuildTmp\MergeDebug
@@ -75,7 +71,7 @@
%devenv% "scew.vcproj" /build "Debug"
REM Build PCRE
-cd %2\..\..\..\Externals\pcre\dll_pcre
+cd %2\..\..\..\Externals\pcre\Win32
%msdev% "pcre.dsp" /make "pcre - Win32 Debug"
%devenv% "pcre.vcproj" /build "Debug"
cd %2\..\..\pcre
@@ -99,9 +95,9 @@
%devenv% "scew.vcproj" /build "Release"
REM Build PCRE
-cd %2\..\..\..\Externals\pcre\dll_pcre
+cd %2\..\..\..\Externals\pcre\Win32
%msdev% "pcre.dsp" /make "pcre - Win32 Release"
-%devenv% "pcre.vcproj" /build "Release"
+%devenv% "pcre.vcproj" /build "MinSizeRel"
cd %2\..\..\pcre
copy bin\release\pcre.dll %2\..\
goto Common
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-28 21:06:08
|
Revision: 5389
http://winmerge.svn.sourceforge.net/winmerge/?rev=5389&view=rev
Author: kimmov
Date: 2008-05-28 14:05:54 -0700 (Wed, 28 May 2008)
Log Message:
-----------
Add doxygen comments.
Modified Paths:
--------------
trunk/Src/DirViewColItems.cpp
trunk/Src/locality.cpp
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2008-05-28 12:51:28 UTC (rev 5388)
+++ trunk/Src/DirViewColItems.cpp 2008-05-28 21:05:54 UTC (rev 5389)
@@ -164,9 +164,18 @@
}
/**
- * @name Functions to display each type of column info.
+ * @name Functions to format content of each type of column.
+ * These functions all receive two parameters, a pointer to CDiffContext.
+ * which contains general compare information. And a void pointer whose type
+ * depends on column to format. Function to call for each column, and
+ * parameter for the function are defined in static DirColInfo f_cols table.
*/
/* @{ */
+/**
+ * @brief Format Filename column data.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColFileNameGet(const CDiffContext *, const void *p) //sfilename
{
const DIFFITEM &di = *static_cast<const DIFFITEM*>(p);
@@ -178,17 +187,24 @@
di.left.filename + _T("|") + di.right.filename
);
}
-/*static CString ColNameGet(const CDiffContext *, const void *p) //sfilename
-{
- const CString &r = *static_cast<const CString*>(p);
- return r;
-}*/
+
+/**
+ * @brief Format Extension column data.
+ * @param [in] p Pointer to String having extension string.
+ * @return String to show in the column.
+ */
static String ColExtGet(const CDiffContext *, const void *p) //sfilename
{
const String &r = *static_cast<const String*>(p);
LPCTSTR s = PathFindExtension(r.c_str());
return s + _tcsspn(s, _T("."));
}
+
+/**
+ * @brief Format Folder column data.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColPathGet(const CDiffContext *, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM*>(p);
@@ -217,6 +233,13 @@
s = _T(".");
return s;
}
+
+/**
+ * @brief Format Result column data.
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColStatusGet(const CDiffContext *pCtxt, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM*>(p);
@@ -265,6 +288,12 @@
}
return s;
}
+
+/**
+ * @brief Format Date column data.
+ * @param [in] p Pointer to integer (seconds since 1.1.1970).
+ * @return String to show in the column.
+ */
static String ColTimeGet(const CDiffContext *, const void *p)
{
const __int64 &r = *static_cast<const __int64*>(p);
@@ -273,6 +302,12 @@
else
return _T("");
}
+
+/**
+ * @brief Format Sizw column data.
+ * @param [in] p Pointer to integer containing size in bytes.
+ * @return String to show in the column.
+ */
static String ColSizeGet(const CDiffContext *, const void *p)
{
const __int64 &r = *static_cast<const __int64*>(p);
@@ -283,6 +318,12 @@
}
return s;
}
+
+/**
+ * @brief Format Folder column data.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColSizeShortGet(const CDiffContext *, const void *p)
{
const __int64 &r = *static_cast<const __int64*>(p);
@@ -293,6 +334,12 @@
}
return s;
}
+
+/**
+ * @brief Format Difference cout column data.
+ * @param [in] p Pointer to integer having count of differences.
+ * @return String to show in the column.
+ */
static String ColDiffsGet(const CDiffContext *, const void *p)
{
const int &r = *static_cast<const int*>(p);
@@ -311,6 +358,12 @@
}
return s;
}
+
+/**
+ * @brief Format Newer/Older column data.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColNewerGet(const CDiffContext *, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
@@ -336,6 +389,14 @@
}
return _T("***");
}
+
+/**
+ * @brief Format Version info to string.
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in] pdi Pointer to DIFFITEM.
+ * @param [in] bLeft Is the item left-size item?
+ * @return String proper to show in the GUI.
+ */
static String GetVersion(const CDiffContext * pCtxt, const DIFFITEM * pdi, BOOL bLeft)
{
DIFFITEM & di = const_cast<DIFFITEM &>(*pdi);
@@ -346,16 +407,36 @@
}
return dfi.version.GetFileVersionString();
}
+
+/**
+ * @brief Format Version column data (for left-side).
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColLversionGet(const CDiffContext * pCtxt, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
return GetVersion(pCtxt, &di, TRUE);
}
+
+/**
+ * @brief Format Version column data (for right-side).
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColRversionGet(const CDiffContext * pCtxt, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
return GetVersion(pCtxt, &di, FALSE);
}
+
+/**
+ * @brief Format Short Result column data.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColStatusAbbrGet(const CDiffContext *, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
@@ -398,6 +479,12 @@
return theApp.LoadString(id);
}
+
+/**
+ * @brief Format Binary column data.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColBinGet(const CDiffContext *, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
@@ -407,16 +494,35 @@
else
return _T("");
}
+
+/**
+ * @brief Format File Attributes column data.
+ * @param [in] p Pointer to file flags class.
+ * @return String to show in the column.
+ */
static String ColAttrGet(const CDiffContext *, const void *p)
{
const DiffFileFlags &r = *static_cast<const DiffFileFlags *>(p);
return r.toString();
}
+
+/**
+ * @brief Format File Encoding column data.
+ * @param [in] p Pointer to file information.
+ * @return String to show in the column.
+ */
static String ColEncodingGet(const CDiffContext *, const void *p)
{
const DiffFileInfo &r = *static_cast<const DiffFileInfo *>(p);
return r.encoding.GetName();
}
+
+/**
+ * @brief Format EOL type to string.
+ * @param [in] p Pointer to DIFFITEM.
+ * @param [in] bLeft Are we formatting left-side file's data?
+ * @return EOL type as as string.
+ */
static String GetEOLType(const CDiffContext *, const void *p, BOOL bLeft)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
@@ -457,11 +563,25 @@
return theApp.LoadString(id);
}
+
+/**
+ * @brief Format EOL type column data (for left-side file).
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColLEOLTypeGet(const CDiffContext * pCtxt, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
return GetEOLType(pCtxt, &di, TRUE);
}
+
+/**
+ * @brief Format EOL type column data (for right-side file).
+ * @param [in] pCtxt Pointer to compare context.
+ * @param [in] p Pointer to DIFFITEM.
+ * @return String to show in the column.
+ */
static String ColREOLTypeGet(const CDiffContext * pCtxt, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
Modified: trunk/Src/locality.cpp
===================================================================
--- trunk/Src/locality.cpp 2008-05-28 12:51:28 UTC (rev 5388)
+++ trunk/Src/locality.cpp 2008-05-28 21:05:54 UTC (rev 5389)
@@ -3,7 +3,7 @@
*
* @brief Implementation of helper functions involving locale
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "StdAfx.h"
@@ -121,7 +121,9 @@
}
/**
- * @brief Return time displayed appropriately, as string
+ * @brief Convert unix time to string to show in the GUI.
+ * @param [in] tim Time in seconds since 1.1.1970.
+ * @return Time as a string, proper to show in the GUI.
*/
String TimeString(const __int64 * tim)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-29 07:34:58
|
Revision: 5392
http://winmerge.svn.sourceforge.net/winmerge/?rev=5392&view=rev
Author: kimmov
Date: 2008-05-29 00:34:48 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Uninline DiffFileFlags::toString(). Also rename it to ToString() to comply with function naming.
Modified Paths:
--------------
trunk/Src/DiffFileInfo.cpp
trunk/Src/DiffFileInfo.h
trunk/Src/DirViewColItems.cpp
Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp 2008-05-28 21:53:27 UTC (rev 5391)
+++ trunk/Src/DiffFileInfo.cpp 2008-05-29 07:34:48 UTC (rev 5392)
@@ -19,25 +19,44 @@
*
* @brief Implementation for DiffFileInfo routines
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include "DirItem.h"
#include "DiffFileInfo.h"
#include "unicoder.h"
+#include "UnicodeString.h"
/**
- * @brief Clears FileInfo data.
+ * @brief Convert file flags to string presentation.
+ * This function converts file flags to a string presentation that can be
+ * shown in the GUI.
+ * @return File flags as a string.
*/
-/*void DiffFileInfo::Clear()
+String DiffFileFlags::ToString() const
{
- DirItem::Clear();
- bVersionChecked = false;
- encoding.Clear();
- m_textStats.clear();
-}*/
+ String sflags;
+ if (attributes & FILE_ATTRIBUTE_READONLY)
+ sflags += _T("R");
+ if (attributes & FILE_ATTRIBUTE_HIDDEN)
+ sflags += _T("H");
+ if (attributes & FILE_ATTRIBUTE_SYSTEM)
+ sflags += _T("S");
+ if (attributes & FILE_ATTRIBUTE_ARCHIVE)
+ sflags += _T("A");
+ if ((coding & coding_mask) == UTF_8)
+ sflags += _T("8");
+ if ((coding & coding_mask) == UCS_2BE)
+ sflags += _T("B");
+ if ((coding & coding_mask) == UCS_2LE)
+ sflags += _T("L");
+ if ((coding & coding_mask) == UCS_4)
+ sflags += _T("4");
+ return sflags;
+}
+
/**
* @brief Clears FileInfo data.
*/
Modified: trunk/Src/DiffFileInfo.h
===================================================================
--- trunk/Src/DiffFileInfo.h 2008-05-28 21:53:27 UTC (rev 5391)
+++ trunk/Src/DiffFileInfo.h 2008-05-29 07:34:48 UTC (rev 5392)
@@ -42,33 +42,6 @@
*/
struct DiffFileFlags : public FileFlags
{
- DWORD coding; /**< Coding info for item */
- DiffFileFlags() : coding(0) { }
-
- /// Convert flags and coding to string for UI.
- String toString() const
- {
- String sflags;
- if (attributes & FILE_ATTRIBUTE_READONLY)
- sflags += _T("R");
- if (attributes & FILE_ATTRIBUTE_HIDDEN)
- sflags += _T("H");
- if (attributes & FILE_ATTRIBUTE_SYSTEM)
- sflags += _T("S");
- if (attributes & FILE_ATTRIBUTE_ARCHIVE)
- sflags += _T("A");
-
- if ((coding & coding_mask) == UTF_8)
- sflags += _T("8");
- if ((coding & coding_mask) == UCS_2BE)
- sflags += _T("B");
- if ((coding & coding_mask) == UCS_2LE)
- sflags += _T("L");
- if ((coding & coding_mask) == UCS_4)
- sflags += _T("4");
- return sflags;
- }
-
/**
* @brief Encodings supported.
*/
@@ -80,6 +53,10 @@
UCS_2LE = 0x4000,
coding_mask = 0x7000,
};
+
+ DWORD coding; /**< Coding info for item */
+ DiffFileFlags() : coding(0) { }
+ String ToString() const;
};
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2008-05-28 21:53:27 UTC (rev 5391)
+++ trunk/Src/DirViewColItems.cpp 2008-05-29 07:34:48 UTC (rev 5392)
@@ -503,7 +503,7 @@
static String ColAttrGet(const CDiffContext *, const void *p)
{
const DiffFileFlags &r = *static_cast<const DiffFileFlags *>(p);
- return r.toString();
+ return r.ToString();
}
/**
@@ -673,7 +673,7 @@
{
const DiffFileFlags &r = *static_cast<const DiffFileFlags *>(p);
const DiffFileFlags &s = *static_cast<const DiffFileFlags *>(q);
- return r.toString().compare(s.toString());
+ return r.ToString().compare(s.ToString());
}
static int ColEncodingSort(const CDiffContext *, const void *p, const void *q)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-05-30 12:09:30
|
Revision: 5401
http://winmerge.svn.sourceforge.net/winmerge/?rev=5401&view=rev
Author: kimmov
Date: 2008-05-30 05:09:27 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Add doxygen comments and cleanup header bar edit control code.
Modified Paths:
--------------
trunk/Src/EditorFilepathBar.cpp
trunk/Src/EditorFilepathBar.h
trunk/Src/FilepathEdit.cpp
trunk/Src/FilepathEdit.h
Modified: trunk/Src/EditorFilepathBar.cpp
===================================================================
--- trunk/Src/EditorFilepathBar.cpp 2008-05-30 06:26:40 UTC (rev 5400)
+++ trunk/Src/EditorFilepathBar.cpp 2008-05-30 12:09:27 UTC (rev 5401)
@@ -18,8 +18,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
-// EditorFilepathBar.cpp : implementation of the CEditorFilepathBar class
-//
+/**
+ * @file DiffList.cpp
+ *
+ * @brief Implementation file for CEditorFilepathBar class
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
#include "stdafx.h"
#include "Merge.h"
@@ -32,25 +37,37 @@
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CEditorFilePathBar construction destruction
+BEGIN_MESSAGE_MAP(CEditorFilePathBar, CDialogBar)
+ ON_NOTIFY_EX (TTN_NEEDTEXT, 0, OnToolTipNotify)
+END_MESSAGE_MAP()
+
+/**
+ * @brief Constructor.
+ */
CEditorFilePathBar::CEditorFilePathBar()
: m_pFont(NULL)
{
}
+/**
+ * @brief Destructor.
+ */
CEditorFilePathBar::~CEditorFilePathBar()
{
delete m_pFont;
}
-
+/**
+ * @brief Create the window.
+ * This function subclasses the edit controls.
+ * @param [in] pParentWnd Parent window for edit controls.
+ * @return TRUE if succeeded, FALSE otherwise.
+ */
BOOL CEditorFilePathBar::Create(CWnd* pParentWnd)
{
if (! CDialogBar::Create(pParentWnd, CEditorFilePathBar::IDD,
- CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY,
- CEditorFilePathBar::IDD))
+ CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY, CEditorFilePathBar::IDD))
return FALSE;
// subclass the two custom edit boxes
@@ -60,10 +77,6 @@
return TRUE;
};
-
-
-/////////////////////////////////////////////////////////////////////////////
-
/**
* @brief Set look of headerbars similar to other window.
*
@@ -109,7 +122,7 @@
}
/**
- * @brief resize both controls to an equal size
+ * @brief Resize both controls to an equal size.
*/
void CEditorFilePathBar::Resize()
{
@@ -135,7 +148,11 @@
m_Edit[1].RefreshDisplayText();
}
/**
- * @brief resize both controls to given sizes (the ones of the splitter views)
+ * @brief Set widths.
+ * This function resizes both controls to given size. The width is usually
+ * same as the splitter view width.
+ * @param [in] leftWidth Left-side control width.
+ * @param [in] rightWidth Right-side control width.
*/
void CEditorFilePathBar::Resize(int leftWidth, int rightWidth)
{
@@ -157,14 +174,10 @@
m_Edit[1].RefreshDisplayText();
}
-/////////////////////////////////////////////////////////////////////////////
-// CEditorFilePathBar message handlers
-
-BEGIN_MESSAGE_MAP(CEditorFilePathBar, CDialogBar)
- ON_NOTIFY_EX (TTN_NEEDTEXT, 0, OnToolTipNotify)
-END_MESSAGE_MAP()
-
-
+/**
+ * @brief Called when tooltip is about to be shown.
+ * In this function we set the tooltip text shown.
+ */
BOOL CEditorFilePathBar::OnToolTipNotify(UINT id, NMHDR * pTTTStruct, LRESULT * pResult)
{
if (m_hWnd == NULL)
@@ -207,9 +220,7 @@
return(TRUE);
}
}
-
return(FALSE);
-
}
/**
@@ -226,7 +237,7 @@
if (m_hWnd == NULL)
return;
- m_Edit[pane].SetWholeText(lpszString);
+ m_Edit[pane].SetOriginalText(lpszString);
}
/**
Modified: trunk/Src/EditorFilepathBar.h
===================================================================
--- trunk/Src/EditorFilepathBar.h 2008-05-30 06:26:40 UTC (rev 5400)
+++ trunk/Src/EditorFilepathBar.h 2008-05-30 12:09:27 UTC (rev 5401)
@@ -17,22 +17,22 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
-// EditorFilePathBar.h : interface of the CEditorFilePathBar class
+/**
+ * @file EditorFilePathBar.h
+ *
+ * @brief Interface of the CEditorFilePathBar class.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
-// a dialog bar for the both files path in the editor
-// looks like a statusBar (font, height)
-// use CFilepathEdit instead of CEdit
-// display a tip for each path (as a tooltip)
-
-/////////////////////////////////////////////////////////////////////////////
-
#ifndef __EDITORFILEPATHBAR_H__
#define __EDITORFILEPATHBAR_H__
#include "FilepathEdit.h"
/**
- * Interface to update the header data
+ * Interface to update the header data.
*/
class IHeaderBar
{
@@ -43,7 +43,10 @@
/**
- * @brief dialog bar with two controls for left/right path
+ * @brief A dialog bar with two controls for left/right path.
+ * This class is a dialog bar for the both files path in the editor.
+ * The bar looks like a statusBar (font, height). The control
+ * displays a tip for each path (as a tooltip).
*/
class CEditorFilePathBar : public CDialogBar, public IHeaderBar
{
@@ -78,7 +81,7 @@
private:
// this dialog uses custom edit boxes
- CFilepathEdit m_Edit[2];
+ CFilepathEdit m_Edit[2]; /**< Edit controls. */
CFont * m_pFont; /**< Font for editcontrols */
};
Modified: trunk/Src/FilepathEdit.cpp
===================================================================
--- trunk/Src/FilepathEdit.cpp 2008-05-30 06:26:40 UTC (rev 5400)
+++ trunk/Src/FilepathEdit.cpp 2008-05-30 12:09:27 UTC (rev 5401)
@@ -23,7 +23,7 @@
*
* @brief Implementation of the CFilepathEdit class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -39,8 +39,8 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CFilepathEdit message handlers
+static int FormatFilePathForDisplayWidth(CDC * pDC, int maxWidth, CString & sFilepath);
+
BEGIN_MESSAGE_MAP(CFilepathEdit, CEdit)
ON_WM_CONTEXTMENU()
ON_WM_CTLCOLOR_REFLECT()
@@ -48,13 +48,13 @@
/**
- * @brief Format path for display in header control.
+ * @brief Format the path for display in header control.
*
- * Formats path so it fits to given lenght, tries to end lines after
- * slash chars.
+ * Formats path so it fits to given length, tries to end lines after
+ * slash characters.
*
* @param [in] pDC Pointer to draw context.
- * @param [in] maxWidth Maximum width of string.
+ * @param [in] maxWidth Maximum width of the string in the GUI.
* @param [in,out] sFilepath:
* - in: string to format
* - out: formatted string
@@ -71,7 +71,7 @@
// find the next truncation point
int iEndMin = 0;
- int iEndMax = sFilepath.GetLength()-iBegin + 1;
+ int iEndMax = sFilepath.GetLength() - iBegin + 1;
while(1)
{
int iEnd = (iEndMin + iEndMax) / 2;
@@ -89,98 +89,104 @@
// here iEndMin is the last character displayed in maxWidth
// exit the loop if we can display the remaining characters with no truncation
- if (iBegin+iEndMin == sFilepath.GetLength())
+ if (iBegin + iEndMin == sFilepath.GetLength())
break;
// truncate the text to the previous "\" if possible
line = sFilepath.Mid(iBegin, iEndMin);
int lastSlash = line.ReverseFind('\\');
if (lastSlash >= 0)
- iEndMin = lastSlash+1;
+ iEndMin = lastSlash + 1;
- sFilepath.Insert(iBegin+iEndMin, _T("\n"));
- iBegin += iEndMin+2;
+ sFilepath.Insert(iBegin + iEndMin, _T("\n"));
+ iBegin += iEndMin + 2;
nLines ++;
}
return nLines;
}
-/////////////////////////////////////////////////////////////////////////////
-// CFilepathEdit construction/destruction
+/**
+ * @brief Constructor.
+ * Set text color to black and background white by default.
+ */
CFilepathEdit::CFilepathEdit()
: m_crBackGnd(RGB(255, 255, 255))
, m_crText(RGB(0,0,0))
+ , m_bActive(FALSE)
{
}
+/**
+ * @brief Subclass the control.
+ * @param [in] nID ID of the control to subclass.
+ * @param [in] pParent Parent control of the control to subclass.
+ * @return TRUE if succeeded, FALSE otherwise.
+ */
BOOL CFilepathEdit::SubClassEdit(UINT nID, CWnd* pParent)
{
m_bActive = FALSE;
return SubclassDlgItem(nID, pParent);
};
-/////////////////////////////////////////////////////////////////////////////
-// CFilepathEdit
-
-/** Return the entire path originally given to this edit control */
-void CFilepathEdit::GetWholeText(CString& rString) const
+/**
+ * @brief Return the control's original text.
+ * @return Control's original text.
+ */
+void CFilepathEdit::GetOriginalText(CString& rString) const
{
- rString = m_sWholeText;
+ rString = m_sOriginalText;
}
/**
- * @brief Store path given, and also compute display version (may be shortened)
- *
- * The original path is saved as m_sWholeText.
- * The display version is passed to underlying edit control (via SetWindowText)
+ * @brief Set the text to show in the control.
+ * This function sets the text (original text) to show in the control.
+ * The control may modify the text for displaying in the GUI.
*/
-void CFilepathEdit::SetWholeText(LPCTSTR lpszString)
+void CFilepathEdit::SetOriginalText(LPCTSTR lpszString)
{
- if (_tcscmp(m_sWholeText, lpszString) == 0)
+ if (_tcscmp(m_sOriginalText, lpszString) == 0)
return;
if (lpszString != 0)
- m_sWholeText = lpszString;
+ m_sOriginalText = lpszString;
RefreshDisplayText();
}
/**
- * @brief Recompute display text from m_sWholeText & update window text
- *
- * This method takes the m_sWholeText string and computes a short version
- * and uses the short version to set the window text (which will be used
- * by the underlying edit control to actually paint).
+ * @brief Re-format the displayed text and update GUI.
+ * This method formats the visible text from original text.
*/
void CFilepathEdit::RefreshDisplayText()
{
- CString line = m_sWholeText;
+ CString line = m_sOriginalText;
// we want to keep the first and the last path component, and in between,
// as much characters as possible from the right
// PathCompactPath keeps, in between, as much characters as possible from the left
// so we reverse everything between the first and the last component before calling PathCompactPath
- int iBeginLast, iEndIntro;
- iBeginLast = line.ReverseFind('\\');
- iEndIntro = line.Find('\\');
+ int iBeginLast = line.ReverseFind('\\');
+ int iEndIntro = line.Find('\\');
if (iBeginLast >= 0 && iEndIntro != iBeginLast)
{
- CString textToReverse = line.Mid(iEndIntro+1, iBeginLast-(iEndIntro+1));
+ CString textToReverse = line.Mid(iEndIntro + 1, iBeginLast -
+ (iEndIntro + 1));
textToReverse.MakeReverse();
- line = line.Left(iEndIntro+1) + textToReverse + line.Mid(iBeginLast);
+ line = line.Left(iEndIntro + 1) + textToReverse + line.Mid(iBeginLast);
}
// get a device context object
CClientDC lDC(this);
// and use the correct font
- CFont * pFontOld = lDC.SelectObject(GetFont());
+ CFont *pFontOld = lDC.SelectObject(GetFont());
// compact the path
CRect rect;
GetRect(rect);
// take GetBuffer (lenght +3) to count for ellipsis
- PathCompactPath(lDC.GetSafeHdc(), line.GetBuffer(line.GetLength()+3), rect.Width());
+ PathCompactPath(lDC.GetSafeHdc(), line.GetBuffer(line.GetLength() + 3),
+ rect.Width());
line.ReleaseBuffer();
// set old font back
@@ -192,9 +198,10 @@
iEndIntro = line.Find('\\');
if (iBeginLast >= 0 && iEndIntro != iBeginLast)
{
- CString textToReverse = line.Mid(iEndIntro+1, iBeginLast-(iEndIntro+1));
+ CString textToReverse = line.Mid(iEndIntro + 1, iBeginLast -
+ (iEndIntro+1));
textToReverse.MakeReverse();
- line = line.Left(iEndIntro+1) + textToReverse + line.Mid(iBeginLast);
+ line = line.Left(iEndIntro + 1) + textToReverse + line.Mid(iBeginLast);
}
SetWindowText(line);
@@ -202,26 +209,23 @@
/**
* @brief Updates and returns the tooltip for this edit box
- *
- * @note This uses a member variable (m_sToolTipString) in
- * order to be able to return an LPCTSTR safely.
*/
LPCTSTR CFilepathEdit::GetUpdatedTipText(CDC * pDC, int maxWidth)
{
- GetWholeText(m_sToolTipString);
+ GetOriginalText(m_sToolTipString);
FormatFilePathForDisplayWidth(pDC, maxWidth, m_sToolTipString);
return (LPCTSTR)m_sToolTipString;
}
/**
- * @brief retrieve text from the wholeText
+ * @brief retrieve text from the OriginalText
*
* @note The standard Copy function works with the (compacted) windowText
*/
void CFilepathEdit::CustomCopy(int iBegin, int iEnd /*=-1*/)
{
if (iEnd == -1)
- iEnd = m_sWholeText.GetLength();
+ iEnd = m_sOriginalText.GetLength();
// get the clipboard
if (! OpenClipboard())
@@ -230,12 +234,13 @@
return;
// insert text into clipboard
- HGLOBAL hData = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, (iEnd-iBegin + 1)*sizeof(TCHAR));
+ HGLOBAL hData = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE,
+ (iEnd - iBegin + 1) * sizeof(TCHAR));
if (hData == NULL)
return;
LPTSTR pszData = (LPTSTR)::GlobalLock (hData);
- // Copy selected data from m_sWholeText into the alloc'd data area
- _tcscpy (pszData, (LPTSTR) m_sWholeText.Mid(iBegin, iEnd-iBegin).GetBuffer(0));
+ // Copy selected data from m_sOriginalText into the alloc'd data area
+ _tcscpy (pszData, (LPTSTR) m_sOriginalText.Mid(iBegin, iEnd - iBegin).GetBuffer(0));
GlobalUnlock (hData);
UINT fmt = GetClipTcharTextFormat(); // CF_TEXT or CF_UNICODETEXT
// Using alloc'd data, set the clipboard
@@ -245,6 +250,9 @@
CloseClipboard ();
}
+/**
+ * @brief Format the context menu.
+ */
void CFilepathEdit::OnContextMenu(CWnd*, CPoint point)
{
{
@@ -265,24 +273,26 @@
BCMenu* pPopup = (BCMenu *) menu.GetSubMenu(0);
ASSERT(pPopup != NULL);
- if (m_sWholeText.Right(1) == '\\')
+ if (m_sOriginalText.Right(1) == '\\')
// no filename, we have to disable the unwanted menu entry
pPopup->EnableMenuItem(ID_EDITOR_COPY_FILENAME, MF_GRAYED);
// invoke context menu
- // we don't want to use the main application handlers, so we use flags TPM_NONOTIFY | TPM_RETURNCMD
+ // we don't want to use the main application handlers, so we
+ // use flags TPM_NONOTIFY | TPM_RETURNCMD
// and handle the command after TrackPopupMenu
- int command = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD, point.x, point.y, AfxGetMainWnd());
+ int command = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON |
+ TPM_NONOTIFY | TPM_RETURNCMD, point.x, point.y, AfxGetMainWnd());
if (command != ID_EDITOR_COPY_FILENAME && command != ID_EDITOR_COPY_PATH)
return;
- // compute the beginning of the text to copy (in wholeText)
+ // compute the beginning of the text to copy (in OriginalText)
int iBegin;
switch (command)
{
case ID_EDITOR_COPY_FILENAME:
{
- int lastSlash = m_sWholeText.ReverseFind('\\');
+ int lastSlash = m_sOriginalText.ReverseFind('\\');
if (lastSlash != -1)
iBegin = lastSlash+1;
else
@@ -291,7 +301,7 @@
break;
case ID_EDITOR_COPY_PATH:
// pass the heading "*" for modified files
- if (m_sWholeText.GetAt(0) == '*')
+ if (m_sOriginalText.GetAt(0) == '*')
iBegin = 2;
else
iBegin = 0;
@@ -302,6 +312,13 @@
}
}
+/**
+ * @brief Set the control to look active/inactive.
+ * This function sets control to look like an active control. We don't
+ * have real focus on this control, but editor pane below it. However
+ * for user this active look informs which editor pane is active.
+ * @param [in] bActive If TRUE set control look like active control.
+ */
void CFilepathEdit::SetActive(BOOL bActive)
{
m_bActive = bActive;
@@ -324,8 +341,17 @@
}
}
+/**
+ * @brief Set control's colors.
+ * @param [in] pDC pointer to device context.
+ * @param [in] nCtlColor Control color to set.
+ * @note Parameter @p nCtlColor is not used but must be present as this method
+ * is called by framework.
+ * @return Brush for background.
+ */
HBRUSH CFilepathEdit::CtlColor(CDC* pDC, UINT nCtlColor)
{
+ UNUSED_ALWAYS(nCtlColor);
// Return a non-NULL brush if the parent's
//handler should not be called
@@ -339,6 +365,10 @@
return m_brBackGnd;
}
+/**
+ * @brief Set control's bacground color.
+ * @param [in] rgb Color to set as background color.
+ */
void CFilepathEdit::SetBackColor(COLORREF rgb)
{
//set background color ref (used for text's background)
@@ -353,6 +383,11 @@
//redraw
Invalidate(TRUE);
}
+
+/**
+ * @brief Set control's text color.
+ * @param [in] Color to set as text color.
+ */
void CFilepathEdit::SetTextColor(COLORREF rgb)
{
//set text color ref
@@ -361,4 +396,3 @@
//redraw
Invalidate(TRUE);
}
-
Modified: trunk/Src/FilepathEdit.h
===================================================================
--- trunk/Src/FilepathEdit.h 2008-05-30 06:26:40 UTC (rev 5400)
+++ trunk/Src/FilepathEdit.h 2008-05-30 12:09:27 UTC (rev 5401)
@@ -23,14 +23,12 @@
*
* @brief Declaration file for CFilepathEdit class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef __FILEPATHEDIT_H__
#define __FILEPATHEDIT_H__
-int FormatFilePathForDisplayWidth(CDC * pDC, int maxWidth, CString & sFilepath);
-
/**
* @brief Read-only control to display a filepath.
* The path is compacted (with ellipsis) to fill in the area.
@@ -47,7 +45,7 @@
LPCTSTR GetUpdatedTipText(CDC * pDC, int maxWidth);
void SetActive(BOOL bActive);
- void SetWholeText(LPCTSTR lpszString );
+ void SetOriginalText(LPCTSTR lpszString );
void SetBackColor(COLORREF rgb);
void SetTextColor(COLORREF rgb);
@@ -56,17 +54,17 @@
HBRUSH CtlColor(CDC* pDC, UINT nCtlColor);
DECLARE_MESSAGE_MAP();
- void GetWholeText( CString& rString ) const;
+ void GetOriginalText( CString& rString ) const;
private:
void CustomCopy(int iBegin, int iEnd =-1);
CString m_sToolTipString; /**< buffer for return data from GetUpdatedTipText */
- CString m_sWholeText; /**< Full path that was given to control */
- BOOL m_bActive;
- COLORREF m_crText;
- COLORREF m_crBackGnd;
- CBrush m_brBackGnd;
+ CString m_sOriginalText; /**< Full path that was given to control */
+ BOOL m_bActive; /**< Is the control active-looking? */
+ COLORREF m_crText; /**< Control's text color. */
+ COLORREF m_crBackGnd; /**< Control's background color. */
+ CBrush m_brBackGnd; /**< Background brush for the control. */
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-01 09:29:00
|
Revision: 5406
http://winmerge.svn.sourceforge.net/winmerge/?rev=5406&view=rev
Author: kimmov
Date: 2008-06-01 02:28:58 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Add some doxygen comments to UniMarkdownFile.
Modified Paths:
--------------
trunk/Src/UniMarkdownFile.cpp
trunk/Src/UniMarkdownFile.h
Modified: trunk/Src/UniMarkdownFile.cpp
===================================================================
--- trunk/Src/UniMarkdownFile.cpp 2008-05-31 14:43:13 UTC (rev 5405)
+++ trunk/Src/UniMarkdownFile.cpp 2008-06-01 09:28:58 UTC (rev 5406)
@@ -1,3 +1,11 @@
+/**
+ * @file UniMarkdownFile.cpp
+ *
+ * @brief Implementation of UniMarkdownFile class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
#include "stdafx.h"
#include "UniMarkdownFile.h"
#include "markdown.h"
@@ -3,13 +11,31 @@
#include "unicoder.h"
+static void CollapseWhitespace(CString &line);
+
+/**
+ * @brief Constructor.
+ */
UniMarkdownFile::UniMarkdownFile()
: m_pMarkdown(NULL)
{
}
-bool UniMarkdownFile::DoOpen(LPCTSTR filename, DWORD dwOpenAccess, DWORD dwOpenShareMode, DWORD dwOpenCreationDispostion, DWORD dwMappingProtect, DWORD dwMapViewAccess)
+/**
+ * @brief Open the XML file.
+ * @param [in] filename Filename (and path) of the file to open.
+ * @param [in] dwOpenAccess File access mode.
+ * @param [in] dwOpenShareMode File's share mode when opened.
+ * @param [in] dwOpenCreationDispostion Overwrite existing file?
+ * @param [in] dwMappingProtect
+ * @param [in] dwMapViewAccess
+ * @return true if succeeds, false otherwise.
+ */
+bool UniMarkdownFile::DoOpen(LPCTSTR filename, DWORD dwOpenAccess,
+ DWORD dwOpenShareMode, DWORD dwOpenCreationDispostion,
+ DWORD dwMappingProtect, DWORD dwMapViewAccess)
{
m_depth = 0;
- bool bOpen = UniMemFile::DoOpen(filename, dwOpenAccess, dwOpenShareMode, dwOpenCreationDispostion, dwMappingProtect, dwMapViewAccess);
+ bool bOpen = UniMemFile::DoOpen(filename, dwOpenAccess, dwOpenShareMode,
+ dwOpenCreationDispostion, dwMappingProtect, dwMapViewAccess);
if (bOpen)
{
@@ -20,6 +46,9 @@
return bOpen;
}
+/**
+ * @brief Close the file.
+ */
void UniMarkdownFile::Close()
{
UniMemFile::Close();
@@ -27,6 +56,10 @@
m_pMarkdown = NULL;
}
+/**
+ * @brief Read BOM bytes from the file (if they exist).
+ * @return true if BOM bytes were found, false otherwise.
+ */
bool UniMarkdownFile::ReadBom()
{
bool bReadBom = UniMemFile::ReadBom();
@@ -35,6 +68,10 @@
return bReadBom;
}
+/**
+ * @brief Collapse whitespace characters from the given line.
+ * @param [in, out] Line to handle.
+ */
static void CollapseWhitespace(CString &line)
{
int nEatSpace = -2;
@@ -103,7 +140,8 @@
bool bDone = false;
if (m_current < (LPBYTE)m_pMarkdown->lower)
{
- line = ucr::maketstring((const char *)m_current, m_pMarkdown->lower - (const char *)m_current, m_codepage, lossy);
+ line = ucr::maketstring((const char *)m_current, m_pMarkdown->lower -
+ (const char *)m_current, m_codepage, lossy);
CollapseWhitespace(line);
bDone = !line.IsEmpty();
m_current = (LPBYTE)m_pMarkdown->lower;
@@ -176,14 +214,16 @@
}
if (bDone)
{
- line = ucr::maketstring((const char *)m_current, m_pMarkdown->first - (const char *)m_current, m_codepage, lossy);
+ line = ucr::maketstring((const char *)m_current, m_pMarkdown->first -
+ (const char *)m_current, m_codepage, lossy);
CollapseWhitespace(line);
m_current = (LPBYTE)m_pMarkdown->first;
}
else if (m_current < m_base + m_filesize)
{
bDone = true;
- line = ucr::maketstring((const char *)m_current, m_base + m_filesize - m_current, m_codepage, lossy);
+ line = ucr::maketstring((const char *)m_current, m_base + m_filesize -
+ m_current, m_codepage, lossy);
CollapseWhitespace(line);
m_current = m_base + m_filesize;
}
Modified: trunk/Src/UniMarkdownFile.h
===================================================================
--- trunk/Src/UniMarkdownFile.h 2008-05-31 14:43:13 UTC (rev 5405)
+++ trunk/Src/UniMarkdownFile.h 2008-06-01 09:28:58 UTC (rev 5406)
@@ -1,5 +1,18 @@
+/**
+ * @file TempFile.h
+ *
+ * @brief Declaration of UniMarkdownFile class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
#include "Common/UniFile.h"
+class CMarkdown;
+
+/**
+ * @brief XML file reader class.
+ */
class UniMarkdownFile : public UniMemFile
{
public:
@@ -7,12 +20,17 @@
virtual BOOL ReadString(CString & line, CString & eol, bool * lossy);
virtual void Close();
virtual bool ReadBom();
+
protected:
- virtual bool DoOpen(LPCTSTR filename, DWORD dwOpenAccess, DWORD dwOpenShareMode, DWORD dwOpenCreationDispostion, DWORD dwMappingProtect, DWORD dwMapViewAccess);
+ virtual bool DoOpen(LPCTSTR filename, DWORD dwOpenAccess,
+ DWORD dwOpenShareMode, DWORD dwOpenCreationDispostion,
+ DWORD dwMappingProtect, DWORD dwMapViewAccess);
+
private:
+ void Move();
+
int m_depth;
bool m_bMove;
LPBYTE m_transparent;
- class CMarkdown *m_pMarkdown;
- void Move();
+ CMarkdown *m_pMarkdown;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-01 10:58:47
|
Revision: 5407
http://winmerge.svn.sourceforge.net/winmerge/?rev=5407&view=rev
Author: kimmov
Date: 2008-06-01 03:58:45 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Add some doxygen comments.
Modified Paths:
--------------
trunk/Src/GhostTextBuffer.cpp
trunk/Src/GhostTextBuffer.h
Modified: trunk/Src/GhostTextBuffer.cpp
===================================================================
--- trunk/Src/GhostTextBuffer.cpp 2008-06-01 09:28:58 UTC (rev 5406)
+++ trunk/Src/GhostTextBuffer.cpp 2008-06-01 10:58:45 UTC (rev 5407)
@@ -23,12 +23,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file GhostTextBuffer.cpp
+ *
+ * @brief Implementation of GhostTextBuffer class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
-
#include "stdafx.h"
#include "GhostTextBuffer.h"
-
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -39,8 +44,6 @@
#define _ADVANCED_BUGCHECK 1
#endif
-
-
BEGIN_MESSAGE_MAP (CGhostTextBuffer, CCrystalTextBuffer)
//{{AFX_MSG_MAP(CGhostTextBuffer)
//}}AFX_MSG_MAP
@@ -235,9 +238,7 @@
////////////////////////////////////////////////////////////////////////////
// undo/redo functions
-
-
-void CGhostTextBuffer::SUndoRecord::
+<void CGhostTextBuffer::SUndoRecord::
SetText (LPCTSTR pszText, int nLength)
{
FreeText();
@@ -268,8 +269,6 @@
m_pszText = NULL;
}
-
-
BOOL CGhostTextBuffer::
Undo (CCrystalTextView * pSource, CPoint & ptCursorPos)
{
@@ -841,9 +840,6 @@
return TRUE;
}
-
-
-
BOOL CGhostTextBuffer::
InsertGhostLine (CCrystalTextView * pSource, int nLine)
{
@@ -884,8 +880,6 @@
RecomputeRealityMapping();
}
-
-
////////////////////////////////////////////////////////////////////////////
// apparent <-> real line conversion
@@ -901,8 +895,6 @@
return block.nStartApparent + block.nCount - 1;
}
-
-
/**
Return underlying real line.
For ghost lines, return NEXT HIGHER real line (for trailing ghost line, return last real line + 1).
@@ -1106,7 +1098,6 @@
return nApparent;
}
-
/** Do what we need to do just after we've been reloaded */
void CGhostTextBuffer::FinishLoading()
{
@@ -1238,7 +1229,6 @@
ASSERT ((GetLineFlags(i) & LF_GHOST) != 0);
}
-
void CGhostTextBuffer::OnNotifyLineHasBeenEdited(int nLine)
{
return;
Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h 2008-06-01 09:28:58 UTC (rev 5406)
+++ trunk/Src/GhostTextBuffer.h 2008-06-01 10:58:45 UTC (rev 5407)
@@ -3,45 +3,43 @@
*
* @brief Declaration of CGhostTextBuffer (subclasses CCrystalTextBuffer to handle ghost lines)
*/
+// ID line follows -- this is updated by SVN
+// $Id$
#ifndef __GHOSTTEXTBUFFER_H__
#define __GHOSTTEXTBUFFER_H__
-
#include "ccrystaltextbuffer.h"
/////////////////////////////////////////////////////////////////////////////
-/**
-We use the current ccrystalEditor flags
-
-This flag must be cleared and set in GhostTextBuffer.cpp
-and MergeDoc.cpp (Rescan) only.
-
-GetLineColors (in MergeEditView) reads it to choose the line color.
-*/
-
+/**
+ * We use the current ccrystalEditor flags
+ *
+ * This flag must be cleared and set in GhostTextBuffer.cpp
+ * and MergeDoc.cpp (Rescan) only.
+ *
+ * GetLineColors (in MergeEditView) reads it to choose the line color.
+ */
enum GHOST_LINEFLAGS
{
- LF_GHOST = 0x00400000L,
+ LF_GHOST = 0x00400000L, /**< Ghost line. */
};
-
-
-
/////////////////////////////////////////////////////////////////////////////
// CCrystalTextBuffer command target
/**
-Features offered with this class :
-<ul>
- <li> apparent/real line conversion
- <li> insertText/deleteText working with ghost lines
- <li> AddUndoRecord/Undo/Redo working with ghost lines
- <li> insertGhostLine function
-</ul>
-*/
+ * @brief A class handling ghost lines.
+ * Features offered with this class :
+ * <ul>
+ * <li> apparent/real line conversion
+ * <li> insertText/deleteText working with ghost lines
+ * <li> AddUndoRecord/Undo/Redo working with ghost lines
+ * <li> insertGhostLine function
+ * </ul>
+ */
class EDITPADC_CLASS CGhostTextBuffer : public CCrystalTextBuffer
{
public:
@@ -58,7 +56,7 @@
DWORD m_dwFlags;
DWORD m_dwRevisionNumber;
- int FullLength() const { return m_nLength+m_nEolChars; }
+ int FullLength() const { return m_nLength + m_nEolChars; }
int Length() const { return m_nLength; }
SLineInfo ()
@@ -103,7 +101,7 @@
// and (apparentLine - ComputeApparentLine(previousRealLine))
CPoint m_redo_ptStartPos, m_redo_ptEndPos; // Block of text participating
- int m_redo_ptStartPos_nGhost, m_redo_ptEndPos_nGhost;
+ int m_redo_ptStartPos_nGhost, m_redo_ptEndPos_nGhost;
int m_nRealLinesCreated; // number of lines created during insertion
// (= total of real lines after - total before)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2008-06-01 16:45:22
|
Revision: 5410
http://winmerge.svn.sourceforge.net/winmerge/?rev=5410&view=rev
Author: jtuc
Date: 2008-06-01 09:45:16 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Patch #1981261
Modified Paths:
--------------
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-06-01 14:28:10 UTC (rev 5409)
+++ trunk/Src/MainFrm.cpp 2008-06-01 16:45:16 UTC (rev 5410)
@@ -88,6 +88,7 @@
#endif
static void LoadToolbarImageList(CMainFrame::TOOLBAR_SIZE size, UINT nIDResource, CImageList& ImgList);
+static const CPtrList &GetDocList(const CMultiDocTemplate *pTemplate);
/**
* @brief A table associating menuitem id, icon and menus to apply.
@@ -251,6 +252,19 @@
/** @brief Timeout for window flashing timer, in milliseconds. */
static const UINT WINDOW_FLASH_TIMEOUT = 500;
+/**
+ * @brief Return a const reference to a CMultiDocTemplate's list of documents.
+ */
+static const CPtrList &GetDocList(const CMultiDocTemplate *pTemplate)
+{
+ struct Template : public CMultiDocTemplate
+ {
+ public:
+ using CMultiDocTemplate::m_docList;
+ };
+ return static_cast<const struct Template *>(pTemplate)->m_docList;
+}
+
/////////////////////////////////////////////////////////////////////////////
// CMainFrame construction/destruction
@@ -766,11 +780,11 @@
void CMainFrame::RedisplayAllDirDocs()
{
- DirDocList dirdocs;
- GetAllDirDocs(&dirdocs);
- while (!dirdocs.IsEmpty())
+ const DirDocList &dirdocs = GetAllDirDocs();
+ POSITION pos = 0;
+ while (pos)
{
- CDirDoc * pDirDoc = dirdocs.RemoveHead();
+ CDirDoc * pDirDoc = dirdocs.GetNext(pos);
pDirDoc->Redisplay();
}
}
@@ -1007,11 +1021,11 @@
SetEOLMixed(GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
// make an attempt at rescanning any open diff sessions
- MergeDocList docs;
- GetAllMergeDocs(&docs);
- while (!docs.IsEmpty())
+ const MergeDocList &docs = GetAllMergeDocs();
+ POSITION pos = docs.GetHeadPosition();
+ while (pos)
{
- CMergeDoc * pMergeDoc = docs.RemoveHead();
+ CMergeDoc * pMergeDoc = docs.GetNext(pos);
// Re-read MergeDoc settings (also updates view settings)
// and rescan using new options
@@ -1020,12 +1034,11 @@
}
// Update all dirdoc settings
- DirDocList dirDocs;
- GetAllDirDocs(&dirDocs);
-
- while (!dirDocs.IsEmpty())
+ const DirDocList &dirDocs = GetAllDirDocs();
+ pos = dirDocs.GetHeadPosition();
+ while (pos)
{
- CDirDoc *pDirDoc = dirDocs.RemoveHead();
+ CDirDoc * pDirDoc = dirDocs.GetNext(pos);
pDirDoc->RefreshOptions();
}
}
@@ -1619,30 +1632,30 @@
{
m_wndStatusBar.SetPaneText(0, theApp.LoadString(AFX_IDS_IDLEMESSAGE).c_str());
- DirDocList dirdocs;
- GetAllDirDocs(&dirdocs);
- while (!dirdocs.IsEmpty())
+ const DirDocList &dirdocs = GetAllDirDocs();
+ POSITION pos = dirdocs.GetHeadPosition();
+ while (pos)
{
- CDirDoc * pDoc = dirdocs.RemoveHead();
+ CDirDoc * pDoc = dirdocs.GetNext(pos);
pDoc->UpdateResources();
}
- MergeDocList mergedocs;
- GetAllMergeDocs(&mergedocs);
- while (!mergedocs.IsEmpty())
+ const MergeDocList &mergedocs = GetAllMergeDocs();
+ pos = mergedocs.GetHeadPosition();
+ while (pos)
{
- CMergeDoc * pDoc = mergedocs.RemoveHead();
+ CMergeDoc * pDoc = mergedocs.GetNext(pos);
pDoc->UpdateResources();
}
}
BOOL CMainFrame::IsComparing()
{
- DirDocList dirdocs;
- GetAllDirDocs(&dirdocs);
- while (!dirdocs.IsEmpty())
+ const DirDocList &dirdocs = GetAllDirDocs();
+ POSITION pos = dirdocs.GetHeadPosition();
+ while (pos)
{
- CDirDoc * pDirDoc = dirdocs.RemoveHead();
+ CDirDoc * pDirDoc = dirdocs.GetNext(pos);
UINT threadState = pDirDoc->m_diffThread.GetThreadState();
if (threadState == CDiffThread::THREAD_COMPARING)
return TRUE;
@@ -1823,11 +1836,11 @@
*/
void CMainFrame::ApplyViewWhitespace()
{
- MergeDocList mergedocs;
- GetAllMergeDocs(&mergedocs);
- while (!mergedocs.IsEmpty())
+ const MergeDocList &mergedocs = GetAllMergeDocs();
+ POSITION pos = mergedocs.GetHeadPosition();
+ while (pos)
{
- CMergeDoc * pMergeDoc = mergedocs.RemoveHead();
+ CMergeDoc *pMergeDoc = mergedocs.GetNext(pos);
CMergeEditView * pLeft = pMergeDoc->GetLeftView();
CMergeEditView * pRight = pMergeDoc->GetRightView();
CMergeDiffDetailView * pLeftDetail = pMergeDoc->GetLeftDetailView();
@@ -1873,98 +1886,17 @@
}
/// Get list of MergeDocs (documents underlying edit sessions)
-void CMainFrame::GetAllMergeDocs(MergeDocList * pMergeDocs)
+const MergeDocList &CMainFrame::GetAllMergeDocs()
{
- CMultiDocTemplate * pTemplate = theApp.m_pDiffTemplate;
- for (POSITION pos = pTemplate->GetFirstDocPosition(); pos; )
- {
- CDocument * pDoc = pTemplate->GetNextDoc(pos);
- CMergeDoc * pMergeDoc = static_cast<CMergeDoc *>(pDoc);
- pMergeDocs->AddTail(pMergeDoc);
- }
+ return static_cast<const MergeDocList &>(GetDocList(theApp.m_pDiffTemplate));
}
/// Get list of DirDocs (documents underlying a scan)
-void CMainFrame::GetAllDirDocs(DirDocList * pDirDocs)
+const DirDocList &CMainFrame::GetAllDirDocs()
{
- CMultiDocTemplate * pTemplate = theApp.m_pDirTemplate;
- for (POSITION pos = pTemplate->GetFirstDocPosition(); pos; )
- {
- CDocument * pDoc = pTemplate->GetNextDoc(pos);
- CDirDoc * pDirDoc = static_cast<CDirDoc *>(pDoc);
- pDirDocs->AddTail(pDirDoc);
- }
+ return static_cast<const DirDocList &>(GetDocList(theApp.m_pDirTemplate));
}
-/// Get list of all dirviews
-void CMainFrame::GetDirViews(DirViewList * pDirViews)
-{
- GetAllViews(NULL, NULL, pDirViews);
-}
-
-/// Get list of all merge edit views
-void CMainFrame::GetMergeEditViews(MergeEditViewList * pMergeViews)
-{
- GetAllViews(pMergeViews, NULL, NULL);
-}
-
-/// Get pointers to all views into typed lists (both arguments are optional)
-void CMainFrame::GetAllViews(MergeEditViewList * pEditViews, MergeDetailViewList * pDetailViews, DirViewList * pDirViews)
-{
- for (POSITION pos = AfxGetApp()->GetFirstDocTemplatePosition(); pos; )
- {
- CDocTemplate * pTemplate = AfxGetApp()->GetNextDocTemplate(pos);
- for (POSITION pos2 = pTemplate->GetFirstDocPosition(); pos2; )
- {
- CDocument * pDoc = pTemplate->GetNextDoc(pos2);
- CMergeDoc * pMergeDoc = dynamic_cast<CMergeDoc *>(pDoc);
- CDirDoc * pDirDoc = dynamic_cast<CDirDoc *>(pDoc);
- for (POSITION pos3 = pDoc->GetFirstViewPosition(); pos3; )
- {
- CView * pView = pDoc->GetNextView(pos3);
- // Don't get Location View (font don't change for this view)
- if (pView->IsKindOf(RUNTIME_CLASS(CLocationView)))
- continue;
- if (pMergeDoc)
- {
- if (pEditViews || pDetailViews)
- {
- // a merge doc only has merge edit views or diff detail views
- CMergeEditView * pEditView = dynamic_cast<CMergeEditView *>(pView);
- CMergeDiffDetailView * pDetailView = dynamic_cast<CMergeDiffDetailView *>(pView);
- ASSERT(pEditView || pDetailView);
- if (pEditView)
- {
- if (pEditViews)
- pEditViews->AddTail(pEditView);
- }
- else if (pDetailView)
- {
- if (pDetailViews)
- pDetailViews->AddTail(pDetailView);
- }
- }
- }
- else if (pDirDoc)
- {
- if (pDirViews)
- {
- // a dir doc only has dir views
- CDirView * pDirView = dynamic_cast<CDirView *>(pView);
- ASSERT(pDirView);
- pDirViews->AddTail(pDirView);
- }
- }
- else
- {
- // There are currently only two types of docs 2003-02-20
- ASSERT(0);
- }
- }
- }
- }
-}
-
/**
* @brief Obtain a merge doc to display a difference in files.
* This function (usually) uses DirDoc to determine if new or existing
@@ -1978,8 +1910,7 @@
CMergeDoc * CMainFrame::GetMergeDocToShow(CDirDoc * pDirDoc, BOOL * pNew)
{
const BOOL bMultiDocs = GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS);
- MergeDocList docs;
- GetAllMergeDocs(&docs);
+ const MergeDocList &docs = GetAllMergeDocs();
if (!pDirDoc->HasDiffs() && !bMultiDocs && !docs.IsEmpty())
{
@@ -2601,10 +2532,8 @@
{
if (GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC))
{
- MergeDocList docs;
- GetAllMergeDocs(&docs);
- DirDocList dirDocs;
- GetAllDirDocs(&dirDocs);
+ const MergeDocList &docs = GetAllMergeDocs();
+ const DirDocList &dirDocs = GetAllDirDocs();
if (docs.IsEmpty() && dirDocs.IsEmpty())
{
@@ -2827,11 +2756,10 @@
*/
void CMainFrame::ShowFontChangeMessage()
{
- DirViewList dirViews;
- MergeEditViewList editViews;
- GetAllViews(&editViews, NULL, &dirViews);
+ const DirDocList &dirdocs = GetAllDirDocs();
+ const MergeDocList &mergedocs = GetAllMergeDocs();
- if (editViews.GetCount() > 0 || dirViews.GetCount() > 0)
+ if (dirdocs.GetCount() > 0 || mergedocs.GetCount() > 0)
LangMessageBox(IDS_FONT_CHANGE, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN, IDS_FONT_CHANGE);
}
@@ -2899,21 +2827,21 @@
void CMainFrame::OnWindowCloseAll()
{
// save any dirty edit views
- MergeDocList mergedocs;
- GetAllMergeDocs(&mergedocs);
- for (POSITION pos = mergedocs.GetHeadPosition(); pos; mergedocs.GetNext(pos))
+ const MergeDocList &mergedocs = GetAllMergeDocs();
+ POSITION pos = mergedocs.GetHeadPosition();
+ while (pos)
{
- CMergeDoc * pMergeDoc = mergedocs.GetAt(pos);
+ CMergeDoc * pMergeDoc = mergedocs.GetNext(pos);
// Allow user to cancel closing
if (!pMergeDoc->PromptAndSaveIfNeeded(TRUE))
return;
}
- DirDocList dirdocs;
- GetAllDirDocs(&dirdocs);
- while (!dirdocs.IsEmpty())
+ const DirDocList &dirdocs = GetAllDirDocs();
+ pos = dirdocs.GetHeadPosition();
+ while (pos)
{
- CDirDoc * pDirDoc = dirdocs.RemoveHead();
+ CDirDoc * pDirDoc = dirdocs.GetNext(pos);
if (pDirDoc->HasDirView())
{
pDirDoc->CloseMergeDocs();
@@ -2934,16 +2862,14 @@
*/
void CMainFrame::OnUpdateWindowCloseAll(CCmdUI* pCmdUI)
{
- MergeDocList mergedocs;
- GetAllMergeDocs(&mergedocs);
+ const MergeDocList &mergedocs = GetAllMergeDocs();
if (!mergedocs.IsEmpty())
{
pCmdUI->Enable(TRUE);
return;
}
- DirDocList dirdocs;
- GetAllDirDocs(&dirdocs);
+ const DirDocList &dirdocs = GetAllDirDocs();
if (!dirdocs.IsEmpty())
pCmdUI->Enable(TRUE);
else
@@ -3403,12 +3329,11 @@
*/
bool CMainFrame::AskCloseConfirmation()
{
- DirViewList dirViews;
- MergeEditViewList mergeViews;
- GetAllViews(&mergeViews, NULL, &dirViews);
+ const DirDocList &dirdocs = GetAllDirDocs();
+ const MergeDocList &mergedocs = GetAllMergeDocs();
int ret = IDYES;
- const int count = dirViews.GetCount() + (mergeViews.GetCount() / 2);
+ const int count = dirdocs.GetCount() + mergedocs.GetCount();
if (count > 1)
{
ret = LangMessageBox(IDS_CLOSEALL_WINDOWS, MB_YESNO | MB_ICONWARNING);
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2008-06-01 14:28:10 UTC (rev 5409)
+++ trunk/Src/MainFrm.h 2008-06-01 16:45:16 UTC (rev 5410)
@@ -77,9 +77,6 @@
// typed lists (homogenous pointer lists)
-typedef CTypedPtrList<CPtrList, CMergeEditView *> MergeEditViewList;
-typedef CTypedPtrList<CPtrList, CMergeDiffDetailView *> MergeDetailViewList;
-typedef CTypedPtrList<CPtrList, CDirView *> DirViewList;
typedef CTypedPtrList<CPtrList, CMergeDoc *> MergeDocList;
typedef CTypedPtrList<CPtrList, CDirDoc *> DirDocList;
@@ -128,8 +125,6 @@
void ShowVSSError(CException *e, LPCTSTR strItem);
void ShowHelp(LPCTSTR helpLocation = NULL);
void UpdateCodepageModule();
- void GetDirViews(DirViewList * pDirViews);
- void GetMergeEditViews(MergeEditViewList * pMergeViews);
void CheckinToClearCase(CString strDestinationPath);
static void CenterToMainFrame(CDialog * dlg);
static void SetMainIcon(CDialog * dlg);
@@ -329,9 +324,8 @@
private:
void addToMru(LPCTSTR szItem, LPCTSTR szRegSubKey, UINT nMaxItems = 20);
- void GetAllViews(MergeEditViewList * pEditViews, MergeDetailViewList * pDetailViews, DirViewList * pDirViews);
- void GetAllMergeDocs(MergeDocList * pMergeDocs);
- void GetAllDirDocs(DirDocList * pDirDocs);
+ const MergeDocList &GetAllMergeDocs();
+ const DirDocList &GetAllDirDocs();
BOOL IsComparing();
void RedisplayAllDirDocs();
CMergeDoc * GetMergeDocToShow(CDirDoc * pDirDoc, BOOL * pNew);
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2008-06-01 14:28:10 UTC (rev 5409)
+++ trunk/Src/Merge.cpp 2008-06-01 16:45:16 UTC (rev 5410)
@@ -380,13 +380,6 @@
if (m_bNonInteractive)
{
- DirViewList DirViews;
- pMainFrame->GetDirViews(&DirViews);
- if (DirViews.GetCount() == 1)
- {
- CDirView *pDirView = DirViews.RemoveHead();
- CDirFrame *pf = pDirView->GetParentFrame();
- }
bContinue = FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-03 15:38:00
|
Revision: 5416
http://winmerge.svn.sourceforge.net/winmerge/?rev=5416&view=rev
Author: kimmov
Date: 2008-06-03 08:37:48 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Use UINT as diffcode type, not int.
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteCompare.cpp
trunk/Src/CompareEngines/DiffUtils.cpp
trunk/Src/DiffItem.h
trunk/Src/DirScan.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
Modified: trunk/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.cpp 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/CompareEngines/ByteCompare.cpp 2008-06-03 15:37:48 UTC (rev 5416)
@@ -119,7 +119,7 @@
// We could compare directly in UCS-2LE here, as an optimization, in that case
char buff[2][WMCMPBUFF]; // buffered access to files
int i;
- int diffcode = 0;
+ UINT diffcode = 0;
// area of buffer currently holding data
__int64 bfstart[2]; // offset into buff[i] where current data resides
Modified: trunk/Src/CompareEngines/DiffUtils.cpp
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.cpp 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/CompareEngines/DiffUtils.cpp 2008-06-03 15:37:48 UTC (rev 5416)
@@ -111,7 +111,7 @@
{
return DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
}
- int code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::SAME;
+ UINT code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::SAME;
// make sure to start counting diffs at 0
// (usually it is -1 at this point, for unknown)
Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/DiffItem.h 2008-06-03 15:37:48 UTC (rev 5416)
@@ -62,24 +62,24 @@
SCANFLAGS=0x100000, NEEDSCAN=0x100000,
};
- int diffcode;
+ UINT diffcode;
- DIFFCODE(int diffcode = 0) : diffcode(diffcode) { }
+ DIFFCODE(UINT diffcode = 0) : diffcode(diffcode) { }
protected:
/// Worker function, to check one area (mask) of code for a particular value (result)
- static bool Check(int code, int mask, int result) { return ((code & mask) == result); }
+ static bool Check(UINT code, int mask, int result) { return ((code & mask) == result); }
/// Convenience function to check the part of the code for comparison results
- static bool CheckCompare(int code, int result) { return Check(code, DIFFCODE::COMPAREFLAGS, result); }
+ static bool CheckCompare(UINT code, int result) { return Check(code, DIFFCODE::COMPAREFLAGS, result); }
/// Convenience function to check the part of the code for filter status
- static bool CheckFilter(int code, int result) { return Check(code, DIFFCODE::FILTERFLAGS, result); }
+ static bool CheckFilter(UINT code, int result) { return Check(code, DIFFCODE::FILTERFLAGS, result); }
/// Convenience function to check the part of the code for side status (eg, left-only)
- static bool CheckSide(int code, int result) { return Check(code, DIFFCODE::SIDEFLAGS, result); }
+ static bool CheckSide(UINT code, int result) { return Check(code, DIFFCODE::SIDEFLAGS, result); }
/// Worker function to set the area indicated by mask to specified result
- void Set(int mask, int result) { diffcode &= (~mask); diffcode |= result; }
+ void Set(int mask, UINT result) { diffcode &= (~mask); diffcode |= result; }
/// Convenience function to set the side status, eg, SetSide(DIFFCODE::LEFT)
- void SetSide(int result) { Set(DIFFCODE::SIDEFLAGS, result); }
+ void SetSide(UINT result) { Set(DIFFCODE::SIDEFLAGS, result); }
public:
// file/directory
@@ -98,9 +98,9 @@
bool isResultSame() const { return CheckCompare(diffcode, DIFFCODE::SAME); }
bool isResultDiff() const { return (!isResultSame() && !isResultFiltered() && !isResultError() &&
!isSideLeftOnly() && !isSideRightOnly()); }
- static bool isResultError(int code) { return CheckCompare(code, DIFFCODE::CMPERR); }
+ static bool isResultError(UINT code) { return CheckCompare(code, DIFFCODE::CMPERR); }
bool isResultError() const { return isResultError(diffcode); }
- static bool isResultAbort(int code) { return CheckCompare(code, DIFFCODE::CMPABORT); }
+ static bool isResultAbort(UINT code) { return CheckCompare(code, DIFFCODE::CMPABORT); }
bool isResultAbort() const { return isResultAbort(diffcode); }
// filter status
bool isResultFiltered() const { return CheckFilter(diffcode, DIFFCODE::SKIPPED); }
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/DirScan.cpp 2008-06-03 15:37:48 UTC (rev 5416)
@@ -130,7 +130,7 @@
{
if (i<leftDirs.size() && (j == rightDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)<0))
{
- int nDiffCode = DIFFCODE::LEFT | DIFFCODE::DIR;
+ const UINT nDiffCode = DIFFCODE::LEFT | DIFFCODE::DIR;
AddToList(leftsubdir, rightsubdir, &leftDirs[i], 0, nDiffCode, pList, pCtxt);
// Advance left pointer over left-only entry, and then retest with new pointers
++i;
@@ -138,7 +138,7 @@
}
if (j<rightDirs.size() && (i == leftDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)>0))
{
- int nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR;
+ const UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR;
AddToList(leftsubdir, rightsubdir, 0, &rightDirs[j], nDiffCode, pList, pCtxt);
// Advance right pointer over right-only entry, and then retest with new pointers
++j;
@@ -153,7 +153,7 @@
// Non-recursive compare
// We are only interested about list of subdirectories to show - user can open them
// TODO: scan one level deeper to see if directories are identical/different
- const int nDiffCode = DIFFCODE::BOTH | DIFFCODE::DIR;
+ const UINT nDiffCode = DIFFCODE::BOTH | DIFFCODE::DIR;
AddToList(leftsubdir, rightsubdir, &leftDirs[i], &rightDirs[j], nDiffCode, pList, pCtxt);
}
else
@@ -204,7 +204,7 @@
if (i<leftFiles.size() && (j == rightFiles.size() ||
collstr(leftFiles[i].filename, rightFiles[j].filename, casesensitive) < 0))
{
- const int nDiffCode = DIFFCODE::LEFT | DIFFCODE::FILE;
+ const UINT nDiffCode = DIFFCODE::LEFT | DIFFCODE::FILE;
AddToList(leftsubdir, rightsubdir, &leftFiles[i], 0, nDiffCode, pList, pCtxt);
// Advance left pointer over left-only entry, and then retest with new pointers
++i;
@@ -213,7 +213,7 @@
if (j<rightFiles.size() && (i == leftFiles.size() ||
collstr(leftFiles[i].filename, rightFiles[j].filename, casesensitive) > 0))
{
- const int nDiffCode = DIFFCODE::RIGHT | DIFFCODE::FILE;
+ const UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::FILE;
AddToList(leftsubdir, rightsubdir, 0, &rightFiles[j], nDiffCode, pList, pCtxt);
// Advance right pointer over right-only entry, and then retest with new pointers
++j;
@@ -222,7 +222,7 @@
if (i<leftFiles.size())
{
ASSERT(j<rightFiles.size());
- const int nDiffCode = DIFFCODE::BOTH | DIFFCODE::FILE;
+ const UINT nDiffCode = DIFFCODE::BOTH | DIFFCODE::FILE;
AddToList(leftsubdir, rightsubdir, &leftFiles[i], &rightFiles[j], nDiffCode, pList, pCtxt);
++i;
++j;
@@ -410,7 +410,7 @@
pCtxt->m_nCompMethod != CMP_SIZE)
{
FolderCmp folderCmp;
- int diffCode = folderCmp.prepAndCompareTwoFiles(pCtxt, di);
+ UINT diffCode = folderCmp.prepAndCompareTwoFiles(pCtxt, di);
// Add possible binary flag for unique items
if (diffCode & DIFFCODE::BIN)
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/DirViewColItems.cpp 2008-06-03 15:37:48 UTC (rev 5416)
@@ -68,7 +68,7 @@
* @brief Function to compare two diffcodes for a sort
* @todo How shall we order diff statuses?
*/
-static int cmpdiffcode(int diffcode1, int diffcode2)
+static UINT cmpdiffcode(UINT diffcode1, UINT diffcode2)
{
return diffcode1-diffcode2;
}
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/FolderCmp.cpp 2008-06-03 15:37:48 UTC (rev 5416)
@@ -164,7 +164,7 @@
* @param [in, out] di Compared files with associated data.
* @return Compare result code.
*/
-int FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
+UINT FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
{
PluginsContext plugCtxt;
int nCompMethod = pCtxt->m_nCompMethod;
@@ -174,7 +174,7 @@
m_diffFileData.m_textStats0.clear();
m_diffFileData.m_textStats1.clear();
- int code = DIFFCODE::FILE | DIFFCODE::CMPERR;
+ UINT code = DIFFCODE::FILE | DIFFCODE::CMPERR;
// Run plugins
if (pCtxt->m_nCompMethod == CMP_CONTENT ||
Modified: trunk/Src/FolderCmp.h
===================================================================
--- trunk/Src/FolderCmp.h 2008-06-03 15:00:06 UTC (rev 5415)
+++ trunk/Src/FolderCmp.h 2008-06-03 15:37:48 UTC (rev 5416)
@@ -49,7 +49,7 @@
~FolderCmp();
bool RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CString &errStr);
void CleanupAfterPlugins(PluginsContext *plugCtxt);
- int prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di);
+ UINT prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di);
int m_ndiffs;
int m_ntrivialdiffs;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-04 06:31:44
|
Revision: 5421
http://winmerge.svn.sourceforge.net/winmerge/?rev=5421&view=rev
Author: kimmov
Date: 2008-06-03 23:31:43 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Convert line filter list to use vector instead of CList.
Modified Paths:
--------------
trunk/Src/LineFiltersDlg.cpp
trunk/Src/LineFiltersList.cpp
trunk/Src/LineFiltersList.h
Modified: trunk/Src/LineFiltersDlg.cpp
===================================================================
--- trunk/Src/LineFiltersDlg.cpp 2008-06-03 21:31:12 UTC (rev 5420)
+++ trunk/Src/LineFiltersDlg.cpp 2008-06-04 06:31:43 UTC (rev 5421)
@@ -114,7 +114,7 @@
int ind = -1;
for (int i = 0; i < count; i++)
{
- LineFilterItem item = m_pList->GetAt(i);
+ const LineFilterItem &item = m_pList->GetAt(i);
ind = AddRow(item.filterStr.c_str(), item.enabled);
}
if (count > 0)
Modified: trunk/Src/LineFiltersList.cpp
===================================================================
--- trunk/Src/LineFiltersList.cpp 2008-06-03 21:31:12 UTC (rev 5420)
+++ trunk/Src/LineFiltersList.cpp 2008-06-04 06:31:43 UTC (rev 5421)
@@ -7,10 +7,13 @@
// $Id$
#include "stdafx.h"
+#include <vector>
#include "LineFiltersList.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+using namespace std;
+
/** @brief Registry key for saving linefilters. */
static const TCHAR FiltersRegPath[] =_T("LineFilters");
@@ -37,10 +40,10 @@
*/
void LineFiltersList::AddFilter(LPCTSTR filter, BOOL enabled)
{
- LineFilterItem item;
- item.enabled = enabled;
- item.filterStr = filter;
- m_items.AddTail(item);
+ LineFilterItem *item = new LineFilterItem();
+ item->enabled = enabled;
+ item->filterStr = filter;
+ m_items.push_back(item);
}
/**
@@ -49,7 +52,7 @@
*/
int LineFiltersList::GetCount() const
{
- return m_items.GetCount();
+ return m_items.size();
}
/**
@@ -57,9 +60,11 @@
*/
void LineFiltersList::Empty()
{
- while (!m_items.IsEmpty())
+ while (!m_items.empty())
{
- m_items.RemoveHead();
+ LineFilterItem * item = m_items.back();
+ delete item;
+ m_items.pop_back();
}
}
@@ -73,17 +78,17 @@
String LineFiltersList::GetAsString() const
{
String filter;
- POSITION pos = m_items.GetHeadPosition();
+ vector<LineFilterItem*>::const_iterator iter = m_items.begin();
- while (pos)
+ while (iter != m_items.end())
{
- LineFilterItem item = m_items.GetNext(pos);
- if (item.enabled)
+ if ((*iter)->enabled)
{
if (!filter.empty())
filter += _T("|");
- filter += item.filterStr;
+ filter += (*iter)->filterStr;
}
+ ++iter;
}
return filter;
}
@@ -91,21 +96,15 @@
/**
* @brief Return filter from given index.
* @param [in] ind Index of filter.
- * @return Filter item from the index.
+ * @return Filter item from the index. If the index is beyond table limit,
+ * return the last item in the list.
*/
-LineFilterItem LineFiltersList::GetAt(int ind)
+const LineFilterItem & LineFiltersList::GetAt(int ind)
{
- LineFilterItem item;
-
- if (ind < m_items.GetCount())
- {
- POSITION pos = m_items.FindIndex(ind);
- if (pos)
- {
- return m_items.GetAt(pos);
- }
- }
- return item;
+ if (ind < m_items.size())
+ return *m_items[ind];
+ else
+ return *m_items.back();
}
/**
@@ -137,7 +136,7 @@
m_pOptionsMgr = pOptionsMgr;
- int count = m_items.GetCount();
+ int count = m_items.size();
valuename += _T("/Values");
m_pOptionsMgr->InitOption(valuename.c_str(), count);
count = m_pOptionsMgr->GetInt(valuename.c_str());
@@ -166,23 +165,22 @@
ASSERT(m_pOptionsMgr);
String valuename(FiltersRegPath);
- int count = m_items.GetCount();
+ int count = m_items.size();
valuename += _T("/Values");
m_pOptionsMgr->SetInt(valuename.c_str(), count);
for (unsigned int i = 0; i < count; i++)
{
- POSITION pos = m_items.FindIndex(i);
- LineFilterItem item = m_items.GetAt(pos);
+ LineFilterItem *item = m_items[i];
TCHAR name[100] = {0};
_sntprintf(name, 99, _T("%s/Filter%02u"), FiltersRegPath, i);
m_pOptionsMgr->InitOption(name, _T(""));
- m_pOptionsMgr->SaveOption(name, item.filterStr.c_str());
+ m_pOptionsMgr->SaveOption(name, item->filterStr.c_str());
_sntprintf(name, 99, _T("%s/Enabled%02u"), FiltersRegPath, i);
m_pOptionsMgr->InitOption(name, 0);
- m_pOptionsMgr->SaveOption(name, (int)item.enabled);
+ m_pOptionsMgr->SaveOption(name, (int)item->enabled);
}
// Remove options we don't need anymore
Modified: trunk/Src/LineFiltersList.h
===================================================================
--- trunk/Src/LineFiltersList.h 2008-06-03 21:31:12 UTC (rev 5420)
+++ trunk/Src/LineFiltersList.h 2008-06-04 06:31:43 UTC (rev 5421)
@@ -10,6 +10,7 @@
#define _LINEFILTERS_LIST_H_
#include "stdafx.h"
+#include <vector>
class COptionsMgr;
@@ -23,8 +24,6 @@
LineFilterItem() : enabled(FALSE) { }
};
-typedef CList<LineFilterItem, const LineFilterItem&> LineFilterItems;
-
/**
@brief List of line filters.
*/
@@ -38,7 +37,7 @@
int GetCount() const;
void Empty();
String GetAsString() const;
- LineFilterItem GetAt(int ind);
+ const LineFilterItem & GetAt(int ind);
void CloneFrom(LineFiltersList *list);
void Initialize(COptionsMgr *pOptionsMgr);
@@ -47,9 +46,8 @@
void Import(LPCTSTR filters);
private:
- LineFilterItems m_items; /**< List for linefilter items */
+ std::vector<LineFilterItem*> m_items; /**< List for linefilter items */
COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
#endif // _LINEFILTERS_LIST_H_
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-04 13:29:50
|
Revision: 5423
http://winmerge.svn.sourceforge.net/winmerge/?rev=5423&view=rev
Author: kimmov
Date: 2008-06-04 06:29:42 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
PATCH: [ 1983958 ] Use std::vector for storing folder compare items
Modified Paths:
--------------
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
trunk/Src/DirScan.cpp
trunk/Src/DirScan.h
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2008-06-04 12:54:47 UTC (rev 5422)
+++ trunk/Src/DiffThread.cpp 2008-06-04 13:29:42 UTC (rev 5423)
@@ -23,6 +23,7 @@
// $Id$
#include "stdafx.h"
+#include <vector>
#include "diffcontext.h"
#include "diffthread.h"
#include "DirScan.h"
@@ -32,6 +33,8 @@
#include "CompareStats.h"
#include "IAbortable.h"
+using namespace std;
+
/**
* @brief Force compare to be single-threaded.
* Set this to true in order to single step through entire compare process all
@@ -58,7 +61,7 @@
BOOL bRecursive; /**< Is compare recursive (subfolders included)? */
DiffThreadAbortable * m_pAbortgate; /**< Interface for aborting compare. */
bool bOnlyRequested; /**< Compare only requested items? */
- DiffItemList *pItemList; /**< List of items to compare. */
+ std::vector<DIFFITEM*> *pItemList; /**< List of items to compare. */
HANDLE hEvent; /**< Event for synchronizing thread start. */
DiffFuncStruct()
@@ -273,9 +276,9 @@
// Add sentinel to ItemList
EnterCriticalSection(&myStruct->context->m_criticalSect);
- DIFFITEM di;
- di = di.MakeEmptyDiffItem();
- myStruct->pItemList->AddDiff(di);
+ DIFFITEM *di = new DIFFITEM();
+ di->empty = true;
+ myStruct->pItemList->push_back(di);
LeaveCriticalSection(&myStruct->context->m_criticalSect);
return 1;
@@ -324,8 +327,13 @@
myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE);
}
- // Clear the list - its job is now done
- myStruct->pItemList->RemoveAll();
+ // Empty the list
+ while (!myStruct->pItemList->empty())
+ {
+ DIFFITEM * di = myStruct->pItemList->back();
+ delete di;
+ myStruct->pItemList->pop_back();
+ }
// Send message to UI to update
myStruct->nThreadState = CDiffThread::THREAD_COMPLETED;
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2008-06-04 12:54:47 UTC (rev 5422)
+++ trunk/Src/DiffThread.h 2008-06-04 13:29:42 UTC (rev 5423)
@@ -25,6 +25,7 @@
#ifndef _DIFFTHREAD_H
#define _DIFFTHREAD_H
+#include <vector>
#include "diffcontext.h"
struct DiffFuncStruct;
@@ -70,7 +71,7 @@
CWinThread * m_threads[2]; /**< Compare threads. */
DiffFuncStruct * m_pDiffParm; /**< Structure for sending data to threads. */
DiffThreadAbortable * m_pAbortgate;
- DiffItemList m_diffList; /**< Compare-time list for compared items. */
+ std::vector<DIFFITEM*> m_diffList; /**< Compare-time list for compared items. */
UINT m_msgUpdateUI; /**< UI-update message number */
HWND m_hWnd; /**< Handle to folder compare GUI window */
bool m_bAborting; /**< Is compare aborting? */
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2008-06-04 12:54:47 UTC (rev 5422)
+++ trunk/Src/DirScan.cpp 2008-06-04 13:29:42 UTC (rev 5423)
@@ -7,6 +7,7 @@
// $Id$
#include "stdafx.h"
+#include <vector>
#include "UnicodeString.h"
#include "Merge.h"
#include "LogFile.h"
@@ -28,12 +29,14 @@
static char THIS_FILE[] = __FILE__;
#endif
+using namespace std;
+
// Static functions (ie, functions only used locally)
void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt);
static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt,
const FolderCmp * pCmpData);
static void AddToList(LPCTSTR sLeftDir, LPCTSTR sRightDir, const DirItem * lent, const DirItem * rent,
- int code, DiffItemList * pList, CDiffContext *pCtxt);
+ int code, vector<DIFFITEM*> * pList, CDiffContext *pCtxt);
static void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt);
/** @brief cmpmth is a typedef for a pointer to a method */
@@ -75,7 +78,7 @@
* @return 1 normally, -1 if compare was aborted
*/
int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir,
- LPCTSTR rightsubdir, DiffItemList *pList,
+ LPCTSTR rightsubdir, vector<DIFFITEM*> * pList,
bool casesensitive, int depth, CDiffContext * pCtxt)
{
static const TCHAR backslash[] = _T("\\");
@@ -240,27 +243,20 @@
* @param pCtxt [in,out] Compare context: contains list where results are added.
* @return 1 if compare finished, -1 if compare was aborted
*/
-int DirScan_CompareItems(DiffItemList * list, CDiffContext * pCtxt)
+int DirScan_CompareItems(vector<DIFFITEM*> * pList, CDiffContext * pCtxt)
{
int res = 1;
- POSITION pos = NULL;
- POSITION prevPos = NULL;
-
- EnterCriticalSection(&pCtxt->m_criticalSect);
- pos = list->GetFirstDiffPosition();
- LeaveCriticalSection(&pCtxt->m_criticalSect);
-
+
// Wait until we have items in list
- while (pos == NULL)
- {
+ while (pList->empty())
Sleep(100);
- EnterCriticalSection(&pCtxt->m_criticalSect);
- pos = list->GetFirstDiffPosition();
- LeaveCriticalSection(&pCtxt->m_criticalSect);
- }
-
+
+ vector<DIFFITEM*>::const_iterator iter = pList->begin();
+
// Compare whole list
- while (pos != NULL)
+ // Normally compare ends with sentinel item, but aborted compare
+ // may not add it. So we need to check both cases.
+ while (iter != pList->end() && !(*iter)->empty)
{
if (pCtxt->ShouldAbort())
{
@@ -268,26 +264,17 @@
break;
}
- prevPos = pos;
- EnterCriticalSection(&pCtxt->m_criticalSect);
- DIFFITEM di = list->GetNextDiffPosition(pos);
- LeaveCriticalSection(&pCtxt->m_criticalSect);
- if (di.empty)
+ if ((*iter)->empty)
break; // found sentinel
- CompareDiffItem(di, pCtxt);
+ CompareDiffItem(*(*iter), pCtxt);
- // Some compare methdods can be faster than collecting,
+ // Some compare methods can be faster than collecting,
// so we can reach the end of list while collect is running.
// In this case we must wait for a while for new items to be
- // added to the list.
- while (pos == NULL)
- {
- pos = prevPos;
+ // added to the list. On
+ while (iter + 1 == pList->end())
Sleep(200);
- EnterCriticalSection(&pCtxt->m_criticalSect);
- list->GetNextDiffPosition(pos);
- LeaveCriticalSection(&pCtxt->m_criticalSect);
- }
+ ++iter;
}
return res;
@@ -490,59 +477,59 @@
*/
static void AddToList(LPCTSTR sLeftDir, LPCTSTR sRightDir,
const DirItem * lent, const DirItem * rent,
- int code, DiffItemList * pList, CDiffContext *pCtxt)
+ int code, vector<DIFFITEM*> * pList, CDiffContext *pCtxt)
{
// We must store both paths - we cannot get paths later
// and we need unique item paths for example when items
// change to identical
- DIFFITEM di;
+ DIFFITEM *di = new DIFFITEM();
- di.left.path = sLeftDir;
- di.right.path = sRightDir;
+ di->left.path = sLeftDir;
+ di->right.path = sRightDir;
if (lent)
{
- di.left.filename = lent->filename;
- di.left.mtime = lent->mtime;
- di.left.ctime = lent->ctime;
- di.left.size = lent->size;
- di.left.flags.attributes = lent->flags.attributes;
+ di->left.filename = lent->filename;
+ di->left.mtime = lent->mtime;
+ di->left.ctime = lent->ctime;
+ di->left.size = lent->size;
+ di->left.flags.attributes = lent->flags.attributes;
}
else
{
// Don't break CDirView::DoCopyRightToLeft()
- di.left.filename = rent->filename;
+ di->left.filename = rent->filename;
}
if (rent)
{
- di.right.filename = OPTIMIZE_SHARE_CSTRINGDATA
+ di->right.filename = OPTIMIZE_SHARE_CSTRINGDATA
(
- di.left.filename.c_str() == rent->filename.c_str() ? di.left.filename :
+ di->left.filename.c_str() == rent->filename.c_str() ? di->left.filename :
) rent->filename;
- di.right.mtime = rent->mtime;
- di.right.ctime = rent->ctime;
- di.right.size = rent->size;
- di.right.flags.attributes = rent->flags.attributes;
+ di->right.mtime = rent->mtime;
+ di->right.ctime = rent->ctime;
+ di->right.size = rent->size;
+ di->right.flags.attributes = rent->flags.attributes;
}
else
{
// Don't break CDirView::DoCopyLeftToRight()
- di.right.filename = lent->filename;
+ di->right.filename = lent->filename;
}
- di.diffcode = code;
+ di->diffcode = code;
GetLog()->Write
(
CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
- di.left.filename.c_str(), di.left.path.c_str(), di.right.path.c_str(), code
+ di->left.filename.c_str(), di->left.path.c_str(), di->right.path.c_str(), code
);
pCtxt->m_pCompareStats->IncreaseTotalItems();
EnterCriticalSection(&pCtxt->m_criticalSect);
- pList->AddDiff(di);
+ pList->push_back(di);
LeaveCriticalSection(&pCtxt->m_criticalSect);
}
Modified: trunk/Src/DirScan.h
===================================================================
--- trunk/Src/DirScan.h 2008-06-04 12:54:47 UTC (rev 5422)
+++ trunk/Src/DirScan.h 2008-06-04 13:29:42 UTC (rev 5423)
@@ -3,21 +3,25 @@
*
* @brief Declaration of DirScan module (see DirScan function)
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef DirScan_h_included
#define DirScan_h_included
+#include <vector>
+
class CDiffContext;
class DiffItemList;
class PathContext;
class IAbortable;
+struct DIFFITEM;
-int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, LPCTSTR rightsubdir, DiffItemList * pLst,
+int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir,
+ LPCTSTR rightsubdir, std::vector<DIFFITEM*> * pList,
bool casesensitive, int depth, CDiffContext * pCtxt);
-int DirScan_CompareItems(DiffItemList * list, CDiffContext * pCtxt);
+int DirScan_CompareItems(std::vector<DIFFITEM*> * pList, CDiffContext * pCtxt);
int DirScan_CompareItems(CDiffContext * pCtxt);
void DirScan_InitializeDefaultCodepage();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-04 15:57:05
|
Revision: 5424
http://winmerge.svn.sourceforge.net/winmerge/?rev=5424&view=rev
Author: kimmov
Date: 2008-06-04 08:56:57 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
Remove MFC dependency from LineFiltersList.h and LineFiltersList.cpp.
Modified Paths:
--------------
trunk/Src/LineFiltersList.cpp
trunk/Src/LineFiltersList.h
trunk/Src/Merge.vcproj
trunk/Src/OptionsDef.h
Modified: trunk/Src/LineFiltersList.cpp
===================================================================
--- trunk/Src/LineFiltersList.cpp 2008-06-04 13:29:42 UTC (rev 5423)
+++ trunk/Src/LineFiltersList.cpp 2008-06-04 15:56:57 UTC (rev 5424)
@@ -6,8 +6,10 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
+#include <windows.h>
#include <vector>
+#include <assert.h>
+#include "UnicodeString.h"
#include "LineFiltersList.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
@@ -131,7 +133,7 @@
*/
void LineFiltersList::Initialize(COptionsMgr *pOptionsMgr)
{
- ASSERT(pOptionsMgr);
+ assert(pOptionsMgr);
String valuename(FiltersRegPath);
m_pOptionsMgr = pOptionsMgr;
@@ -162,7 +164,7 @@
*/
void LineFiltersList::SaveFilters()
{
- ASSERT(m_pOptionsMgr);
+ assert(m_pOptionsMgr);
String valuename(FiltersRegPath);
int count = m_items.size();
Modified: trunk/Src/LineFiltersList.h
===================================================================
--- trunk/Src/LineFiltersList.h 2008-06-04 13:29:42 UTC (rev 5423)
+++ trunk/Src/LineFiltersList.h 2008-06-04 15:56:57 UTC (rev 5424)
@@ -9,7 +9,6 @@
#ifndef _LINEFILTERS_LIST_H_
#define _LINEFILTERS_LIST_H_
-#include "stdafx.h"
#include <vector>
class COptionsMgr;
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-06-04 13:29:42 UTC (rev 5423)
+++ trunk/Src/Merge.vcproj 2008-06-04 15:56:57 UTC (rev 5424)
@@ -2711,7 +2711,8 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ PrecompiledHeaderThrough=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -2720,6 +2721,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ PrecompiledHeaderThrough=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2729,6 +2731,7 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ PrecompiledHeaderThrough=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2737,7 +2740,8 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ PrecompiledHeaderThrough=""/>
</FileConfiguration>
</File>
<File
Modified: trunk/Src/OptionsDef.h
===================================================================
--- trunk/Src/OptionsDef.h 2008-06-04 13:29:42 UTC (rev 5423)
+++ trunk/Src/OptionsDef.h 2008-06-04 15:56:57 UTC (rev 5424)
@@ -9,6 +9,8 @@
#ifndef _OPTIONS_DEF_H_
#define _OPTIONS_DEF_H_
+#include <tchar.h>
+
// View-menu
const TCHAR OPT_SHOW_UNIQUE_LEFT[] = _T("Settings/ShowUniqueLeft");
const TCHAR OPT_SHOW_UNIQUE_RIGHT[] = _T("Settings/ShowUniqueRight");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-06-06 05:20:51
|
Revision: 5442
http://winmerge.svn.sourceforge.net/winmerge/?rev=5442&view=rev
Author: kimmov
Date: 2008-06-05 22:20:49 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
PATCH: [ 1985982 ] Remove some unused forward declarations
Submitted by Marcel Gosselin
Modified Paths:
--------------
trunk/Src/Common/CMoveConstraint.h
trunk/Src/DiffThread.cpp
trunk/Src/DirScan.h
trunk/Src/FolderCmp.h
Modified: trunk/Src/Common/CMoveConstraint.h
===================================================================
--- trunk/Src/Common/CMoveConstraint.h 2008-06-05 23:18:46 UTC (rev 5441)
+++ trunk/Src/Common/CMoveConstraint.h 2008-06-06 05:20:49 UTC (rev 5442)
@@ -25,8 +25,6 @@
namespace prdlg {
-class ConstraintData;
-
/*!
\class CMoveConstraint
\brief Code to resize controls on a dialog (formview, propertypage)
@@ -260,3 +258,4 @@
#endif // CMoveConstraint_h
+
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2008-06-05 23:18:46 UTC (rev 5441)
+++ trunk/Src/DiffThread.cpp 2008-06-06 05:20:49 UTC (rev 5442)
@@ -28,7 +28,6 @@
#include "diffthread.h"
#include "DirScan.h"
#include "Plugins.h"
-#include "DiffItemList.h"
#include "PathContext.h"
#include "CompareStats.h"
#include "IAbortable.h"
Modified: trunk/Src/DirScan.h
===================================================================
--- trunk/Src/DirScan.h 2008-06-05 23:18:46 UTC (rev 5441)
+++ trunk/Src/DirScan.h 2008-06-06 05:20:49 UTC (rev 5442)
@@ -12,9 +12,7 @@
#include <vector>
class CDiffContext;
-class DiffItemList;
class PathContext;
-class IAbortable;
struct DIFFITEM;
int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir,
Modified: trunk/Src/FolderCmp.h
===================================================================
--- trunk/Src/FolderCmp.h 2008-06-05 23:18:46 UTC (rev 5441)
+++ trunk/Src/FolderCmp.h 2008-06-06 05:20:49 UTC (rev 5442)
@@ -13,13 +13,9 @@
#include "DiffUtils.h"
#include "ByteCompare.h"
-//using namespace CompareEngines;
-
class CDiffContext;
-class IAbortable;
class PackingInfo;
class PrediffingInfo;
-//class CompareEngines::DiffUtils;
/**
* @brief Holds plugin-related paths and information.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
