From: Frank Li <lznuaa@gmail.com>
Date: Sun, 12 Jul 2009 15:43:43 +0000 (+0800)
Subject: Fix "ESC" = "push" when after commit and Add Alt-P  for Push
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=dcd9374d91ef67154b6161092831581f1c2e8a78

Fix "ESC" = "push" when after commit and Add Alt-P  for Push

Signed-off-by: Frank Li <lznuaa@gmail.com>
---

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index ed2c2fb..e018bab 100644
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 76a7519..97bb3b8 100644
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -512,7 +512,7 @@ void CCommitDlg::OnOK()
 		progress.m_GitCmd=cmd;
 		progress.m_bShowCommand = FALSE;	// don't show the commit command
 		progress.m_PreText = out;			// show any output already generated in log window
-		progress.m_changeAbortButtonOnSuccessTo = "Push";
+		progress.m_changeAbortButtonOnSuccessTo = "&Push";
 		DWORD userResponse = progress.DoModal();
 		
 		if(progress.m_GitStatus)
@@ -520,11 +520,10 @@ void CCommitDlg::OnOK()
 			bCloseCommitDlg = false;
 			this->Refresh();
 		}
-		else if(userResponse == IDCANCEL)
+		else if(userResponse == IDC_PROGRESS_BUTTON1)
 		{
 			//User pressed 'Push' button after successful commit.
-			if(progress.m_bAltAbortPress)
-				m_bPushAfterCommit=true;
+			m_bPushAfterCommit=true;
 		}
 
 		CFile::Remove(tempfile);
diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp
index 21cf4dd..abe8c2c 100644
--- a/src/TortoiseProc/ProgressDlg.cpp
+++ b/src/TortoiseProc/ProgressDlg.cpp
@@ -38,7 +38,7 @@ void CProgressDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CProgressDlg, CResizableStandAloneDialog)
 	ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI, OnProgressUpdateUI)
 	ON_BN_CLICKED(IDOK, &CProgressDlg::OnBnClickedOk)
-	ON_BN_CLICKED(IDCANCEL,&CProgressDlg::OnBnClickedCancel)
+	ON_BN_CLICKED(IDC_PROGRESS_BUTTON1,&CProgressDlg::OnBnClickedButton1)
 END_MESSAGE_MAP()
 
 BOOL CProgressDlg::OnInitDialog()
@@ -51,7 +51,9 @@ BOOL CProgressDlg::OnInitDialog()
 
 	AddAnchor(IDOK,BOTTOM_RIGHT);
 	AddAnchor(IDCANCEL,BOTTOM_RIGHT);
+	AddAnchor(IDC_PROGRESS_BUTTON1,BOTTOM_RIGHT);
 
+	this->GetDlgItem(IDC_PROGRESS_BUTTON1)->ShowWindow(SW_HIDE);
 	m_Animate.Open(IDR_DOWNLOAD);
 	
 	CString InitialText;
@@ -175,7 +177,9 @@ LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
 
 			if(!m_changeAbortButtonOnSuccessTo.IsEmpty())
 			{
-				GetDlgItem(IDCANCEL)->SetWindowText(m_changeAbortButtonOnSuccessTo);
+				GetDlgItem(IDC_PROGRESS_BUTTON1)->SetWindowText(m_changeAbortButtonOnSuccessTo);
+				GetDlgItem(IDC_PROGRESS_BUTTON1)->ShowWindow(SW_SHOW);
+				GetDlgItem(IDCANCEL)->ShowWindow(SW_HIDE);
 				//Set default button is "close" rather than "push"
 				this->SendMessage(WM_NEXTDLGCTL, (WPARAM)GetDlgItem(IDOK)->m_hWnd, TRUE);
 			}
@@ -263,20 +267,9 @@ void CProgressDlg::OnBnClickedOk()
 	OnOK();
 }
 
-void CProgressDlg::OnBnClickedCancel()
+void CProgressDlg::OnBnClickedButton1()
 {
-	if(!this->m_changeAbortButtonOnSuccessTo.IsEmpty())
-	{
-		CString text;
-		GetDlgItem(IDCANCEL)->GetWindowText(text);
-		if(m_changeAbortButtonOnSuccessTo == text)
-		{
-			m_bAltAbortPress=true;
-		}
-	
-	}
-	
-	OnCancel();
+	this->EndDialog(IDC_PROGRESS_BUTTON1);
 	
 }
 void CProgressDlg::OnCancel()
@@ -286,6 +279,6 @@ void CProgressDlg::OnCancel()
 		CResizableStandAloneDialog::OnCancel();
 		return;
 	}
-
+	
 	m_bAbort = true;
 }
diff --git a/src/TortoiseProc/ProgressDlg.h b/src/TortoiseProc/ProgressDlg.h
index 85fb602..2281a0c 100644
--- a/src/TortoiseProc/ProgressDlg.h
+++ b/src/TortoiseProc/ProgressDlg.h
@@ -59,5 +59,5 @@ protected:
 	DECLARE_MESSAGE_MAP()
 public:
 	afx_msg void OnBnClickedOk();
-	afx_msg void OnBnClickedCancel();
+	afx_msg void OnBnClickedButton1();
 };
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index d8b5b14..7542b8d 100644
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ