From ef462382079f4558ba7e05c8bc6730d470c0989f Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Fri, 12 Jun 2009 22:07:19 +0800
Subject: [PATCH] Enable Bugtraq setting dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc       | Bin 431076 -> 434678 bytes
 src/TortoiseProc/ProjectProperties.h   |   4 ++--
 src/TortoiseProc/Settings/Settings.cpp |   8 ++++++++
 src/TortoiseProc/Settings/Settings.h   |   2 ++
 src/TortoiseProc/TortoiseProc.vcproj   |  32 ++++++++++++++++++++------------
 src/TortoiseProc/resource.h            | Bin 160030 -> 161216 bytes
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index dcea82c7f28d31715ef4cf1c3ae43732da4362f4..2a6dc846136fb4c50fb53dc6dafd92edae546055 100644
GIT binary patch
delta 1042
zcwUWDOK1~O6uoa=)6{5FqohJaYt&MUVVp4~lTf>e*c72Z(x$qbM6^YyX_8u$(1it|
zF53=x>CT<tLMjy6jc5@!u0*<)F1is>+$b(Rd1EAo5X$AgJHtEoymQ`X|9R-wyU?S@
zVpB6%*ep7=OHTIZ1|M;>IL9Yt{^=`mfmhZwf7qrBrD>QVWFn%dmio4kl^W%pDLLY~
zPbFI5@Nez7W4!S7+H`}G=o_W$$RUg=)G^cvM1}^*rb*0aoTbnGyyw?Cd1X<ww7V-@
zroPI^s~<GWJ54#7rTKr{7Z1Xn0%DjZz&_AnQVdaLjdJq52s+Qou0LKYw;l^rt@V-N
zn&W_>^>ATR=ylG5Hkii|gIM!gQx~yjE>6_*G*TREq`1olE=gC>S$it+gGe96_Kc|3
zbYtlqE}03kXjAe3Gu4O>RK-_0>g4xS<d5Ol(&!yR-mEcUs*6=)W5XwO_I>gAy*e$x
z%`6vRi?G*Hh7-=}m8hES(&+&-mMBkmkuw;lQRh(S5!i!nd5W`BTAQb`qX`bY7nbT2
zx??^$$ws&I^Ik}{Nyu=LUlVGwT?c6aaR+3#-KAr=M_8PTAGIL=$ceKGd058=<>(fW
ze<jA%`>@#T6*V|8=3(TXLY8>vj6CNx)X7=SQlSPIs1VM<NeRFi<U<8MWKu#s!33K{
z5$5r-ILeVV&A)80wq>wP4e;A_d0OHob8=Dkt4S_@lixY}QhsuOfo)yh-j&Fft?gY;
G<jo)2LHIrZ

delta 52
zcwYN<SnA1gsfHHDEldW}+uas3ZFgJD>}ETC!31W7=>n^m`KIekV&ZE*@`xFTS+*Z}
I#A>u3075$z_y7O^

diff --git a/src/TortoiseProc/ProjectProperties.h b/src/TortoiseProc/ProjectProperties.h
index fdb6736af..deb3ba19a 100644
--- a/src/TortoiseProc/ProjectProperties.h
+++ b/src/TortoiseProc/ProjectProperties.h
@@ -66,8 +66,8 @@ public:
 	 * \param path path to a file or a folder
 	 */
 	BOOL ReadProps(CTGitPath path);
-	BOOL GetStringProps(CString &prop,TCHAR *key,bool bRemoveCR=true);
-	BOOL GetBOOLProps(BOOL &b, TCHAR*key);
+	static BOOL GetStringProps(CString &prop,TCHAR *key,bool bRemoveCR=true);
+	static BOOL GetBOOLProps(BOOL &b, TCHAR*key);
 	/**
 	 * Reads the properties from all paths found in a path list.
 	 * This method calls ReadProps() for each path .
diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 7c54b0a9c..40730ab1f 100644
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -64,6 +64,7 @@ void CSettings::AddPropPages()
 	m_pTBlamePage = new CSettingsTBlame();
 	m_pGitConfig = new CSettingGitConfig();
 	m_pGitRemote = new CSettingGitRemote(m_CmdPath.GetWinPath());
+	m_pBugtraqConfig = new CSettingsBugtraqConfig(m_CmdPath.GetWinPath());
 
 
 	SetPageIcon(m_pMainPage, m_pMainPage->GetIconID());
@@ -89,6 +90,7 @@ void CSettings::AddPropPages()
 	SetPageIcon(m_pGitConfig, m_pGitConfig->GetIconID());
 	SetPageIcon(m_pGitRemote, m_pGitRemote->GetIconID());
 	SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID());
+	SetPageIcon(m_pBugtraqConfig, m_pBugtraqConfig->GetIconID());
 	SetPageIcon(m_pTBlamePage, m_pTBlamePage->GetIconID());
 
 	AddPage(m_pMainPage);
@@ -117,6 +119,10 @@ void CSettings::AddPropPages()
 //    AddPage(m_pLogCacheListPage);
 //	AddPage(m_pHooksPage);
 	AddPage(m_pBugTraqPage);
+	if(	g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()) )
+	{
+		AddPage(m_pBugtraqConfig);
+	}
 	AddPage(m_pTBlamePage);
 }
 
@@ -145,6 +151,7 @@ void CSettings::RemovePropPages()
 
 	delete m_pGitConfig;
 	delete m_pGitRemote;
+	delete m_pBugtraqConfig;
 
 }
 
@@ -174,6 +181,7 @@ void CSettings::HandleRestart()
 
 	restart |= m_pGitConfig->GetRestart();
 	restart |= m_pGitRemote->GetRestart();
+	restart |= m_pBugTraqPage->GetRestart();
 
 	if (restart & ISettingsPropPage::Restart_System)
 	{
diff --git a/src/TortoiseProc/Settings/Settings.h b/src/TortoiseProc/Settings/Settings.h
index d2551e674..c9bc6aedd 100644
--- a/src/TortoiseProc/Settings/Settings.h
+++ b/src/TortoiseProc/Settings/Settings.h
@@ -42,6 +42,7 @@
 #include "TreePropSheet/TreePropSheet.h"
 #include "SettingGitConfig.h"
 #include "SettingGitRemote.h"
+#include "SettingsBugtraqConfig.h"
 
 using namespace TreePropSheet;
 
@@ -90,6 +91,7 @@ private:
 	CSettingsTBlame *		m_pTBlamePage;
 	CSettingGitConfig *		m_pGitConfig;
 	CSettingGitRemote *		m_pGitRemote;
+	CSettingsBugtraqConfig * m_pBugtraqConfig;
 
 	HICON					m_hIcon;
 public:
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index b3a943527..467a00033 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -588,11 +588,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\copy.ico"
+				RelativePath=".\copy.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\copy.ico"
+				RelativePath="..\Resources\copy.ico"
 				>
 			</File>
 			<File
@@ -620,11 +620,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\explorer.ico"
+				RelativePath="..\Resources\explorer.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\explorer.ico"
+				RelativePath=".\explorer.ico"
 				>
 			</File>
 			<File
@@ -868,11 +868,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\newfolder.ico"
+				RelativePath=".\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\newfolder.ico"
+				RelativePath="..\Resources\newfolder.ico"
 				>
 			</File>
 			<File
@@ -904,11 +904,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\refresh.ico"
+				RelativePath=".\refresh.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\refresh.ico"
+				RelativePath="..\Resources\refresh.ico"
 				>
 			</File>
 			<File
@@ -984,11 +984,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\save.ico"
+				RelativePath="..\Resources\save.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\save.ico"
+				RelativePath=".\save.ico"
 				>
 			</File>
 			<File
@@ -1088,11 +1088,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\up.ico"
+				RelativePath=".\up.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\up.ico"
+				RelativePath="..\Resources\up.ico"
 				>
 			</File>
 			<File
@@ -1691,6 +1691,14 @@
 					>
 				</File>
 				<File
+					RelativePath=".\Settings\SettingsBugtraqConfig.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsBugtraqConfig.h"
+					>
+				</File>
+				<File
 					RelativePath=".\Settings\SettingsColors.cpp"
 					>
 				</File>
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 448e3fa13e44ba6a3c12402d72eb17d6f734c64f..fe25ee26aaf8941769346469ddf4e783cb7e2d20 100644
GIT binary patch
delta 500
zcwU?Li1WZ}&I#)_?hCS*?7%59xz3W0F@AEOwDjaz7Iw_>433i-l_Y^|nPvgY?E;pJ
zQzRyD@MM{sa1Era@w@i)a{-KU(*ve4vQ59|&nPr~PaxwGkSu#VgAap0gZuQq-HfW+
z?SdH3sK7KD$1{X8I5Gq=_%V0_u{)4-1JeFLIv5B;8C)6S8A5>aAeI7yA%iJ{<>Z5Y
z@<i)(1FG-=@}RmWU$l{h*)0n65kmkFx&n2%z|>AI%n+SE!IzPR(Q@*_K(Ix^@jwNk
z489CbK&3$t2TgA*V3M8eA|Zuj8mb};(;g<tL&NIgTh-|aA&eZ8jUFpZ-%!seHhoSl
zBhPe$az-<lanqB^7_}zxvP}0XXRLq;3ZuIi>JZ6k6^ty~SCljESpbW;=|N&lQqz0H
knG_~(xX3X*A)1k6dx->-S_Dw3)bs`UOd``y6flJW04WQNuK)l5

delta 120
zcwRg3nseSG&I#*yT^Lds%78eBA)ldO<LXe0$rt!ons-=k-(kr(L1MCjC(HDP07jAN
zdx993Y~K^ixJqSuLldLg^nF!~W+0Z#^qgu&hv^4u7^Su=)i8D}nB3scv7JwrNiSmh
YgmOlf=~E^#icOzW!Xz?1tCT4W0E4<KV*mgE

-- 
2.11.4.GIT