BrowseRefs: Implemented an example of how to use the BrowseRefs dialog as ref-picker.

For this, see the additional '...' button at the top-right of the rebase dialog.

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 8b202fb..522f9bb 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index 51125f3..e1b7a3a 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -7,6 +7,7 @@
 #include "AppUtils.h"\r
 #include "MessageBox.h"\r
 #include "UnicodeUtils.h"\r
+#include "BrowseRefsDlg.h"\r
 // CRebaseDlg dialog\r
 \r
 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)\r
@@ -54,6 +55,7 @@ BEGIN_MESSAGE_MAP(CRebaseDlg, CResizableStandAloneDialog)
        ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH,   &CRebaseDlg::OnCbnSelchangeBranch)\r
        ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM, &CRebaseDlg::OnCbnSelchangeUpstream)\r
        ON_MESSAGE(MSG_REBASE_UPDATE_UI, OnRebaseUpdateUI)\r
+       ON_BN_CLICKED(IDC_BUTTON_BROWSE, &CRebaseDlg::OnBnClickedButtonBrowse)\r
 END_MESSAGE_MAP()\r
 \r
 void CRebaseDlg::AddRebaseAnchor()\r
@@ -1206,3 +1208,18 @@ void CRebaseDlg::OnBnClickedAbort()
        }\r
        __super::OnCancel();\r
 }\r
+\r
+void CRebaseDlg::OnBnClickedButtonBrowse()\r
+{\r
+       CString origRef;\r
+       m_UpstreamCtrl.GetLBText(m_UpstreamCtrl.GetCurSel(), origRef);\r
+       CString resultRef = CBrowseRefsDlg::PickRef(false,origRef);\r
+       if(resultRef.IsEmpty())\r
+               return;\r
+       if(wcsncmp(resultRef,L"refs/",5)==0)\r
+               resultRef = resultRef.Mid(5);\r
+       if(wcsncmp(resultRef,L"heads/",6)==0)\r
+               resultRef = resultRef.Mid(6);\r
+       m_UpstreamCtrl.SetCurSel(m_UpstreamCtrl.FindStringExact(0,resultRef));\r
+\r
+}\r

diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h
index 581d3ef..eb2ed75 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.h
+++ b/src/TortoiseProc/RebaseDlg.h
@@ -131,4 +131,5 @@ public:
        int  m_CurrentRebaseIndex;\r
        int  StateAction();\r
        int  GoNext();\r
+       afx_msg void OnBnClickedButtonBrowse();\r
 };\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 115e1a6..d0f02e9 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ