From b82af30d63f084552d583bceec3c2bf30f0351e1 Mon Sep 17 00:00:00 2001 From: Johan t Hart Date: Sat, 31 Jan 2009 01:58:59 +0100 Subject: [PATCH] Remove some more Subversion leftovers --- src/Resources/TortoiseProcENG.rc | Bin 400014 -> 399854 bytes src/TortoiseProc/Commands/LogCommand.cpp | 8 +------- src/TortoiseProc/GitLogListBase.cpp | 1 - src/TortoiseProc/LogDlg.cpp | 18 ++---------------- src/TortoiseProc/LogDlg.h | 7 +------ 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index b9f64a202a60c0d809603c0012c4613458b610c9..1135ae124be4ff8f52e94c82cab09086ca52ba51 100644 GIT binary patch delta 346 zcmeC%D)DZ!#D<>9oQ4cK3Bk#blrP4nR#jlN%P4F9@3)g_>_HZojdZar=$MOd@U5O*EKwrb}osPnm8o Yn^|D`hgN2}cAzRCX4!sAi*?I;0HNJ-1^@s6 delta 431 zcmXv{%PWL&6utNReS<+>F@`ivQXUP>+c$&ck&Qx88dl1Vn3TuDM#4r@Ty>4-FeS=j z#?b66DW&)itSsa)qm;7o^I>uBx%b?2?|Ds_Ll@@QDjDry11q?|$!mw`qOEi`pJt&( zcj==XcvyPIypo#>(btua3HqlGR*HPu#_mv8Ja2M*9AyQRHR zLIba?ZmIk{@bSnfIwfbn;!ftyCwo9N*rmz0Al;Q~9=9)$n6l_RB!%C=@TmyRYY z$bOh%kPdkh50+6d=q}VJ8S~E`!rKyxTzBPo^>|(9g(s|Lf1M~=)S@d|6q8z1DPHEH aL1E*$TCsr+Zd(%dE7BsNCjE7W^S5t&g@P;q diff --git a/src/TortoiseProc/Commands/LogCommand.cpp b/src/TortoiseProc/Commands/LogCommand.cpp index 70cde22..82eea1e 100644 --- a/src/TortoiseProc/Commands/LogCommand.cpp +++ b/src/TortoiseProc/Commands/LogCommand.cpp @@ -64,17 +64,11 @@ bool LogCommand::Execute() CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100); limit = (int)(LONG)reg; } - BOOL bStrict = (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE); - if (parser.HasKey(_T("strict"))) - { - bStrict = TRUE; - } - CLogDlg dlg; theApp.m_pMainWnd = &dlg; //dlg.SetParams(cmdLinePath); - dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit, bStrict); + dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit); // dlg.SetIncludeMerge(!!parser.HasKey(_T("merge"))); // val = parser.GetVal(_T("propspath")); // if (!val.IsEmpty()) diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index c167113..43abebe 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1477,7 +1477,6 @@ UINT CGitLogListBase::LogThread() #endif InterlockedExchange(&m_bNoDispUpdates, FALSE); - int index=0; unsigned int updated=0; int percent=0; CRect rect; diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 78d6677..fd68088 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -60,7 +60,6 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/) , m_nSortColumn(0) , m_bShowedAll(false) , m_bSelect(false) - , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE) , m_bSelectionMustBeContinuous(false) , m_bShowBugtraqColumn(false) @@ -99,7 +98,6 @@ void CLogDlg::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_PROGRESS, m_LogProgress); DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1); DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2); - DDX_Check(pDX, IDC_CHECK_STOPONCOPY, m_bStrict); DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText); DDX_Control(pDX, IDC_DATEFROM, m_DateFrom); DDX_Control(pDX, IDC_DATETO, m_DateTo); @@ -138,7 +136,6 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog) //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList) ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths) - ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy) ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom) ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto) ON_WM_SIZE() @@ -150,7 +147,7 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog) ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy) END_MESSAGE_MAP() -void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */) +void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit /* = FALSE */) { m_path = path; m_pegrev = pegrev; @@ -158,8 +155,6 @@ void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, G m_LogRevision = startrev; m_endrev = endrev; m_hasWC = !path.IsUrl(); - m_bStrict = bStrict; - m_bSaveStrict = bSaveStrict; m_limit = limit; if (::IsWindow(m_hWnd)) UpdateData(FALSE); @@ -180,8 +175,6 @@ BOOL CLogDlg::OnInitDialog() m_bVista = (fullver >= 0x0600); // use the state of the "stop on copy/rename" option from the last time - if (!m_bStrict) - m_bStrict = m_regLastStrict; UpdateData(FALSE); // set the font to use in the log message view, configured in the settings dialog @@ -234,7 +227,6 @@ BOOL CLogDlg::OnInitDialog() m_cFilter.SetValidator(this); AdjustControlSize(IDC_HIDEPATHS); - AdjustControlSize(IDC_CHECK_STOPONCOPY); AdjustControlSize(IDC_INCLUDEMERGE); GetClientRect(m_DlgOrigRect); @@ -262,7 +254,6 @@ BOOL CLogDlg::OnInitDialog() AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT); AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT); - AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT); AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT); AddAnchor(IDC_GETALL, BOTTOM_LEFT); AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT); @@ -396,7 +387,6 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam) //DialogEnableWindow(IDC_GETALL, FALSE); //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE); - DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE); DialogEnableWindow(IDC_INCLUDEMERGE, FALSE); DialogEnableWindow(IDC_STATBUTTON, FALSE); DialogEnableWindow(IDC_REFRESH, FALSE); @@ -729,8 +719,6 @@ void CLogDlg::OnCancel() //m_LogList.TerminateThread(); } UpdateData(); - if (m_bSaveStrict) - m_regLastStrict = m_bStrict; CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")); reg = m_btnShow.GetCurrentEntry(); @@ -1235,8 +1223,6 @@ void CLogDlg::OnOK() } } UpdateData(); - if (m_bSaveStrict) - m_regLastStrict = m_bStrict; CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")); reg = m_btnShow.GetCurrentEntry(); SaveSplitterPos(); @@ -1790,7 +1776,7 @@ void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult) m_nSearchIndex = pNMLV->iItem; if (pNMLV->iSubItem != 0) return; - if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/)) + if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())) { // remove the selected state if (pNMLV->uChanged & LVIF_STATE) diff --git a/src/TortoiseProc/LogDlg.h b/src/TortoiseProc/LogDlg.h index c023cea..287e7ff 100644 --- a/src/TortoiseProc/LogDlg.h +++ b/src/TortoiseProc/LogDlg.h @@ -82,8 +82,7 @@ public: FILELIST_PATH }; - void SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, - BOOL bStrict = CRegDWORD(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE), BOOL bSaveStrict = TRUE); + void SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit); void SetIncludeMerge(bool bInclude = true) {m_bIncludeMerges = bInclude;} void SetProjectPropertiesPath(const CTGitPath& path) {m_ProjectProperties.ReadProps(path);} bool IsThreadRunning() {return !!m_LogList.m_bThreadRunning;} @@ -231,11 +230,8 @@ private: long m_logcounter; bool m_bCancelled; - BOOL m_bStrict; - BOOL m_bIncludeMerges; git_revnum_t m_lowestRev; - BOOL m_bSaveStrict; CTGitPathList * m_currentChangedArray; LogChangedPathArray m_CurrentFilteredChangedArray; CTGitPathList m_currentChangedPathList; @@ -264,7 +260,6 @@ private: bool m_bAscending; static int m_nSortColumnPathList; static bool m_bAscendingPathList; - CRegDWORD m_regLastStrict; //CRegDWORD m_regMaxBugIDColWidth; CButton m_cHidePaths; bool m_bShowedAll; -- 2.11.0