From c0eb68186023c6cf2cbef029c373729c19e42733 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Thu, 29 Dec 2011 20:15:12 +0100
Subject: [PATCH] Fixed issue #855: moved up Git and hooks/bugtraq page in
 settings dialog

these might be use more often than the others

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/Changelog.txt                      |  1 +
 src/TortoiseProc/Settings/Settings.cpp | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Changelog.txt b/src/Changelog.txt
index 7e6b753ba..d39c11fe9 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -3,6 +3,7 @@
  * Fixed issue #758: Make the log of a bare repository available
  * Fixed issue #880: Allow sync / fetch / push on bare repository
  * Fixed issue #818: SafeCRLF = warn should be available
+ * Fixed issue #855: moved up Git page in settings dialog
 
 == Bug Fix ==
  * Updated shipped PuTTY binaries to version 0.62
diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 8c2a22205..3ebebfda7 100644
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -96,6 +96,17 @@ void CSettings::AddPropPages()
 	SetPageIcon(m_pTBlamePage, m_pTBlamePage->GetIconID());
 
 	AddPage(m_pMainPage);
+	AddPage(m_pGitConfig);
+	if (g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()) || g_GitAdminDir.IsBareRepo(this->m_CmdPath.GetWinPath()))
+	{
+		AddPage(m_pGitRemote);
+	}
+	AddPage(m_pHooksPage);
+	AddPage(m_pBugTraqPage);
+	if (g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()))
+	{
+		AddPage(m_pBugtraqConfig);
+	}
 	AddPage(m_pOverlayPage);
 	AddPage(m_pOverlaysPage);
 	AddPage(m_pOverlayHandlersPage);
@@ -111,19 +122,6 @@ void CSettings::AddPropPages()
 	AddPage(m_pColorsPage3);
 	AddPage(m_pProgsAlternativeEditor);
 	AddPage(m_pSavedPage);
-
-	AddPage(m_pGitConfig);
-
-	if (g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()) || g_GitAdminDir.IsBareRepo(this->m_CmdPath.GetWinPath()))
-	{
-		AddPage(m_pGitRemote);
-	}
-	AddPage(m_pHooksPage);
-	AddPage(m_pBugTraqPage);
-	if (g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()))
-	{
-		AddPage(m_pBugtraqConfig);
-	}
 	AddPage(m_pTBlamePage);
 }
 
-- 
2.11.4.GIT