From e439bd02956a7f4587c93b02fdbda5c8126bef6b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 20 Nov 2016 23:07:49 +0100 Subject: [PATCH] Fixed issue #2863: Increase text box size limit for command progress dialog and make it configurable Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/ProgressDlg.cpp | 4 +++- src/TortoiseProc/ProgressDlg.h | 1 + src/TortoiseProc/Settings/SettingsAdvanced.cpp | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 669100f2f..462b1e624 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -18,6 +18,7 @@ Released: unreleased * Fixed issue #2154: Copy to clipboard function in show log window doesn't include annotated tag or notes messages * Fixed issue #1668: Allow submodules to be removed ("Delete" is now available for submodules) * Update libgit2 to 0.25-rc1 + * Fixed issue #2863: Increase text box size limit for command progress dialog and make it configurable == Bug Fixes == * Fixed issue #2837: Layout of overlapping icons settings dialog diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp index 2c7a430b2..53d551463 100644 --- a/src/TortoiseProc/ProgressDlg.cpp +++ b/src/TortoiseProc/ProgressDlg.cpp @@ -39,6 +39,8 @@ IMPLEMENT_DYNAMIC(CProgressDlg, CResizableStandAloneDialog) +const int CProgressDlg::s_iProgressLinesLimit = max(50, (int)CRegDWORD(L"Software\\TortoiseGit\\ProgressDlgLinesLimit", 50000)); + CProgressDlg::CProgressDlg(CWnd* pParent /*=nullptr*/) : CResizableStandAloneDialog(CProgressDlg::IDD, pParent) , m_bShowCommand(true) @@ -605,7 +607,7 @@ void CProgressDlg::ParserCmdOutput(CRichEditCtrl &log,CProgressCtrl &progressctr log.ReplaceSel(str); } - if (lines > 500) //limited log length + if (lines > s_iProgressLinesLimit) //limited log length { int end=log.LineIndex(1); log.SetSel(0,end); diff --git a/src/TortoiseProc/ProgressDlg.h b/src/TortoiseProc/ProgressDlg.h index 47b9d28d3..c847d2abb 100644 --- a/src/TortoiseProc/ProgressDlg.h +++ b/src/TortoiseProc/ProgressDlg.h @@ -130,6 +130,7 @@ private: void ParserCmdOutput(char ch); void RemoveLastLine(CString &str); + static const int s_iProgressLinesLimit; LRESULT OnProgressUpdateUI(WPARAM wParam,LPARAM lParam); diff --git a/src/TortoiseProc/Settings/SettingsAdvanced.cpp b/src/TortoiseProc/Settings/SettingsAdvanced.cpp index 77baa189a..44ac46039 100644 --- a/src/TortoiseProc/Settings/SettingsAdvanced.cpp +++ b/src/TortoiseProc/Settings/SettingsAdvanced.cpp @@ -106,6 +106,10 @@ CSettingsAdvanced::CSettingsAdvanced() settings[i].type = CSettingsAdvanced::SettingTypeNumber; settings[i++].def.l = 10; + settings[i].sName = L"ProgressDlgLinesLimit"; + settings[i].type = CSettingsAdvanced::SettingTypeNumber; + settings[i++].def.l = 50000; + settings[i].sName = L"PullRebaseBehaviorLike1816"; settings[i].type = CSettingsAdvanced::SettingTypeBoolean; settings[i++].def.b = false; -- 2.11.4.GIT