\r
// CSyncDlg dialog\r
\r
-IMPLEMENT_DYNAMIC(CSyncDlg, CDialog)\r
+IMPLEMENT_DYNAMIC(CSyncDlg, CResizableStandAloneDialog)\r
\r
CSyncDlg::CSyncDlg(CWnd* pParent /*=NULL*/)\r
- : CDialog(CSyncDlg::IDD, pParent)\r
+ : CResizableStandAloneDialog(CSyncDlg::IDD, pParent)\r
, m_bAutoLoadPuttyKey(FALSE)\r
{\r
-\r
+ m_pTooltip=&this->m_tooltips;\r
+ m_bInited=false;\r
}\r
\r
CSyncDlg::~CSyncDlg()\r
{\r
CDialog::DoDataExchange(pDX);\r
DDX_Check(pDX, IDC_CHECK_PUTTY_KEY, m_bAutoLoadPuttyKey);\r
- DDX_Control(pDX, IDC_COMBOBOXEX_LOCAL_BRANCH, m_ctrlLocalBranch);\r
- DDX_Control(pDX, IDC_COMBOBOXEX_REMOTE_BRANCH, m_ctrlRemoteBranch);\r
DDX_Control(pDX, IDC_COMBOBOXEX_URL, m_ctrlURL);\r
DDX_Control(pDX, IDC_BUTTON_TABCTRL, m_ctrlDumyButton);\r
DDX_Control(pDX, IDC_BUTTON_PULL, m_ctrlPull);\r
DDX_Control(pDX, IDC_STATIC_STATUS, m_ctrlStatus);\r
DDX_Control(pDX, IDC_PROGRESS_SYNC, m_ctrlProgress);\r
DDX_Control(pDX, IDC_ANIMATE_SYNC, m_ctrlAnimate);\r
+\r
+ BRANCH_COMBOX_DDX;\r
}\r
\r
\r
-BEGIN_MESSAGE_MAP(CSyncDlg, CDialog)\r
+BEGIN_MESSAGE_MAP(CSyncDlg, CResizableStandAloneDialog)\r
ON_BN_CLICKED(IDC_BUTTON_PULL, &CSyncDlg::OnBnClickedButtonPull)\r
ON_BN_CLICKED(IDC_BUTTON_PUSH, &CSyncDlg::OnBnClickedButtonPush)\r
ON_BN_CLICKED(IDC_BUTTON_APPLY, &CSyncDlg::OnBnClickedButtonApply)\r
ON_BN_CLICKED(IDC_BUTTON_EMAIL, &CSyncDlg::OnBnClickedButtonEmail)\r
+ ON_BN_CLICKED(IDC_BUTTON_MANAGE, &CSyncDlg::OnBnClickedButtonManage)\r
+ BRANCH_COMBOX_EVENT\r
+ ON_NOTIFY(CBEN_ENDEDIT, IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbenEndeditComboboxexUrl)\r
+ ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbnEditchangeComboboxexUrl)\r
END_MESSAGE_MAP()\r
\r
\r
void CSyncDlg::OnBnClickedButtonPull()\r
{\r
// TODO: Add your control notification handler code here\r
+ this->m_regPullButton =this->m_ctrlPull.GetCurrentEntry();\r
}\r
\r
void CSyncDlg::OnBnClickedButtonPush()\r
{\r
// TODO: Add your control notification handler code here\r
+ this->m_regPushButton=this->m_ctrlPush.GetCurrentEntry();\r
+ this->SwitchToRun();\r
}\r
\r
void CSyncDlg::OnBnClickedButtonApply()\r
{\r
// TODO: Add your control notification handler code here\r
}\r
+void CSyncDlg::ShowProgressCtrl(bool bShow)\r
+{\r
+ int b=bShow?SW_NORMAL:SW_HIDE;\r
+ this->m_ctrlAnimate.ShowWindow(b);\r
+ this->m_ctrlProgress.ShowWindow(b);\r
+ this->m_ctrlAnimate.Open(IDR_DOWNLOAD);\r
+ if(b == SW_NORMAL)\r
+ this->m_ctrlAnimate.Play(0,-1,-1);\r
+ else\r
+ this->m_ctrlAnimate.Stop();\r
+}\r
+void CSyncDlg::ShowInputCtrl(bool bShow)\r
+{\r
+ int b=bShow?SW_NORMAL:SW_HIDE;\r
+ this->m_ctrlURL.ShowWindow(b);\r
+ this->m_ctrlLocalBranch.ShowWindow(b);\r
+ this->m_ctrlRemoteBranch.ShowWindow(b);\r
+ this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_BUTTON_MANAGE)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_CHECK_PUTTY_KEY)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_CHECK_FORCE)->ShowWindow(b);\r
+ this->GetDlgItem(IDC_STATIC_REMOTE_URL)->ShowWindow(b);\r
+ \r
+}\r
+BOOL CSyncDlg::OnInitDialog()\r
+{\r
+ CResizableStandAloneDialog::OnInitDialog();\r
+\r
+ /*\r
+ this->m_ctrlAnimate.ShowWindow(SW_NORMAL);\r
+ this->m_ctrlAnimate.Open(IDR_DOWNLOAD);\r
+ this->m_ctrlAnimate.Play(0,-1,-1);\r
+ */\r
+\r
+ //Create Tabctrl\r
+ CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);\r
+ CRect rectDummy;\r
+ pwnd->GetWindowRect(&rectDummy);\r
+ this->ScreenToClient(rectDummy);\r
+\r
+ if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_SYNC_TAB))\r
+ {\r
+ TRACE0("Failed to create output tab window\n");\r
+ return FALSE; // fail to create\r
+ }\r
+ m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);\r
+\r
+ DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;\r
+\r
+ if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))\r
+ {\r
+ TRACE0("Failed to create output commits window\n");\r
+ return FALSE; // fail to create\r
+\r
+ }\r
+ m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);\r
+\r
+ m_OutLogList.InsertGitColumn();\r
+\r
+ dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
+ \r
+ if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))\r
+ {\r
+ TRACE0("Failed to create output change files window\n");\r
+ return FALSE; // fail to create\r
+ }\r
+ m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),1);\r
+\r
+ m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
+ (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r
+ CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)),false);\r
+\r
+ this->m_tooltips.Create(this);\r
+\r
+ AddAnchor(IDC_SYNC_TAB,TOP_LEFT,BOTTOM_RIGHT);\r
+\r
+ AddAnchor(IDC_GROUP_INFO,TOP_LEFT,TOP_RIGHT);\r
+ AddAnchor(IDC_COMBOBOXEX_URL,TOP_LEFT,TOP_RIGHT);\r
+ AddAnchor(IDC_BUTTON_MANAGE,TOP_RIGHT);\r
+ AddAnchor(IDC_BUTTON_PULL,BOTTOM_LEFT);\r
+ AddAnchor(IDC_BUTTON_PUSH,BOTTOM_LEFT);\r
+ AddAnchor(IDC_BUTTON_APPLY,BOTTOM_LEFT);\r
+ AddAnchor(IDC_BUTTON_EMAIL,BOTTOM_LEFT);\r
+ AddAnchor(IDC_PROGRESS_SYNC,TOP_LEFT,TOP_RIGHT);\r
+ AddAnchor(IDOK,BOTTOM_RIGHT);\r
+ AddAnchor(IDHELP,BOTTOM_RIGHT);\r
+ AddAnchor(IDC_STATIC_STATUS,BOTTOM_LEFT);\r
+ AddAnchor(IDC_ANIMATE_SYNC,TOP_LEFT);\r
+ \r
+ BRANCH_COMBOX_ADD_ANCHOR();\r
+\r
+ CString WorkingDir=g_Git.m_CurrentDir;\r
+ WorkingDir.Replace(_T(':'),_T('_'));\r
+ m_RegKeyRemoteBranch = CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir;\r
+\r
+\r
+ this->AddOthersToAnchor();\r
+ // TODO: Add extra initialization here\r
+\r
+ this->m_ctrlPush.AddEntry(CString(_T("Push")));\r
+ this->m_ctrlPush.AddEntry(CString(_T("Push tags")));\r
+ this->m_ctrlPush.AddEntry(CString(_T("Push All")));\r
+\r
+ this->m_ctrlPull.AddEntry(CString(_T("&Pull")));\r
+ this->m_ctrlPull.AddEntry(CString(_T("&Fetch")));\r
+ this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Rebase")));\r
+\r
+ \r
+ WorkingDir.Replace(_T(':'),_T('_'));\r
+\r
+ CString regkey ;\r
+ regkey.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"),WorkingDir);\r
+\r
+ this->m_regPullButton = CRegDWORD(regkey+_T("\\Pull"),0);\r
+ this->m_regPushButton = CRegDWORD(regkey+_T("\\Push"),0);\r
+\r
+ this->m_ctrlPull.SetCurrentEntry(this->m_regPullButton);\r
+ this->m_ctrlPush.SetCurrentEntry(this->m_regPushButton);\r
+\r
+ CString str;\r
+ this->GetWindowText(str);\r
+ str += _T(" - ") + g_Git.m_CurrentDir;\r
+ this->SetWindowText(str);\r
+\r
+ EnableSaveRestore(_T("SyncDlg"));\r
+\r
+ this->LoadBranchInfo();\r
+\r
+ this->m_bInited=true;\r
+ FetchOutList();\r
+ \r
+ return TRUE; // return TRUE unless you set the focus to a control\r
+ // EXCEPTION: OCX Property Pages should return FALSE\r
+}\r
+\r
+void CSyncDlg::OnBnClickedButtonManage()\r
+{\r
+ // TODO: Add your control notification handler code here\r
+ CAppUtils::LaunchRemoteSetting();\r
+}\r
+\r
+BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)\r
+{\r
+ // TODO: Add your specialized code here and/or call the base class\r
+ m_tooltips.RelayEvent(pMsg);\r
+ return __super::PreTranslateMessage(pMsg);\r
+}\r
+void CSyncDlg::FetchOutList()\r
+{\r
+ if(!m_bInited)\r
+ return;\r
+ m_OutChangeFileList.Clear();\r
+ this->m_OutLogList.Clear();\r
+\r
+ CString remote;\r
+ this->m_ctrlURL.GetWindowText(remote);\r
+ CString remotebranch;\r
+ this->m_ctrlRemoteBranch.GetWindowText(remotebranch);\r
+ remotebranch=remote+_T("/")+remotebranch;\r
+\r
+ if(IsURL())\r
+ {\r
+ CString str;\r
+ str=_T("Don't know what will push befause you enter URL");\r
+ m_OutLogList.ShowText(str);\r
+ this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+ m_OutLocalBranch.Empty();\r
+ m_OutRemoteBranch.Empty();\r
+ return ;\r
+ \r
+ }else if(g_Git.GetHash(remotebranch).GetLength()<40)\r
+ {\r
+ CString str;\r
+ str.Format(_T("Don't know what will push befause unkown \"%s\""),remotebranch);\r
+ m_OutLogList.ShowText(str);\r
+ this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+ m_OutLocalBranch.Empty();\r
+ m_OutRemoteBranch.Empty();\r
+ return ;\r
+ }\r
+ else\r
+ {\r
+ CString localbranch;\r
+ localbranch=this->m_ctrlLocalBranch.GetString();\r
+\r
+ if(localbranch != m_OutLocalBranch || m_OutRemoteBranch != remotebranch)\r
+ {\r
+ m_OutLogList.ClearText();\r
+ m_OutLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
+ &remotebranch,&localbranch);\r
+ \r
+ CString str;\r
+ if(m_OutLogList.GetItemCount() == 0)\r
+ { \r
+ str.Format(_T("No commits ahead \"%s\""),remotebranch);\r
+ m_OutLogList.ShowText(str);\r
+ this->m_ctrlStatus.SetWindowText(str);\r
+ this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+ }\r
+ else\r
+ {\r
+ str.Format(_T("%d commits ahead \"%s\""),m_OutLogList.GetItemCount(),remotebranch);\r
+ this->m_ctrlStatus.SetWindowText(str);\r
+ g_Git.GetCommitDiffList(localbranch,remotebranch,m_arOutChangeList);\r
+ m_OutChangeFileList.m_Rev1=localbranch;\r
+ m_OutChangeFileList.m_Rev2=remotebranch;\r
+ m_OutChangeFileList.Show(0,this->m_arOutChangeList);\r
+ m_OutChangeFileList.SetEmptyString(CString(_T("No changed file")));\r
+ this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,TRUE);\r
+ }\r
+ }\r
+ this->m_OutLocalBranch=localbranch;\r
+ this->m_OutRemoteBranch=remotebranch;\r
+ }\r
+\r
+}\r
+\r
+bool CSyncDlg::IsURL()\r
+{\r
+ CString str;\r
+ this->m_ctrlURL.GetWindowText(str);\r
+ if(str.Find(_T('\\'))>=0 || str.Find(_T('/'))>=0)\r
+ return true;\r
+ else\r
+ return false;\r
+}\r
+void CSyncDlg::OnCbenEndeditComboboxexUrl(NMHDR *pNMHDR, LRESULT *pResult)\r
+{\r
+ // TODO: Add your control notification handler code here\r
+ *pResult = 0;\r
+}\r
+\r
+void CSyncDlg::OnCbnEditchangeComboboxexUrl()\r
+{\r
+ this->FetchOutList();\r
+ // TODO: Add your control notification handler code here\r
+}\r
OSDN Git Service
