From 1b2e57ba80c8b1815b81f9f548b20132ead6e96c Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 19 Jul 2009 15:09:07 +0800
Subject: [PATCH] Record Push and Pull button at sync dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc | Bin 444988 -> 444988 bytes
 src/TortoiseProc/SyncDlg.cpp     |  30 ++++++++++++++++++++++++++++++
 src/TortoiseProc/SyncDlg.h       |  12 ++++++++----
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index ac4914131c7f939a0ac4b8bfaf0f281d51b6f3e4..0ed1f0e01314a051f097ca678e8a9f2742454d4f 100644
GIT binary patch
delta 129
zcmdlpMS9N^>4p}@7N#xC+j<$zCnru4oz$x|y`Y?#W%{RHW(|Hz1_K5i1|tST22&ty
zKKWyo`SgT7W;<pJ27~FVdzqc5*A+5zO@G(NY{G29U<ekP{9u#R^rn91tm&J2nWd%+
ccrYqWZ`jWy(e5yT8Hibcn033u1hzkx0PQa;wg3PC

delta 118
zcmdlpMS9N^>4p}@7N#xC+j^(3>0`E-UQo`=GW}C8vj(R*gCT<sgAs$_<c%rPlX{h=
zC-gDfF`F=$P7jP^Rs;#u6*6;8f7i!s!fe1`1{JlL-qg>WHF;Bt&Gd%-OcL!56PSUR
O1&CR<J4|5vV+jCn{V2@<

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index f0a9700..8a52e21 100644
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -69,11 +69,14 @@ END_MESSAGE_MAP()
 void CSyncDlg::OnBnClickedButtonPull()
 {
 	// TODO: Add your control notification handler code here
+	this->m_regPullButton =this->m_ctrlPull.GetCurrentEntry();
 }
 
 void CSyncDlg::OnBnClickedButtonPush()
 {
 	// TODO: Add your control notification handler code here
+	this->m_regPushButton=this->m_ctrlPush.GetCurrentEntry();
+
 }
 
 void CSyncDlg::OnBnClickedButtonApply()
@@ -109,6 +112,33 @@ BOOL CSyncDlg::OnInitDialog()
 	this->AddOthersToAnchor();
 	// TODO:  Add extra initialization here
 
+	this->m_ctrlPush.AddEntry(CString(_T("Push")));
+	this->m_ctrlPush.AddEntry(CString(_T("Push tags")));
+	this->m_ctrlPush.AddEntry(CString(_T("Push All")));
+
+	this->m_ctrlPull.AddEntry(CString(_T("&Pull")));
+	this->m_ctrlPull.AddEntry(CString(_T("&Fetch")));
+	this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Rebase")));
+
+	CString WorkingDir=g_Git.m_CurrentDir;
+	WorkingDir.Replace(_T(':'),_T('_'));
+
+	CString regkey ;
+	regkey.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"),WorkingDir);
+
+	this->m_regPullButton = CRegDWORD(regkey+_T("\\Pull"),0);
+	this->m_regPushButton = CRegDWORD(regkey+_T("\\Push"),0);
+
+	this->m_ctrlPull.SetCurrentEntry(this->m_regPullButton);
+	this->m_ctrlPush.SetCurrentEntry(this->m_regPushButton);
+
+	CString str;
+	this->GetWindowText(str);
+	str += _T(" - ") + g_Git.m_CurrentDir;
+	this->SetWindowText(str);
+
+	EnableSaveRestore(_T("SyncDlg"));
+
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// EXCEPTION: OCX Property Pages should return FALSE
 }
diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index 144b87c..bf3c94b 100644
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -23,7 +23,8 @@
 
 #include "StandAloneDlg.h"
 #include "HistoryCombo.h"
-
+#include "MenuButton.h"
+#include "registry.h"
 // CSyncDlg dialog
 
 class CSyncDlg : public CResizableStandAloneDialog
@@ -40,6 +41,9 @@ public:
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 
+	CRegDWORD m_regPullButton;
+	CRegDWORD m_regPushButton;
+
 	DECLARE_MESSAGE_MAP()
 public:
 	BOOL m_bAutoLoadPuttyKey;
@@ -47,9 +51,9 @@ public:
 	CComboBoxEx m_ctrlRemoteBranch;
 	CComboBoxEx m_ctrlURL;
 	CButton m_ctrlDumyButton;
-	CButton m_ctrlPull;
-	CButton m_ctrlPush;
-	CStatic m_ctrlStatus;
+	CMenuButton m_ctrlPull;
+	CMenuButton m_ctrlPush;
+	CMenuButton m_ctrlStatus;
 	afx_msg void OnBnClickedButtonPull();
 	afx_msg void OnBnClickedButtonPush();
 	afx_msg void OnBnClickedButtonApply();
-- 
2.11.0