From: Johan 't Hart Date: Fri, 5 Jun 2009 23:12:58 +0000 (+0200) Subject: Pick Ref: Browse Ref buttons added to dialogs derived from ChooseVersion. X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=100f0470e69c28fe4172d7e2cd04cd719e7d2a1b 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 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 --- a/src/TortoiseProc/ChooseVersion.h +++ b/src/TortoiseProc/ChooseVersion.h @@ -1,6 +1,7 @@ #pragma once #include "afxwin.h" #include "LogDlg.h" +#include "BrowseRefsDlg.h" class CChooseVersion { @@ -79,6 +80,38 @@ protected: OnBnClickedChooseRadio(); } + void OnBnClickedButtonBrowseRef() + { + CString origRef; + UpdateRevsionName(); + CString resultRef = CBrowseRefsDlg::PickRef(false, m_VersionName, gPickRef_All); + if(resultRef.IsEmpty()) + return; + if(wcsncmp(resultRef,L"refs/",5)==0) + resultRef = resultRef.Mid(5); + if(wcsncmp(resultRef,L"heads/",6)==0) + { + resultRef = resultRef.Mid(6); + SetDefaultChoose(IDC_RADIO_BRANCH); + m_ChooseVersioinBranch.SetCurSel( + m_ChooseVersioinBranch.FindStringExact(-1, resultRef)); + } + else if(wcsncmp(resultRef,L"remotes/",8)==0) + { + SetDefaultChoose(IDC_RADIO_BRANCH); + m_ChooseVersioinBranch.SetCurSel( + m_ChooseVersioinBranch.FindStringExact(-1, resultRef)); + } + else if(wcsncmp(resultRef,L"tags/",5)==0) + { + resultRef = resultRef.Mid(5); + SetDefaultChoose(IDC_RADIO_TAGS); + m_ChooseVersioinTags.SetCurSel( + m_ChooseVersioinTags.FindStringExact(-1, resultRef)); + } + } + + void Init() { m_ChooseVersioinBranch.SetMaxHistoryItems(0x7FFFFFFF); @@ -116,7 +149,8 @@ public: ON_BN_CLICKED(IDC_RADIO_BRANCH, OnBnClickedChooseRadioHost)\ ON_BN_CLICKED(IDC_RADIO_TAGS, OnBnClickedChooseRadioHost)\ ON_BN_CLICKED(IDC_BUTTON_SHOW, OnBnClickedShow)\ - ON_BN_CLICKED(IDC_RADIO_VERSION, OnBnClickedChooseRadioHost) + ON_BN_CLICKED(IDC_RADIO_VERSION, OnBnClickedChooseRadioHost)\ + ON_BN_CLICKED(IDC_BUTTON_BROWSE_REF, OnBnClickedButtonBrowseRefHost) #define CHOOSE_VERSION_ADDANCHOR \ { \ @@ -125,8 +159,10 @@ public: AddAnchor(IDC_COMBOBOXEX_VERSION, TOP_LEFT, TOP_RIGHT); \ AddAnchor(IDC_GROUP_BASEON, TOP_LEFT, TOP_RIGHT); \ AddAnchor(IDC_BUTTON_SHOW,TOP_RIGHT); \ + AddAnchor(IDC_BUTTON_BROWSE_REF,TOP_RIGHT); \ } #define CHOOSE_EVENT_RADIO() \ afx_msg void OnBnClickedChooseRadioHost(){OnBnClickedChooseRadio();}\ - afx_msg void OnBnClickedShow(){OnBnClickedChooseVersion();} + afx_msg void OnBnClickedShow(){OnBnClickedChooseVersion();}\ + afx_msg void OnBnClickedButtonBrowseRefHost(){OnBnClickedButtonBrowseRef();} diff --git a/src/TortoiseProc/CreateBranchTagDlg.cpp b/src/TortoiseProc/CreateBranchTagDlg.cpp index ee62a9e..65988d3 100644 --- a/src/TortoiseProc/CreateBranchTagDlg.cpp +++ b/src/TortoiseProc/CreateBranchTagDlg.cpp @@ -43,6 +43,7 @@ BEGIN_MESSAGE_MAP(CCreateBranchTagDlg, CResizableStandAloneDialog) CHOOSE_VERSION_EVENT ON_BN_CLICKED(IDOK, &CCreateBranchTagDlg::OnBnClickedOk) ON_CBN_SELCHANGE(IDC_COMBOBOXEX_BRANCH, &CCreateBranchTagDlg::OnCbnSelchangeComboboxexBranch) +// ON_BN_CLICKED(IDC_BUTTON_BROWSE_REF, &CCreateBranchTagDlg::OnBnClickedButtonBrowseRef) END_MESSAGE_MAP() BOOL CCreateBranchTagDlg::OnInitDialog() diff --git a/src/TortoiseProc/GitSwitchDlg.h b/src/TortoiseProc/GitSwitchDlg.h index dab30bc..31ac461 100644 --- a/src/TortoiseProc/GitSwitchDlg.h +++ b/src/TortoiseProc/GitSwitchDlg.h @@ -30,6 +30,7 @@ protected: afx_msg void OnBnClickedChooseRadioHost(); afx_msg void OnBnClickedShow(); + afx_msg void OnBnClickedButtonBrowseRefHost(){OnBnClickedButtonBrowseRef();} DECLARE_MESSAGE_MAP() public: diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index bf74599..448e3fa 100644 Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ