Submodule Add Dialog support browse

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

diff --git a/src/TortoiseProc/PushDlg.cpp b/src/TortoiseProc/PushDlg.cpp
index 6330e55..d72ff80 100644 (file)
--- a/src/TortoiseProc/PushDlg.cpp
+++ b/src/TortoiseProc/PushDlg.cpp
@@ -44,57 +44,69 @@ END_MESSAGE_MAP()
 BOOL CPushDlg::OnInitDialog()\r
 {\r
        CResizableStandAloneDialog::OnInitDialog();\r
+       \r
+       AddAnchor(IDOK,BOTTOM_RIGHT);\r
+       AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDC_BRANCH_GROUP, TOP_LEFT,TOP_RIGHT);\r
+       AddAnchor(IDC_STATIC_REMOTE, TOP_RIGHT);\r
+       AddAnchor(IDC_STATIC_SOURCE, TOP_LEFT);\r
+\r
        AddAnchor(IDC_BRANCH_REMOTE, TOP_RIGHT);\r
        AddAnchor(IDC_BRANCH_SOURCE, TOP_LEFT);\r
 \r
+       AddAnchor(IDC_URL_GROUP, TOP_LEFT,TOP_RIGHT);\r
+       AddAnchor(IDC_RD_REMOTE, TOP_LEFT);\r
+       AddAnchor(IDC_RD_URL, TOP_LEFT);\r
+\r
        AddAnchor(IDC_REMOTE, TOP_LEFT, TOP_RIGHT);\r
+       \r
        AddAnchor(IDC_URL, TOP_LEFT,TOP_RIGHT);\r
 \r
-       AddAnchor(IDC_URL_GROUP, TOP_LEFT,TOP_RIGHT);\r
        AddAnchor(IDC_OPTION_GROUP, TOP_LEFT,TOP_RIGHT);\r
-       AddAnchor(IDC_BRANCH_GROUP, TOP_LEFT,TOP_RIGHT);\r
+       \r
+       AddAnchor(IDC_FORCE, TOP_LEFT);\r
+       AddAnchor(IDC_PACK, TOP_LEFT);\r
+       AddAnchor(IDC_TAGS, TOP_LEFT);\r
 \r
-       AddAnchor(IDC_STATIC_REMOTE, TOP_RIGHT);\r
 \r
-       AddAnchor(IDOK,BOTTOM_RIGHT);\r
-       AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddOthersToAnchor();\r
+\r
+\r
+       EnableSaveRestore(_T("PushDlg"));\r
 \r
        m_RemoteURL.SetURLHistory(TRUE);\r
-       m_RemoteURL.LoadHistory(_T("Software\\TortoiseGit\\History\\PushURLS"), _T("url"));\r
+       \r
+       CString WorkingDir=g_Git.m_CurrentDir;\r
+       WorkingDir.Replace(_T(':'),_T('_'));\r
+       m_RemoteURL.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\PushURLS\\"))+WorkingDir, _T("url"));\r
        m_RemoteURL.SetCurSel(0);\r
 \r
-\r
        m_RemoteURL.EnableWindow(FALSE);\r
        CheckRadioButton(IDC_RD_REMOTE,IDC_RD_URL,IDC_RD_REMOTE);\r
 \r
-       CStringList list;\r
+       STRING_VECTOR list;\r
 \r
        if(!g_Git.GetRemoteList(list))\r
        {       \r
-               POSITION pos;\r
-               pos=list.GetHeadPosition();\r
-               while(pos)\r
-               {\r
-                       m_Remote.AddString(list.GetNext(pos));\r
-               }\r
+               for(unsigned int i=0;i<list.size();i++)\r
+                       m_Remote.AddString(list[i]);\r
        }\r
 \r
        int current=0;\r
+       list.clear();\r
        if(!g_Git.GetBranchList(list,&current))\r
        {\r
-               POSITION pos;\r
-               pos=list.GetHeadPosition();\r
-               while(pos)\r
-               {\r
-                       m_BranchSource.AddString(list.GetNext(pos));\r
-               }\r
+               for(unsigned int i=0;i<list.size();i++)\r
+                       m_BranchSource.AddString(list[i]);\r
        }\r
        m_BranchSource.SetCurSel(current);\r
        \r
-       m_BranchRemote.LoadHistory(_T("Software\\TortoiseGit\\History\\RemoteBranch"), _T("branch"));\r
+       m_BranchRemote.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\RemoteBranch\\"))+WorkingDir, _T("branch"));\r
        m_BranchRemote.SetCurSel(0);\r
 \r
        //m_BranchRemote.SetWindowTextW(m_BranchSource.GetString());\r
+\r
+       \r
        return TRUE;\r
 }\r
 \r