From aa12766e063285b0c3f6189d4a6a3d790a4b8102 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 12 Feb 2017 11:56:30 +0100 Subject: [PATCH] =?utf8?q?Fixed=20issue=20#2931:=20Make=20=E2=80=9CChangeL?= =?utf8?q?ist=E2=80=9D=20grids=20in=20=E2=80=9CGit=20synchronization?= =?utf8?q?=E2=80=9D=20multi-selectable?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sven Strickroth --- src/Changelog.txt | 3 +++ src/TortoiseProc/SyncDlg.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 1af253a0b..8390dabbf 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,6 +1,9 @@ = Release 2.5.0 = Released: unreleased +== Features == + * Fixed issue #2931: Make “ChangeList” grids in “Git synchronization” multi-selectable + == Bug Fixes == * Fixed issue #2909: Commit window unclosable after clicking "No" and "do not ask again" * Fixed issue #2911: Doing Add on repository root fails with libgit2 returned invalid path" diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index 4767fa0e0..be3a56ff6 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -914,7 +914,7 @@ BOOL CSyncDlg::OnInitDialog() m_InLogList.InsertGitColumn(); //----------- Create In Change file list ----------- - dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE; + dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE; if( !m_InChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CHANGELIST)) { @@ -962,7 +962,7 @@ BOOL CSyncDlg::OnInitDialog() //------------- Create Change File List Control ---------------- - dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE; + dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE; if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST)) { @@ -975,6 +975,7 @@ BOOL CSyncDlg::OnInitDialog() (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWOREVISIONS) | CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2REVISIONS)), false, true, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD | GITSLC_COLDEL); + dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE; if (!m_GitProgressList.Create(dwStyle | LVS_OWNERDATA, rectDummy, &m_ctrlTabCtrl, IDC_CMD_GIT_PROG)) { TRACE0("Failed to create Git Progress List Window\n"); -- 2.11.4.GIT