From a8e1250833dcec2c4b580bc381d0704b712a4308 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 30 Jan 2012 22:18:05 +0100 Subject: [PATCH] do not show "Restore after commit" in Changed Files, Rebase or Log Dialog Signed-off-by: Sven Strickroth --- src/TortoiseProc/ChangedDlg.cpp | 2 +- src/TortoiseProc/LogDlg.cpp | 2 +- src/TortoiseProc/RebaseDlg.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TortoiseProc/ChangedDlg.cpp b/src/TortoiseProc/ChangedDlg.cpp index 2a55ab630..e2ecb2f2e 100644 --- a/src/TortoiseProc/ChangedDlg.cpp +++ b/src/TortoiseProc/ChangedDlg.cpp @@ -87,7 +87,7 @@ BOOL CChangedDlg::OnInitDialog() UpdateData(FALSE); m_FileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS, _T("ChangedDlg"), - (GITSLC_POPALL ^ GITSLC_POPSAVEAS), false); + (GITSLC_POPALL ^ (GITSLC_POPSAVEAS|GITSLC_POPRESTORE)), false); m_FileListCtrl.SetCancelBool(&m_bCanceled); m_FileListCtrl.SetBackgroundImage(IDI_CFM_BKG); m_FileListCtrl.SetEmptyString(IDS_REPOSTATUS_EMPTYFILELIST); diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 0f7aa4875..5aeb85495 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -235,7 +235,7 @@ BOOL CLogDlg::OnInitDialog() m_LogList.m_hasWC = m_LogList.m_bShowWC = !g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir); m_LogList.InsertGitColumn(); - m_ChangedFileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL, _T("LogDlg"), (GITSLC_POPALL ^ (GITSLC_POPCOMMIT|GITSLC_POPIGNORE)), false, m_LogList.m_hasWC); + m_ChangedFileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL, _T("LogDlg"), (GITSLC_POPALL ^ (GITSLC_POPCOMMIT|GITSLC_POPIGNORE|GITSLC_POPRESTORE)), false, m_LogList.m_hasWC); GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE); diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index cec5fb6cf..6839515e1 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -191,7 +191,7 @@ BOOL CRebaseDlg::OnInitDialog() - m_FileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("RebaseDlg"),(GITSLC_POPALL ^ GITSLC_POPCOMMIT),false); + m_FileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("RebaseDlg"),(GITSLC_POPALL ^ (GITSLC_POPCOMMIT|GITSLC_POPRESTORE)),false); m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Revision Files")); m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1); -- 2.11.4.GIT