OSDN Git Service

Fixed issue #113: (10) Push and push times out on WebDAV passwords
authorFrank Li <lznuaa@gmail.com>
Sat, 11 Jul 2009 14:59:15 +0000 (22:59 +0800)
committerFrank Li <lznuaa@gmail.com>
Sat, 11 Jul 2009 14:59:15 +0000 (22:59 +0800)
10. Push: When you press "Manage" under Destinations, the Settings dialog opening should have "Git -> Remote" selected by default.

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/Commands/SettingsCommand.cpp
src/TortoiseProc/Settings/Settings.cpp
src/TortoiseProc/Settings/Settings.h

index 9f2b6c4..a327d77 100644 (file)
@@ -654,7 +654,7 @@ bool CAppUtils::LaunchRemoteSetting()
     proc += _T("TortoiseProc.exe /command:settings");\r
     proc += _T(" /path:\"");\r
     proc += g_Git.m_CurrentDir;\r
     proc += _T("TortoiseProc.exe /command:settings");\r
     proc += _T(" /path:\"");\r
     proc += g_Git.m_CurrentDir;\r
-    proc += _T("\" /page:remote");\r
+    proc += _T("\" /page:gitremote");\r
     return LaunchApplication(proc, IDS_ERR_EXTDIFFSTART, false);\r
 }\r
 /**\r
     return LaunchApplication(proc, IDS_ERR_EXTDIFFSTART, false);\r
 }\r
 /**\r
index 8458a51..3b0a85b 100644 (file)
 \r
 bool SettingsCommand::Execute()\r
 {\r
 \r
 bool SettingsCommand::Execute()\r
 {\r
+\r
+       CString defaultpage = parser.GetVal(_T("page"));\r
+       \r
        CSettings dlg(IDS_PROC_SETTINGS_TITLE,&orgCmdLinePath);\r
        dlg.SetTreeViewMode(TRUE, TRUE, TRUE);\r
        dlg.SetTreeWidth(220);\r
        CSettings dlg(IDS_PROC_SETTINGS_TITLE,&orgCmdLinePath);\r
        dlg.SetTreeViewMode(TRUE, TRUE, TRUE);\r
        dlg.SetTreeWidth(220);\r
-       \r
+       dlg.m_DefaultPage = defaultpage;\r
+\r
        dlg.DoModal();\r
        dlg.HandleRestart();\r
        return true;\r
        dlg.DoModal();\r
        dlg.HandleRestart();\r
        return true;\r
index 40730ab..8ec5c95 100644 (file)
@@ -274,6 +274,74 @@ BOOL CSettings::OnInitDialog()
        SetIcon(m_hIcon, FALSE);                // Set small icon\r
 \r
        CenterWindow(CWnd::FromHandle(hWndExplorer));\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
        return bResult;\r
 }\r
 \r
index c9bc6ae..5f723ea 100644 (file)
@@ -98,6 +98,7 @@ public:
        CSettings(UINT nIDCaption,CTGitPath *CmdPath=NULL, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);\r
        virtual ~CSettings();\r
        CTGitPath m_CmdPath;\r
        CSettings(UINT nIDCaption,CTGitPath *CmdPath=NULL, CWnd* pParentWnd = NULL, UINT iSelectPage = 0);\r
        virtual ~CSettings();\r
        CTGitPath m_CmdPath;\r
+       CString m_DefaultPage;\r
        /**\r
         * Calls the SaveData()-methods of each of the settings pages.\r
         */\r
        /**\r
         * Calls the SaveData()-methods of each of the settings pages.\r
         */\r