From: Frank Li <lznuaa@gmail.com>
Date: Fri, 12 Jun 2009 14:07:19 +0000 (+0800)
Subject: Enable Bugtraq setting dialog
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef462382079f4558ba7e05c8bc6730d470c0989f;p=tortoisegit%2FTortoiseGitJp.git

Enable Bugtraq setting dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>
---

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index dcea82c..2a6dc84 100644
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
diff --git a/src/TortoiseProc/ProjectProperties.h b/src/TortoiseProc/ProjectProperties.h
index fdb6736..deb3ba1 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 7c54b0a..40730ab 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 d2551e6..c9bc6ae 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 b3a9435..467a000 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 448e3fa..fe25ee2 100644
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ