From 9d59228347247a34dbaa35a96a8f070a893b3951 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 19 Jul 2009 14:03:25 +0800
Subject: [PATCH] Add SYNC  dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc          | Bin 440804 -> 444796 bytes
 src/TortoiseProc/Commands/Command.cpp     |   5 ++
 src/TortoiseProc/Commands/SyncCommand.cpp |  38 +++++++++++++
 src/TortoiseProc/Commands/SyncCommand.h   |  36 +++++++++++++
 src/TortoiseProc/SyncDlg.cpp              |  87 ++++++++++++++++++++++++++++++
 src/TortoiseProc/SyncDlg.h                |  57 ++++++++++++++++++++
 src/TortoiseProc/TortoiseProc.vcproj      |  44 ++++++++++-----
 src/TortoiseProc/resource.h               | Bin 163516 -> 165354 bytes
 8 files changed, 255 insertions(+), 12 deletions(-)
 create mode 100644 src/TortoiseProc/Commands/SyncCommand.cpp
 create mode 100644 src/TortoiseProc/Commands/SyncCommand.h
 create mode 100644 src/TortoiseProc/SyncDlg.cpp
 create mode 100644 src/TortoiseProc/SyncDlg.h

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 6aea821331a75e3179c46c651a0a823c0be15006..2ad730419c568a20969bc29c67cf18131a19bb6c 100644
GIT binary patch
delta 1057
zcmZuwT}V_x82x5u_o|!as_E*QwYwR{TCjJ2ObM&?ufi=?TN5eJ%D^ZswFr%5Bcq@n
z#1X!Sg0zTULJSfi41KHUp?~P12LpQvDyg^Vp>O7<_7Iml_cC+N`OchgX8x!9_i#aS
zkPY%jB5_f+y>QrDU@uh3hTiq~yG^9pgAf4|FFfYYv-d$CbionmfF3wWf5)I7GbE4V
zoSQY`&=VHGwi&i&#TM8ECWL4VV|TO2#tEPB;lf7l!^1Pojma;(8k2AMw#<k|DSQ~p
zXbj<4orvJ<SDuTpZ`>^>?iqOSB~QhVGc0Rm8F^9C0U9Id-OT@$enq91rL%)1Sx&hB
zi975~&<HWvU7NpD!PN?S@-HO>LHY|rK$>T^<4`j*aITm;WzTd>ThFnqhqM<}OF4^R
zgP%93O|DrPSgLM9nS4DGL8qU4P`S)dEESIxl(pLbl&53+P42|_M&T&j15xTj6m~)l
z0T&5DEgD8v&vP)I!i#XOjoGm01NY-9zevX)XT@syt}B)n(f%V4z}uhsBs$j#TZ*YH
z(#*?Ao-aKkJ{)fnMqwv))dQ7q22RtX`s#sN`u0F4c+fk~3yKqDq!Owip;G(nyHvXm
z(au#+CXMCz=?*KAqX&F=>a4Jd6L3P)GvbtNY>5~|GoR(ig>!xj)(agPmaSm>V3*cc
zR)ZA&!}fyV>pt9Z#mGh9Ja@aI5T_>wExM=`I{~rV&MI)ATR2vDX#EiFgwCnfb=80h
zbGJ4?P$;#u=}fa096u@y5rm*@9jWlv!*QbafsYWop&II;PGie;?3SMjOwRB;9DUEy
z3tGvq$|j+mFP=<NgDvv=FPA>|awwLL9h^DS6k1;{JkMDP?r#!#nI<VKKZ`k*%GbD+
zHo2GTE7u8X|1$5>H1{fAmK=SyHq&B;HQ%JhhNQPQf9k=QkzhD*Ll{%zgQEW$CU1#c
x>r!L%t+>R(c;TvW;p|-_hK)Bw9>zD=9GH9Gs6^sUTrSG8(QBV7$}(o}{{g(51xx?{

delta 35
qcmew}N&3lWsfHHD7N#xCA<f$_Ok}>&+kQZS1&CR<A5dW1vjPAtmJkR4

diff --git a/src/TortoiseProc/Commands/Command.cpp b/src/TortoiseProc/Commands/Command.cpp
index 22bf3a2..28f9abc 100644
--- a/src/TortoiseProc/Commands/Command.cpp
+++ b/src/TortoiseProc/Commands/Command.cpp
@@ -64,6 +64,7 @@
 #include "RefBrowseCommand.h"
 #include "SVNDCommitCommand.h"
 #include "SVNRebaseCommand.h"
+#include "SyncCommand.h"
 
 #if 0
 
@@ -182,6 +183,7 @@ typedef enum
 	cmdRefBrowse,
 	cmdSVNDCommit,
 	cmdSVNRebase,
+	cmdSync,
 	
 } TGitCommand;
 
@@ -259,6 +261,7 @@ static const struct CommandInfo
 	{	cmdRefBrowse,		_T("refbrowse")			},
 	{	cmdSVNDCommit,		_T("svndcommit")		},
 	{	cmdSVNRebase,		_T("svnrebase")			},
+	{	cmdSync,			_T("sync")				},
 };
 
 
@@ -374,6 +377,8 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 		return new SVNDCommitCommand;
 	case cmdSVNRebase:
 		return new SVNRebaseCommand;
+	case cmdSync:
+		return new SyncCommand;
 #if 0
 
 	
diff --git a/src/TortoiseProc/Commands/SyncCommand.cpp b/src/TortoiseProc/Commands/SyncCommand.cpp
new file mode 100644
index 0000000..7228977
--- /dev/null
+++ b/src/TortoiseProc/Commands/SyncCommand.cpp
@@ -0,0 +1,38 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2008-2009 - TortoiseGit
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+#include "stdafx.h"
+#include "TortoiseProc.h"
+#include "messagebox.h"
+#include "DirFileEnum.h"
+#include "SyncDlg.h"
+//#include "SVNConfig.h"
+#include "Registry.h"
+#include "CommonResource.h"
+#include "SyncCommand.h"
+
+bool SyncCommand::Execute()
+{
+	bool bRet = false;
+	CSyncDlg dlg;
+	if(dlg.DoModal() == IDOK)
+		bRet=true;
+
+	return bRet;
+}
+
diff --git a/src/TortoiseProc/Commands/SyncCommand.h b/src/TortoiseProc/Commands/SyncCommand.h
new file mode 100644
index 0000000..52147d4
--- /dev/null
+++ b/src/TortoiseProc/Commands/SyncCommand.h
@@ -0,0 +1,36 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2008-2009 - TortoiseGit
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#pragma once
+#include "Command.h"
+
+/**
+ * \ingroup TortoiseProc
+ * Shows the add dialog.
+ */
+class SyncCommand : public Command
+{
+public:
+	/**
+	 * Executes the command.
+	 */
+	virtual bool			Execute();
+};
+
+
diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
new file mode 100644
index 0000000..97ee96f
--- /dev/null
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -0,0 +1,87 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2008-2009 - TortoiseGit
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// SyncDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "TortoiseProc.h"
+#include "SyncDlg.h"
+
+
+// CSyncDlg dialog
+
+IMPLEMENT_DYNAMIC(CSyncDlg, CDialog)
+
+CSyncDlg::CSyncDlg(CWnd* pParent /*=NULL*/)
+	: CDialog(CSyncDlg::IDD, pParent)
+	, m_bAutoLoadPuttyKey(FALSE)
+{
+
+}
+
+CSyncDlg::~CSyncDlg()
+{
+}
+
+void CSyncDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Check(pDX, IDC_CHECK_PUTTY_KEY, m_bAutoLoadPuttyKey);
+	DDX_Control(pDX, IDC_COMBOBOXEX_LOCAL_BRANCH, m_ctrlLocalBranch);
+	DDX_Control(pDX, IDC_COMBOBOXEX_REMOTE_BRANCH, m_ctrlRemoteBranch);
+	DDX_Control(pDX, IDC_COMBOBOXEX_URL, m_ctrlURL);
+	DDX_Control(pDX, IDC_BUTTON_TABCTRL, m_ctrlDumyButton);
+	DDX_Control(pDX, IDC_BUTTON_PULL, m_ctrlPull);
+	DDX_Control(pDX, IDC_BUTTON_PUSH, m_ctrlPush);
+	DDX_Control(pDX, IDC_STATIC_STATUS, m_ctrlStatus);
+	DDX_Control(pDX, IDC_PROGRESS_SYNC, m_ctrlProgress);
+	DDX_Control(pDX, IDC_ANIMATE_SYNC, m_ctrlAnimate);
+}
+
+
+BEGIN_MESSAGE_MAP(CSyncDlg, CDialog)
+	ON_BN_CLICKED(IDC_BUTTON_PULL, &CSyncDlg::OnBnClickedButtonPull)
+	ON_BN_CLICKED(IDC_BUTTON_PUSH, &CSyncDlg::OnBnClickedButtonPush)
+	ON_BN_CLICKED(IDC_BUTTON_APPLY, &CSyncDlg::OnBnClickedButtonApply)
+	ON_BN_CLICKED(IDC_BUTTON_EMAIL, &CSyncDlg::OnBnClickedButtonEmail)
+END_MESSAGE_MAP()
+
+
+// CSyncDlg message handlers
+
+void CSyncDlg::OnBnClickedButtonPull()
+{
+	// TODO: Add your control notification handler code here
+}
+
+void CSyncDlg::OnBnClickedButtonPush()
+{
+	// TODO: Add your control notification handler code here
+}
+
+void CSyncDlg::OnBnClickedButtonApply()
+{
+	// TODO: Add your control notification handler code here
+}
+
+void CSyncDlg::OnBnClickedButtonEmail()
+{
+	// TODO: Add your control notification handler code here
+}
diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
new file mode 100644
index 0000000..4e6dfd7
--- /dev/null
+++ b/src/TortoiseProc/SyncDlg.h
@@ -0,0 +1,57 @@
+// TortoiseGit - a Windows shell extension for easy version control
+
+// Copyright (C) 2008-2009 - TortoiseGit
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#pragma once
+#include "afxcmn.h"
+#include "afxwin.h"
+
+
+// CSyncDlg dialog
+
+class CSyncDlg : public CDialog
+{
+	DECLARE_DYNAMIC(CSyncDlg)
+
+public:
+	CSyncDlg(CWnd* pParent = NULL);   // standard constructor
+	virtual ~CSyncDlg();
+
+// Dialog Data
+	enum { IDD = IDD_SYNC };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	DECLARE_MESSAGE_MAP()
+public:
+	BOOL m_bAutoLoadPuttyKey;
+	CComboBoxEx m_ctrlLocalBranch;
+	CComboBoxEx m_ctrlRemoteBranch;
+	CComboBoxEx m_ctrlURL;
+	CButton m_ctrlDumyButton;
+	CButton m_ctrlPull;
+	CButton m_ctrlPush;
+	CStatic m_ctrlStatus;
+	afx_msg void OnBnClickedButtonPull();
+	afx_msg void OnBnClickedButtonPush();
+	afx_msg void OnBnClickedButtonApply();
+	afx_msg void OnBnClickedButtonEmail();
+	CProgressCtrl m_ctrlProgress;
+	CAnimateCtrl m_ctrlAnimate;
+};
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 5dc37c5..e980a58 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -588,11 +588,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\copy.ico"
+				RelativePath="..\Resources\copy.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\copy.ico"
+				RelativePath=".\copy.ico"
 				>
 			</File>
 			<File
@@ -620,11 +620,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\explorer.ico"
+				RelativePath=".\explorer.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\explorer.ico"
+				RelativePath="..\Resources\explorer.ico"
 				>
 			</File>
 			<File
@@ -868,11 +868,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\newfolder.ico"
+				RelativePath="..\Resources\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\newfolder.ico"
+				RelativePath=".\newfolder.ico"
 				>
 			</File>
 			<File
@@ -904,11 +904,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\refresh.ico"
+				RelativePath="..\Resources\refresh.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\refresh.ico"
+				RelativePath=".\refresh.ico"
 				>
 			</File>
 			<File
@@ -984,11 +984,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\save.ico"
+				RelativePath=".\save.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\save.ico"
+				RelativePath="..\Resources\save.ico"
 				>
 			</File>
 			<File
@@ -1088,11 +1088,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\up.ico"
+				RelativePath="..\Resources\up.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\up.ico"
+				RelativePath=".\up.ico"
 				>
 			</File>
 			<File
@@ -2007,6 +2007,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Sync"
+				>
+				<File
+					RelativePath=".\Commands\SyncCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SyncCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\SyncDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\SyncDlg.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Utility Dialogs"
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index cd17e9df9e39d7a4d165b201c59531133f9ca074..3660354ad3fe2915c24ccb1de56de615d3093c25 100644
GIT binary patch
delta 557
zcmYLGO=uHg5dGd~nkGx!rfZC{gs>Z92%(2iGzW#4#MG_^L;ft-i#_E~C=~xtq&14E
zP@x1r$Xs*qBnr|B3!;*%x9XunEfTLD#Dnx82!6YX_Be0en|W{M?H~X5C(5f&mPq@(
zhpw_ReO!boD$t%<9#L%R)OiEn)~>a;L9HM(e}m;&ft_a!VXCJ1x?@o81N5!!&ymwz
z6{>icPf>pyaq1s|&;AvF!5zH201rh=NKorA;-Xwt?C1n`(oT;G0ZdUZ?=a3GDt;`h
z^gM%*9nRskm$q*rEXT%Zw<yQHzk~qoo#ndy^8&Oi1rzX5`W7_OONdcsl}D(*j%fG3
z#N%z8IbeudH75EK9xAkP$4!F@O+Ldh88<|^w%p%q<F?xwtFSAqE*|J7UB&Nz3hFHK
zlnc$RjfT+R6p}P}1TSqmSnnP*=L`-@6lw-7+>q{4vrs5mLd1oqXCf|-60`DVwdx3c
zX^?SO=ChVC<?=S`u3Q!T%W&)Urp(vTp@_jdMNBu7t`}_{26Y0^#_DYJ!xPBR<UGuy
zc~)i@*=6~*2Ag5m*nfsO^c?#pwZV0S?c!r(_r=<Nn6fK8L@!qOhTzumVbxsabAJH`
Co~|MQ

delta 189
zcmaFW&9&z*=Y~rj(+~JFa!j7!$+g+e^HSgR11A{8rhmA_$g;WZhK%Xt4Ph*k3pTTC
zXX9g3V47@D$+EpofbovO_I-|w*Vwjy@L;sCn=a7LC^LOQJEH@LB{kh{0;9n6v<^li
z2=@awBinS5PDUHJEXVY7os3oxZ4F&8ZD!q!P6!>_EBY8MzD;iVCN{mHl}Tj!trn)f
M={)U>5+H6C0Q3Y!Q2+n{

-- 
2.11.0