merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Settings / Settings.cpp

diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 8ec5c95..bd99c7f 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -50,6 +50,9 @@ void CSettings::AddPropPages()
        m_pProgsMergePage = new CSettingsProgsMerge();\r
        m_pProgsUniDiffPage = new CSettingsProgsUniDiff();\r
        m_pLookAndFeelPage = new CSetLookAndFeelPage();\r
+       \r
+       m_pExtMenu      = new CSetExtMenu();\r
+\r
        m_pDialogsPage = new CSetDialogs();\r
        m_pMiscPage = new CSetMisc();\r
        m_pRevisionGraphPage = new CSettingsRevisionGraph();\r
@@ -67,6 +70,8 @@ void CSettings::AddPropPages()
        m_pBugtraqConfig = new CSettingsBugtraqConfig(m_CmdPath.GetWinPath());\r
 \r
 \r
+       SetPageIcon(m_pExtMenu,m_pExtMenu->GetIconID());\r
+\r
        SetPageIcon(m_pMainPage, m_pMainPage->GetIconID());\r
        SetPageIcon(m_pOverlayPage, m_pOverlayPage->GetIconID());\r
        SetPageIcon(m_pOverlaysPage, m_pOverlaysPage->GetIconID());\r
@@ -101,6 +106,7 @@ void CSettings::AddPropPages()
        AddPage(m_pProgsMergePage);\r
        AddPage(m_pProgsUniDiffPage);\r
        AddPage(m_pLookAndFeelPage);\r
+       AddPage(m_pExtMenu);\r
        AddPage(m_pDialogsPage);\r
        AddPage(m_pMiscPage);\r
        AddPage(m_pRevisionGraphPage);\r
@@ -152,6 +158,7 @@ void CSettings::RemovePropPages()
        delete m_pGitConfig;\r
        delete m_pGitRemote;\r
        delete m_pBugtraqConfig;\r
+       delete m_pExtMenu;\r
 \r
 }\r
 \r
@@ -182,6 +189,7 @@ void CSettings::HandleRestart()
        restart |= m_pGitConfig->GetRestart();\r
        restart |= m_pGitRemote->GetRestart();\r
        restart |= m_pBugTraqPage->GetRestart();\r
+       restart |= m_pExtMenu->GetRestart();\r
 \r
        if (restart & ISettingsPropPage::Restart_System)\r
        {\r