Pick Ref: Browse Ref buttons added to dialogs derived from ChooseVersion.

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index baecbcd..b42ebf3 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/ChooseVersion.h b/src/TortoiseProc/ChooseVersion.h
index cb15d1e..0ab0fd8 100644 (file)
--- a/src/TortoiseProc/ChooseVersion.h
+++ b/src/TortoiseProc/ChooseVersion.h
@@ -1,6 +1,7 @@
 #pragma once\r
 #include "afxwin.h"\r
 #include "LogDlg.h"\r
+#include "BrowseRefsDlg.h"\r
 \r
 class CChooseVersion\r
 {\r
@@ -79,6 +80,38 @@ protected:
                OnBnClickedChooseRadio();\r
        }\r
 \r
+       void OnBnClickedButtonBrowseRef()\r
+       {\r
+               CString origRef;\r
+               UpdateRevsionName();\r
+               CString resultRef = CBrowseRefsDlg::PickRef(false, m_VersionName, gPickRef_All);\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
+               {\r
+                       resultRef = resultRef.Mid(6);\r
+                       SetDefaultChoose(IDC_RADIO_BRANCH);\r
+                       m_ChooseVersioinBranch.SetCurSel(\r
+                               m_ChooseVersioinBranch.FindStringExact(-1, resultRef));\r
+               }\r
+               else if(wcsncmp(resultRef,L"remotes/",8)==0)\r
+               {\r
+                       SetDefaultChoose(IDC_RADIO_BRANCH);\r
+                       m_ChooseVersioinBranch.SetCurSel(\r
+                               m_ChooseVersioinBranch.FindStringExact(-1, resultRef));\r
+               }\r
+               else if(wcsncmp(resultRef,L"tags/",5)==0)\r
+               {\r
+                       resultRef = resultRef.Mid(5);\r
+                       SetDefaultChoose(IDC_RADIO_TAGS);\r
+                       m_ChooseVersioinTags.SetCurSel(\r
+                               m_ChooseVersioinTags.FindStringExact(-1, resultRef));\r
+               }\r
+       }\r
+\r
+\r
        void Init()\r
        {       \r
                m_ChooseVersioinBranch.SetMaxHistoryItems(0x7FFFFFFF);\r
@@ -116,7 +149,8 @@ public:
        ON_BN_CLICKED(IDC_RADIO_BRANCH,         OnBnClickedChooseRadioHost)\\r
        ON_BN_CLICKED(IDC_RADIO_TAGS,           OnBnClickedChooseRadioHost)\\r
        ON_BN_CLICKED(IDC_BUTTON_SHOW,          OnBnClickedShow)\\r
-       ON_BN_CLICKED(IDC_RADIO_VERSION,        OnBnClickedChooseRadioHost)\r
+       ON_BN_CLICKED(IDC_RADIO_VERSION,        OnBnClickedChooseRadioHost)\\r
+       ON_BN_CLICKED(IDC_BUTTON_BROWSE_REF,    OnBnClickedButtonBrowseRefHost)\r
 \r
 #define CHOOSE_VERSION_ADDANCHOR                                                               \\r
        {                                                                                                                       \\r
@@ -125,8 +159,10 @@ public:
                AddAnchor(IDC_COMBOBOXEX_VERSION, TOP_LEFT, TOP_RIGHT); \\r
                AddAnchor(IDC_GROUP_BASEON, TOP_LEFT, TOP_RIGHT);               \\r
                AddAnchor(IDC_BUTTON_SHOW,TOP_RIGHT);           \\r
+               AddAnchor(IDC_BUTTON_BROWSE_REF,TOP_RIGHT);             \\r
        }       \r
 \r
 #define CHOOSE_EVENT_RADIO() \\r
        afx_msg void OnBnClickedChooseRadioHost(){OnBnClickedChooseRadio();}\\r
-       afx_msg void OnBnClickedShow(){OnBnClickedChooseVersion();}\r
+       afx_msg void OnBnClickedShow(){OnBnClickedChooseVersion();}\\r
+       afx_msg void OnBnClickedButtonBrowseRefHost(){OnBnClickedButtonBrowseRef();}\r

diff --git a/src/TortoiseProc/CreateBranchTagDlg.cpp b/src/TortoiseProc/CreateBranchTagDlg.cpp
index ee62a9e..65988d3 100644 (file)
--- a/src/TortoiseProc/CreateBranchTagDlg.cpp
+++ b/src/TortoiseProc/CreateBranchTagDlg.cpp
@@ -43,6 +43,7 @@ BEGIN_MESSAGE_MAP(CCreateBranchTagDlg, CResizableStandAloneDialog)
        CHOOSE_VERSION_EVENT\r
        ON_BN_CLICKED(IDOK, &CCreateBranchTagDlg::OnBnClickedOk)\r
        ON_CBN_SELCHANGE(IDC_COMBOBOXEX_BRANCH, &CCreateBranchTagDlg::OnCbnSelchangeComboboxexBranch)\r
+//     ON_BN_CLICKED(IDC_BUTTON_BROWSE_REF, &CCreateBranchTagDlg::OnBnClickedButtonBrowseRef)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CCreateBranchTagDlg::OnInitDialog()\r

diff --git a/src/TortoiseProc/GitSwitchDlg.h b/src/TortoiseProc/GitSwitchDlg.h
index dab30bc..31ac461 100644 (file)
--- a/src/TortoiseProc/GitSwitchDlg.h
+++ b/src/TortoiseProc/GitSwitchDlg.h
@@ -30,6 +30,7 @@ protected:
 \r
        afx_msg void OnBnClickedChooseRadioHost();\r
        afx_msg void OnBnClickedShow();\r
+       afx_msg void OnBnClickedButtonBrowseRefHost(){OnBnClickedButtonBrowseRef();}\r
 \r
        DECLARE_MESSAGE_MAP()\r
 public:\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index bf74599..448e3fa 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ