|
From: <ge...@us...> - 2011-01-03 13:07:26
|
Revision: 7500
http://winmerge.svn.sourceforge.net/winmerge/?rev=7500&view=rev
Author: gerundt
Date: 2011-01-03 13:07:18 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Rename CProp* classes to Prop* to keep them named in same way.
Modified Paths:
--------------
branches/R2_14/Src/Common/PreferencesDlg.h
branches/R2_14/Src/MainFrm.cpp
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/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
Modified: branches/R2_14/Src/Common/PreferencesDlg.h
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/Common/PreferencesDlg.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -58,17 +58,17 @@
CPropertyPageHost m_pphost;
- CPropGeneral m_pageGeneral;
- CPropCompare m_pageCompare;
- CPropEditor m_pageEditor;
- CPropVss m_pageVss;
- CPropRegistry m_pageSystem;
- CPropCodepage m_pageCodepage;
- CPropMergeColors m_pageMergeColors;
- CPropTextColors m_pageTextColors;
- CPropSyntaxColors m_pageSyntaxColors;
- CPropArchive m_pageArchive;
- CPropBackups m_pageBackups;
+ PropGeneral m_pageGeneral;
+ PropCompare m_pageCompare;
+ PropEditor m_pageEditor;
+ PropVss m_pageVss;
+ PropRegistry m_pageSystem;
+ PropCodepage m_pageCodepage;
+ PropMergeColors m_pageMergeColors;
+ PropTextColors m_pageTextColors;
+ PropSyntaxColors m_pageSyntaxColors;
+ PropArchive m_pageArchive;
+ PropBackups m_pageBackups;
PropShell m_pageShell;
SyntaxColors *m_pSyntaxColors;
Modified: branches/R2_14/Src/MainFrm.cpp
===================================================================
--- branches/R2_14/Src/MainFrm.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/MainFrm.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1290,13 +1290,13 @@
// Determine backup folder
if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
- CPropBackups::FOLDER_ORIGINAL)
+ PropBackups::FOLDER_ORIGINAL)
{
// Put backups to same folder than original file
bakPath = path;
}
else if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
- CPropBackups::FOLDER_GLOBAL)
+ PropBackups::FOLDER_GLOBAL)
{
// Put backups to global folder defined in options
bakPath = GetOptionsMgr()->GetString(OPT_BACKUP_GLOBALFOLDER);
Modified: branches/R2_14/Src/PropArchive.cpp
===================================================================
--- branches/R2_14/Src/PropArchive.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropArchive.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropArchive.cpp
*
- * @brief Implementation of CPropArchive propertysheet
+ * @brief Implementation of PropArchive propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -19,10 +19,10 @@
static char THIS_FILE[] = __FILE__;
#endif
-// CPropArchive dialog
+// PropArchive dialog
-CPropArchive::CPropArchive(COptionsMgr *optionsMgr)
-: CPropertyPage(CPropArchive::IDD)
+PropArchive::PropArchive(COptionsMgr *optionsMgr)
+: CPropertyPage(PropArchive::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bEnableSupport(false)
, m_nInstallType(0)
@@ -30,14 +30,14 @@
{
}
-CPropArchive::~CPropArchive()
+PropArchive::~PropArchive()
{
}
/**
* @brief Sets update handlers for dialog controls.
*/
-void CPropArchive::DoDataExchange(CDataExchange* pDX)
+void PropArchive::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
DDX_Control(pDX, IDC_ARCHIVE_WWW, m_wwwLink);
@@ -47,14 +47,14 @@
}
-BEGIN_MESSAGE_MAP(CPropArchive, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropArchive, CPropertyPage)
ON_BN_CLICKED(IDC_ARCHIVE_ENABLE, OnEnableClicked)
END_MESSAGE_MAP()
/**
* @brief Reads options values from storage to UI.
*/
-void CPropArchive::ReadOptions()
+void PropArchive::ReadOptions()
{
int enable = m_pOptionsMgr->GetInt(OPT_ARCHIVE_ENABLE);
m_bEnableSupport = enable > 0;
@@ -65,7 +65,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropArchive::WriteOptions()
+void PropArchive::WriteOptions()
{
if (m_bEnableSupport)
m_pOptionsMgr->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
@@ -77,7 +77,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropArchive::OnInitDialog()
+BOOL PropArchive::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
m_wwwLink.m_link = DownloadUrl;
@@ -92,7 +92,7 @@
/**
* @brief Called when archive support is enabled or disabled.
*/
-void CPropArchive::OnEnableClicked()
+void PropArchive::OnEnableClicked()
{
UpdateControls();
}
@@ -100,7 +100,7 @@
/**
* @brief Called Updates controls enabled/disables state.
*/
-void CPropArchive::UpdateControls()
+void PropArchive::UpdateControls()
{
CButton *chkEnabled = (CButton *) GetDlgItem(IDC_ARCHIVE_ENABLE);
CButton *btnLocal = (CButton *) GetDlgItem(IDC_ARCHIVE_INSTALLOCAL);
Modified: branches/R2_14/Src/PropArchive.h
===================================================================
--- branches/R2_14/Src/PropArchive.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropArchive.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropArchive.h
*
- * @brief Declaration file for CPropArchive propertyheet
+ * @brief Declaration file for PropArchive propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -18,11 +18,11 @@
/**
* @brief Class for Archive Support options page.
*/
-class CPropArchive : public CPropertyPage
+class PropArchive : public CPropertyPage
{
public:
- CPropArchive(COptionsMgr *optionsMgr);
- virtual ~CPropArchive();
+ PropArchive(COptionsMgr *optionsMgr);
+ virtual ~PropArchive();
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: branches/R2_14/Src/PropBackups.cpp
===================================================================
--- branches/R2_14/Src/PropBackups.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropBackups.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropBackups.cpp
*
- * @brief Implementation of CPropBackups propertysheet
+ * @brief Implementation of PropBackups propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -20,14 +20,14 @@
#endif
-// CPropBackups dialog
+// PropBackups dialog
/**
* @brief Constructor taking OptionsManager parameter.
* @param [in] optionsMgr Pointer to OptionsManager.
*/
-CPropBackups::CPropBackups(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropBackups::IDD)
+PropBackups::PropBackups(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropBackups::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bCreateForFolderCmp(FALSE)
, m_bCreateForFileCmp(FALSE)
@@ -40,11 +40,11 @@
/**
* @brief Destructor.
*/
-CPropBackups::~CPropBackups()
+PropBackups::~PropBackups()
{
}
-void CPropBackups::DoDataExchange(CDataExchange* pDX)
+void PropBackups::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
DDX_Check(pDX, IDC_BACKUP_FOLDERCMP, m_bCreateForFolderCmp);
@@ -56,7 +56,7 @@
}
-BEGIN_MESSAGE_MAP(CPropBackups, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropBackups, CPropertyPage)
ON_BN_CLICKED(IDC_BACKUP_BROWSE, OnBnClickedBackupBrowse)
END_MESSAGE_MAP()
@@ -64,7 +64,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropBackups::ReadOptions()
+void PropBackups::ReadOptions()
{
m_bCreateForFolderCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FOLDERCMP);
m_bCreateForFileCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FILECMP);
@@ -77,7 +77,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropBackups::WriteOptions()
+void PropBackups::WriteOptions()
{
m_sGlobalFolder.TrimLeft();
m_sGlobalFolder.TrimRight();
@@ -98,7 +98,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropBackups::OnInitDialog()
+BOOL PropBackups::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -110,7 +110,7 @@
/**
* @brief Called when user selects Browse-button.
*/
-void CPropBackups::OnBnClickedBackupBrowse()
+void PropBackups::OnBnClickedBackupBrowse()
{
CString path;
if (SelectFolder(path, m_sGlobalFolder, 0, GetSafeHwnd()))
Modified: branches/R2_14/Src/PropBackups.h
===================================================================
--- branches/R2_14/Src/PropBackups.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropBackups.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropBackups.h
*
- * @brief Declaration file for CPropBackups propertyheet
+ * @brief Declaration file for PropBackups propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -17,11 +17,11 @@
/**
* @brief A class for Backup file options page.
*/
-class CPropBackups : public CPropertyPage
+class PropBackups : public CPropertyPage
{
public:
- CPropBackups(COptionsMgr *optionsMgr);
- virtual ~CPropBackups();
+ PropBackups(COptionsMgr *optionsMgr);
+ virtual ~PropBackups();
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: branches/R2_14/Src/PropCodepage.cpp
===================================================================
--- branches/R2_14/Src/PropCodepage.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -21,10 +21,10 @@
/**
* @file PropCodepage.h
*
- * @brief Implementation file for CPropCodepage propertyheet
+ * @brief Implementation file for PropCodepage propertyheet
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -40,10 +40,10 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage property page
+// PropCodepage property page
-CPropCodepage::CPropCodepage(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropCodepage::IDD)
+PropCodepage::PropCodepage(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropCodepage::IDD)
, m_pOptionsMgr(optionsMgr)
, m_nCodepageSystem(-1)
, m_nCustomCodepageValue(0)
@@ -51,14 +51,14 @@
{
}
-CPropCodepage::~CPropCodepage()
+PropCodepage::~PropCodepage()
{
}
-void CPropCodepage::DoDataExchange(CDataExchange* pDX)
+void PropCodepage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropCodepage)
+ //{{AFX_DATA_MAP(PropCodepage)
DDX_Radio(pDX, IDC_CP_SYSTEM, m_nCodepageSystem);
DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_nCustomCodepageValue);
DDX_Check(pDX, IDC_DETECT_CODEPAGE, m_bDetectCodepage);
@@ -66,8 +66,8 @@
}
-BEGIN_MESSAGE_MAP(CPropCodepage, CPropertyPage)
- //{{AFX_MSG_MAP(CPropCodepage)
+BEGIN_MESSAGE_MAP(PropCodepage, CPropertyPage)
+ //{{AFX_MSG_MAP(PropCodepage)
ON_BN_CLICKED(IDC_CP_SYSTEM, OnCpSystem)
ON_BN_CLICKED(IDC_CP_CUSTOM, OnCpCustom)
ON_BN_CLICKED(IDC_CP_UI, OnCpUi)
@@ -77,7 +77,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropCodepage::ReadOptions()
+void PropCodepage::ReadOptions()
{
m_nCodepageSystem = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_MODE);
m_nCustomCodepageValue = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_CUSTOM);
@@ -87,7 +87,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropCodepage::WriteOptions()
+void PropCodepage::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
@@ -95,9 +95,9 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage message handlers
+// PropCodepage message handlers
-BOOL CPropCodepage::OnInitDialog()
+BOOL PropCodepage::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -114,17 +114,17 @@
// EXCEPTION: OCX Property Pages should return FALSE
}
-void CPropCodepage::OnCpSystem()
+void PropCodepage::OnCpSystem()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
-void CPropCodepage::OnCpCustom()
+void PropCodepage::OnCpCustom()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(TRUE);
}
-void CPropCodepage::OnCpUi()
+void PropCodepage::OnCpUi()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
Modified: branches/R2_14/Src/PropCodepage.h
===================================================================
--- branches/R2_14/Src/PropCodepage.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCodepage.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropCodepage.h
*
- * @brief Declaration of CPropCodepage class
+ * @brief Declaration of PropCodepage class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
@@ -14,21 +14,21 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage dialog
+// PropCodepage dialog
-class CPropCodepage : public CPropertyPage, public IOptionsPanel
+class PropCodepage : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropCodepage(COptionsMgr *optionsMgr);
- ~CPropCodepage();
+ PropCodepage(COptionsMgr *optionsMgr);
+ ~PropCodepage();
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropCodepage)
+ //{{AFX_DATA(PropCodepage)
enum { IDD = IDD_PROPPAGE_CODEPAGE };
int m_nCodepageSystem;
int m_nCustomCodepageValue;
@@ -38,7 +38,7 @@
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropCodepage)
+ //{{AFX_VIRTUAL(PropCodepage)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -46,7 +46,7 @@
// Implementation
protected:
// Generated message map functions
- //{{AFX_MSG(CPropCodepage)
+ //{{AFX_MSG(PropCodepage)
virtual BOOL OnInitDialog();
afx_msg void OnCpSystem();
afx_msg void OnCpCustom();
Modified: branches/R2_14/Src/PropColors.cpp
===================================================================
--- branches/R2_14/Src/PropColors.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropColors.cpp
*
- * @brief Implementation of CPropMergeColors propertysheet
+ * @brief Implementation of PropMergeColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -21,21 +21,21 @@
static const TCHAR Section[] = _T("Custom Colors");
/////////////////////////////////////////////////////////////////////////////
-// CPropMergeColors dialog
+// PropMergeColors dialog
/**
* @brief Default constructor.
*/
-CPropMergeColors::CPropMergeColors(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropMergeColors::IDD)
+PropMergeColors::PropMergeColors(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropMergeColors::IDD)
, m_pOptionsMgr(optionsMgr)
{
}
-void CPropMergeColors::DoDataExchange(CDataExchange* pDX)
+void PropMergeColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropMergeColors)
+ //{{AFX_DATA_MAP(PropMergeColors)
DDX_Control(pDX, IDC_TRIVIAL_DIFF_DELETED_COLOR, m_cTrivialDeleted);
DDX_Control(pDX, IDC_TRIVIAL_DIFF_COLOR, m_cTrivial);
DDX_Control(pDX, IDC_SEL_DIFFERENCE_TEXT_COLOR, m_cSelDiffText);
@@ -59,8 +59,8 @@
}
-BEGIN_MESSAGE_MAP(CPropMergeColors, CDialog)
- //{{AFX_MSG_MAP(CPropMergeColors)
+BEGIN_MESSAGE_MAP(PropMergeColors, CDialog)
+ //{{AFX_MSG_MAP(PropMergeColors)
ON_BN_CLICKED(IDC_DIFFERENCE_COLOR, OnDifferenceColor)
ON_BN_CLICKED(IDC_DIFFERENCE_DELETED_COLOR, OnDifferenceDeletedColor)
ON_BN_CLICKED(IDC_SEL_DIFFERENCE_DELETED_COLOR, OnSelDifferenceDeletedColor)
@@ -87,7 +87,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropMergeColors::OnInitDialog()
+BOOL PropMergeColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
return CPropertyPage::OnInitDialog();
@@ -97,7 +97,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropMergeColors::ReadOptions()
+void PropMergeColors::ReadOptions()
{
SerializeColors(READ_OPTIONS);
}
@@ -106,7 +106,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropMergeColors::WriteOptions()
+void PropMergeColors::WriteOptions()
{
SerializeColors(WRITE_OPTIONS);
}
@@ -114,7 +114,7 @@
/**
* @brief Let user browse common color dialog, and select a color
*/
-void CPropMergeColors::BrowseColor(CColorButton & colorButton, COLORREF & currentColor)
+void PropMergeColors::BrowseColor(CColorButton & colorButton, COLORREF & currentColor)
{
CColorDialog dialog(currentColor);
LoadCustomColors();
@@ -131,7 +131,7 @@
/**
* @brief User wants to change difference color
*/
-void CPropMergeColors::OnDifferenceColor()
+void PropMergeColors::OnDifferenceColor()
{
BrowseColor(m_cDiff, m_clrDiff);
}
@@ -139,7 +139,7 @@
/**
* @brief User wants to change selected difference color
*/
-void CPropMergeColors::OnSelDifferenceColor()
+void PropMergeColors::OnSelDifferenceColor()
{
BrowseColor(m_cSelDiff, m_clrSelDiff);
}
@@ -147,7 +147,7 @@
/**
* @brief User wants to change deleted difference color
*/
-void CPropMergeColors::OnDifferenceDeletedColor()
+void PropMergeColors::OnDifferenceDeletedColor()
{
BrowseColor(m_cDiffDeleted, m_clrDiffDeleted);
}
@@ -155,7 +155,7 @@
/**
* @brief User wants to change selected & deleted difference color
*/
-void CPropMergeColors::OnSelDifferenceDeletedColor()
+void PropMergeColors::OnSelDifferenceDeletedColor()
{
BrowseColor(m_cSelDiffDeleted, m_clrSelDiffDeleted);
}
@@ -163,7 +163,7 @@
/**
* @brief User wants to change difference text color
*/
-void CPropMergeColors::OnDifferenceTextColor()
+void PropMergeColors::OnDifferenceTextColor()
{
BrowseColor(m_cDiffText, m_clrDiffText);
}
@@ -171,7 +171,7 @@
/**
* @brief User wants to change selected difference text color
*/
-void CPropMergeColors::OnSelDifferenceTextColor()
+void PropMergeColors::OnSelDifferenceTextColor()
{
BrowseColor(m_cSelDiffText, m_clrSelDiffText);
}
@@ -179,7 +179,7 @@
/**
* @brief User wants to change trivial difference color
*/
-void CPropMergeColors::OnTrivialDiffColor()
+void PropMergeColors::OnTrivialDiffColor()
{
BrowseColor(m_cTrivial, m_clrTrivial);
}
@@ -187,42 +187,42 @@
/**
* @brief User wants to change deleted trivial difference color
*/
-void CPropMergeColors::OnTrivialDiffDeletedColor()
+void PropMergeColors::OnTrivialDiffDeletedColor()
{
BrowseColor(m_cTrivialDeleted, m_clrTrivialDeleted);
}
-void CPropMergeColors::OnTrivialDiffTextColor()
+void PropMergeColors::OnTrivialDiffTextColor()
{
BrowseColor(m_cTrivialText, m_clrTrivialText);
}
-void CPropMergeColors::OnMovedColor()
+void PropMergeColors::OnMovedColor()
{
BrowseColor(m_cMoved, m_clrMoved);
}
-void CPropMergeColors::OnMovedDeletedColor()
+void PropMergeColors::OnMovedDeletedColor()
{
BrowseColor(m_cMovedDeleted, m_clrMovedDeleted);
}
-void CPropMergeColors::OnMovedTextColor()
+void PropMergeColors::OnMovedTextColor()
{
BrowseColor(m_cMovedText, m_clrMovedText);
}
-void CPropMergeColors::OnSelMovedColor()
+void PropMergeColors::OnSelMovedColor()
{
BrowseColor(m_cSelMoved, m_clrSelMoved);
}
-void CPropMergeColors::OnSelMovedDeletedColor()
+void PropMergeColors::OnSelMovedDeletedColor()
{
BrowseColor(m_cSelMovedDeleted, m_clrSelMovedDeleted);
}
-void CPropMergeColors::OnSelMovedTextColor()
+void PropMergeColors::OnSelMovedTextColor()
{
BrowseColor(m_cSelMovedText, m_clrSelMovedText);
}
@@ -230,7 +230,7 @@
/**
* @brief User wants to change word difference color
*/
-void CPropMergeColors::OnWordDifferenceColor()
+void PropMergeColors::OnWordDifferenceColor()
{
BrowseColor(m_cWordDiff, m_clrWordDiff);
}
@@ -238,7 +238,7 @@
/**
* @brief User wants to change selected word difference color
*/
-void CPropMergeColors::OnSelWordDifferenceColor()
+void PropMergeColors::OnSelWordDifferenceColor()
{
BrowseColor(m_cSelWordDiff, m_clrSelWordDiff);
}
@@ -246,7 +246,7 @@
/**
* @brief User wants to change word difference text color
*/
-void CPropMergeColors::OnWordDifferenceTextColor()
+void PropMergeColors::OnWordDifferenceTextColor()
{
BrowseColor(m_cWordDiffText, m_clrWordDiffText);
}
@@ -254,12 +254,12 @@
/**
* @brief User wants to change selected word difference text color
*/
-void CPropMergeColors::OnSelWordDifferenceTextColor()
+void PropMergeColors::OnSelWordDifferenceTextColor()
{
BrowseColor(m_cSelWordDiffText, m_clrSelWordDiffText);
}
-void CPropMergeColors::SerializeColors(OPERATION op)
+void PropMergeColors::SerializeColors(OPERATION op)
{
SerializeColor(op, m_cDiff, OPT_CLR_DIFF, m_clrDiff);
SerializeColor(op, m_cDiffDeleted, OPT_CLR_DIFF_DELETED, m_clrDiffDeleted);
@@ -288,7 +288,7 @@
SerializeColor(op, m_cSelWordDiffText, OPT_CLR_SELECTED_WORDDIFF_TEXT, m_clrSelWordDiffText);
}
-void CPropMergeColors::SerializeColor(OPERATION op, CColorButton & btn, LPCTSTR optionName, COLORREF & color)
+void PropMergeColors::SerializeColor(OPERATION op, CColorButton & btn, LPCTSTR optionName, COLORREF & color)
{
switch (op)
{
@@ -312,7 +312,7 @@
/**
* @brief Resets colors to defaults
*/
-void CPropMergeColors::OnDefaults()
+void PropMergeColors::OnDefaults()
{
SerializeColors(SET_DEFAULTS);
}
@@ -320,7 +320,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropMergeColors::LoadCustomColors()
+void PropMergeColors::LoadCustomColors()
{
for (int i = 0; i < CustomColorsAmount; i++)
{
@@ -334,7 +334,7 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropMergeColors::SaveCustomColors()
+void PropMergeColors::SaveCustomColors()
{
for (int i = 0; i < CustomColorsAmount; i++)
{
Modified: branches/R2_14/Src/PropColors.h
===================================================================
--- branches/R2_14/Src/PropColors.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropColors.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,10 +1,10 @@
/**
* @file PropColors.h
*
- * @brief Declaration file for CPropMergeColors propertyheet
+ * @brief Declaration file for PropMergeColors propertyheet
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_)
@@ -19,14 +19,14 @@
const int CustomColorsAmount = 16;
/////////////////////////////////////////////////////////////////////////////
-// CPropMergeColors dialog
+// PropMergeColors dialog
/** @brief Property page for colors options; used in options property sheet */
-class CPropMergeColors : public CPropertyPage, public IOptionsPanel
+class PropMergeColors : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropMergeColors(COptionsMgr *optionsMgr);
+ PropMergeColors(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -34,7 +34,7 @@
// Dialog Data
private:
- //{{AFX_DATA(CPropMergeColors)
+ //{{AFX_DATA(PropMergeColors)
enum { IDD = IDD_PROPPAGE_COLORS_WINMERGE };
CColorButton m_cTrivialDeleted;
CColorButton m_cTrivial;
@@ -80,7 +80,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropMergeColors)
+ //{{AFX_VIRTUAL(PropMergeColors)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
@@ -100,7 +100,7 @@
COLORREF m_cCustColors[CustomColorsAmount];
// Generated message map functions
- //{{AFX_MSG(CPropMergeColors)
+ //{{AFX_MSG(PropMergeColors)
afx_msg void OnDifferenceColor();
afx_msg void OnDifferenceDeletedColor();
afx_msg void OnSelDifferenceDeletedColor();
Modified: branches/R2_14/Src/PropCompare.cpp
===================================================================
--- branches/R2_14/Src/PropCompare.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCompare.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropCompare.cpp
*
- * @brief Implementation of CPropCompare propertysheet
+ * @brief Implementation of PropCompare propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -19,13 +19,13 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// CPropCompare property page
+// PropCompare property page
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to COptionsMgr.
*/
-CPropCompare::CPropCompare(COptionsMgr *optionsMgr) : CPropertyPage(CPropCompare::IDD)
+PropCompare::PropCompare(COptionsMgr *optionsMgr) : CPropertyPage(PropCompare::IDD)
, m_pOptionsMgr(optionsMgr)
, m_compareMethod(-1)
, m_bIgnoreCase(FALSE)
@@ -40,10 +40,10 @@
{
}
-void CPropCompare::DoDataExchange(CDataExchange* pDX)
+void PropCompare::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropCompare)
+ //{{AFX_DATA_MAP(PropCompare)
DDX_CBIndex(pDX, IDC_COMPAREMETHODCOMBO, m_compareMethod);
DDX_Check(pDX, IDC_IGNCASE_CHECK, m_bIgnoreCase);
DDX_Check(pDX, IDC_IGNBLANKS_CHECK, m_bIgnoreBlankLines);
@@ -58,8 +58,8 @@
}
-BEGIN_MESSAGE_MAP(CPropCompare, CPropertyPage)
- //{{AFX_MSG_MAP(CPropCompare)
+BEGIN_MESSAGE_MAP(PropCompare, CPropertyPage)
+ //{{AFX_MSG_MAP(PropCompare)
ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
//}}AFX_MSG_MAP
ON_CBN_SELCHANGE(IDC_COMPAREMETHODCOMBO, OnCbnSelchangeComparemethodcombo)
@@ -70,7 +70,7 @@
* Property sheet calls this before displaying GUI to load values
* into members.
*/
-void CPropCompare::ReadOptions()
+void PropCompare::ReadOptions()
{
m_nIgnoreWhite = m_pOptionsMgr->GetInt(OPT_CMP_IGNORE_WHITESPACE);
m_bIgnoreBlankLines = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_BLANKLINES);
@@ -89,7 +89,7 @@
* Property sheet calls this after dialog is closed with OK button to
* store values in member variables.
*/
-void CPropCompare::WriteOptions()
+void PropCompare::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
@@ -104,12 +104,12 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropCompare message handlers
+// PropCompare message handlers
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropCompare::OnInitDialog()
+BOOL PropCompare::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -140,7 +140,7 @@
/**
* @brief Sets options to defaults
*/
-void CPropCompare::OnDefaults()
+void PropCompare::OnDefaults()
{
DWORD tmp;
m_pOptionsMgr->GetDefault(OPT_CMP_METHOD, tmp);
@@ -169,7 +169,7 @@
* Enables / disables "Stop compare after first difference" checkbox.
* That checkbox is valid only for quick contents compare method.
*/
-void CPropCompare::OnCbnSelchangeComparemethodcombo()
+void PropCompare::OnCbnSelchangeComparemethodcombo()
{
CComboBox * pCombo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
Modified: branches/R2_14/Src/PropCompare.h
===================================================================
--- branches/R2_14/Src/PropCompare.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCompare.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropCompare.h
*
- * @brief Declaration of CPropCompare propertysheet
+ * @brief Declaration of PropCompare propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -14,7 +14,7 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropCompare dialog
+// PropCompare dialog
/**
* @brief Property page to set compare options for WinMerge.
@@ -33,18 +33,18 @@
*
* @author Tim Musschoot, several modifications by others
*/
-class CPropCompare : public CPropertyPage, public IOptionsPanel
+class PropCompare : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropCompare(COptionsMgr *optionsMgr);
+ PropCompare(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropCompare)
+ //{{AFX_DATA(PropCompare)
enum { IDD = IDD_PROPPAGE_COMPARE };
int m_compareMethod;
BOOL m_bIgnoreEol;
@@ -61,7 +61,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropCompare)
+ //{{AFX_VIRTUAL(PropCompare)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -69,7 +69,7 @@
// Implementation
protected:
// Generated message map functions
- //{{AFX_MSG(CPropCompare)
+ //{{AFX_MSG(PropCompare)
afx_msg BOOL OnInitDialog();
afx_msg void OnDefaults();
afx_msg void OnCbnSelchangeComparemethodcombo();
Modified: branches/R2_14/Src/PropEditor.cpp
===================================================================
--- branches/R2_14/Src/PropEditor.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropEditor.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropEditor.cpp
*
- * @brief Implementation of CPropEditor propertysheet
+ * @brief Implementation of PropEditor propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -22,13 +22,13 @@
static const int MAX_TABSIZE = 64;
/////////////////////////////////////////////////////////////////////////////
-// CPropEditor dialog
+// PropEditor dialog
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager for handling options.
*/
-CPropEditor::CPropEditor(COptionsMgr *optionsMgr) : CPropertyPage(CPropEditor::IDD)
+PropEditor::PropEditor(COptionsMgr *optionsMgr) : CPropertyPage(PropEditor::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bHiliteSyntax(FALSE)
, m_nTabType(-1)
@@ -44,10 +44,10 @@
/**
* @brief Function handling dialog data exchange between GUI and variables.
*/
-void CPropEditor::DoDataExchange(CDataExchange* pDX)
+void PropEditor::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropEditor)
+ //{{AFX_DATA_MAP(PropEditor)
DDX_Check(pDX, IDC_HILITE_CHECK, m_bHiliteSyntax);
DDX_Radio(pDX, IDC_PROP_INSERT_TABS, m_nTabType);
DDX_Text(pDX, IDC_TAB_EDIT, m_nTabSize);
@@ -60,8 +60,8 @@
}
-BEGIN_MESSAGE_MAP(CPropEditor, CDialog)
- //{{AFX_MSG_MAP(CPropEditor)
+BEGIN_MESSAGE_MAP(PropEditor, CDialog)
+ //{{AFX_MSG_MAP(PropEditor)
ON_BN_CLICKED(IDC_VIEW_LINE_DIFFERENCES, OnLineDiffControlClicked)
ON_BN_CLICKED(IDC_EDITOR_CHARLEVEL, OnLineDiffControlClicked)
ON_BN_CLICKED(IDC_EDITOR_WORDLEVEL, OnLineDiffControlClicked)
@@ -72,7 +72,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropEditor::ReadOptions()
+void PropEditor::ReadOptions()
{
m_nTabSize = m_pOptionsMgr->GetInt(OPT_TAB_SIZE);
m_nTabType = m_pOptionsMgr->GetInt(OPT_TAB_TYPE);
@@ -87,7 +87,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropEditor::WriteOptions()
+void PropEditor::WriteOptions()
{
// Sanity check tabsize
if (m_nTabSize < 1)
@@ -105,12 +105,12 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropEditor message handlers
+// PropEditor message handlers
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropEditor::OnInitDialog()
+BOOL PropEditor::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -132,7 +132,7 @@
/**
* @brief Load strings (from resource) into combobox for break type
*/
-void CPropEditor::LoadBreakTypeStrings()
+void PropEditor::LoadBreakTypeStrings()
{
CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_BREAK_TYPE);
cbo->AddString(theApp.LoadString(IDS_BREAK_ON_WHITESPACE).c_str());
@@ -142,7 +142,7 @@
/**
* @brief Handlers any clicks in any of the line differencing controls
*/
-void CPropEditor::OnLineDiffControlClicked()
+void PropEditor::OnLineDiffControlClicked()
{
UpdateLineDiffControls();
}
@@ -152,7 +152,7 @@
* @param [in] item ID of dialog control to enable/disable.
* @param [in] enable if true control is enabled, else disabled.
*/
-void CPropEditor::EnableDlgItem(int item, bool enable)
+void PropEditor::EnableDlgItem(int item, bool enable)
{
GetDlgItem(item)->EnableWindow(!!enable);
}
@@ -160,7 +160,7 @@
/**
* @brief Update availability of line difference controls
*/
-void CPropEditor::UpdateLineDiffControls()
+void PropEditor::UpdateLineDiffControls()
{
UpdateDataFromWindow();
// Can only choose char/word level if line differences are enabled
@@ -173,7 +173,7 @@
/**
* @brief Check tabsize value when control loses focus.
*/
-void CPropEditor::OnEnKillfocusTabEdit()
+void PropEditor::OnEnKillfocusTabEdit()
{
CEdit * pEdit = (CEdit *)GetDlgItem(IDC_TAB_EDIT);
CString valueAsText;
Modified: branches/R2_14/Src/PropEditor.h
===================================================================
--- branches/R2_14/Src/PropEditor.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropEditor.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,10 +1,10 @@
/**
* @file PropEditor.h
*
- * @brief Declaration file for CPropEditor propertyheet
+ * @brief Declaration file for PropEditor propertyheet
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_)
@@ -15,7 +15,7 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropEditor dialog
+// PropEditor dialog
/**
* @brief Property page for editor options.
@@ -23,18 +23,18 @@
* Editor options affect to editor behavior. For example syntax highlighting
* and tabs.
*/
-class CPropEditor : public CPropertyPage, public IOptionsPanel
+class PropEditor : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropEditor(COptionsMgr *optionsMgr);
+ PropEditor(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropEditor)
+ //{{AFX_DATA(PropEditor)
enum { IDD = IDD_PROPPAGE_EDITOR };
BOOL m_bHiliteSyntax;
int m_nTabType;
@@ -56,7 +56,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropEditor)
+ //{{AFX_VIRTUAL(PropEditor)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -65,7 +65,7 @@
protected:
// Generated message map functions
- //{{AFX_MSG(CPropEditor)
+ //{{AFX_MSG(PropEditor)
afx_msg BOOL OnInitDialog();
afx_msg void OnLineDiffControlClicked();
afx_msg void OnEnKillfocusTabEdit();
Modified: branches/R2_14/Src/PropGeneral.cpp
===================================================================
--- branches/R2_14/Src/PropGeneral.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropGeneral.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -21,7 +21,7 @@
/**
* @file PropGeneral.h
*
- * @brief Implementation file for CPropGeneral propertyheet
+ * @brief Implementation file for PropGeneral propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -40,12 +40,12 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral property page
+// PropGeneral property page
/**
* @brief Constructor initialising members.
*/
-CPropGeneral::CPropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(CPropGeneral::IDD)
+PropGeneral::PropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(PropGeneral::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bScroll(FALSE)
, m_bDisableSplash(FALSE)
@@ -61,11 +61,11 @@
{
}
-CPropGeneral::~CPropGeneral()
+PropGeneral::~PropGeneral()
{
}
-BOOL CPropGeneral::OnInitDialog()
+BOOL PropGeneral::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -82,10 +82,10 @@
return TRUE; // return TRUE unless you set the focus to a control
}
-void CPropGeneral::DoDataExchange(CDataExchange* pDX)
+void PropGeneral::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropGeneral)
+ //{{AFX_DATA_MAP(PropGeneral)
DDX_Check(pDX, IDC_SCROLL_CHECK, m_bScroll);
DDX_Check(pDX, IDC_DISABLE_SPLASH, m_bDisableSplash);
DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
@@ -101,8 +101,8 @@
}
-BEGIN_MESSAGE_MAP(CPropGeneral, CPropertyPage)
- //{{AFX_MSG_MAP(CPropGeneral)
+BEGIN_MESSAGE_MAP(PropGeneral, CPropertyPage)
+ //{{AFX_MSG_MAP(PropGeneral)
ON_BN_CLICKED(IDC_RESET_ALL_MESSAGE_BOXES, OnResetAllMessageBoxes)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -110,7 +110,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropGeneral::ReadOptions()
+void PropGeneral::ReadOptions()
{
m_bScroll = m_pOptionsMgr->GetBool(OPT_SCROLL_TO_FIRST);
m_bDisableSplash = m_pOptionsMgr->GetBool(OPT_DISABLE_SPLASH);
@@ -128,7 +128,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropGeneral::WriteOptions()
+void PropGeneral::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
m_pOptionsMgr->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
@@ -144,12 +144,12 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral message handlers
+// PropGeneral message handlers
/**
* @brief Called when user wants to see all messageboxes again.
*/
-void CPropGeneral::OnResetAllMessageBoxes()
+void PropGeneral::OnResetAllMessageBoxes()
{
CMessageBoxDialog::ResetMessageBoxes();
LangMessageBox(IDS_MESSAGE_BOX_ARE_RESET, MB_ICONINFORMATION);
Modified: branches/R2_14/Src/PropGeneral.h
===================================================================
--- branches/R2_14/Src/PropGeneral.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropGeneral.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropGeneral.h
*
- * @brief Declaration of CPropGeneral class
+ * @brief Declaration of PropGeneral class
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -14,24 +14,24 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral dialog
+// PropGeneral dialog
/**
* @brief Class for General options -propertypage.
*/
-class CPropGeneral : public CPropertyPage, public IOptionsPanel
+class PropGeneral : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropGeneral(COptionsMgr *optionsMgr);
- ~CPropGeneral();
+ PropGeneral(COptionsMgr *optionsMgr);
+ ~PropGeneral();
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropGeneral)
+ //{{AFX_DATA(PropGeneral)
enum { IDD = IDD_PROPPAGE_GENERAL };
BOOL m_bScroll;
BOOL m_bDisableSplash;
@@ -49,7 +49,7 @@
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropGeneral)
+ //{{AFX_VIRTUAL(PropGeneral)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -59,7 +59,7 @@
virtual BOOL OnInitDialog();
// Generated message map functions
- //{{AFX_MSG(CPropGeneral)
+ //{{AFX_MSG(PropGeneral)
afx_msg void OnResetAllMessageBoxes();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: branches/R2_14/Src/PropRegistry.cpp
===================================================================
--- branches/R2_14/Src/PropRegistry.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropRegistry.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -17,7 +17,7 @@
/**
* @file PropRegistry.cpp
*
- * @brief CPropRegistry implementation file
+ * @brief PropRegistry implementation file
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -46,21 +46,21 @@
static LPCTSTR f_RegValuePath = _T("Executable");
/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry dialog
+// PropRegistry dialog
-CPropRegistry::CPropRegistry(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropRegistry::IDD)
+PropRegistry::PropRegistry(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropRegistry::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bUseRecycleBin(TRUE)
, m_tempFolderType(0)
{
}
-void CPropRegistry::DoDataExchange(CDataExchange* pDX)
+void PropRegistry::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropRegistry)
+ //{{AFX_DATA_MAP(PropRegistry)
DDX_Text(pDX, IDC_EXT_EDITOR_PATH, m_strEditorPath);
DDX_Check(pDX, IDC_USE_RECYCLE_BIN, m_bUseRecycleBin);
DDX_Text(pDX, IDC_FILTER_USER_PATH, m_strUserFilterPath);
@@ -69,8 +69,8 @@
//}}AFX_DATA_MAP
}
-BEGIN_MESSAGE_MAP(CPropRegistry, CDialog)
- //{{AFX_MSG_MAP(CPropRegistry)
+BEGIN_MESSAGE_MAP(PropRegistry, CDialog)
+ //{{AFX_MSG_MAP(PropRegistry)
ON_BN_CLICKED(IDC_EXT_EDITOR_BROWSE, OnBrowseEditor)
ON_BN_CLICKED(IDC_FILTER_USER_BROWSE, OnBrowseFilterPath)
ON_BN_CLICKED(IDC_TMPFOLDER_BROWSE, OnBrowseTmpFolder)
@@ -80,7 +80,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropRegistry::ReadOptions()
+void PropRegistry::ReadOptions()
{
m_strEditorPath = m_pOptionsMgr->GetString(OPT_EXT_EDITOR_CMD).c_str();
m_bUseRecycleBin = m_pOptionsMgr->GetBool(OPT_USE_RECYCLE_BIN);
@@ -92,7 +92,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropRegistry::WriteOptions()
+void PropRegistry::WriteOptions()
{
CMergeApp *app = static_cast<CMergeApp*>(AfxGetApp());
CString sDefaultEditor = app->GetDefaultEditor();
@@ -121,9 +121,9 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry message handlers
+// PropRegistry message handlers
-BOOL CPropRegistry::OnInitDialog()
+BOOL PropRegistry::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -135,7 +135,7 @@
}
/// Open file browse dialog to locate editor
-void CPropRegistry::OnBrowseEditor()
+void PropRegistry::OnBrowseEditor()
{
CString path;
if (SelectFile(GetSafeHwnd(), path, NULL, IDS_OPEN_TITLE, IDS_PROGRAMFILES, TRUE))
@@ -145,7 +145,7 @@
}
/// Open Folder selection dialog for user to select filter folder.
-void CPropRegistry::OnBrowseFilterPath()
+void PropRegistry::OnBrowseFilterPath()
{
CString path;
if (SelectFolder(path, m_strUserFilterPath, IDS_OPEN_TITLE, GetSafeHwnd()))
@@ -155,7 +155,7 @@
}
/// Select temporary files folder.
-void CPropRegistry::OnBrowseTmpFolder()
+void PropRegistry::OnBrowseTmpFolder()
{
CString path;
if (SelectFolder(path, m_tempFolder, NULL, GetSafeHwnd()))
Modified: branches/R2_14/Src/PropRegistry.h
===================================================================
--- branches/R2_14/Src/PropRegistry.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropRegistry.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -17,7 +17,7 @@
/**
* @file PropRegistry.h
*
- * @brief Declaration file CPropRegistry
+ * @brief Declaration file PropRegistry
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -30,7 +30,7 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry dialog
+// PropRegistry dialog
/**
* @brief Property page for system options; used in options property sheet.
@@ -39,18 +39,18 @@
* It allows user to select options like whether to use Recycle Bin for
* deleted files and External text editor.
*/
-class CPropRegistry : public CPropertyPage, public IOptionsPanel
+class PropRegistry : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropRegistry(COptionsMgr *optionsMgr);
+ PropRegistry(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropRegistry)
+ //{{AFX_DATA(PropRegistry)
enum { IDD = IDD_PROPPAGE_SYSTEM };
CString m_strEditorPath;
BOOL m_bUseRecycleBin;
@@ -61,7 +61,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropRegistry)
+ //{{AFX_VIRTUAL(PropRegistry)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -69,7 +69,7 @@
// Implementation methods
protected:
// Generated message map functions
- //{{AFX_MSG(CPropRegistry)
+ //{{AFX_MSG(PropRegistry)
virtual BOOL OnInitDialog();
afx_msg void OnBrowseEditor();
afx_msg void OnBrowseFilterPath();
Modified: branches/R2_14/Src/PropSyntaxColors.cpp
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropSyntaxColors.cpp
*
- * @brief Implementation of CPropSyntaxColors propertysheet
+ * @brief Implementation of PropSyntaxColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -19,12 +19,12 @@
#endif
-// CPropEditorColor dialog
+// PropEditorColor dialog
-IMPLEMENT_DYNAMIC(CPropSyntaxColors, CPropertyPage)
+IMPLEMENT_DYNAMIC(PropSyntaxColors, CPropertyPage)
-CPropSyntaxColors::CPropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
-: CPropertyPage(CPropSyntaxColors::IDD)
+PropSyntaxColors::PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
+: CPropertyPage(PropSyntaxColors::IDD)
, m_pOptionsMgr(optionsMgr)
, m_nKeywordsBold(0)
, m_nFunctionsBold(0)
@@ -60,11 +60,11 @@
m_nUser2Bold = GetCheckVal(COLORINDEX_USER2);
}
-CPropSyntaxColors::~CPropSyntaxColors()
+PropSyntaxColors::~PropSyntaxColors()
{
}
-void CPropSyntaxColors::DoDataExchange(CDataExchange* pDX)
+void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
DDX_Control(pDX, IDC_SCOLOR_KEYWORDS, m_btnKeywordsText);
@@ -97,7 +97,7 @@
}
-BEGIN_MESSAGE_MAP(CPropSyntaxColors, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropSyntaxColors, CPropertyPage)
ON_BN_CLICKED(IDC_SCOLOR_KEYWORDS, OnBnClickedEcolorKeywords)
ON_BN_CLICKED(IDC_SCOLOR_FUNCTIONS, OnBnClickedEcolorFunctions)
ON_BN_CLICKED(IDC_SCOLOR_COMMENTS, OnBnClickedEcolorComments)
@@ -124,7 +124,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropSyntaxColors::OnInitDialog()
+BOOL PropSyntaxColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
return CPropertyPage::OnInitDialog();
@@ -134,7 +134,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropSyntaxColors::ReadOptions()
+void PropSyntaxColors::ReadOptions()
{
}
@@ -142,7 +142,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropSyntaxColors::WriteOptions()
+void PropSyntaxColors::WriteOptions()
{
// User can only change colors via BrowseColorAndSave,
// which writes to m_pTempColors
@@ -154,7 +154,7 @@
/**
* @brief Let user browse common color dialog, and select a color & save to registry
*/
-void CPropSyntaxColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
+void PropSyntaxColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
{
COLORREF currentColor = m_pTempColors->GetColor(colorIndex);
CColorDialog dialog(currentColor);
@@ -170,52 +170,52 @@
SaveCustomColors();
}
-void CPropSyntaxColors::OnBnClickedEcolorKeywords()
+void PropSyntaxColors::OnBnClickedEcolorKeywords()
{
BrowseColorAndSave(m_btnKeywordsText, COLORINDEX_KEYWORD);
}
-void CPropSyntaxColors::OnBnClickedEcolorFunctions()
+void PropSyntaxColors::OnBnClickedEcolorFunctions()
{
BrowseColorAndSave(m_btnFunctionsText, COLORINDEX_FUNCNAME);
}
-void CPropSyntaxColors::OnBnClickedEcolorComments()
+void PropSyntaxColors::OnBnClickedEcolorComments()
{
BrowseColorAndSave(m_btnCommentsText, COLORINDEX_COMMENT);
}
-void CPropSyntaxColors::OnBnClickedEcolorNumbers()
+void PropSyntaxColors::OnBnClickedEcolorNumbers()
{
BrowseColorAndSave(m_btnNumbersText, COLORINDEX_NUMBER);
}
-void CPropSyntaxColors::OnBnClickedEcolorOperators()
+void PropSyntaxColors::OnBnClickedEcolorOperators()
{
BrowseColorAndSave(m_btnOperatorsText, COLORINDEX_OPERATOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorStrings()
+void PropSyntaxColors::OnBnClickedEcolorStrings()
{
BrowseColorAndSave(m_btnStringsText, COLORINDEX_STRING);
}
-void CPropSyntaxColors::OnBnClickedEcolorPreprocessor()
+void PropSyntaxColors::OnBnClickedEcolorPreprocessor()
{
BrowseColorAndSave(m_btnPreprocessorText, COLORINDEX_PREPROCESSOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser1()
+void PropSyntaxColors::OnBnClickedEcolorUser1()
{
BrowseColorAndSave(m_btnUser1Text, COLORINDEX_USER1);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser2()
+void PropSyntaxColors::OnBnClickedEcolorUser2()
{
BrowseColorAndSave(m_btnUser2Text, COLORINDEX_USER2);
}
-void CPropSyntaxColors::OnBnClickedEcolorsBdefaults()
+void PropSyntaxColors::OnBnClickedEcolorsBdefaults()
{
m_pTempColors->SetDefaults();
m_btnKeywordsText.SetColor(m_pTempColors->GetColor(COLORINDEX_KEYWORD));
@@ -244,7 +244,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropSyntaxColors::LoadCustomColors()
+void PropSyntaxColors::LoadCustomColors()
{
SyntaxColors_Load(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
@@ -252,57 +252,57 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropSyntaxColors::SaveCustomColors()
+void PropSyntaxColors::SaveCustomColors()
{
SyntaxColors_Save(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
-void CPropSyntaxColors::OnBnClickedEcolorKeywordsBold()
+void PropSyntaxColors::OnBnClickedEcolorKeywordsBold()
{
UpdateBoldStatus(m_btnKeywordsBold, COLORINDEX_KEYWORD);
}
-void CPropSyntaxColors::OnBnClickedEcolorFunctionsBold()
+void PropSyntaxColors::OnBnClickedEcolorFunctionsBold()
{
UpdateBoldStatus(m_btnFunctionsBold, COLORINDEX_FUNCNAME);
}
-void CPropSyntaxColors::OnBnClickedEcolorCommentsBold()
+void PropSyntaxColors::OnBnClickedEcolorCommentsBold()
{
UpdateBoldStatus(m_btnCommentsBold, COLORINDEX_COMMENT);
}
-void CPropSyntaxColors::OnBnClickedEcolorNumbersBold()
+void PropSyntaxColors::OnBnClickedEcolorNumbersBold()
{
UpdateBoldStatus(m_btnNumbersBold, COLORINDEX_NUMBER);
}
-void CPropSyntaxColors::OnBnClickedEcolorOperatorsBold()
+void PropSyntaxColors::OnBnClickedEcolorOperatorsBold()
{
UpdateBoldStatus(m_btnOperatorsBold, COLORINDEX_OPERATOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorStringsBold()
+void PropSyntaxColors::OnBnClickedEcolorStringsBold()
{
UpdateBoldStatus(m_btnStringsBold, COLORINDEX_STRING);
}
-void CPropSyntaxColors::OnBnClickedEcolorPreprocessorBold()
+void PropSyntaxColors::OnBnClickedEcolorPreprocessorBold()
{
UpdateBoldStatus(m_btnPreProcessorBold, COLORINDEX_PREPROCESSOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser1Bold()
+void PropSyntaxColors::OnBnClickedEcolorUser1Bold()
{
UpdateBoldStatus(m_btnUser1Bold, COLORINDEX_USER1);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser2Bold()
+void PropSyntaxColors::OnBnClickedEcolorUser2Bold()
{
UpdateBoldStatus(m_btnUser2Bold, COLORINDEX_USER2);
}
-int CPropSyntaxColors::GetCheckVal(UINT nColorIndex)
+int PropSyntaxColors::GetCheckVal(UINT nColorIndex)
{
if (m_pTempColors->GetBold(nColorIndex))
return BST_CHECKED;
@@ -310,7 +310,7 @@
return BST_UNCHECKED;
}
-void CPropSyntaxColors::UpdateBoldStatus(CButton &btn, UINT colorIndex)
+void PropSyntaxColors::UpdateBoldStatus(CButton &btn, UINT colorIndex)
{
int state = btn.GetCheck();
if (state == BST_CHECKED)
Modified: branches/R2_14/Src/PropSyntaxColors.h
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropSyntaxColors.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropSyntaxColors.h
*
- * @brief Declaration file for CPropSyntaxColors propertyheet
+ * @brief Declaration file for PropSyntaxColors propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -17,14 +17,14 @@
const int NumCustomColors = 16;
-class CPropSyntaxColors : public CPropertyPage, public IOptionsPanel
+class PropSyntaxColors : public CPropertyPage, public IOptionsPanel
{
- DECLARE_DYNAMIC(CPropSyntaxColors)
+ DECLARE_DYNAMIC(PropSyntaxColors)
// Construction & Destruction
public:
- CPropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
- virtual ~CPropSyntaxColors();
+ PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
+ virtual ~PropSyntaxColors();
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: branches/R2_14/Src/PropTextColors.cpp
===================================================================
--- branches/R2_14/Src/PropTextColors.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropTextColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropTextColors.cpp
*
- * @brief Implementation of CPropTextColors propertysheet
+ * @brief Implementation of PropTextColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -24,27 +24,27 @@
static const TCHAR Section[] = _T("Custom Colors");
/////////////////////////////////////////////////////////////////////////////
-// CPropTextColors dialog
+// PropTextColors dialog
/**
* @brief Default constructor.
*/
-CPropTextColors::CPropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
- : CPropertyPage(CPropTextColors::IDD)
+PropTextColors::PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
+ : CPropertyPage(PropTextColors::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bCustomColors(FALSE)
, m_pTempColors(pColors)
{
}
-CPropTextColors::~CPropTextColors()
+PropTextColors::~PropTextColors()
{
}
-void CPropTextColors::DoDataExchange(CDataExchange* pDX)
+void PropTextColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropTextColors)
+ //{{AFX_DATA_MAP(PropTextColors)
DDX_Control(pDX, IDC_DEFAULT_STANDARD_COLORS, m_btnDefaultStandardColors);
DDX_Check(pDX, IDC_DEFAULT_STANDARD_COLORS, m_bCustomColors);
DDX_Control(pDX, IDC_WHITESPACE_BKGD_COLOR, m_btnWhitespaceBackground);
@@ -56,8 +56,8 @@
}
-BEGIN_MESSAGE_MAP(CPropTextColors, CDialog)
- //{{AFX_MSG_MAP(CPropTextColors)
+BEGIN_MESSAGE_MAP(PropTextColors, CDialog)
+ //{{AFX_MSG_MAP(PropTextColors)
ON_BN_CLICKED(IDC_DEFAULT_STANDARD_COLORS, OnDefaultsStandardColors)
ON_BN_CLICKED(IDC_WHITESPACE_BKGD_COLOR, OnWhitespaceBackgroundColor)
ON_BN_CLICKED(IDC_REGULAR_BKGD_COLOR, OnRegularBackgroundColor)
@@ -70,7 +70,7 @@
/**
* @brief Enable/Disable controls when dialog is shown.
*/
-BOOL CPropTextColors::OnInitDialog()
+BOOL PropTextColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -87,7 +87,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropTextColors::ReadOptions()
+void PropTextColors::ReadOptions()
{
m_bCustomColors = GetOptionsMgr()->GetBool(OPT_CLR_DEFAULT_TEXT_COLORING) ? FALSE : TRUE;
SerializeColorsToFromScreen(LOAD_COLORS);
@@ -97,7 +97,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropTextColors::WriteOptions()
+void PropTextColors::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
// User can only change colors via BrowseColorAndSave,
@@ -105,8 +105,8 @@
// so user's latest choices are in m_pTempColors
// (we don't have to read them from screen)
- // Also, CPropSyntaxColors writes m_pTempColors out, so we don't have to
- // We share m_pTempColors with CPropSyntaxColors
+ // Also, PropSyntaxColors writes m_pTempColors out, so we don't have to
+ // We share m_pTempColors with PropSyntaxColors
}
/**
@@ -114,7 +114,7 @@
* @param [in] colorButton Button for which to change color.
* @param [in] colorIndex Index to color table.
*/
-void CPropTextColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
+void PropTextColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
{
// Ignore user if colors are slaved to system
if (m_btnDefaultStandardColors.GetCheck() == BST_UNCHECKED)
@@ -137,7 +137,7 @@
/**
* @brief User wants to change whitespace color
*/
-void CPropTextColors::OnWhitespaceBackgroundColor()
+void PropTextColors::OnWhitespaceBackgroundColor()
{
BrowseColorAndSave(m_btnWhitespaceBackground, COLORINDEX_WHITESPACE);
}
@@ -145,7 +145,7 @@
/**
* @brief User wants to change regular background color
*/
-void CPropTextColors::OnRegularBackgroundColor()
+void PropTextColors::OnRegularBackgroundColor()
{
BrowseColorAndSave(m_btnRegularBackground, COLORINDEX_BKGND);
}
@@ -153,7 +153,7 @@
/**
* @brief User wants to change regular text color
*/
-void CPropTextColors::OnRegularTextColor()
+void PropTextColors::OnRegularTextColor()
{
BrowseColorAndSave(m_btnRegularText, COLORINDEX_NORMALTEXT);
}
@@ -161,7 +161,7 @@
/**
* @brief User wants to change regular selection background color
*/
-void CPropTextColors::OnSelectionBackgroundColor()
+void PropTextColors::OnSelectionBackgroundColor()
{
BrowseColorAndSave(m_btnSelectionBackground, COLORINDEX_SELBKGND);
}
@@ -169,7 +169,7 @@
/**
* @brief User wants to change regular selection text color
*/
-void CPropTextColors::OnSelectionTextColor()
+void PropTextColors::OnSelectionTextColor()
{
BrowseColorAndSave(m_btnSelectionText, COLORINDEX_SELTEXT);
}
@@ -181,7 +181,7 @@
* - LOAD_COLORS : Loads colors from registry
* (No save operation because BrowseColorAndSave saves immediately when user chooses)
*/
-void CPropTextColors::SerializeColorsToFromScreen(OPERATION op)
+void PropTextColors::SerializeColorsToFromScreen(OPERATION op)
{
if (op == SET_DEFAULTS)
m_pTempColors->SetDefaults();
@@ -202,7 +202,7 @@
* - LOAD_COLORS : Loads colors from registry
* (No save operation because BrowseColorAndSave saves immediately when user chooses)
*/
-void CPropTextColors::SerializeColorToFromScreen(OPERATION op, CColorButton & btn, int colorIndex)
+void PropTextColors::SerializeColorToFromScreen(OPERATION op, CColorButton & btn, int colorIndex)
{
switch (op)
@@ -227,7 +227,7 @@
/**
* @brief Set colors to track standard (theme) colors
*/
-void CPropTextColors::OnDefaultsStandardColors()
+void PropTextColors::OnDefaultsStandardColors()
{
// Reset all text colors to default every ti...
[truncated message content] |
