From 21d1057db51bb3d341aff40e6b71efebdc5d5026 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sat, 11 Jul 2009 14:24:59 +0800
Subject: [PATCH] Fixed issue #112: (7)  Low hanging GUI fruits during Commit
 and Push

When using "Commit" to also add files, if you forget to check the new files and press "Ok", you get the dialog "Nothing Commit" and then the whole Commit dialog closes. Keep the dialog open after this message.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc | Bin 438322 -> 438506 bytes
 src/TortoiseProc/CommitDlg.cpp   |   5 ++++-
 src/TortoiseProc/resource.h      | Bin 162320 -> 162504 bytes
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index c6db0668c43bb5f8e7dcaebe7077a069ed51d55c..dcd728ccd7d547b21aae275b7e2eef19ff45544b 100644
GIT binary patch
delta 125
zcmdn=K<d>)sfHHD7N!>F7M2#)Eo_I{rq4=b5t#m<g-t*^gu#QslfjR{ogtpVnZcjI
z7YIEWLKqYnlz^i73?&R144Djh4CxFC(;45eDo+=PVBzC-1MBf*2xjn@E-1w$Ir-mm
WHg-3#!p!M~*I6XDUua`X(gXmU?;$?`

delta 32
ocmaF$P-@cysfHHD7N!>F7M2#)Eo_I{rq9Y^<=fuT&X%MJ0OcbLyZ`_I

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 0ca8712..ac04831 100644
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -519,7 +519,10 @@ void CCommitDlg::OnOK()
 
 		CFile::Remove(tempfile);
 	}else
-		CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);
+	{
+		CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
+		bCloseCommitDlg=false;
+	}
 #if 0
 	if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)
 	{
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 5f0806d51f3ff33b954cfaf0f935f6af0252e3c3..4f58fed887f16f00a4be48224708ae4c3b895edd 100644
GIT binary patch
delta 76
zcmbR6h4aK$&W0AoEldxxrWa%~iExK7crbV}_%XOM#802-%p^a3QyZhwWQR38-0=)<
eU>Q$_;K_|riqj8dF|kb-X=jw${veCVfFA(HA{SNw

delta 24
gcmX@{m2<)u&W0AoEldxxrYjUOiELk!%_PGQ0E_Vnk^lez

-- 
2.11.0