From 366a230e2c05d55fa42913857e4b9bb47c6e6607 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 28 Jul 2011 04:06:56 +0200 Subject: [PATCH] Fixed issue #828: disable the commit button if there's no comment entered Signed-off-by: Sven Strickroth --- src/Changelog.txt | 3 +++ src/Resources/TortoiseProcENG.rc | 2 +- src/TortoiseProc/CommitDlg.cpp | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index bcc264166..12b4c0b39 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,4 +1,7 @@ = Release 1.7.1.0 = +== Features == + * Fixed issue #828: disable the commit button if there's no comment entered + == Bug Fix == * Fixed issue #796: plz add code page name "cp949" * Fixed Issue #795: Switch/Checkout Dialog, "Switch To Version" is confusing diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index f3b773385..1e0527827 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -401,7 +401,7 @@ BEGIN CONTROL "&Whole Project",IDC_WHOLE_PROJECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,252,109,10 ICON IDI_WARNING_GENERAL,IDC_EXTERNALWARNING,270,234,20,20,SS_NOTIFY | SS_REALSIZEIMAGE | NOT WS_VISIBLE | WS_DISABLED,WS_EX_TRANSPARENT CONTROL "Keep changelists",IDC_KEEPLISTS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,263,111,10 - PUSHBUTTON "&OK",IDOK,129,259,50,14 + PUSHBUTTON "&OK",IDOK,129,259,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,187,259,50,14 PUSHBUTTON "Help",IDHELP,243,259,50,14 GROUPBOX "&Message:",IDC_MESSAGEGROUP,6,19,287,110 diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index 9387702e7..ab1754eba 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -1768,12 +1768,13 @@ LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM) void CCommitDlg::UpdateOKButton() { - BOOL bValidLogSize = FALSE; + if (m_bBlock) + return; - if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize) - bValidLogSize = !m_bBlock; + bool bValidLogSize = m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize && m_cLogMessage.GetText().GetLength() > 0; + bool bAmendOrSelectFiles = m_ListCtrl.GetSelected() > 0 || (m_bCommitAmend && m_bAmendDiffToLastCommit); - DialogEnableWindow(IDOK, bValidLogSize); + DialogEnableWindow(IDOK, bValidLogSize && bAmendOrSelectFiles); } LRESULT CCommitDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) -- 2.11.4.GIT