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 (file)
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 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -512,7 +512,7 @@ void CCommitDlg::OnOK()
                progress.m_GitCmd=cmd;\r
                progress.m_bShowCommand = FALSE;        // don't show the commit command\r
                progress.m_PreText = out;                       // show any output already generated in log window\r
-               progress.m_changeAbortButtonOnSuccessTo = "Push";\r
+               progress.m_changeAbortButtonOnSuccessTo = "&Push";\r
                DWORD userResponse = progress.DoModal();\r
                \r
                if(progress.m_GitStatus)\r
@@ -520,11 +520,10 @@ void CCommitDlg::OnOK()
                        bCloseCommitDlg = false;\r
                        this->Refresh();\r
                }\r
-               else if(userResponse == IDCANCEL)\r
+               else if(userResponse == IDC_PROGRESS_BUTTON1)\r
                {\r
                        //User pressed 'Push' button after successful commit.\r
-                       if(progress.m_bAltAbortPress)\r
-                               m_bPushAfterCommit=true;\r
+                       m_bPushAfterCommit=true;\r
                }\r
 \r
                CFile::Remove(tempfile);\r

diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp
index 21cf4dd..abe8c2c 100644 (file)
--- a/src/TortoiseProc/ProgressDlg.cpp
+++ b/src/TortoiseProc/ProgressDlg.cpp
@@ -38,7 +38,7 @@ void CProgressDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CProgressDlg, CResizableStandAloneDialog)\r
        ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI, OnProgressUpdateUI)\r
        ON_BN_CLICKED(IDOK, &CProgressDlg::OnBnClickedOk)\r
-       ON_BN_CLICKED(IDCANCEL,&CProgressDlg::OnBnClickedCancel)\r
+       ON_BN_CLICKED(IDC_PROGRESS_BUTTON1,&CProgressDlg::OnBnClickedButton1)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CProgressDlg::OnInitDialog()\r
@@ -51,7 +51,9 @@ BOOL CProgressDlg::OnInitDialog()
 \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDC_PROGRESS_BUTTON1,BOTTOM_RIGHT);\r
 \r
+       this->GetDlgItem(IDC_PROGRESS_BUTTON1)->ShowWindow(SW_HIDE);\r
        m_Animate.Open(IDR_DOWNLOAD);\r
        \r
        CString InitialText;\r
@@ -175,7 +177,9 @@ LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
 \r
                        if(!m_changeAbortButtonOnSuccessTo.IsEmpty())\r
                        {\r
-                               GetDlgItem(IDCANCEL)->SetWindowText(m_changeAbortButtonOnSuccessTo);\r
+                               GetDlgItem(IDC_PROGRESS_BUTTON1)->SetWindowText(m_changeAbortButtonOnSuccessTo);\r
+                               GetDlgItem(IDC_PROGRESS_BUTTON1)->ShowWindow(SW_SHOW);\r
+                               GetDlgItem(IDCANCEL)->ShowWindow(SW_HIDE);\r
                                //Set default button is "close" rather than "push"\r
                                this->SendMessage(WM_NEXTDLGCTL, (WPARAM)GetDlgItem(IDOK)->m_hWnd, TRUE);\r
                        }\r
@@ -263,20 +267,9 @@ void CProgressDlg::OnBnClickedOk()
        OnOK();\r
 }\r
 \r
-void CProgressDlg::OnBnClickedCancel()\r
+void CProgressDlg::OnBnClickedButton1()\r
 {\r
-       if(!this->m_changeAbortButtonOnSuccessTo.IsEmpty())\r
-       {\r
-               CString text;\r
-               GetDlgItem(IDCANCEL)->GetWindowText(text);\r
-               if(m_changeAbortButtonOnSuccessTo == text)\r
-               {\r
-                       m_bAltAbortPress=true;\r
-               }\r
-       \r
-       }\r
-       \r
-       OnCancel();\r
+       this->EndDialog(IDC_PROGRESS_BUTTON1);\r
        \r
 }\r
 void CProgressDlg::OnCancel()\r
@@ -286,6 +279,6 @@ void CProgressDlg::OnCancel()
                CResizableStandAloneDialog::OnCancel();\r
                return;\r
        }\r
-\r
+       \r
        m_bAbort = true;\r
 }\r

diff --git a/src/TortoiseProc/ProgressDlg.h b/src/TortoiseProc/ProgressDlg.h
index 85fb602..2281a0c 100644 (file)
--- a/src/TortoiseProc/ProgressDlg.h
+++ b/src/TortoiseProc/ProgressDlg.h
@@ -59,5 +59,5 @@ protected:
        DECLARE_MESSAGE_MAP()\r
 public:\r
        afx_msg void OnBnClickedOk();\r
-       afx_msg void OnBnClickedCancel();\r
+       afx_msg void OnBnClickedButton1();\r
 };\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index d8b5b14..7542b8d 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ