From: Frank Li Date: Wed, 21 Jan 2009 09:37:53 +0000 (+0800) Subject: Add color setting X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=1a8e0ab29e5dfeb6aab24b610560eda0c9edeed4;hp=d39d6c9d0b7881dba6a54b620e73e272556d0feb;p=tortoisegit%2FTortoiseGitJp.git Add color setting --- diff --git a/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user b/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user index e077687..f1fabbf 100644 --- a/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user +++ b/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user @@ -34,6 +34,34 @@ /> + + + + + + diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 15ee9f2..e903e7c 100644 Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ diff --git a/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user b/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user index 16bbce6..9d0cf37 100644 --- a/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user +++ b/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user @@ -34,6 +34,34 @@ /> + + + + + + diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user index ae5c3ce..347927c 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user +++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user @@ -34,6 +34,34 @@ /> + + + + + + diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user index 55dd3ea..4ad7b75 100644 --- a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user +++ b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user @@ -33,5 +33,33 @@ MPIAcceptFilter="" /> + + + diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user index 0d7e285..8e15097 100644 --- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user +++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user @@ -34,6 +34,34 @@ /> + + + + + + diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp index cabd9e7..91563b2 100644 --- a/src/TortoiseProc/Settings/Settings.cpp +++ b/src/TortoiseProc/Settings/Settings.cpp @@ -53,6 +53,8 @@ void CSettings::AddPropPages() // m_pLogCachePage = new CSetLogCache(); // m_pLogCacheListPage = new CSettingsLogCaches(); m_pColorsPage = new CSettingsColors(); + m_pColorsPage2 = new CSettingsColors2(); + m_pColorsPage3 = new CSettingsColors3(); m_pSavedPage = new CSetSavedDataPage(); // m_pHooksPage = new CSetHooks(); m_pBugTraqPage = new CSetBugTraq(); @@ -72,6 +74,9 @@ void CSettings::AddPropPages() //// SetPageIcon(m_pLogCachePage, m_pLogCachePage->GetIconID()); // SetPageIcon(m_pLogCacheListPage, m_pLogCacheListPage->GetIconID()); SetPageIcon(m_pColorsPage, m_pColorsPage->GetIconID()); + SetPageIcon(m_pColorsPage2, m_pColorsPage2->GetIconID()); + SetPageIcon(m_pColorsPage3, m_pColorsPage3->GetIconID()); + SetPageIcon(m_pSavedPage, m_pSavedPage->GetIconID()); // SetPageIcon(m_pHooksPage, m_pHooksPage->GetIconID()); SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID()); diff --git a/src/TortoiseProc/Settings/Settings.h b/src/TortoiseProc/Settings/Settings.h index a97961b..123efc2 100644 --- a/src/TortoiseProc/Settings/Settings.h +++ b/src/TortoiseProc/Settings/Settings.h @@ -29,6 +29,8 @@ #include "SetLookAndFeelPage.h" #include "SetDialogs.h" #include "SettingsColors.h" +#include "SettingsColors2.h" +#include "SettingsColors3.h" #include "SetMisc.h" #include "SetLogCache.h" #include "SettingsLogCaches.h" @@ -75,6 +77,8 @@ private: CSetDialogs * m_pDialogsPage; CSettingsRevisionGraph* m_pRevisionGraphPage; CSettingsColors * m_pColorsPage; + CSettingsColors2 * m_pColorsPage2; + CSettingsColors3 * m_pColorsPage3; CSetMisc * m_pMiscPage; // CSetLogCache * m_pLogCachePage; // CSettingsLogCaches* m_pLogCacheListPage; diff --git a/src/TortoiseProc/Settings/SettingsColors.h b/src/TortoiseProc/Settings/SettingsColors.h index 54b443e..e8bec99 100644 --- a/src/TortoiseProc/Settings/SettingsColors.h +++ b/src/TortoiseProc/Settings/SettingsColors.h @@ -34,7 +34,7 @@ public: UINT GetIconID() {return IDI_LOOKANDFEEL;} - enum { IDD = IDD_SETTINGSCOLORS }; + enum { IDD = IDD_SETTINGSCOLORS_1 }; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support diff --git a/src/TortoiseProc/Settings/SettingsColors2.cpp b/src/TortoiseProc/Settings/SettingsColors2.cpp new file mode 100644 index 0000000..98aed92 --- /dev/null +++ b/src/TortoiseProc/Settings/SettingsColors2.cpp @@ -0,0 +1,134 @@ +// TortoiseSVN - 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. +// +#include "stdafx.h" +#include "TortoiseProc.h" +#include "SettingsColors2.h" +#include ".\settingscolors2.h" + +IMPLEMENT_DYNAMIC(CSettingsColors2, ISettingsPropPage) +CSettingsColors2::CSettingsColors2() + : ISettingsPropPage(CSettingsColors2::IDD) +{ +} + +CSettingsColors2::~CSettingsColors2() +{ +} + +void CSettingsColors2::DoDataExchange(CDataExchange* pDX) +{ + ISettingsPropPage::DoDataExchange(pDX); + DDX_Control(pDX, IDC_CONFLICTCOLOR, m_cConflict); + DDX_Control(pDX, IDC_ADDEDCOLOR, m_cAdded); + DDX_Control(pDX, IDC_DELETEDCOLOR, m_cDeleted); + DDX_Control(pDX, IDC_MERGEDCOLOR, m_cMerged); + DDX_Control(pDX, IDC_MODIFIEDCOLOR, m_cModified); + DDX_Control(pDX, IDC_DELETEDNODECOLOR, m_cDeletedNode); + DDX_Control(pDX, IDC_ADDEDNODECOLOR, m_cAddedNode); + DDX_Control(pDX, IDC_REPLACEDNODECOLOR, m_cReplacedNode); + DDX_Control(pDX, IDC_RENAMEDNODECOLOR, m_cRenamedNode); +} + + +BEGIN_MESSAGE_MAP(CSettingsColors2, ISettingsPropPage) + ON_BN_CLICKED(IDC_RESTORE, OnBnClickedRestore) + ON_BN_CLICKED(IDC_CONFLICTCOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_ADDEDCOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_DELETEDCOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_MERGEDCOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_MODIFIEDCOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_DELETEDNODECOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_ADDEDNODECOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_REPLACEDNODECOLOR, &CSettingsColors2::OnBnClickedColor) + ON_BN_CLICKED(IDC_RENAMEDNODECOLOR, &CSettingsColors2::OnBnClickedColor) +END_MESSAGE_MAP() + +BOOL CSettingsColors2::OnInitDialog() +{ + ISettingsPropPage::OnInitDialog(); + + m_cAdded.SetColor(m_Colors.GetColor(CColors::Added)); + m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted)); + m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged)); + m_cModified.SetColor(m_Colors.GetColor(CColors::Modified)); + m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict)); + m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode)); + m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode)); + m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode)); + m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode)); + + CString sDefaultText, sCustomText; + sDefaultText.LoadString(IDS_COLOURPICKER_DEFAULTTEXT); + sCustomText.LoadString(IDS_COLOURPICKER_CUSTOMTEXT); + m_cAdded.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Added, true)); + m_cAdded.EnableOtherButton(sCustomText); + m_cDeleted.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Deleted, true)); + m_cDeleted.EnableOtherButton(sCustomText); + m_cMerged.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Merged, true)); + m_cMerged.EnableOtherButton(sCustomText); + m_cModified.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Modified, true)); + m_cModified.EnableOtherButton(sCustomText); + m_cConflict.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Conflict, true)); + m_cConflict.EnableOtherButton(sCustomText); + m_cAddedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::AddedNode, true)); + m_cAddedNode.EnableOtherButton(sCustomText); + m_cDeletedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::DeletedNode, true)); + m_cDeletedNode.EnableOtherButton(sCustomText); + m_cRenamedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::RenamedNode, true)); + m_cRenamedNode.EnableOtherButton(sCustomText); + m_cReplacedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::ReplacedNode, true)); + m_cReplacedNode.EnableOtherButton(sCustomText); + + return TRUE; +} + +void CSettingsColors2::OnBnClickedRestore() +{ + m_cAdded.SetColor(m_Colors.GetColor(CColors::Added)); + m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted)); + m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged)); + m_cModified.SetColor(m_Colors.GetColor(CColors::Modified)); + m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict)); + m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode)); + m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode)); + m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode)); + m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode)); + SetModified(TRUE); +} + +BOOL CSettingsColors2::OnApply() +{ + m_Colors.SetColor(CColors::Added, m_cAdded.GetColor() == -1 ? m_cAdded.GetAutomaticColor() : m_cAdded.GetColor()); + m_Colors.SetColor(CColors::Deleted, m_cDeleted.GetColor() == -1 ? m_cDeleted.GetAutomaticColor() : m_cDeleted.GetColor()); + m_Colors.SetColor(CColors::Merged, m_cMerged.GetColor() == -1 ? m_cMerged.GetAutomaticColor() : m_cMerged.GetColor()); + m_Colors.SetColor(CColors::Modified, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor()); + m_Colors.SetColor(CColors::Conflict, m_cConflict.GetColor() == -1 ? m_cConflict.GetAutomaticColor() : m_cConflict.GetColor()); + m_Colors.SetColor(CColors::AddedNode, m_cAddedNode.GetColor() == -1 ? m_cAddedNode.GetAutomaticColor() : m_cAddedNode.GetColor()); + m_Colors.SetColor(CColors::DeletedNode, m_cDeletedNode.GetColor() == -1 ? m_cDeletedNode.GetAutomaticColor() : m_cDeletedNode.GetColor()); + m_Colors.SetColor(CColors::RenamedNode, m_cRenamedNode.GetColor() == -1 ? m_cRenamedNode.GetAutomaticColor() : m_cRenamedNode.GetColor()); + m_Colors.SetColor(CColors::ReplacedNode, m_cReplacedNode.GetColor() == -1 ? m_cReplacedNode.GetAutomaticColor() : m_cReplacedNode.GetColor()); + m_Colors.SetColor(CColors::PropertyChanged, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor()); + + return ISettingsPropPage::OnApply(); +} + +void CSettingsColors2::OnBnClickedColor() +{ + SetModified(); +} diff --git a/src/TortoiseProc/Settings/SettingsColors2.h b/src/TortoiseProc/Settings/SettingsColors2.h new file mode 100644 index 0000000..c74c1fb --- /dev/null +++ b/src/TortoiseProc/Settings/SettingsColors2.h @@ -0,0 +1,59 @@ +// TortoiseSVN - 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 "Colors.h" + +/** + * \ingroup TortoiseProc + * Settings property page to set custom colors used in TortoiseSVN + */ +class CSettingsColors2 : public ISettingsPropPage +{ + DECLARE_DYNAMIC(CSettingsColors2) + +public: + CSettingsColors2(); + virtual ~CSettingsColors2(); + + UINT GetIconID() {return IDI_LOOKANDFEEL;} + + enum { IDD = IDD_SETTINGSCOLORS_2 }; + +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual BOOL OnInitDialog(); + afx_msg void OnBnClickedColor(); + afx_msg void OnBnClickedRestore(); + virtual BOOL OnApply(); + + DECLARE_MESSAGE_MAP() +private: + CMFCColorButton m_cConflict; + CMFCColorButton m_cAdded; + CMFCColorButton m_cDeleted; + CMFCColorButton m_cMerged; + CMFCColorButton m_cModified; + CMFCColorButton m_cAddedNode; + CMFCColorButton m_cDeletedNode; + CMFCColorButton m_cRenamedNode; + CMFCColorButton m_cReplacedNode; + CColors m_Colors; +public: +}; diff --git a/src/TortoiseProc/Settings/SettingsColors3.cpp b/src/TortoiseProc/Settings/SettingsColors3.cpp new file mode 100644 index 0000000..b24104d --- /dev/null +++ b/src/TortoiseProc/Settings/SettingsColors3.cpp @@ -0,0 +1,134 @@ +// TortoiseSVN - 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. +// +#include "stdafx.h" +#include "TortoiseProc.h" +#include "SettingsColors3.h" +#include ".\settingscolors3.h" + +IMPLEMENT_DYNAMIC(CSettingsColors3, ISettingsPropPage) +CSettingsColors3::CSettingsColors3() + : ISettingsPropPage(CSettingsColors3::IDD) +{ +} + +CSettingsColors3::~CSettingsColors3() +{ +} + +void CSettingsColors3::DoDataExchange(CDataExchange* pDX) +{ + ISettingsPropPage::DoDataExchange(pDX); + DDX_Control(pDX, IDC_CONFLICTCOLOR, m_cConflict); + DDX_Control(pDX, IDC_ADDEDCOLOR, m_cAdded); + DDX_Control(pDX, IDC_DELETEDCOLOR, m_cDeleted); + DDX_Control(pDX, IDC_MERGEDCOLOR, m_cMerged); + DDX_Control(pDX, IDC_MODIFIEDCOLOR, m_cModified); + DDX_Control(pDX, IDC_DELETEDNODECOLOR, m_cDeletedNode); + DDX_Control(pDX, IDC_ADDEDNODECOLOR, m_cAddedNode); + DDX_Control(pDX, IDC_REPLACEDNODECOLOR, m_cReplacedNode); + DDX_Control(pDX, IDC_RENAMEDNODECOLOR, m_cRenamedNode); +} + + +BEGIN_MESSAGE_MAP(CSettingsColors3, ISettingsPropPage) + ON_BN_CLICKED(IDC_RESTORE, OnBnClickedRestore) + ON_BN_CLICKED(IDC_CONFLICTCOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_ADDEDCOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_DELETEDCOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_MERGEDCOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_MODIFIEDCOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_DELETEDNODECOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_ADDEDNODECOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_REPLACEDNODECOLOR, &CSettingsColors3::OnBnClickedColor) + ON_BN_CLICKED(IDC_RENAMEDNODECOLOR, &CSettingsColors3::OnBnClickedColor) +END_MESSAGE_MAP() + +BOOL CSettingsColors3::OnInitDialog() +{ + ISettingsPropPage::OnInitDialog(); + + m_cAdded.SetColor(m_Colors.GetColor(CColors::Added)); + m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted)); + m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged)); + m_cModified.SetColor(m_Colors.GetColor(CColors::Modified)); + m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict)); + m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode)); + m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode)); + m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode)); + m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode)); + + CString sDefaultText, sCustomText; + sDefaultText.LoadString(IDS_COLOURPICKER_DEFAULTTEXT); + sCustomText.LoadString(IDS_COLOURPICKER_CUSTOMTEXT); + m_cAdded.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Added, true)); + m_cAdded.EnableOtherButton(sCustomText); + m_cDeleted.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Deleted, true)); + m_cDeleted.EnableOtherButton(sCustomText); + m_cMerged.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Merged, true)); + m_cMerged.EnableOtherButton(sCustomText); + m_cModified.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Modified, true)); + m_cModified.EnableOtherButton(sCustomText); + m_cConflict.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Conflict, true)); + m_cConflict.EnableOtherButton(sCustomText); + m_cAddedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::AddedNode, true)); + m_cAddedNode.EnableOtherButton(sCustomText); + m_cDeletedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::DeletedNode, true)); + m_cDeletedNode.EnableOtherButton(sCustomText); + m_cRenamedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::RenamedNode, true)); + m_cRenamedNode.EnableOtherButton(sCustomText); + m_cReplacedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::ReplacedNode, true)); + m_cReplacedNode.EnableOtherButton(sCustomText); + + return TRUE; +} + +void CSettingsColors3::OnBnClickedRestore() +{ + m_cAdded.SetColor(m_Colors.GetColor(CColors::Added)); + m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted)); + m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged)); + m_cModified.SetColor(m_Colors.GetColor(CColors::Modified)); + m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict)); + m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode)); + m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode)); + m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode)); + m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode)); + SetModified(TRUE); +} + +BOOL CSettingsColors3::OnApply() +{ + m_Colors.SetColor(CColors::Added, m_cAdded.GetColor() == -1 ? m_cAdded.GetAutomaticColor() : m_cAdded.GetColor()); + m_Colors.SetColor(CColors::Deleted, m_cDeleted.GetColor() == -1 ? m_cDeleted.GetAutomaticColor() : m_cDeleted.GetColor()); + m_Colors.SetColor(CColors::Merged, m_cMerged.GetColor() == -1 ? m_cMerged.GetAutomaticColor() : m_cMerged.GetColor()); + m_Colors.SetColor(CColors::Modified, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor()); + m_Colors.SetColor(CColors::Conflict, m_cConflict.GetColor() == -1 ? m_cConflict.GetAutomaticColor() : m_cConflict.GetColor()); + m_Colors.SetColor(CColors::AddedNode, m_cAddedNode.GetColor() == -1 ? m_cAddedNode.GetAutomaticColor() : m_cAddedNode.GetColor()); + m_Colors.SetColor(CColors::DeletedNode, m_cDeletedNode.GetColor() == -1 ? m_cDeletedNode.GetAutomaticColor() : m_cDeletedNode.GetColor()); + m_Colors.SetColor(CColors::RenamedNode, m_cRenamedNode.GetColor() == -1 ? m_cRenamedNode.GetAutomaticColor() : m_cRenamedNode.GetColor()); + m_Colors.SetColor(CColors::ReplacedNode, m_cReplacedNode.GetColor() == -1 ? m_cReplacedNode.GetAutomaticColor() : m_cReplacedNode.GetColor()); + m_Colors.SetColor(CColors::PropertyChanged, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor()); + + return ISettingsPropPage::OnApply(); +} + +void CSettingsColors3::OnBnClickedColor() +{ + SetModified(); +} diff --git a/src/TortoiseProc/Settings/SettingsColors3.h b/src/TortoiseProc/Settings/SettingsColors3.h new file mode 100644 index 0000000..42e99d1 --- /dev/null +++ b/src/TortoiseProc/Settings/SettingsColors3.h @@ -0,0 +1,59 @@ +// TortoiseSVN - 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 "Colors.h" + +/** + * \ingroup TortoiseProc + * Settings property page to set custom colors used in TortoiseSVN + */ +class CSettingsColors3 : public ISettingsPropPage +{ + DECLARE_DYNAMIC(CSettingsColors3) + +public: + CSettingsColors3(); + virtual ~CSettingsColors3(); + + UINT GetIconID() {return IDI_LOOKANDFEEL;} + + enum { IDD = IDD_SETTINGSCOLORS_3 }; + +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual BOOL OnInitDialog(); + afx_msg void OnBnClickedColor(); + afx_msg void OnBnClickedRestore(); + virtual BOOL OnApply(); + + DECLARE_MESSAGE_MAP() +private: + CMFCColorButton m_cConflict; + CMFCColorButton m_cAdded; + CMFCColorButton m_cDeleted; + CMFCColorButton m_cMerged; + CMFCColorButton m_cModified; + CMFCColorButton m_cAddedNode; + CMFCColorButton m_cDeletedNode; + CMFCColorButton m_cRenamedNode; + CMFCColorButton m_cReplacedNode; + CColors m_Colors; +public: +}; diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj index b6d8594..e6ac0b3 100644 --- a/src/TortoiseProc/TortoiseProc.vcproj +++ b/src/TortoiseProc/TortoiseProc.vcproj @@ -574,11 +574,11 @@ > + + + + + + + + diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index feba744..688e76a 100644 Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ diff --git a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user b/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user index 55dd3ea..4ad7b75 100644 --- a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user +++ b/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user @@ -33,5 +33,33 @@ MPIAcceptFilter="" /> + + +