OSDN Git Service

Add external diff merge and udiff Setting at setting Page
authorFrank Li <lznuaa@gmail.com>
Sun, 8 Mar 2009 09:22:20 +0000 (17:22 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 9 Mar 2009 13:23:47 +0000 (21:23 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/GitStatusListCtrl.cpp
src/TortoiseProc/Settings/Settings.cpp
src/TortoiseProc/Settings/Settings.h
src/TortoiseProc/TortoiseProc.vcproj

index 046d654..50dc24f 100644 (file)
@@ -2302,6 +2302,11 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                        popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);\r
                                        popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);\r
                                }\r
+\r
+                               if (m_dwContextMenus & this->GetContextMenuBit(IDSVNLC_COMPAREWC))\r
+                               {\r
+                                       popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);\r
+                               }\r
                                //Select one items\r
                                if (GetSelectedCount() == 1)\r
                                {\r
index 8794e03..bcf9dbf 100644 (file)
@@ -43,9 +43,9 @@ void CSettings::AddPropPages()
        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
@@ -64,9 +64,9 @@ void CSettings::AddPropPages()
        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
@@ -86,9 +86,9 @@ void CSettings::AddPropPages()
        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
@@ -110,9 +110,9 @@ void CSettings::RemovePropPages()
        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
@@ -135,9 +135,9 @@ void CSettings::HandleRestart()
        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
index 123efc2..36b5a1e 100644 (file)
@@ -70,9 +70,9 @@ private:
        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
index 634b64b..5453b20 100644 (file)
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath=".\Settings\SettingsProgsDiff.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsProgsMerge.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsProgsUniDiff.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Settings\SetProxyPage.cpp"\r
                                        >\r
                                </File>\r