OSDN Git Service

Rebase: Add Upstream and Branch ComboxBox
authorFrank Li <lznuaa@gmail.com>
Fri, 13 Feb 2009 09:39:34 +0000 (17:39 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 13 Feb 2009 09:39:34 +0000 (17:39 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/RebaseDlg.cpp
src/TortoiseProc/RebaseDlg.h
src/TortoiseProc/resource.h

index 9286524..f4231ac 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index e3a658d..f9848b8 100644 (file)
@@ -33,6 +33,9 @@ void CRebaseDlg::DoDataExchange(CDataExchange* pDX)
     DDX_Check(pDX, IDC_EDIT_ALL, m_bEditAll);\r
        DDX_Control(pDX, IDC_REBASE_SPLIT, m_wndSplitter);\r
        DDX_Control(pDX,IDC_COMMIT_LIST,m_CommitList);\r
+       DDX_Control(pDX,IDC_REBASE_COMBOXEX_BRANCH, this->m_BranchCtrl);\r
+       DDX_Control(pDX,IDC_REBASE_COMBOXEX_UPSTREAM,   this->m_UpstreamCtrl);\r
+\r
 }\r
 \r
 \r
@@ -55,7 +58,11 @@ void CRebaseDlg::AddRebaseAnchor()
        AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT);\r
        AddAnchor(IDC_PICK_ALL,TOP_LEFT);\r
        AddAnchor(IDC_SQUASH_ALL,TOP_LEFT);\r
-       AddAnchor(IDC_EDIT_ALL,TOP_LEFT);\r
+       AddAnchor(IDC_EDIT_ALL,TOP_LEFT);       \r
+       AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM,TOP_LEFT);\r
+       AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);\r
+       AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);\r
+       AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);\r
        \r
 }\r
 \r
index e3a7d60..77943a5 100644 (file)
@@ -5,6 +5,7 @@
 #include "GitStatusListCtrl.h"\r
 #include "SciEdit.h"\r
 #include "SplitterControl.h"\r
+#include "HistoryCombo.h"\r
 // CRebaseDlg dialog\r
 #define IDC_REBASE_TAB 0x1000000\r
 \r
@@ -53,4 +54,7 @@ public:
        CGitStatusListCtrl m_FileListCtrl;\r
        CSciEdit                   m_LogMessageCtrl;\r
        CListCtrl                  m_CommitList;\r
+\r
+       CHistoryCombo      m_BranchCtrl;\r
+       CHistoryCombo      m_UpstreamCtrl;\r
 };\r
index 36fdeab..571c2e3 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ