|
From: <ge...@us...> - 2011-01-03 13:29:08
|
Revision: 7501
http://winmerge.svn.sourceforge.net/winmerge/?rev=7501&view=rev
Author: gerundt
Date: 2011-01-03 13:29:00 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Add new OptionsPanel class as base class for WinMerge option dialogs.
Modified Paths:
--------------
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/MergeX64.vcproj
branches/R2_14/Src/PropArchive.cpp
branches/R2_14/Src/PropArchive.h
branches/R2_14/Src/PropBackups.cpp
branches/R2_14/Src/PropBackups.h
branches/R2_14/Src/PropCodepage.cpp
branches/R2_14/Src/PropCodepage.h
branches/R2_14/Src/PropColors.cpp
branches/R2_14/Src/PropColors.h
branches/R2_14/Src/PropCompare.cpp
branches/R2_14/Src/PropCompare.h
branches/R2_14/Src/PropEditor.cpp
branches/R2_14/Src/PropEditor.h
branches/R2_14/Src/PropGeneral.cpp
branches/R2_14/Src/PropGeneral.h
branches/R2_14/Src/PropRegistry.cpp
branches/R2_14/Src/PropRegistry.h
branches/R2_14/Src/PropShell.cpp
branches/R2_14/Src/PropShell.h
branches/R2_14/Src/PropSyntaxColors.cpp
branches/R2_14/Src/PropSyntaxColors.h
branches/R2_14/Src/PropTextColors.cpp
branches/R2_14/Src/PropTextColors.h
branches/R2_14/Src/PropVss.cpp
branches/R2_14/Src/PropVss.h
Added Paths:
-----------
branches/R2_14/Src/OptionsPanel.cpp
branches/R2_14/Src/OptionsPanel.h
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/Merge.vcproj 2011-01-03 13:29:00 UTC (rev 7501)
@@ -2544,6 +2544,35 @@
</FileConfiguration>
</File>
<File
+ RelativePath="OptionsPanel.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="OutputDlg.cpp"
>
<FileConfiguration
@@ -4492,6 +4521,10 @@
>
</File>
<File
+ RelativePath="OptionsPanel.h"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.h"
>
</File>
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/MergeX64.vcproj 2011-01-03 13:29:00 UTC (rev 7501)
@@ -4576,6 +4576,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\OptionsPanel.cpp"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.cpp"
>
<FileConfiguration
@@ -7707,6 +7711,10 @@
>
</File>
<File
+ RelativePath=".\OptionsPanel.h"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.h"
>
</File>
Added: branches/R2_14/Src/OptionsPanel.cpp
===================================================================
--- branches/R2_14/Src/OptionsPanel.cpp (rev 0)
+++ branches/R2_14/Src/OptionsPanel.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -0,0 +1,20 @@
+/**
+ * @file OptionsPanel.cpp
+ *
+ * @brief Implementation of OptionsPanel class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include "OptionsMgr.h"
+#include "OptionsPanel.h"
+
+/**
+ * @brief Constructor.
+ */
+OptionsPanel::OptionsPanel(COptionsMgr *optionsMgr, UINT nIDTemplate)
+ : CPropertyPage(nIDTemplate)
+ , m_pOptionsMgr(optionsMgr)
+{
+}
Property changes on: branches/R2_14/Src/OptionsPanel.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Src/OptionsPanel.h
===================================================================
--- branches/R2_14/Src/OptionsPanel.h (rev 0)
+++ branches/R2_14/Src/OptionsPanel.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -0,0 +1,32 @@
+/**
+ * @file OptionsPanel.h
+ *
+ * @brief Declaration file for OptionsPanel class.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _OPTIONS_PANEL_H_
+#define _OPTIONS_PANEL_H_
+
+#include "IOptionsPanel.h"
+
+class COptionsMgr;
+
+/**
+ * @brief A base class for WinMerge options dialogs.
+ */
+class OptionsPanel : public CPropertyPage, public IOptionsPanel
+{
+public:
+ OptionsPanel(COptionsMgr *optionsMgr, UINT nIDTemplate);
+
+protected:
+ COptionsMgr * GetOptionsMgr() const { return m_pOptionsMgr; }
+
+private:
+ COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
+};
+
+#endif // _OPTIONS_PANEL_H_
Property changes on: branches/R2_14/Src/OptionsPanel.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/R2_14/Src/PropArchive.cpp
===================================================================
--- branches/R2_14/Src/PropArchive.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropArchive.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -12,6 +12,7 @@
#include "PropArchive.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -22,18 +23,13 @@
// PropArchive dialog
PropArchive::PropArchive(COptionsMgr *optionsMgr)
-: CPropertyPage(PropArchive::IDD)
-, m_pOptionsMgr(optionsMgr)
+: OptionsPanel(optionsMgr, PropArchive::IDD)
, m_bEnableSupport(false)
, m_nInstallType(0)
, m_bProbeType(false)
{
}
-PropArchive::~PropArchive()
-{
-}
-
/**
* @brief Sets update handlers for dialog controls.
*/
@@ -56,10 +52,10 @@
*/
void PropArchive::ReadOptions()
{
- int enable = m_pOptionsMgr->GetInt(OPT_ARCHIVE_ENABLE);
+ int enable = GetOptionsMgr()->GetInt(OPT_ARCHIVE_ENABLE);
m_bEnableSupport = enable > 0;
m_nInstallType = enable > 1 ? enable - 1 : 0;
- m_bProbeType = m_pOptionsMgr->GetBool(OPT_ARCHIVE_PROBETYPE);
+ m_bProbeType = GetOptionsMgr()->GetBool(OPT_ARCHIVE_PROBETYPE);
}
/**
@@ -68,10 +64,10 @@
void PropArchive::WriteOptions()
{
if (m_bEnableSupport)
- m_pOptionsMgr->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
else
- m_pOptionsMgr->SaveOption(OPT_ARCHIVE_ENABLE, (int)0);
- m_pOptionsMgr->SaveOption(OPT_ARCHIVE_PROBETYPE, m_bProbeType == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, (int)0);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_PROBETYPE, m_bProbeType == TRUE);
}
/**
Modified: branches/R2_14/Src/PropArchive.h
===================================================================
--- branches/R2_14/Src/PropArchive.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropArchive.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,18 +11,17 @@
#define _PROP_ARCHIVE_H_
#include "StatLink.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
/**
* @brief Class for Archive Support options page.
*/
-class PropArchive : public CPropertyPage
+class PropArchive : public OptionsPanel
{
public:
PropArchive(COptionsMgr *optionsMgr);
- virtual ~PropArchive();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -44,8 +43,5 @@
BOOL m_bEnableSupport;
int m_nInstallType;
BOOL m_bProbeType;
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
#endif // _PROP_ARCHIVE_H_
Modified: branches/R2_14/Src/PropBackups.cpp
===================================================================
--- branches/R2_14/Src/PropBackups.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropBackups.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropBackups.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#include "FileOrFolderSelect.h"
#ifdef _DEBUG
@@ -19,16 +20,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-
-// PropBackups dialog
-
/**
* @brief Constructor taking OptionsManager parameter.
* @param [in] optionsMgr Pointer to OptionsManager.
*/
PropBackups::PropBackups(COptionsMgr *optionsMgr)
- : CPropertyPage(PropBackups::IDD)
- , m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropBackups::IDD)
, m_bCreateForFolderCmp(FALSE)
, m_bCreateForFileCmp(FALSE)
, m_bAppendBak(FALSE)
@@ -37,13 +34,6 @@
{
}
-/**
- * @brief Destructor.
- */
-PropBackups::~PropBackups()
-{
-}
-
void PropBackups::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -66,12 +56,12 @@
*/
void PropBackups::ReadOptions()
{
- m_bCreateForFolderCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FOLDERCMP);
- m_bCreateForFileCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FILECMP);
- m_nBackupFolder = m_pOptionsMgr->GetInt(OPT_BACKUP_LOCATION);
- m_sGlobalFolder = m_pOptionsMgr->GetString(OPT_BACKUP_GLOBALFOLDER).c_str();
- m_bAppendBak = m_pOptionsMgr->GetBool(OPT_BACKUP_ADD_BAK);
- m_bAppendTime = m_pOptionsMgr->GetBool(OPT_BACKUP_ADD_TIME);
+ m_bCreateForFolderCmp = GetOptionsMgr()->GetBool(OPT_BACKUP_FOLDERCMP);
+ m_bCreateForFileCmp = GetOptionsMgr()->GetBool(OPT_BACKUP_FILECMP);
+ m_nBackupFolder = GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION);
+ m_sGlobalFolder = GetOptionsMgr()->GetString(OPT_BACKUP_GLOBALFOLDER).c_str();
+ m_bAppendBak = GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK);
+ m_bAppendTime = GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_TIME);
}
/**
@@ -87,12 +77,12 @@
m_sGlobalFolder += "\\";
}
- m_pOptionsMgr->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_LOCATION, m_nBackupFolder);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_GLOBALFOLDER, m_sGlobalFolder);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_ADD_BAK, m_bAppendBak == TRUE);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_ADD_TIME, m_bAppendTime == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_LOCATION, m_nBackupFolder);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_GLOBALFOLDER, m_sGlobalFolder);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_ADD_BAK, m_bAppendBak == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_ADD_TIME, m_bAppendTime == TRUE);
}
/**
Modified: branches/R2_14/Src/PropBackups.h
===================================================================
--- branches/R2_14/Src/PropBackups.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropBackups.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -10,18 +10,17 @@
#ifndef _PROPBACKUPS_H_
#define _PROPBACKUPS_H_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
/**
* @brief A class for Backup file options page.
*/
-class PropBackups : public CPropertyPage
+class PropBackups : public OptionsPanel
{
public:
PropBackups(COptionsMgr *optionsMgr);
- virtual ~PropBackups();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -50,9 +49,6 @@
afx_msg void OnBnClickedBackupBrowse();
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
#endif // _PROPBACKUPS_H_
Modified: branches/R2_14/Src/PropCodepage.cpp
===================================================================
--- branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -32,6 +32,7 @@
#include "PropCodepage.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -39,22 +40,14 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropCodepage property page
-
PropCodepage::PropCodepage(COptionsMgr *optionsMgr)
- : CPropertyPage(PropCodepage::IDD)
-, m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropCodepage::IDD)
, m_nCodepageSystem(-1)
, m_nCustomCodepageValue(0)
, m_bDetectCodepage(FALSE)
{
}
-PropCodepage::~PropCodepage()
-{
-}
-
void PropCodepage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
@@ -79,9 +72,9 @@
*/
void PropCodepage::ReadOptions()
{
- m_nCodepageSystem = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_MODE);
- m_nCustomCodepageValue = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_CUSTOM);
- m_bDetectCodepage = m_pOptionsMgr->GetBool(OPT_CP_DETECT);
+ m_nCodepageSystem = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_MODE);
+ m_nCustomCodepageValue = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_CUSTOM);
+ m_bDetectCodepage = GetOptionsMgr()->GetBool(OPT_CP_DETECT);
}
/**
@@ -89,14 +82,11 @@
*/
void PropCodepage::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
- m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
- m_pOptionsMgr->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
+ GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
+ GetOptionsMgr()->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropCodepage message handlers
-
BOOL PropCodepage::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
Modified: branches/R2_14/Src/PropCodepage.h
===================================================================
--- branches/R2_14/Src/PropCodepage.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCodepage.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,19 +9,15 @@
#if !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
#define AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropCodepage dialog
-
-class PropCodepage : public CPropertyPage, public IOptionsPanel
+class PropCodepage : public OptionsPanel
{
// Construction
public:
PropCodepage(COptionsMgr *optionsMgr);
- ~PropCodepage();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -32,6 +28,7 @@
enum { IDD = IDD_PROPPAGE_CODEPAGE };
int m_nCodepageSystem;
int m_nCustomCodepageValue;
+ CString m_cCustomCodepageValue;
BOOL m_bDetectCodepage;
//}}AFX_DATA
@@ -53,9 +50,6 @@
afx_msg void OnCpUi();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropColors.cpp
===================================================================
--- branches/R2_14/Src/PropColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropColors.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropColors.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -20,15 +21,11 @@
static const TCHAR Section[] = _T("Custom Colors");
-/////////////////////////////////////////////////////////////////////////////
-// PropMergeColors dialog
-
/**
* @brief Default constructor.
*/
PropMergeColors::PropMergeColors(COptionsMgr *optionsMgr)
- : CPropertyPage(PropMergeColors::IDD)
-, m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropMergeColors::IDD)
{
}
@@ -293,16 +290,16 @@
switch (op)
{
case SET_DEFAULTS:
- m_pOptionsMgr->GetDefault(optionName, color);
+ GetOptionsMgr()->GetDefault(optionName, color);
btn.SetColor(color);
return;
case WRITE_OPTIONS:
- m_pOptionsMgr->SaveOption(optionName, (int)color);
+ GetOptionsMgr()->SaveOption(optionName, (int)color);
return;
case READ_OPTIONS:
- color = m_pOptionsMgr->GetInt(optionName);
+ color = GetOptionsMgr()->GetInt(optionName);
// Set colors for buttons, do NOT invalidate
btn.SetColor(color, FALSE);
return;
Modified: branches/R2_14/Src/PropColors.h
===================================================================
--- branches/R2_14/Src/PropColors.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropColors.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -12,17 +12,14 @@
#include "ColorButton.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
const int CustomColorsAmount = 16;
-/////////////////////////////////////////////////////////////////////////////
-// PropMergeColors dialog
-
/** @brief Property page for colors options; used in options property sheet */
-class PropMergeColors : public CPropertyPage, public IOptionsPanel
+class PropMergeColors : public OptionsPanel
{
// Construction
public:
@@ -123,9 +120,6 @@
afx_msg void OnDefaults();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropCompare.cpp
===================================================================
--- branches/R2_14/Src/PropCompare.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCompare.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropCompare.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -18,16 +19,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropCompare property page
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to COptionsMgr.
*/
-PropCompare::PropCompare(COptionsMgr *optionsMgr) : CPropertyPage(PropCompare::IDD)
- , m_pOptionsMgr(optionsMgr)
- , m_compareMethod(-1)
+PropCompare::PropCompare(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropCompare::IDD)
, m_bIgnoreCase(FALSE)
, m_bIgnoreBlankLines(FALSE)
, m_bIgnoreEol(TRUE)
@@ -72,16 +69,16 @@
*/
void PropCompare::ReadOptions()
{
- m_nIgnoreWhite = m_pOptionsMgr->GetInt(OPT_CMP_IGNORE_WHITESPACE);
- m_bIgnoreBlankLines = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_BLANKLINES);
- m_bFilterCommentsLines = m_pOptionsMgr->GetBool(OPT_CMP_FILTER_COMMENTLINES);
- m_bIgnoreCase = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_CASE);
- m_bIgnoreEol = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_EOL) ? true : false;
- m_bMovedBlocks = m_pOptionsMgr->GetBool(OPT_CMP_MOVED_BLOCKS);
- m_bMatchSimilarLines = m_pOptionsMgr->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
- m_compareMethod = m_pOptionsMgr->GetInt(OPT_CMP_METHOD);
- m_bStopAfterFirst = m_pOptionsMgr->GetBool(OPT_CMP_STOP_AFTER_FIRST);
- m_bIgnoreSmallTimeDiff = m_pOptionsMgr->GetBool(OPT_IGNORE_SMALL_FILETIME);
+ m_nIgnoreWhite = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
+ m_bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
+ m_bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
+ m_bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
+ m_bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL) ? true : false;
+ m_bMovedBlocks = GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS);
+ m_bMatchSimilarLines = GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
+ m_compareMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
+ m_bStopAfterFirst = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
+ m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
}
/**
@@ -91,21 +88,18 @@
*/
void PropCompare::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_FILTER_COMMENTLINES, m_bFilterCommentsLines == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_EOL, m_bIgnoreEol == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_CASE, m_bIgnoreCase == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
- m_pOptionsMgr->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
- m_pOptionsMgr->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_FILTER_COMMENTLINES, m_bFilterCommentsLines == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_EOL, m_bIgnoreEol == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_CASE, m_bIgnoreCase == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
+ GetOptionsMgr()->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropCompare message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
@@ -143,23 +137,23 @@
void PropCompare::OnDefaults()
{
DWORD tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_METHOD, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_METHOD, tmp);
m_compareMethod = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_WHITESPACE, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_WHITESPACE, tmp);
m_nIgnoreWhite = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_EOL, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_EOL, tmp);
m_bIgnoreEol = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_BLANKLINES, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_BLANKLINES, tmp);
m_bIgnoreBlankLines = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_FILTER_COMMENTLINES, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_FILTER_COMMENTLINES, tmp);
m_bFilterCommentsLines = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_CASE, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_CASE, tmp);
m_bIgnoreCase = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_MOVED_BLOCKS, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_MOVED_BLOCKS, tmp);
m_bMovedBlocks = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_MATCH_SIMILAR_LINES, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_MATCH_SIMILAR_LINES, tmp);
m_bMatchSimilarLines = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
m_bStopAfterFirst = tmp;
UpdateData(FALSE);
}
Modified: branches/R2_14/Src/PropCompare.h
===================================================================
--- branches/R2_14/Src/PropCompare.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCompare.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,13 +9,10 @@
#ifndef _PROPPAGE_COMPARE_H_
#define _PROPPAGE_COMPARE_H_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropCompare dialog
-
/**
* @brief Property page to set compare options for WinMerge.
*
@@ -33,7 +30,7 @@
*
* @author Tim Musschoot, several modifications by others
*/
-class PropCompare : public CPropertyPage, public IOptionsPanel
+class PropCompare : public OptionsPanel
{
// Construction
public:
@@ -75,9 +72,6 @@
afx_msg void OnCbnSelchangeComparemethodcombo();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropEditor.cpp
===================================================================
--- branches/R2_14/Src/PropEditor.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropEditor.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropEditor.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -21,15 +22,12 @@
/** @brief Maximum size for tabs in spaces. */
static const int MAX_TABSIZE = 64;
-/////////////////////////////////////////////////////////////////////////////
-// PropEditor dialog
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager for handling options.
*/
-PropEditor::PropEditor(COptionsMgr *optionsMgr) : CPropertyPage(PropEditor::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropEditor::PropEditor(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropEditor::IDD)
, m_bHiliteSyntax(FALSE)
, m_nTabType(-1)
, m_nTabSize(0)
@@ -74,14 +72,14 @@
*/
void PropEditor::ReadOptions()
{
- m_nTabSize = m_pOptionsMgr->GetInt(OPT_TAB_SIZE);
- m_nTabType = m_pOptionsMgr->GetInt(OPT_TAB_TYPE);
- m_bAutomaticRescan = m_pOptionsMgr->GetBool(OPT_AUTOMATIC_RESCAN);
- m_bHiliteSyntax = m_pOptionsMgr->GetBool(OPT_SYNTAX_HIGHLIGHT);
- m_bAllowMixedEol = m_pOptionsMgr->GetBool(OPT_ALLOW_MIXED_EOL);
- m_bViewLineDifferences = m_pOptionsMgr->GetBool(OPT_WORDDIFF_HIGHLIGHT);
- m_bBreakOnWords = m_pOptionsMgr->GetBool(OPT_BREAK_ON_WORDS);
- m_nBreakType = m_pOptionsMgr->GetInt(OPT_BREAK_TYPE);
+ m_nTabSize = GetOptionsMgr()->GetInt(OPT_TAB_SIZE);
+ m_nTabType = GetOptionsMgr()->GetInt(OPT_TAB_TYPE);
+ m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
+ m_bHiliteSyntax = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
+ m_bAllowMixedEol = GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL);
+ m_bViewLineDifferences = GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT);
+ m_bBreakOnWords = GetOptionsMgr()->GetBool(OPT_BREAK_ON_WORDS);
+ m_nBreakType = GetOptionsMgr()->GetInt(OPT_BREAK_TYPE);
}
/**
@@ -94,19 +92,16 @@
m_nTabSize = 1;
if (m_nTabSize > MAX_TABSIZE)
m_nTabSize = MAX_TABSIZE;
- m_pOptionsMgr->SaveOption(OPT_TAB_SIZE, (int)m_nTabSize);
- m_pOptionsMgr->SaveOption(OPT_TAB_TYPE, (int)m_nTabType);
- m_pOptionsMgr->SaveOption(OPT_AUTOMATIC_RESCAN, m_bAutomaticRescan == TRUE);
- m_pOptionsMgr->SaveOption(OPT_ALLOW_MIXED_EOL, m_bAllowMixedEol == TRUE);
- m_pOptionsMgr->SaveOption(OPT_SYNTAX_HIGHLIGHT, m_bHiliteSyntax == TRUE);
- m_pOptionsMgr->SaveOption(OPT_WORDDIFF_HIGHLIGHT, !!m_bViewLineDifferences);
- m_pOptionsMgr->SaveOption(OPT_BREAK_ON_WORDS, !!m_bBreakOnWords);
- m_pOptionsMgr->SaveOption(OPT_BREAK_TYPE, m_nBreakType);
+ GetOptionsMgr()->SaveOption(OPT_TAB_SIZE, (int)m_nTabSize);
+ GetOptionsMgr()->SaveOption(OPT_TAB_TYPE, (int)m_nTabType);
+ GetOptionsMgr()->SaveOption(OPT_AUTOMATIC_RESCAN, m_bAutomaticRescan == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ALLOW_MIXED_EOL, m_bAllowMixedEol == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_SYNTAX_HIGHLIGHT, m_bHiliteSyntax == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_WORDDIFF_HIGHLIGHT, !!m_bViewLineDifferences);
+ GetOptionsMgr()->SaveOption(OPT_BREAK_ON_WORDS, !!m_bBreakOnWords);
+ GetOptionsMgr()->SaveOption(OPT_BREAK_TYPE, m_nBreakType);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropEditor message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
Modified: branches/R2_14/Src/PropEditor.h
===================================================================
--- branches/R2_14/Src/PropEditor.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropEditor.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -10,20 +10,17 @@
#if !defined(AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_)
#define AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropEditor dialog
-
/**
* @brief Property page for editor options.
*
* Editor options affect to editor behavior. For example syntax highlighting
* and tabs.
*/
-class PropEditor : public CPropertyPage, public IOptionsPanel
+class PropEditor : public OptionsPanel
{
// Construction
public:
@@ -71,9 +68,6 @@
afx_msg void OnEnKillfocusTabEdit();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options manager used for loading/saving values. */
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropGeneral.cpp
===================================================================
--- branches/R2_14/Src/PropGeneral.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropGeneral.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -32,6 +32,7 @@
#include "PropGeneral.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -39,14 +40,11 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropGeneral property page
-
/**
* @brief Constructor initialising members.
*/
-PropGeneral::PropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(PropGeneral::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropGeneral::PropGeneral(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropGeneral::IDD)
, m_bScroll(FALSE)
, m_bDisableSplash(FALSE)
, m_bSingleInstance(FALSE)
@@ -112,17 +110,17 @@
*/
void PropGeneral::ReadOptions()
{
- m_bScroll = m_pOptionsMgr->GetBool(OPT_SCROLL_TO_FIRST);
- m_bDisableSplash = m_pOptionsMgr->GetBool(OPT_DISABLE_SPLASH);
- m_bSingleInstance = m_pOptionsMgr->GetBool(OPT_SINGLE_INSTANCE);
- m_bVerifyPaths = m_pOptionsMgr->GetBool(OPT_VERIFY_OPEN_PATHS);
- m_bCloseWindowWithEsc = m_pOptionsMgr->GetBool(OPT_CLOSE_WITH_ESC);
- m_bAskMultiWindowClose = m_pOptionsMgr->GetBool(OPT_ASK_MULTIWINDOW_CLOSE);
- m_bMultipleFileCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_MERGEDOCS);
- m_bMultipleDirCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_DIRDOCS);
- m_nAutoCompleteSource = m_pOptionsMgr->GetInt(OPT_AUTO_COMPLETE_SOURCE);
- m_bPreserveFiletime = m_pOptionsMgr->GetBool(OPT_PRESERVE_FILETIMES);
- m_bShowSelectFolderOnStartup = m_pOptionsMgr->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP);
+ m_bScroll = GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST);
+ m_bDisableSplash = GetOptionsMgr()->GetBool(OPT_DISABLE_SPLASH);
+ m_bSingleInstance = GetOptionsMgr()->GetBool(OPT_SINGLE_INSTANCE);
+ m_bVerifyPaths = GetOptionsMgr()->GetBool(OPT_VERIFY_OPEN_PATHS);
+ m_bCloseWindowWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
+ m_bAskMultiWindowClose = GetOptionsMgr()->GetBool(OPT_ASK_MULTIWINDOW_CLOSE);
+ m_bMultipleFileCmp = GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS);
+ m_bMultipleDirCmp = GetOptionsMgr()->GetBool(OPT_MULTIDOC_DIRDOCS);
+ m_nAutoCompleteSource = GetOptionsMgr()->GetInt(OPT_AUTO_COMPLETE_SOURCE);
+ m_bPreserveFiletime = GetOptionsMgr()->GetBool(OPT_PRESERVE_FILETIMES);
+ m_bShowSelectFolderOnStartup = GetOptionsMgr()->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP);
}
/**
@@ -130,22 +128,19 @@
*/
void PropGeneral::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
- m_pOptionsMgr->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
- m_pOptionsMgr->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance == TRUE);
- m_pOptionsMgr->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc == TRUE);
- m_pOptionsMgr->SaveOption(OPT_ASK_MULTIWINDOW_CLOSE, m_bAskMultiWindowClose == TRUE);
- m_pOptionsMgr->SaveOption(OPT_MULTIDOC_MERGEDOCS, m_bMultipleFileCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
- m_pOptionsMgr->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime);
- m_pOptionsMgr->SaveOption(OPT_SHOW_SELECT_FILES_AT_STARTUP, m_bShowSelectFolderOnStartup);
+ GetOptionsMgr()->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ASK_MULTIWINDOW_CLOSE, m_bAskMultiWindowClose == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_MULTIDOC_MERGEDOCS, m_bMultipleFileCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
+ GetOptionsMgr()->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_SELECT_FILES_AT_STARTUP, m_bShowSelectFolderOnStartup);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropGeneral message handlers
-
/**
* @brief Called when user wants to see all messageboxes again.
*/
Modified: branches/R2_14/Src/PropGeneral.h
===================================================================
--- branches/R2_14/Src/PropGeneral.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropGeneral.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,17 +9,14 @@
#if !defined(AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
#define AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropGeneral dialog
-
/**
* @brief Class for General options -propertypage.
*/
-class PropGeneral : public CPropertyPage, public IOptionsPanel
+class PropGeneral : public OptionsPanel
{
// Construction
public:
@@ -63,9 +60,6 @@
afx_msg void OnResetAllMessageBoxes();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr *m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropRegistry.cpp
===================================================================
--- branches/R2_14/Src/PropRegistry.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropRegistry.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -31,6 +31,7 @@
#include "Merge.h" // GetDefaultEditor()
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -45,13 +46,8 @@
static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
static LPCTSTR f_RegValuePath = _T("Executable");
-/////////////////////////////////////////////////////////////////////////////
-// PropRegistry dialog
-
-
PropRegistry::PropRegistry(COptionsMgr *optionsMgr)
- : CPropertyPage(PropRegistry::IDD)
-, m_pOptionsMgr(optionsMgr)
+: OptionsPanel(optionsMgr, PropRegistry::IDD)
, m_bUseRecycleBin(TRUE)
, m_tempFolderType(0)
{
@@ -82,11 +78,11 @@
*/
void PropRegistry::ReadOptions()
{
- m_strEditorPath = m_pOptionsMgr->GetString(OPT_EXT_EDITOR_CMD).c_str();
- m_bUseRecycleBin = m_pOptionsMgr->GetBool(OPT_USE_RECYCLE_BIN);
- m_strUserFilterPath = m_pOptionsMgr->GetString(OPT_FILTER_USERPATH).c_str();
- m_tempFolderType = m_pOptionsMgr->GetBool(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1;
- m_tempFolder = m_pOptionsMgr->GetString(OPT_CUSTOM_TEMP_PATH).c_str();
+ m_strEditorPath = GetOptionsMgr()->GetString(OPT_EXT_EDITOR_CMD).c_str();
+ m_bUseRecycleBin = GetOptionsMgr()->GetBool(OPT_USE_RECYCLE_BIN);
+ m_strUserFilterPath = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH).c_str();
+ m_tempFolderType = GetOptionsMgr()->GetBool(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1;
+ m_tempFolder = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH).c_str();
}
/**
@@ -97,32 +93,29 @@
CMergeApp *app = static_cast<CMergeApp*>(AfxGetApp());
CString sDefaultEditor = app->GetDefaultEditor();
- m_pOptionsMgr->SaveOption(OPT_USE_RECYCLE_BIN, m_bUseRecycleBin == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_USE_RECYCLE_BIN, m_bUseRecycleBin == TRUE);
CString sExtEditor = m_strEditorPath;
sExtEditor.TrimLeft();
sExtEditor.TrimRight();
if (sExtEditor.IsEmpty())
sExtEditor = sDefaultEditor;
- m_pOptionsMgr->SaveOption(OPT_EXT_EDITOR_CMD, sExtEditor);
+ GetOptionsMgr()->SaveOption(OPT_EXT_EDITOR_CMD, sExtEditor);
CString sFilterPath = m_strUserFilterPath;
sFilterPath.TrimLeft();
sFilterPath.TrimRight();
- m_pOptionsMgr->SaveOption(OPT_FILTER_USERPATH, sFilterPath);
+ GetOptionsMgr()->SaveOption(OPT_FILTER_USERPATH, sFilterPath);
bool useSysTemp = m_tempFolderType == 0;
- m_pOptionsMgr->SaveOption(OPT_USE_SYSTEM_TEMP_PATH, useSysTemp);
+ GetOptionsMgr()->SaveOption(OPT_USE_SYSTEM_TEMP_PATH, useSysTemp);
CString tempFolder = m_tempFolder;
tempFolder.TrimLeft();
tempFolder.TrimRight();
- m_pOptionsMgr->SaveOption(OPT_CUSTOM_TEMP_PATH, tempFolder);
+ GetOptionsMgr()->SaveOption(OPT_CUSTOM_TEMP_PATH, tempFolder);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropRegistry message handlers
-
BOOL PropRegistry::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
Modified: branches/R2_14/Src/PropRegistry.h
===================================================================
--- branches/R2_14/Src/PropRegistry.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropRegistry.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -25,13 +25,10 @@
#ifndef PropRegistry_h_included
#define PropRegistry_h_included
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropRegistry dialog
-
/**
* @brief Property page for system options; used in options property sheet.
*
@@ -39,7 +36,7 @@
* It allows user to select options like whether to use Recycle Bin for
* deleted files and External text editor.
*/
-class PropRegistry : public CPropertyPage, public IOptionsPanel
+class PropRegistry : public OptionsPanel
{
// Construction
public:
@@ -76,10 +73,6 @@
afx_msg void OnBrowseTmpFolder();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-// Implementation data
-private:
- COptionsMgr * m_pOptionsMgr; /**< Pointer to options manager */
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropShell.cpp
===================================================================
--- branches/R2_14/Src/PropShell.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropShell.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -14,6 +14,7 @@
#include "RegKey.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -34,8 +35,8 @@
static LPCTSTR f_RegValuePath = _T("Executable");
-PropShell::PropShell(COptionsMgr *optionsMgr) : CPropertyPage(PropShell::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropShell::PropShell(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropShell::IDD)
, m_bEnableShellContextMenu(FALSE)
, m_bContextAdded(FALSE)
, m_bContextAdvanced(FALSE)
@@ -80,7 +81,7 @@
void PropShell::ReadOptions()
{
GetContextRegValues();
- m_bEnableShellContextMenu = m_pOptionsMgr->GetBool(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU);
+ m_bEnableShellContextMenu = GetOptionsMgr()->GetBool(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU);
}
/**
@@ -88,7 +89,7 @@
*/
void PropShell::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu);
+ GetOptionsMgr()->SaveOption(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu);
SaveMergePath(); // saves context menu settings as well
}
Modified: branches/R2_14/Src/PropShell.h
===================================================================
--- branches/R2_14/Src/PropShell.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropShell.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,12 +9,12 @@
#ifndef _PROP_SHELL_H_
#define _PROP_SHELL_H_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
/**
* @brief Class for Shell options -propertypage.
*/
-class PropShell : public CPropertyPage, public IOptionsPanel
+class PropShell : public OptionsPanel
{
// Construction
public:
@@ -47,10 +47,6 @@
DECLARE_MESSAGE_MAP()
void SaveMergePath();
-
-private:
- COptionsMgr *m_pOptionsMgr;
-
};
#endif // _PROP_SHELL_H_
Modified: branches/R2_14/Src/PropSyntaxColors.cpp
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "SyntaxColors.h"
#include "PropSyntaxColors.h"
#include "Merge.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -18,14 +19,10 @@
static char THIS_FILE[] = __FILE__;
#endif
-
-// PropEditorColor dialog
-
IMPLEMENT_DYNAMIC(PropSyntaxColors, CPropertyPage)
PropSyntaxColors::PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
-: CPropertyPage(PropSyntaxColors::IDD)
-, m_pOptionsMgr(optionsMgr)
+: OptionsPanel(optionsMgr, PropSyntaxColors::IDD)
, m_nKeywordsBold(0)
, m_nFunctionsBold(0)
, m_nCommentsBold(0)
@@ -60,10 +57,6 @@
m_nUser2Bold = GetCheckVal(COLORINDEX_USER2);
}
-PropSyntaxColors::~PropSyntaxColors()
-{
-}
-
void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
@@ -119,8 +112,6 @@
ON_BN_CLICKED(IDC_SCOLOR_USER2_BOLD, OnBnClickedEcolorUser2Bold)
END_MESSAGE_MAP()
-// CPropSyntaxColor message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
@@ -318,4 +309,3 @@
else
m_pTempColors->SetBold(colorIndex, FALSE);
}
-
Modified: branches/R2_14/Src/PropSyntaxColors.h
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropSyntaxColors.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,20 +11,19 @@
#define _PROP_SYNTAX_COLORS_H_
#include "ColorButton.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class SyntaxColors;
const int NumCustomColors = 16;
-class PropSyntaxColors : public CPropertyPage, public IOptionsPanel
+class PropSyntaxColors : public OptionsPanel
{
DECLARE_DYNAMIC(PropSyntaxColors)
// Construction & Destruction
public:
PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
- virtual ~PropSyntaxColors();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -37,8 +36,6 @@
enum { IDD = IDD_PROPPAGE_COLORS_SYNTAX };
protected:
-
-
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
afx_msg void OnBnClickedEcolorKeywords();
@@ -100,6 +97,5 @@
SyntaxColors *m_pTempColors;
COLORREF m_cCustColors[COLORINDEX_COUNT];
- COptionsMgr * m_pOptionsMgr;
};
#endif // _PROP_SYNTAX_COLORS_H_
Modified: branches/R2_14/Src/PropTextColors.cpp
===================================================================
--- branches/R2_14/Src/PropTextColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropTextColors.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -13,6 +13,7 @@
#include "PropTextColors.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -23,24 +24,16 @@
/** @brief Section name for settings in registry. */
static const TCHAR Section[] = _T("Custom Colors");
-/////////////////////////////////////////////////////////////////////////////
-// PropTextColors dialog
-
/**
* @brief Default constructor.
*/
PropTextColors::PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
- : CPropertyPage(PropTextColors::IDD)
-, m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropTextColors::IDD)
, m_bCustomColors(FALSE)
, m_pTempColors(pColors)
{
}
-PropTextColors::~PropTextColors()
-{
-}
-
void PropTextColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -99,14 +92,14 @@
*/
void PropTextColors::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
+ GetOptionsMgr()->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
// User can only change colors via BrowseColorAndSave,
// which writes to m_pTempColors
// so user's latest choices are in m_pTempColors
// (we don't have to read them from screen)
- // Also, PropSyntaxColors writes m_pTempColors out, so we don't have to
- // We share m_pTempColors with PropSyntaxColors
+ // Also, CPropSyntaxColors writes m_pTempColors out, so we don't have to
+ // We share m_pTempColors with CPropSyntaxColors
}
/**
Modified: branches/R2_14/Src/PropTextColors.h
===================================================================
--- branches/R2_14/Src/PropTextColors.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropTextColors.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,24 +11,19 @@
#define PropTextColors_h_included
#include "ColorButton.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
class SyntaxColors;
-
-/////////////////////////////////////////////////////////////////////////////
-// PropTextColors dialog
-
/** @brief Property page for colors options; used in options property sheet */
-class PropTextColors : public CPropertyPage, public IOptionsPanel
+class PropTextColors : public OptionsPanel
{
// Construction
public:
PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
- virtual ~PropTextColors();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -39,7 +34,6 @@
SyntaxColors *m_pTempColors;
COLORREF m_cCustColors[COLORINDEX_COUNT];
- COptionsMgr * m_pOptionsMgr;
//{{AFX_DATA(PropTextColors)
enum { IDD = IDD_PROPPAGE_COLORS_TEXT };
Modified: branches/R2_14/Src/PropVss.cpp
===================================================================
--- branches/R2_14/Src/PropVss.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropVss.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -33,6 +33,7 @@
#include "PropVss.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -40,15 +41,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropVss property page
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager.
*/
-PropVss::PropVss(COptionsMgr *optionsMgr) : CPropertyPage(PropVss::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropVss::PropVss(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropVss::IDD)
, m_nVerSys(-1)
{
}
@@ -78,8 +76,8 @@
*/
void PropVss::ReadOptions()
{
- m_nVerSys = m_pOptionsMgr->GetInt(OPT_VCS_SYSTEM);
- m_strPath = m_pOptionsMgr->GetString(OPT_VSS_PATH).c_str();
+ m_nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
+ m_strPath = GetOptionsMgr()->GetString(OPT_VSS_PATH).c_str();
}
/**
@@ -87,13 +85,10 @@
*/
void PropVss::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_VCS_SYSTEM, (int)m_nVerSys);
- m_pOptionsMgr->SaveOption(OPT_VSS_PATH, m_strPath);
+ GetOptionsMgr()->SaveOption(OPT_VCS_SYSTEM, (int)m_nVerSys);
+ GetOptionsMgr()->SaveOption(OPT_VSS_PATH, m_strPath);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropVss message handlers
-
/**
* @brief Called when Browse-button is selected.
*/
Modified: branches/R2_14/Src/PropVss.h
===================================================================
--- branches/R2_14/Src/PropVss.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropVss.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,15 +9,12 @@
#if !defined(AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
#define AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropVss dialog
-
/** @brief Options property page covering Visual SourceSafe integration */
-class PropVss : public CPropertyPage, public IOptionsPanel
+class PropVss : public OptionsPanel
{
// Construction & Destruction
@@ -58,9 +55,6 @@
afx_msg void OnSelendokVerSys();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options manager. */
};
//{{AFX_INSERT_LOCATION}}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
