#include "MessageBox.h"\r
#include "..\..\TGitCache\CacheInterface.h"\r
#include "CommonResource.h"\r
-\r
+#include "GitAdminDir.h"\r
\r
IMPLEMENT_DYNAMIC(CSettings, CTreePropSheet)\r
-CSettings::CSettings(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage)\r
+CSettings::CSettings(UINT nIDCaption,CTGitPath *cmdPath, CWnd* pParentWnd, UINT iSelectPage)\r
:CTreePropSheet(nIDCaption, pParentWnd, iSelectPage)\r
{\r
+ if(cmdPath)\r
+ this->m_CmdPath=*cmdPath;\r
+\r
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);\r
AddPropPages();\r
}\r
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
// m_pLogCachePage = new CSetLogCache();\r
// m_pLogCacheListPage = new CSettingsLogCaches();\r
m_pColorsPage = new CSettingsColors();\r
+ m_pColorsPage2 = new CSettingsColors2();\r
+ m_pColorsPage3 = new CSettingsColors3();\r
m_pSavedPage = new CSetSavedDataPage();\r
// m_pHooksPage = new CSetHooks();\r
m_pBugTraqPage = new CSetBugTraq();\r
m_pTBlamePage = new CSettingsTBlame();\r
+ m_pGitConfig = new CSettingGitConfig();\r
+ m_pGitRemote = new CSettingGitRemote(m_CmdPath.GetWinPath());\r
+ m_pBugtraqConfig = new CSettingsBugtraqConfig(m_CmdPath.GetWinPath());\r
+\r
\r
SetPageIcon(m_pMainPage, m_pMainPage->GetIconID());\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
//// SetPageIcon(m_pLogCachePage, m_pLogCachePage->GetIconID());\r
// SetPageIcon(m_pLogCacheListPage, m_pLogCacheListPage->GetIconID());\r
SetPageIcon(m_pColorsPage, m_pColorsPage->GetIconID());\r
+ SetPageIcon(m_pColorsPage2, m_pColorsPage2->GetIconID());\r
+ SetPageIcon(m_pColorsPage3, m_pColorsPage3->GetIconID());\r
+\r
SetPageIcon(m_pSavedPage, m_pSavedPage->GetIconID());\r
// SetPageIcon(m_pHooksPage, m_pHooksPage->GetIconID());\r
+\r
+ SetPageIcon(m_pGitConfig, m_pGitConfig->GetIconID());\r
+ SetPageIcon(m_pGitRemote, m_pGitRemote->GetIconID());\r
SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID());\r
+ SetPageIcon(m_pBugtraqConfig, m_pBugtraqConfig->GetIconID());\r
SetPageIcon(m_pTBlamePage, m_pTBlamePage->GetIconID());\r
\r
AddPage(m_pMainPage);\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
AddPage(m_pRevisionGraphPage);\r
AddPage(m_pColorsPage);\r
+ AddPage(m_pColorsPage2);\r
+ AddPage(m_pColorsPage3);\r
AddPage(m_pSavedPage);\r
-// AddPage(m_pLogCachePage);\r
+\r
+ AddPage(m_pGitConfig);\r
+\r
+ if( g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()) )\r
+ {\r
+ AddPage(m_pGitRemote);\r
+ }\r
+// AddPage(m_pGitRemotem_pLogCachePage);\r
// AddPage(m_pLogCacheListPage);\r
// AddPage(m_pHooksPage);\r
AddPage(m_pBugTraqPage);\r
+ if( g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()) )\r
+ {\r
+ AddPage(m_pBugtraqConfig);\r
+ }\r
AddPage(m_pTBlamePage);\r
}\r
\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
//// delete m_pLogCachePage;\r
//// delete m_pLogCacheListPage;\r
delete m_pColorsPage;\r
+ delete m_pColorsPage2;\r
+ delete m_pColorsPage3;\r
delete m_pSavedPage;\r
// delete m_pHooksPage;\r
delete m_pBugTraqPage;\r
delete m_pTBlamePage;\r
+\r
+ delete m_pGitConfig;\r
+ delete m_pGitRemote;\r
+ delete m_pBugtraqConfig;\r
+\r
}\r
\r
void CSettings::HandleRestart()\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
//// restart |= m_pLogCachePage->GetRestart();\r
// restart |= m_pLogCacheListPage->GetRestart();\r
restart |= m_pColorsPage->GetRestart();\r
+ restart |= m_pColorsPage2->GetRestart();\r
+ restart |= m_pColorsPage3->GetRestart();\r
restart |= m_pSavedPage->GetRestart();\r
//// restart |= m_pHooksPage->GetRestart();\r
restart |= m_pBugTraqPage->GetRestart();\r
restart |= m_pTBlamePage->GetRestart();\r
+\r
+ restart |= m_pGitConfig->GetRestart();\r
+ restart |= m_pGitRemote->GetRestart();\r
+ restart |= m_pBugTraqPage->GetRestart();\r
+\r
if (restart & ISettingsPropPage::Restart_System)\r
{\r
DWORD_PTR res = 0;\r
SetIcon(m_hIcon, FALSE); // Set small icon\r
\r
CenterWindow(CWnd::FromHandle(hWndExplorer));\r
+\r
+ if(this->m_DefaultPage == _T("gitremote"))\r
+ {\r
+ this->SetActivePage(this->m_pGitRemote);\r
+ }\r
+ if(this->m_DefaultPage == _T("main"))\r
+ {\r
+ this->SetActivePage(this->m_pMainPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("overlay"))\r
+ {\r
+ this->SetActivePage(this->m_pOverlayPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("overlays"))\r
+ {\r
+ this->SetActivePage(this->m_pOverlaysPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("proxy"))\r
+ {\r
+ this->SetActivePage(this->m_pProxyPage);\r
+ }\r
+ \r
+ if(this->m_DefaultPage == _T("diff"))\r
+ {\r
+ this->SetActivePage(this->m_pProgsDiffPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("merge"))\r
+ {\r
+ this->SetActivePage(this->m_pProgsMergePage);\r
+ }\r
+ if(this->m_DefaultPage == _T("unidiff"))\r
+ {\r
+ this->SetActivePage(this->m_pProgsUniDiffPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("look"))\r
+ {\r
+ this->SetActivePage(this->m_pLookAndFeelPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("dialog"))\r
+ {\r
+ this->SetActivePage(this->m_pDialogsPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("misc"))\r
+ {\r
+ this->SetActivePage(this->m_pMiscPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("graph"))\r
+ {\r
+ this->SetActivePage(this->m_pRevisionGraphPage);\r
+ }\r
+\r
+ if(this->m_DefaultPage == _T("color1"))\r
+ {\r
+ this->SetActivePage(this->m_pColorsPage);\r
+ }\r
+ if(this->m_DefaultPage == _T("color2"))\r
+ {\r
+ this->SetActivePage(this->m_pColorsPage2);\r
+ }\r
+ if(this->m_DefaultPage == _T("color3"))\r
+ {\r
+ this->SetActivePage(this->m_pColorsPage3);\r
+ }\r
+ if(this->m_DefaultPage == _T("save"))\r
+ {\r
+ this->SetActivePage(this->m_pSavedPage);\r
+ }\r
+\r
return bResult;\r
}\r
\r