Add auto load putty key option at clone, pull and push dialog.

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

diff --git a/src/TortoiseProc/PullFetchDlg.cpp b/src/TortoiseProc/PullFetchDlg.cpp
index 38f993b..ef8a0f0 100644 (file)
--- a/src/TortoiseProc/PullFetchDlg.cpp
+++ b/src/TortoiseProc/PullFetchDlg.cpp
@@ -5,6 +5,7 @@
 #include "TortoiseProc.h"\r
 #include "PullFetchDlg.h"\r
 #include "Git.h"\r
+#include "AppUtils.h"\r
 \r
 // CPullFetchDlg dialog\r
 \r
@@ -14,6 +15,8 @@ CPullFetchDlg::CPullFetchDlg(CWnd* pParent /*=NULL*/)
        : CResizableStandAloneDialog(CPullFetchDlg::IDD, pParent)\r
 {\r
        m_IsPull=TRUE;\r
+    m_bAutoLoad = CAppUtils::IsSSHPutty();\r
+    m_bAutoLoadEnable=true;\r
 }\r
 \r
 CPullFetchDlg::~CPullFetchDlg()\r
@@ -26,6 +29,8 @@ void CPullFetchDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_REMOTE_COMBO, this->m_Remote);\r
        DDX_Control(pDX, IDC_OTHER, this->m_Other);\r
        DDX_Control(pDX, IDC_REMOTE_BRANCH, this->m_RemoteBranch);\r
+    DDX_Control(pDX,IDC_REMOTE_MANAGE, this->m_RemoteManage);\r
+    DDX_Check(pDX,IDC_PUTTYKEY_AUTOLOAD,m_bAutoLoad);\r
 \r
 }\r
 \r
@@ -34,6 +39,7 @@ BEGIN_MESSAGE_MAP(CPullFetchDlg,CResizableStandAloneDialog )
        ON_BN_CLICKED(IDC_REMOTE_RD, &CPullFetchDlg::OnBnClickedRd)\r
        ON_BN_CLICKED(IDC_OTHER_RD, &CPullFetchDlg::OnBnClickedRd)\r
        ON_BN_CLICKED(IDOK, &CPullFetchDlg::OnBnClickedOk)\r
+    ON_STN_CLICKED(IDC_REMOTE_MANAGE, &CPullFetchDlg::OnStnClickedRemoteManage)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CPullFetchDlg::OnInitDialog()\r
@@ -46,8 +52,13 @@ BOOL CPullFetchDlg::OnInitDialog()
        \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+    AddAnchor(IDC_GROUPT_REMOTE,TOP_LEFT,BOTTOM_RIGHT);\r
+    AddAnchor(IDC_PUTTYKEY_AUTOLOAD,BOTTOM_LEFT);\r
+    AddAnchor(IDC_REMOTE_MANAGE,BOTTOM_LEFT);\r
 \r
-       this->AddOthersToAnchor();\r
+    this->AddOthersToAnchor();\r
+\r
+    this->GetDlgItem(IDC_PUTTYKEY_AUTOLOAD)->EnableWindow(m_bAutoLoadEnable);\r
 \r
        CheckRadioButton(IDC_REMOTE_RD,IDC_OTHER_RD,IDC_REMOTE_RD);\r
        m_Remote.EnableWindow(TRUE);\r
@@ -74,6 +85,7 @@ BOOL CPullFetchDlg::OnInitDialog()
                        m_Remote.AddString(list[i]);\r
        }\r
        EnableSaveRestore(_T("PullFetchDlg"));\r
+    this->m_RemoteManage.SetURL(CString());\r
        return TRUE;\r
 }\r
 // CPullFetchDlg message handlers\r
@@ -119,3 +131,9 @@ void CPullFetchDlg::OnBnClickedOk()
        m_RemoteBranch.SaveHistory();\r
        this->OnOK();\r
 }\r
+\r
+void CPullFetchDlg::OnStnClickedRemoteManage()\r
+{\r
+    // TODO: Add your control notification handler code here\r
+    CAppUtils::LaunchRemoteSetting();\r
+}\r