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 (file)
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 (file)
--- a/src/TortoiseProc/ProjectProperties.h
+++ b/src/TortoiseProc/ProjectProperties.h
@@ -66,8 +66,8 @@ public:
         * \param path path to a file or a folder\r
         */\r
        BOOL ReadProps(CTGitPath path);\r
-       BOOL GetStringProps(CString &prop,TCHAR *key,bool bRemoveCR=true);\r
-       BOOL GetBOOLProps(BOOL &b, TCHAR*key);\r
+       static BOOL GetStringProps(CString &prop,TCHAR *key,bool bRemoveCR=true);\r
+       static BOOL GetBOOLProps(BOOL &b, TCHAR*key);\r
        /**\r
         * Reads the properties from all paths found in a path list.\r
         * This method calls ReadProps() for each path .\r

diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 7c54b0a..40730ab 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -64,6 +64,7 @@ void CSettings::AddPropPages()
        m_pTBlamePage = new CSettingsTBlame();\r
        m_pGitConfig = new CSettingGitConfig();\r
        m_pGitRemote = new CSettingGitRemote(m_CmdPath.GetWinPath());\r
+       m_pBugtraqConfig = new CSettingsBugtraqConfig(m_CmdPath.GetWinPath());\r
 \r
 \r
        SetPageIcon(m_pMainPage, m_pMainPage->GetIconID());\r
@@ -89,6 +90,7 @@ void CSettings::AddPropPages()
        SetPageIcon(m_pGitConfig, m_pGitConfig->GetIconID());\r
        SetPageIcon(m_pGitRemote, m_pGitRemote->GetIconID());\r
        SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID());\r
+       SetPageIcon(m_pBugtraqConfig, m_pBugtraqConfig->GetIconID());\r
        SetPageIcon(m_pTBlamePage, m_pTBlamePage->GetIconID());\r
 \r
        AddPage(m_pMainPage);\r
@@ -117,6 +119,10 @@ void CSettings::AddPropPages()
 //    AddPage(m_pLogCacheListPage);\r
 //     AddPage(m_pHooksPage);\r
        AddPage(m_pBugTraqPage);\r
+       if(     g_GitAdminDir.HasAdminDir(this->m_CmdPath.GetWinPath()) )\r
+       {\r
+               AddPage(m_pBugtraqConfig);\r
+       }\r
        AddPage(m_pTBlamePage);\r
 }\r
 \r
@@ -145,6 +151,7 @@ void CSettings::RemovePropPages()
 \r
        delete m_pGitConfig;\r
        delete m_pGitRemote;\r
+       delete m_pBugtraqConfig;\r
 \r
 }\r
 \r
@@ -174,6 +181,7 @@ void CSettings::HandleRestart()
 \r
        restart |= m_pGitConfig->GetRestart();\r
        restart |= m_pGitRemote->GetRestart();\r
+       restart |= m_pBugTraqPage->GetRestart();\r
 \r
        if (restart & ISettingsPropPage::Restart_System)\r
        {\r

diff --git a/src/TortoiseProc/Settings/Settings.h b/src/TortoiseProc/Settings/Settings.h
index d2551e6..c9bc6ae 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.h
+++ b/src/TortoiseProc/Settings/Settings.h
@@ -42,6 +42,7 @@
 #include "TreePropSheet/TreePropSheet.h"\r
 #include "SettingGitConfig.h"\r
 #include "SettingGitRemote.h"\r
+#include "SettingsBugtraqConfig.h"\r
 \r
 using namespace TreePropSheet;\r
 \r
@@ -90,6 +91,7 @@ private:
        CSettingsTBlame *               m_pTBlamePage;\r
        CSettingGitConfig *             m_pGitConfig;\r
        CSettingGitRemote *             m_pGitRemote;\r
+       CSettingsBugtraqConfig * m_pBugtraqConfig;\r
 \r
        HICON                                   m_hIcon;\r
 public:\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index b3a9435..467a000 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -588,11 +588,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -620,11 +620,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -868,11 +868,11 @@
                                >\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
@@ -904,11 +904,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -984,11 +984,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1088,11 +1088,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
@@ -1691,6 +1691,14 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath=".\Settings\SettingsBugtraqConfig.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsBugtraqConfig.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Settings\SettingsColors.cpp"\r
                                        >\r
                                </File>\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 448e3fa..fe25ee2 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ