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 (file)
--- a/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
+++ b/src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
@@ -34,6 +34,34 @@
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
@@ -61,5 +89,33 @@
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 15ee9f2..e903e7c 100644 (file)
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 (file)
--- a/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
+++ b/src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
@@ -34,6 +34,34 @@
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
@@ -61,5 +89,33 @@
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
index ae5c3ce..347927c 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
@@ -34,6 +34,34 @@
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
@@ -61,5 +89,33 @@
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r

diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
index 55dd3ea..4ad7b75 100644 (file)
--- a/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
+++ b/src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
@@ -33,5 +33,33 @@
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r

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 (file)
--- 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 @@
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Debug|Win32"\r
                        >\r
                        <DebugSettings\r
@@ -61,5 +89,33 @@
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r

diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index cabd9e7..91563b2 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -53,6 +53,8 @@ void CSettings::AddPropPages()
 //     m_pLogCachePage = new CSetLogCache();\r
 //     m_pLogCacheListPage = new CSettingsLogCaches();\r
        m_pColorsPage = new CSettingsColors();\r
+    m_pColorsPage2 = new CSettingsColors2();\r
+    m_pColorsPage3 = new CSettingsColors3();\r
        m_pSavedPage = new CSetSavedDataPage();\r
 //     m_pHooksPage = new CSetHooks();\r
        m_pBugTraqPage = new CSetBugTraq();\r
@@ -72,6 +74,9 @@ void CSettings::AddPropPages()
 ////   SetPageIcon(m_pLogCachePage, m_pLogCachePage->GetIconID());\r
 //     SetPageIcon(m_pLogCacheListPage, m_pLogCacheListPage->GetIconID());\r
        SetPageIcon(m_pColorsPage, m_pColorsPage->GetIconID());\r
+    SetPageIcon(m_pColorsPage2, m_pColorsPage2->GetIconID());\r
+    SetPageIcon(m_pColorsPage3, m_pColorsPage3->GetIconID());\r
+\r
        SetPageIcon(m_pSavedPage, m_pSavedPage->GetIconID());\r
 //     SetPageIcon(m_pHooksPage, m_pHooksPage->GetIconID());\r
        SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID());\r

diff --git a/src/TortoiseProc/Settings/Settings.h b/src/TortoiseProc/Settings/Settings.h
index a97961b..123efc2 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.h
+++ b/src/TortoiseProc/Settings/Settings.h
@@ -29,6 +29,8 @@
 #include "SetLookAndFeelPage.h"\r
 #include "SetDialogs.h"\r
 #include "SettingsColors.h"\r
+#include "SettingsColors2.h"\r
+#include "SettingsColors3.h"\r
 #include "SetMisc.h"\r
 #include "SetLogCache.h"\r
 #include "SettingsLogCaches.h"\r
@@ -75,6 +77,8 @@ private:
        CSetDialogs *                   m_pDialogsPage;\r
     CSettingsRevisionGraph* m_pRevisionGraphPage;\r
        CSettingsColors *               m_pColorsPage;\r
+    CSettingsColors2 *         m_pColorsPage2;\r
+    CSettingsColors3 *         m_pColorsPage3;\r
        CSetMisc *                              m_pMiscPage;\r
 //     CSetLogCache *                  m_pLogCachePage;\r
 //    CSettingsLogCaches*     m_pLogCacheListPage;\r

diff --git a/src/TortoiseProc/Settings/SettingsColors.h b/src/TortoiseProc/Settings/SettingsColors.h
index 54b443e..e8bec99 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsColors.h
+++ b/src/TortoiseProc/Settings/SettingsColors.h
@@ -34,7 +34,7 @@ public:
 \r
        UINT GetIconID() {return IDI_LOOKANDFEEL;}\r
 \r
-       enum { IDD = IDD_SETTINGSCOLORS };\r
+       enum { IDD = IDD_SETTINGSCOLORS_1 };\r
 \r
 protected:\r
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r

diff --git a/src/TortoiseProc/Settings/SettingsColors2.cpp b/src/TortoiseProc/Settings/SettingsColors2.cpp
new file mode 100644 (file)
index 0000000..98aed92
--- /dev/null
+++ b/src/TortoiseProc/Settings/SettingsColors2.cpp
@@ -0,0 +1,134 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2003-2008 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SettingsColors2.h"\r
+#include ".\settingscolors2.h"\r
+\r
+IMPLEMENT_DYNAMIC(CSettingsColors2, ISettingsPropPage)\r
+CSettingsColors2::CSettingsColors2()\r
+       : ISettingsPropPage(CSettingsColors2::IDD)\r
+{\r
+}\r
+\r
+CSettingsColors2::~CSettingsColors2()\r
+{\r
+}\r
+\r
+void CSettingsColors2::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       ISettingsPropPage::DoDataExchange(pDX);\r
+       DDX_Control(pDX, IDC_CONFLICTCOLOR, m_cConflict);\r
+       DDX_Control(pDX, IDC_ADDEDCOLOR, m_cAdded);\r
+       DDX_Control(pDX, IDC_DELETEDCOLOR, m_cDeleted);\r
+       DDX_Control(pDX, IDC_MERGEDCOLOR, m_cMerged);\r
+       DDX_Control(pDX, IDC_MODIFIEDCOLOR, m_cModified);\r
+       DDX_Control(pDX, IDC_DELETEDNODECOLOR, m_cDeletedNode);\r
+       DDX_Control(pDX, IDC_ADDEDNODECOLOR, m_cAddedNode);\r
+       DDX_Control(pDX, IDC_REPLACEDNODECOLOR, m_cReplacedNode);\r
+       DDX_Control(pDX, IDC_RENAMEDNODECOLOR, m_cRenamedNode);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSettingsColors2, ISettingsPropPage)\r
+       ON_BN_CLICKED(IDC_RESTORE, OnBnClickedRestore)\r
+       ON_BN_CLICKED(IDC_CONFLICTCOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_ADDEDCOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_DELETEDCOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_MERGEDCOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_MODIFIEDCOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_DELETEDNODECOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_ADDEDNODECOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_REPLACEDNODECOLOR, &CSettingsColors2::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_RENAMEDNODECOLOR, &CSettingsColors2::OnBnClickedColor)\r
+END_MESSAGE_MAP()\r
+\r
+BOOL CSettingsColors2::OnInitDialog()\r
+{\r
+       ISettingsPropPage::OnInitDialog();\r
+\r
+       m_cAdded.SetColor(m_Colors.GetColor(CColors::Added));\r
+       m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted));\r
+       m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged));\r
+       m_cModified.SetColor(m_Colors.GetColor(CColors::Modified));\r
+       m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict));\r
+       m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode));\r
+       m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode));\r
+       m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode));\r
+       m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode));\r
+\r
+       CString sDefaultText, sCustomText;\r
+       sDefaultText.LoadString(IDS_COLOURPICKER_DEFAULTTEXT);\r
+       sCustomText.LoadString(IDS_COLOURPICKER_CUSTOMTEXT);\r
+       m_cAdded.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Added, true));\r
+       m_cAdded.EnableOtherButton(sCustomText);\r
+       m_cDeleted.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Deleted, true));\r
+       m_cDeleted.EnableOtherButton(sCustomText);\r
+       m_cMerged.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Merged, true));\r
+       m_cMerged.EnableOtherButton(sCustomText);\r
+       m_cModified.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Modified, true));\r
+       m_cModified.EnableOtherButton(sCustomText);\r
+       m_cConflict.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Conflict, true));\r
+       m_cConflict.EnableOtherButton(sCustomText);\r
+       m_cAddedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::AddedNode, true));\r
+       m_cAddedNode.EnableOtherButton(sCustomText);\r
+       m_cDeletedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::DeletedNode, true));\r
+       m_cDeletedNode.EnableOtherButton(sCustomText);\r
+       m_cRenamedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::RenamedNode, true));\r
+       m_cRenamedNode.EnableOtherButton(sCustomText);\r
+       m_cReplacedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::ReplacedNode, true));\r
+       m_cReplacedNode.EnableOtherButton(sCustomText);\r
+       \r
+       return TRUE;\r
+}\r
+\r
+void CSettingsColors2::OnBnClickedRestore()\r
+{\r
+       m_cAdded.SetColor(m_Colors.GetColor(CColors::Added));\r
+       m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted));\r
+       m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged));\r
+       m_cModified.SetColor(m_Colors.GetColor(CColors::Modified));\r
+       m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict));\r
+       m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode));\r
+       m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode));\r
+       m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode));\r
+       m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode));\r
+       SetModified(TRUE);\r
+}\r
+\r
+BOOL CSettingsColors2::OnApply()\r
+{\r
+       m_Colors.SetColor(CColors::Added, m_cAdded.GetColor() == -1 ? m_cAdded.GetAutomaticColor() : m_cAdded.GetColor());\r
+       m_Colors.SetColor(CColors::Deleted, m_cDeleted.GetColor() == -1 ? m_cDeleted.GetAutomaticColor() : m_cDeleted.GetColor());\r
+       m_Colors.SetColor(CColors::Merged, m_cMerged.GetColor() == -1 ? m_cMerged.GetAutomaticColor() : m_cMerged.GetColor());\r
+       m_Colors.SetColor(CColors::Modified, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor());\r
+       m_Colors.SetColor(CColors::Conflict, m_cConflict.GetColor() == -1 ? m_cConflict.GetAutomaticColor() : m_cConflict.GetColor());\r
+       m_Colors.SetColor(CColors::AddedNode, m_cAddedNode.GetColor() == -1 ? m_cAddedNode.GetAutomaticColor() : m_cAddedNode.GetColor());\r
+       m_Colors.SetColor(CColors::DeletedNode, m_cDeletedNode.GetColor() == -1 ? m_cDeletedNode.GetAutomaticColor() : m_cDeletedNode.GetColor());\r
+       m_Colors.SetColor(CColors::RenamedNode, m_cRenamedNode.GetColor() == -1 ? m_cRenamedNode.GetAutomaticColor() : m_cRenamedNode.GetColor());\r
+       m_Colors.SetColor(CColors::ReplacedNode, m_cReplacedNode.GetColor() == -1 ? m_cReplacedNode.GetAutomaticColor() : m_cReplacedNode.GetColor());\r
+       m_Colors.SetColor(CColors::PropertyChanged, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor());\r
+\r
+       return ISettingsPropPage::OnApply();\r
+}\r
+\r
+void CSettingsColors2::OnBnClickedColor()\r
+{\r
+       SetModified();\r
+}\r

diff --git a/src/TortoiseProc/Settings/SettingsColors2.h b/src/TortoiseProc/Settings/SettingsColors2.h
new file mode 100644 (file)
index 0000000..c74c1fb
--- /dev/null
+++ b/src/TortoiseProc/Settings/SettingsColors2.h
@@ -0,0 +1,59 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2003-2008 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#pragma once\r
+#include "SettingsPropPage.h"\r
+#include "Colors.h"\r
+\r
+/**\r
+ * \ingroup TortoiseProc\r
+ * Settings property page to set custom colors used in TortoiseSVN\r
+ */\r
+class CSettingsColors2 : public ISettingsPropPage\r
+{\r
+       DECLARE_DYNAMIC(CSettingsColors2)\r
+\r
+public:\r
+       CSettingsColors2();\r
+       virtual ~CSettingsColors2();\r
+\r
+       UINT GetIconID() {return IDI_LOOKANDFEEL;}\r
+\r
+       enum { IDD = IDD_SETTINGSCOLORS_2 };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+       virtual BOOL OnInitDialog();\r
+       afx_msg void OnBnClickedColor();\r
+       afx_msg void OnBnClickedRestore();\r
+       virtual BOOL OnApply();\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+private:\r
+       CMFCColorButton m_cConflict;\r
+       CMFCColorButton m_cAdded;\r
+       CMFCColorButton m_cDeleted;\r
+       CMFCColorButton m_cMerged;\r
+       CMFCColorButton m_cModified;\r
+       CMFCColorButton m_cAddedNode;\r
+       CMFCColorButton m_cDeletedNode;\r
+       CMFCColorButton m_cRenamedNode;\r
+       CMFCColorButton m_cReplacedNode;\r
+       CColors                 m_Colors;\r
+public:\r
+};\r

diff --git a/src/TortoiseProc/Settings/SettingsColors3.cpp b/src/TortoiseProc/Settings/SettingsColors3.cpp
new file mode 100644 (file)
index 0000000..b24104d
--- /dev/null
+++ b/src/TortoiseProc/Settings/SettingsColors3.cpp
@@ -0,0 +1,134 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2003-2008 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SettingsColors3.h"\r
+#include ".\settingscolors3.h"\r
+\r
+IMPLEMENT_DYNAMIC(CSettingsColors3, ISettingsPropPage)\r
+CSettingsColors3::CSettingsColors3()\r
+       : ISettingsPropPage(CSettingsColors3::IDD)\r
+{\r
+}\r
+\r
+CSettingsColors3::~CSettingsColors3()\r
+{\r
+}\r
+\r
+void CSettingsColors3::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       ISettingsPropPage::DoDataExchange(pDX);\r
+       DDX_Control(pDX, IDC_CONFLICTCOLOR, m_cConflict);\r
+       DDX_Control(pDX, IDC_ADDEDCOLOR, m_cAdded);\r
+       DDX_Control(pDX, IDC_DELETEDCOLOR, m_cDeleted);\r
+       DDX_Control(pDX, IDC_MERGEDCOLOR, m_cMerged);\r
+       DDX_Control(pDX, IDC_MODIFIEDCOLOR, m_cModified);\r
+       DDX_Control(pDX, IDC_DELETEDNODECOLOR, m_cDeletedNode);\r
+       DDX_Control(pDX, IDC_ADDEDNODECOLOR, m_cAddedNode);\r
+       DDX_Control(pDX, IDC_REPLACEDNODECOLOR, m_cReplacedNode);\r
+       DDX_Control(pDX, IDC_RENAMEDNODECOLOR, m_cRenamedNode);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSettingsColors3, ISettingsPropPage)\r
+       ON_BN_CLICKED(IDC_RESTORE, OnBnClickedRestore)\r
+       ON_BN_CLICKED(IDC_CONFLICTCOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_ADDEDCOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_DELETEDCOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_MERGEDCOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_MODIFIEDCOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_DELETEDNODECOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_ADDEDNODECOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_REPLACEDNODECOLOR, &CSettingsColors3::OnBnClickedColor)\r
+       ON_BN_CLICKED(IDC_RENAMEDNODECOLOR, &CSettingsColors3::OnBnClickedColor)\r
+END_MESSAGE_MAP()\r
+\r
+BOOL CSettingsColors3::OnInitDialog()\r
+{\r
+       ISettingsPropPage::OnInitDialog();\r
+\r
+       m_cAdded.SetColor(m_Colors.GetColor(CColors::Added));\r
+       m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted));\r
+       m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged));\r
+       m_cModified.SetColor(m_Colors.GetColor(CColors::Modified));\r
+       m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict));\r
+       m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode));\r
+       m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode));\r
+       m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode));\r
+       m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode));\r
+\r
+       CString sDefaultText, sCustomText;\r
+       sDefaultText.LoadString(IDS_COLOURPICKER_DEFAULTTEXT);\r
+       sCustomText.LoadString(IDS_COLOURPICKER_CUSTOMTEXT);\r
+       m_cAdded.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Added, true));\r
+       m_cAdded.EnableOtherButton(sCustomText);\r
+       m_cDeleted.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Deleted, true));\r
+       m_cDeleted.EnableOtherButton(sCustomText);\r
+       m_cMerged.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Merged, true));\r
+       m_cMerged.EnableOtherButton(sCustomText);\r
+       m_cModified.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Modified, true));\r
+       m_cModified.EnableOtherButton(sCustomText);\r
+       m_cConflict.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::Conflict, true));\r
+       m_cConflict.EnableOtherButton(sCustomText);\r
+       m_cAddedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::AddedNode, true));\r
+       m_cAddedNode.EnableOtherButton(sCustomText);\r
+       m_cDeletedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::DeletedNode, true));\r
+       m_cDeletedNode.EnableOtherButton(sCustomText);\r
+       m_cRenamedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::RenamedNode, true));\r
+       m_cRenamedNode.EnableOtherButton(sCustomText);\r
+       m_cReplacedNode.EnableAutomaticButton(sDefaultText, m_Colors.GetColor(CColors::ReplacedNode, true));\r
+       m_cReplacedNode.EnableOtherButton(sCustomText);\r
+       \r
+       return TRUE;\r
+}\r
+\r
+void CSettingsColors3::OnBnClickedRestore()\r
+{\r
+       m_cAdded.SetColor(m_Colors.GetColor(CColors::Added));\r
+       m_cDeleted.SetColor(m_Colors.GetColor(CColors::Deleted));\r
+       m_cMerged.SetColor(m_Colors.GetColor(CColors::Merged));\r
+       m_cModified.SetColor(m_Colors.GetColor(CColors::Modified));\r
+       m_cConflict.SetColor(m_Colors.GetColor(CColors::Conflict));\r
+       m_cAddedNode.SetColor(m_Colors.GetColor(CColors::AddedNode));\r
+       m_cDeletedNode.SetColor(m_Colors.GetColor(CColors::DeletedNode));\r
+       m_cRenamedNode.SetColor(m_Colors.GetColor(CColors::RenamedNode));\r
+       m_cReplacedNode.SetColor(m_Colors.GetColor(CColors::ReplacedNode));\r
+       SetModified(TRUE);\r
+}\r
+\r
+BOOL CSettingsColors3::OnApply()\r
+{\r
+       m_Colors.SetColor(CColors::Added, m_cAdded.GetColor() == -1 ? m_cAdded.GetAutomaticColor() : m_cAdded.GetColor());\r
+       m_Colors.SetColor(CColors::Deleted, m_cDeleted.GetColor() == -1 ? m_cDeleted.GetAutomaticColor() : m_cDeleted.GetColor());\r
+       m_Colors.SetColor(CColors::Merged, m_cMerged.GetColor() == -1 ? m_cMerged.GetAutomaticColor() : m_cMerged.GetColor());\r
+       m_Colors.SetColor(CColors::Modified, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor());\r
+       m_Colors.SetColor(CColors::Conflict, m_cConflict.GetColor() == -1 ? m_cConflict.GetAutomaticColor() : m_cConflict.GetColor());\r
+       m_Colors.SetColor(CColors::AddedNode, m_cAddedNode.GetColor() == -1 ? m_cAddedNode.GetAutomaticColor() : m_cAddedNode.GetColor());\r
+       m_Colors.SetColor(CColors::DeletedNode, m_cDeletedNode.GetColor() == -1 ? m_cDeletedNode.GetAutomaticColor() : m_cDeletedNode.GetColor());\r
+       m_Colors.SetColor(CColors::RenamedNode, m_cRenamedNode.GetColor() == -1 ? m_cRenamedNode.GetAutomaticColor() : m_cRenamedNode.GetColor());\r
+       m_Colors.SetColor(CColors::ReplacedNode, m_cReplacedNode.GetColor() == -1 ? m_cReplacedNode.GetAutomaticColor() : m_cReplacedNode.GetColor());\r
+       m_Colors.SetColor(CColors::PropertyChanged, m_cModified.GetColor() == -1 ? m_cModified.GetAutomaticColor() : m_cModified.GetColor());\r
+\r
+       return ISettingsPropPage::OnApply();\r
+}\r
+\r
+void CSettingsColors3::OnBnClickedColor()\r
+{\r
+       SetModified();\r
+}\r

diff --git a/src/TortoiseProc/Settings/SettingsColors3.h b/src/TortoiseProc/Settings/SettingsColors3.h
new file mode 100644 (file)
index 0000000..42e99d1
--- /dev/null
+++ b/src/TortoiseProc/Settings/SettingsColors3.h
@@ -0,0 +1,59 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2003-2008 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#pragma once\r
+#include "SettingsPropPage.h"\r
+#include "Colors.h"\r
+\r
+/**\r
+ * \ingroup TortoiseProc\r
+ * Settings property page to set custom colors used in TortoiseSVN\r
+ */\r
+class CSettingsColors3 : public ISettingsPropPage\r
+{\r
+       DECLARE_DYNAMIC(CSettingsColors3)\r
+\r
+public:\r
+       CSettingsColors3();\r
+       virtual ~CSettingsColors3();\r
+\r
+       UINT GetIconID() {return IDI_LOOKANDFEEL;}\r
+\r
+       enum { IDD = IDD_SETTINGSCOLORS_3 };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+       virtual BOOL OnInitDialog();\r
+       afx_msg void OnBnClickedColor();\r
+       afx_msg void OnBnClickedRestore();\r
+       virtual BOOL OnApply();\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+private:\r
+       CMFCColorButton m_cConflict;\r
+       CMFCColorButton m_cAdded;\r
+       CMFCColorButton m_cDeleted;\r
+       CMFCColorButton m_cMerged;\r
+       CMFCColorButton m_cModified;\r
+       CMFCColorButton m_cAddedNode;\r
+       CMFCColorButton m_cDeletedNode;\r
+       CMFCColorButton m_cRenamedNode;\r
+       CMFCColorButton m_cReplacedNode;\r
+       CColors                 m_Colors;\r
+public:\r
+};\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index b6d8594..e6ac0b3 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -574,11 +574,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -814,19 +814,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -930,19 +930,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1034,11 +1034,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1589,6 +1589,22 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath=".\Settings\SettingsColors2.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors2.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors3.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors3.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Commands\SettingsCommand.cpp"\r
                                        >\r
                                </File>\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index feba744..688e76a 100644 (file)
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 (file)
--- a/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
+++ b/src/crashrpt/CrashRpt.vcproj.FSL.B20596.user
@@ -33,5 +33,33 @@
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r