m_pOverlayPage = new CSetOverlayPage();\r
m_pOverlaysPage = new CSetOverlayIcons();\r
m_pProxyPage = new CSetProxyPage();\r
-// m_pProgsDiffPage = new CSettingsProgsDiff();\r
-// m_pProgsMergePage = new CSettingsProgsMerge();\r
-// m_pProgsUniDiffPage = new CSettingsProgsUniDiff();\r
+ m_pProgsDiffPage = new CSettingsProgsDiff();\r
+ m_pProgsMergePage = new CSettingsProgsMerge();\r
+ m_pProgsUniDiffPage = new CSettingsProgsUniDiff();\r
m_pLookAndFeelPage = new CSetLookAndFeelPage();\r
m_pDialogsPage = new CSetDialogs();\r
m_pMiscPage = new CSetMisc();\r
SetPageIcon(m_pOverlayPage, m_pOverlayPage->GetIconID());\r
SetPageIcon(m_pOverlaysPage, m_pOverlaysPage->GetIconID());\r
SetPageIcon(m_pProxyPage, m_pProxyPage->GetIconID());\r
-//// SetPageIcon(m_pProgsDiffPage, m_pProgsDiffPage->GetIconID());\r
-//// SetPageIcon(m_pProgsMergePage, m_pProgsMergePage->GetIconID());\r
-////// SetPageIcon(m_pProgsUniDiffPage, m_pProgsUniDiffPage->GetIconID());\r
+ SetPageIcon(m_pProgsDiffPage, m_pProgsDiffPage->GetIconID());\r
+ SetPageIcon(m_pProgsMergePage, m_pProgsMergePage->GetIconID());\r
+ SetPageIcon(m_pProgsUniDiffPage, m_pProgsUniDiffPage->GetIconID());\r
SetPageIcon(m_pLookAndFeelPage, m_pLookAndFeelPage->GetIconID());\r
SetPageIcon(m_pDialogsPage, m_pDialogsPage->GetIconID());\r
SetPageIcon(m_pRevisionGraphPage, m_pRevisionGraphPage->GetIconID());\r
AddPage(m_pOverlayPage);\r
AddPage(m_pOverlaysPage);\r
AddPage(m_pProxyPage);\r
-// AddPage(m_pProgsDiffPage);\r
-// AddPage(m_pProgsMergePage);\r
-// AddPage(m_pProgsUniDiffPage);\r
+ AddPage(m_pProgsDiffPage);\r
+ AddPage(m_pProgsMergePage);\r
+ AddPage(m_pProgsUniDiffPage);\r
AddPage(m_pLookAndFeelPage);\r
AddPage(m_pDialogsPage);\r
AddPage(m_pMiscPage);\r
delete m_pOverlayPage;\r
delete m_pOverlaysPage;\r
delete m_pProxyPage;\r
-//// delete m_pProgsDiffPage;\r
-// delete m_pProgsMergePage;\r
-//// delete m_pProgsUniDiffPage;\r
+ delete m_pProgsDiffPage;\r
+ delete m_pProgsMergePage;\r
+ delete m_pProgsUniDiffPage;\r
delete m_pLookAndFeelPage;\r
delete m_pDialogsPage;\r
delete m_pRevisionGraphPage;\r
restart |= m_pOverlayPage->GetRestart();\r
restart |= m_pOverlaysPage->GetRestart();\r
restart |= m_pProxyPage->GetRestart();\r
-// restart |= m_pProgsDiffPage->GetRestart();\r
-// restart |= m_pProgsMergePage->GetRestart();\r
-//// restart |= m_pProgsUniDiffPage->GetRestart();\r
+ restart |= m_pProgsDiffPage->GetRestart();\r
+ restart |= m_pProgsMergePage->GetRestart();\r
+ restart |= m_pProgsUniDiffPage->GetRestart();\r
restart |= m_pLookAndFeelPage->GetRestart();\r
restart |= m_pDialogsPage->GetRestart();\r
restart |= m_pRevisionGraphPage->GetRestart();\r
CSetProxyPage * m_pProxyPage;\r
CSetOverlayPage * m_pOverlayPage;\r
CSetOverlayIcons * m_pOverlaysPage;\r
-// CSettingsProgsDiff* m_pProgsDiffPage;\r
-// CSettingsProgsMerge * m_pProgsMergePage;\r
-// CSettingsProgsUniDiff * m_pProgsUniDiffPage;\r
+ CSettingsProgsDiff* m_pProgsDiffPage;\r
+ CSettingsProgsMerge * m_pProgsMergePage;\r
+ CSettingsProgsUniDiff * m_pProgsUniDiffPage;\r
CSetLookAndFeelPage * m_pLookAndFeelPage;\r
CSetDialogs * m_pDialogsPage;\r
CSettingsRevisionGraph* m_pRevisionGraphPage;\r