From a5744dc13975d404a51251dd13e2f8621b63d7e2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 29 Dec 2011 21:22:16 +0100 Subject: [PATCH] Merge the "Diff Viewer" and "Unified Diff Viewer" settings pages into one page. based on TortoiseSVN r22361 Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 26 +--- src/TortoiseProc/Settings/Settings.cpp | 9 -- src/TortoiseProc/Settings/Settings.h | 2 - src/TortoiseProc/Settings/SettingsProgsDiff.cpp | 63 +++++++++- src/TortoiseProc/Settings/SettingsProgsDiff.h | 13 +- src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp | 134 --------------------- src/TortoiseProc/Settings/SettingsProgsUniDiff.h | 64 ---------- src/TortoiseProc/TortoiseProc.vcproj | 4 - src/TortoiseProc/resource.h | 1 - 9 files changed, 78 insertions(+), 238 deletions(-) delete mode 100644 src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp delete mode 100644 src/TortoiseProc/Settings/SettingsProgsUniDiff.h diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index eb501a32e..9a6f9ccb3 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -607,6 +607,11 @@ BEGIN PUSHBUTTON "...",IDC_EXTDIFFBROWSE,274,41,14,14 LTEXT "Click on ""Advanced"" to specify alternate diff programs based on file extension",IDC_STATIC,16,65,160,25 PUSHBUTTON "&Advanced...",IDC_EXTDIFFADVANCED,201,65,87,14 + GROUPBOX "Configure viewer program for GNU diff files (patch files)",IDC_STATIC,7,104,286,63 + CONTROL "Tortoise&UDiff",IDC_DIFFVIEWER_OFF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,120,74,10 + CONTROL "E&xternal",IDC_DIFFVIEWER_ON,"Button",BS_AUTORADIOBUTTON,92,120,71,10 + EDITTEXT IDC_DIFFVIEWER,14,139,256,14,ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "...",IDC_DIFFVIEWERBROWSE,274,139,14,14 END IDD_SETTINGSPROGSMERGE DIALOGEX 0, 0, 300, 217 @@ -623,18 +628,6 @@ BEGIN PUSHBUTTON "&Advanced...",IDC_EXTMERGEADVANCED,206,73,87,14 END -IDD_SETTINGSPROGSUNIDIFF DIALOGEX 0, 0, 300, 217 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Diff Viewer::Unified Diff Viewer" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Configure viewer program for GNU diff files (patch files).",IDC_STATIC,7,7,286,8 - CONTROL "&TortoiseUDiff",IDC_DIFFVIEWER_OFF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,23,74,10 - CONTROL "&Custom",IDC_DIFFVIEWER_ON,"Button",BS_AUTORADIOBUTTON,89,23,74,10 - EDITTEXT IDC_DIFFVIEWER,7,41,266,14,ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "...",IDC_DIFFVIEWERBROWSE,279,41,14,14 -END - IDD_SETTINGSLOOKANDFEEL DIALOGEX 0, 0, 300, 225 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General::Context Menu" @@ -1839,15 +1832,6 @@ BEGIN HORZGUIDE, 33 END - IDD_SETTINGSPROGSUNIDIFF, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 293 - TOPMARGIN, 7 - BOTTOMMARGIN, 210 - HORZGUIDE, 33 - END - IDD_SETTINGSLOOKANDFEEL, DIALOG BEGIN LEFTMARGIN, 7 diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp index 8c2a22205..6ac862889 100644 --- a/src/TortoiseProc/Settings/Settings.cpp +++ b/src/TortoiseProc/Settings/Settings.cpp @@ -50,7 +50,6 @@ void CSettings::AddPropPages() m_pProxyPage = new CSetProxyPage(); m_pProgsDiffPage = new CSettingsProgsDiff(); m_pProgsMergePage = new CSettingsProgsMerge(); - m_pProgsUniDiffPage = new CSettingsProgsUniDiff(); m_pProgsAlternativeEditor = new CSettingsProgsAlternativeEditor(); m_pLookAndFeelPage = new CSetLookAndFeelPage(); @@ -79,7 +78,6 @@ void CSettings::AddPropPages() SetPageIcon(m_pProgsDiffPage, m_pProgsDiffPage->GetIconID()); SetPageIcon(m_pProgsMergePage, m_pProgsMergePage->GetIconID()); SetPageIcon(m_pProgsAlternativeEditor, m_pProgsAlternativeEditor->GetIconID()); - SetPageIcon(m_pProgsUniDiffPage, m_pProgsUniDiffPage->GetIconID()); SetPageIcon(m_pLookAndFeelPage, m_pLookAndFeelPage->GetIconID()); SetPageIcon(m_pDialogsPage, m_pDialogsPage->GetIconID()); SetPageIcon(m_pColorsPage, m_pColorsPage->GetIconID()); @@ -102,7 +100,6 @@ void CSettings::AddPropPages() AddPage(m_pProxyPage); AddPage(m_pProgsDiffPage); AddPage(m_pProgsMergePage); - AddPage(m_pProgsUniDiffPage); AddPage(m_pLookAndFeelPage); AddPage(m_pExtMenu); AddPage(m_pDialogsPage); @@ -136,7 +133,6 @@ void CSettings::RemovePropPages() delete m_pProxyPage; delete m_pProgsDiffPage; delete m_pProgsMergePage; - delete m_pProgsUniDiffPage; delete m_pProgsAlternativeEditor; delete m_pLookAndFeelPage; delete m_pDialogsPage; @@ -165,7 +161,6 @@ void CSettings::HandleRestart() restart |= m_pProxyPage->GetRestart(); restart |= m_pProgsDiffPage->GetRestart(); restart |= m_pProgsMergePage->GetRestart(); - restart |= m_pProgsUniDiffPage->GetRestart(); restart |= m_pProgsAlternativeEditor->GetRestart(); restart |= m_pLookAndFeelPage->GetRestart(); restart |= m_pDialogsPage->GetRestart(); @@ -312,10 +307,6 @@ BOOL CSettings::OnInitDialog() { this->SetActivePage(this->m_pProgsMergePage); } - if(this->m_DefaultPage == _T("unidiff")) - { - this->SetActivePage(this->m_pProgsUniDiffPage); - } if(this->m_DefaultPage == _T("alternativeeditor")) { this->SetActivePage(this->m_pProgsAlternativeEditor); diff --git a/src/TortoiseProc/Settings/Settings.h b/src/TortoiseProc/Settings/Settings.h index df4bc8f79..69f9f77dd 100644 --- a/src/TortoiseProc/Settings/Settings.h +++ b/src/TortoiseProc/Settings/Settings.h @@ -28,7 +28,6 @@ #include "SettingsProgsDiff.h" #include "SettingsProgsAlternativeEditor.h" #include "SettingsProgsMerge.h" -#include "SettingsProgsUniDiff.h" #include "SetLookAndFeelPage.h" #include "SetDialogs.h" #include "SettingsColors.h" @@ -77,7 +76,6 @@ private: CSetOverlayHandlers * m_pOverlayHandlersPage; CSettingsProgsDiff* m_pProgsDiffPage; CSettingsProgsMerge * m_pProgsMergePage; - CSettingsProgsUniDiff * m_pProgsUniDiffPage; CSettingsProgsAlternativeEditor * m_pProgsAlternativeEditor; CSetLookAndFeelPage * m_pLookAndFeelPage; CSetDialogs * m_pDialogsPage; diff --git a/src/TortoiseProc/Settings/SettingsProgsDiff.cpp b/src/TortoiseProc/Settings/SettingsProgsDiff.cpp index 8a6db8166..70804b21d 100644 --- a/src/TortoiseProc/Settings/SettingsProgsDiff.cpp +++ b/src/TortoiseProc/Settings/SettingsProgsDiff.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2008-2011 - TortoiseGit -// Copyright (C) 2003-2007 - TortoiseSVN +// Copyright (C) 2003-2007,2011 - TortoiseSVN // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -30,8 +30,11 @@ CSettingsProgsDiff::CSettingsProgsDiff() , m_dlgAdvDiff(_T("Diff")) , m_iExtDiff(0) , m_sDiffPath(_T("")) + , m_sDiffViewerPath(_T("")) + , m_iDiffViewer(0) { m_regDiffPath = CRegString(_T("Software\\TortoiseGit\\Diff")); + m_regDiffViewerPath = CRegString(_T("Software\\TortoiseGit\\DiffViewer")); } CSettingsProgsDiff::~CSettingsProgsDiff() @@ -43,10 +46,15 @@ void CSettingsProgsDiff::DoDataExchange(CDataExchange* pDX) ISettingsPropPage::DoDataExchange(pDX); DDX_Text(pDX, IDC_EXTDIFF, m_sDiffPath); DDX_Radio(pDX, IDC_EXTDIFF_OFF, m_iExtDiff); + DDX_Text(pDX, IDC_DIFFVIEWER, m_sDiffViewerPath); + DDX_Radio(pDX, IDC_DIFFVIEWER_OFF, m_iDiffViewer); GetDlgItem(IDC_EXTDIFF)->EnableWindow(m_iExtDiff == 1); GetDlgItem(IDC_EXTDIFFBROWSE)->EnableWindow(m_iExtDiff == 1); + GetDlgItem(IDC_DIFFVIEWER)->EnableWindow(m_iDiffViewer == 1); + GetDlgItem(IDC_DIFFVIEWERBROWSE)->EnableWindow(m_iDiffViewer == 1); DDX_Control(pDX, IDC_EXTDIFF, m_cDiffEdit); + DDX_Control(pDX, IDC_DIFFVIEWER, m_cUnifiedDiffEdit); } @@ -56,6 +64,10 @@ BEGIN_MESSAGE_MAP(CSettingsProgsDiff, ISettingsPropPage) ON_BN_CLICKED(IDC_EXTDIFFBROWSE, OnBnClickedExtdiffbrowse) ON_BN_CLICKED(IDC_EXTDIFFADVANCED, OnBnClickedExtdiffadvanced) ON_EN_CHANGE(IDC_EXTDIFF, OnEnChangeExtdiff) + ON_BN_CLICKED(IDC_DIFFVIEWER_OFF, OnBnClickedDiffviewerOff) + ON_BN_CLICKED(IDC_DIFFVIEWER_ON, OnBnClickedDiffviewerOn) + ON_BN_CLICKED(IDC_DIFFVIEWERBROWSE, OnBnClickedDiffviewerbrowse) + ON_EN_CHANGE(IDC_DIFFVIEWER, OnEnChangeDiffviewer) END_MESSAGE_MAP() @@ -68,8 +80,14 @@ BOOL CSettingsProgsDiff::OnInitDialog() SHAutoComplete(::GetDlgItem(m_hWnd, IDC_EXTDIFF), SHACF_FILESYSTEM | SHACF_FILESYS_ONLY); + m_sDiffViewerPath = m_regDiffViewerPath; + m_iDiffViewer = IsExternal(m_sDiffViewerPath); + + SHAutoComplete(::GetDlgItem(m_hWnd, IDC_DIFFVIEWER), SHACF_FILESYSTEM | SHACF_FILESYS_ONLY); + m_tooltips.Create(this); m_tooltips.AddTool(IDC_EXTDIFF, IDS_SETTINGS_EXTDIFF_TT); + m_tooltips.AddTool(IDC_DIFFVIEWER, IDS_SETTINGS_DIFFVIEWER_TT); UpdateData(FALSE); return TRUE; @@ -91,6 +109,12 @@ BOOL CSettingsProgsDiff::OnApply() m_regDiffPath = m_sDiffPath; m_dlgAdvDiff.SaveData(); + + if (m_iDiffViewer == 0 && !m_sDiffViewerPath.IsEmpty() && m_sDiffViewerPath.Left(1) != _T("#")) + m_sDiffViewerPath = _T("#") + m_sDiffViewerPath; + + m_regDiffViewerPath = m_sDiffViewerPath; + SetModified(FALSE); return ISettingsPropPage::OnApply(); } @@ -141,5 +165,42 @@ void CSettingsProgsDiff::CheckProgComment() m_sDiffPath = _T("#") + m_sDiffPath; else if (m_iExtDiff == 1) m_sDiffPath.TrimLeft('#'); + if (m_iDiffViewer == 0 && !m_sDiffViewerPath.IsEmpty() && m_sDiffViewerPath.Left(1) != _T("#")) + m_sDiffViewerPath = _T("#") + m_sDiffViewerPath; + else if (m_iDiffViewer == 1) + m_sDiffViewerPath.TrimLeft('#'); UpdateData(FALSE); } + +void CSettingsProgsDiff::OnBnClickedDiffviewerOff() +{ + m_iDiffViewer = 0; + SetModified(); + GetDlgItem(IDC_DIFFVIEWER)->EnableWindow(FALSE); + GetDlgItem(IDC_DIFFVIEWERBROWSE)->EnableWindow(FALSE); + CheckProgComment(); +} + +void CSettingsProgsDiff::OnBnClickedDiffviewerOn() +{ + m_iDiffViewer = 1; + SetModified(); + GetDlgItem(IDC_DIFFVIEWER)->EnableWindow(TRUE); + GetDlgItem(IDC_DIFFVIEWERBROWSE)->EnableWindow(TRUE); + GetDlgItem(IDC_DIFFVIEWER)->SetFocus(); + CheckProgComment(); +} + +void CSettingsProgsDiff::OnEnChangeDiffviewer() +{ + SetModified(); +} + +void CSettingsProgsDiff::OnBnClickedDiffviewerbrowse() +{ + if (CAppUtils::FileOpenSave(m_sDiffViewerPath, NULL, IDS_SETTINGS_SELECTDIFFVIEWER, IDS_PROGRAMSFILEFILTER, true, m_hWnd)) + { + UpdateData(FALSE); + SetModified(); + } +} diff --git a/src/TortoiseProc/Settings/SettingsProgsDiff.h b/src/TortoiseProc/Settings/SettingsProgsDiff.h index 837a2a529..1804b2fc2 100644 --- a/src/TortoiseProc/Settings/SettingsProgsDiff.h +++ b/src/TortoiseProc/Settings/SettingsProgsDiff.h @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2011 - TortoiseGit -// Copyright (C) 2003-2008 - TortoiseSVN +// Copyright (C) 2003-2008,2011 - TortoiseSVN // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -53,6 +53,11 @@ protected: afx_msg void OnBnClickedExtdiffbrowse(); afx_msg void OnBnClickedExtdiffadvanced(); afx_msg void OnEnChangeExtdiff(); + afx_msg void OnEnChangeExtdiffprops(); + afx_msg void OnBnClickedDiffviewerOff(); + afx_msg void OnBnClickedDiffviewerOn(); + afx_msg void OnBnClickedDiffviewerbrowse(); + afx_msg void OnEnChangeDiffviewer(); bool IsExternal(const CString& path) const { return !path.IsEmpty() && path.Left(1) != _T("#"); } void CheckProgComment(); @@ -61,9 +66,13 @@ protected: private: CString m_sDiffPath; CRegString m_regDiffPath; - int m_iExtDiff; + int m_iExtDiff; CSetProgsAdvDlg m_dlgAdvDiff; CToolTips m_tooltips; + CString m_sDiffViewerPath; + CRegString m_regDiffViewerPath; + int m_iDiffViewer; CFileDropEdit m_cDiffEdit; + CFileDropEdit m_cUnifiedDiffEdit; }; diff --git a/src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp b/src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp deleted file mode 100644 index 35d0edf32..000000000 --- a/src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp +++ /dev/null @@ -1,134 +0,0 @@ -// TortoiseGit - a Windows shell extension for easy version control - -// Copyright (C) 2003-2007 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#include "stdafx.h" -#include "TortoiseProc.h" -#include "AppUtils.h" -#include "StringUtils.h" -#include ".\settingsprogsunidiff.h" - - -IMPLEMENT_DYNAMIC(CSettingsProgsUniDiff, ISettingsPropPage) -CSettingsProgsUniDiff::CSettingsProgsUniDiff() - : ISettingsPropPage(CSettingsProgsUniDiff::IDD) - , m_sDiffViewerPath(_T("")) - , m_iDiffViewer(0) -{ - m_regDiffViewerPath = CRegString(_T("Software\\TortoiseGit\\DiffViewer")); -} - -CSettingsProgsUniDiff::~CSettingsProgsUniDiff() -{ -} - -void CSettingsProgsUniDiff::DoDataExchange(CDataExchange* pDX) -{ - ISettingsPropPage::DoDataExchange(pDX); - DDX_Text(pDX, IDC_DIFFVIEWER, m_sDiffViewerPath); - DDX_Radio(pDX, IDC_DIFFVIEWER_OFF, m_iDiffViewer); - - GetDlgItem(IDC_DIFFVIEWER)->EnableWindow(m_iDiffViewer == 1); - GetDlgItem(IDC_DIFFVIEWERBROWSE)->EnableWindow(m_iDiffViewer == 1); - DDX_Control(pDX, IDC_DIFFVIEWER, m_cUnifiedDiffEdit); -} - - -BEGIN_MESSAGE_MAP(CSettingsProgsUniDiff, ISettingsPropPage) - ON_BN_CLICKED(IDC_DIFFVIEWER_OFF, OnBnClickedDiffviewerOff) - ON_BN_CLICKED(IDC_DIFFVIEWER_ON, OnBnClickedDiffviewerOn) - ON_BN_CLICKED(IDC_DIFFVIEWERBROWSE, OnBnClickedDiffviewerbrowse) - ON_EN_CHANGE(IDC_DIFFVIEWER, OnEnChangeDiffviewer) -END_MESSAGE_MAP() - -void CSettingsProgsUniDiff::OnBnClickedDiffviewerOff() -{ - m_iDiffViewer = 0; - SetModified(); - GetDlgItem(IDC_DIFFVIEWER)->EnableWindow(FALSE); - GetDlgItem(IDC_DIFFVIEWERBROWSE)->EnableWindow(FALSE); - CheckProgComment(); -} - -void CSettingsProgsUniDiff::OnBnClickedDiffviewerOn() -{ - m_iDiffViewer = 1; - SetModified(); - GetDlgItem(IDC_DIFFVIEWER)->EnableWindow(TRUE); - GetDlgItem(IDC_DIFFVIEWERBROWSE)->EnableWindow(TRUE); - GetDlgItem(IDC_DIFFVIEWER)->SetFocus(); - CheckProgComment(); -} - -void CSettingsProgsUniDiff::OnEnChangeDiffviewer() -{ - SetModified(); -} - -void CSettingsProgsUniDiff::OnBnClickedDiffviewerbrowse() -{ - if (CAppUtils::FileOpenSave(m_sDiffViewerPath, NULL, IDS_SETTINGS_SELECTDIFFVIEWER, IDS_PROGRAMSFILEFILTER, true, m_hWnd)) - { - UpdateData(FALSE); - SetModified(); - } -} - -BOOL CSettingsProgsUniDiff::OnInitDialog() -{ - ISettingsPropPage::OnInitDialog(); - - EnableToolTips(); - - m_sDiffViewerPath = m_regDiffViewerPath; - m_iDiffViewer = IsExternal(m_sDiffViewerPath); - - SHAutoComplete(::GetDlgItem(m_hWnd, IDC_DIFFVIEWER), SHACF_FILESYSTEM | SHACF_FILESYS_ONLY); - - m_tooltips.Create(this); - m_tooltips.AddTool(IDC_DIFFVIEWER, IDS_SETTINGS_DIFFVIEWER_TT); - - UpdateData(FALSE); - return TRUE; -} - -BOOL CSettingsProgsUniDiff::PreTranslateMessage(MSG* pMsg) -{ - m_tooltips.RelayEvent(pMsg); - return ISettingsPropPage::PreTranslateMessage(pMsg); -} - -BOOL CSettingsProgsUniDiff::OnApply() -{ - UpdateData(); - if (m_iDiffViewer == 0 && !m_sDiffViewerPath.IsEmpty() && m_sDiffViewerPath.Left(1) != _T("#")) - m_sDiffViewerPath = _T("#") + m_sDiffViewerPath; - - m_regDiffViewerPath = m_sDiffViewerPath; - SetModified(FALSE); - return ISettingsPropPage::OnApply(); -} - -void CSettingsProgsUniDiff::CheckProgComment() -{ - UpdateData(); - if (m_iDiffViewer == 0 && !m_sDiffViewerPath.IsEmpty() && m_sDiffViewerPath.Left(1) != _T("#")) - m_sDiffViewerPath = _T("#") + m_sDiffViewerPath; - else if (m_iDiffViewer == 1) - m_sDiffViewerPath.TrimLeft('#'); - UpdateData(FALSE); -} \ No newline at end of file diff --git a/src/TortoiseProc/Settings/SettingsProgsUniDiff.h b/src/TortoiseProc/Settings/SettingsProgsUniDiff.h deleted file mode 100644 index 1513aa2cc..000000000 --- a/src/TortoiseProc/Settings/SettingsProgsUniDiff.h +++ /dev/null @@ -1,64 +0,0 @@ -// TortoiseGit - a Windows shell extension for easy version control - -// Copyright (C) 2003-2008 - TortoiseSVN - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#pragma once -#include "SettingsPropPage.h" -#include "SetProgsAdvDlg.h" -#include "FileDropEdit.h" -#include "Tooltip.h" - - -/** - * \ingroup TortoiseProc - * Settings page to configure external unified diff viewers. - */ -class CSettingsProgsUniDiff : public ISettingsPropPage -{ - DECLARE_DYNAMIC(CSettingsProgsUniDiff) - -public: - CSettingsProgsUniDiff(); - virtual ~CSettingsProgsUniDiff(); - - UINT GetIconID() {return IDI_DIFF;} - - enum { IDD = IDD_SETTINGSPROGSUNIDIFF }; - -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnInitDialog(); - virtual BOOL PreTranslateMessage(MSG* pMsg); - virtual BOOL OnApply(); - afx_msg void OnBnClickedDiffviewerOff(); - afx_msg void OnBnClickedDiffviewerOn(); - afx_msg void OnBnClickedDiffviewerbrowse(); - afx_msg void OnEnChangeDiffviewer(); - - DECLARE_MESSAGE_MAP() - -private: - bool IsExternal(const CString& path) const { return !path.IsEmpty() && path.Left(1) != _T("#"); } - void CheckProgComment(); -private: - CString m_sDiffViewerPath; - CRegString m_regDiffViewerPath; - int m_iDiffViewer; - CToolTips m_tooltips; - - CFileDropEdit m_cUnifiedDiffEdit; -}; diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj index 4a9046cb8..0658db831 100644 --- a/src/TortoiseProc/TortoiseProc.vcproj +++ b/src/TortoiseProc/TortoiseProc.vcproj @@ -1725,10 +1725,6 @@ > - - diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 55b8c0fce..efa20cc8a 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -46,7 +46,6 @@ #define IDI_SET_OVERLAYS 190 #define IDD_SETTINGSPROGSDIFF 192 #define IDD_SETTINGSPROGSMERGE 193 -#define IDD_SETTINGSPROGSUNIDIFF 194 #define IDD_SETTINGSLOOKANDFEEL 195 #define IDI_GENERAL 195 #define IDD_SETTINGSDIALOGS 196 -- 2.11.4.GIT