From ef462382079f4558ba7e05c8bc6730d470c0989f Mon Sep 17 00:00:00 2001 From: Frank Li Date: Fri, 12 Jun 2009 22:07:19 +0800 Subject: [PATCH] Enable Bugtraq setting dialog Signed-off-by: Frank Li --- 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 zcma)5O=uHA6n?YQG&S02lvIdljaq6kth-IgCe$7xHbv+kX;ZyzBHALAoS$zCLoad!gEf}>aM_C%A7@3GTvZa1ocys@Y^VWnM z^4+Bh&2jXXcFZxJ1-fjyMroWIrmI*3cxI4CkjD@?>L;7Vv7d7mKKAlXP;29*dC}DB zb?BxZV0ZKKJI(S>Qh}yv_AmB@{a|O%eUQe0-gnrf1Oj*pHO}dCBJ4b=dir>!+I%!r zlh#9qCyqmg*2$%Hp*JWC+dv*g^h3{;Jyj(3QgOTyXE(+kLIdM=8_Lpj84T*DlH3pV zVO;%?I-1>`Ixfo{u?a9Y|7Qds|1VMG z`FlZ}QI!XEc(gz_Q2B>qQhgs5n_Z%=4v0kvxuYs8ymeZh^&4t(ma|Z*D-5}SGf+|i z}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 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 @@ > + + + + diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 448e3fa13e44ba6a3c12402d72eb17d6f734c64f..fe25ee26aaf8941769346469ddf4e783cb7e2d20 100644 GIT binary patch delta 500 zcmbRDi1WZ}&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@*rc0((48^-3MqARQKeIHnK3gMS(tI2mnG?pp7m-d%$WZ7iNe~pWw^L!e}{pVIbHd z;dr2ePzGNHC!o?Gh=Zm#7BI<9c9D=mG7VJ`hG`Fzz@`Di>f&3~=?Ni>9FvV6D@@-| z&nPy1PAwzPbc1q6GnjGHlgb#iCh@XN_bO+sfC&N}g6d*m$bcLoIjw?`W&4V9#ytyQ t5jQ