Show project info at setting dialog title bar

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 0d20a7e..2ec2733 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -305,13 +305,15 @@ CString CGit::GetUserName(void)
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 CString CGit::GetUserEmail(void)\r
 {\r
        CString UserName;\r
        Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
-       return UserName;\r
+       int start = 0;\r
+       return UserName.Tokenize(_T("\n"),start);\r
 }\r
 \r
 CString CGit::GetCurrentBranch(void)\r

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index ae15433..53e1d52 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/Resources/gitconfig.ico b/src/Resources/gitconfig.ico
new file mode 100644 (file)
index 0000000..f1a2503
Binary files /dev/null and b/src/Resources/gitconfig.ico differ

diff --git a/src/Resources/gitremote.ico b/src/Resources/gitremote.ico
new file mode 100644 (file)
index 0000000..f1a2503
Binary files /dev/null and b/src/Resources/gitremote.ico differ

diff --git a/src/TortoiseProc/Settings/SettingGitConfig.cpp b/src/TortoiseProc/Settings/SettingGitConfig.cpp
index 1696776..a0d1ac1 100644 (file)
--- a/src/TortoiseProc/Settings/SettingGitConfig.cpp
+++ b/src/TortoiseProc/Settings/SettingGitConfig.cpp
@@ -7,6 +7,7 @@
 #include "Git.h"\r
 #include "Settings.h"\r
 #include "GitAdminDir.h"\r
+#include "MessageBox.h"\r
 // CSettingGitConfig dialog\r
 \r
 IMPLEMENT_DYNAMIC(CSettingGitConfig, ISettingsPropPage)\r
@@ -94,11 +95,25 @@ void CSettingGitConfig::OnEnChangeGitUseremail()
 \r
 BOOL CSettingGitConfig::OnApply()\r
 {\r
-    CString cmd, out;\r
+    CString cmd, out,global;\r
     this->UpdateData(FALSE);\r
+       \r
+       if(this->m_bGlobal)\r
+               global = _T(" --global ");\r
 \r
-    cmd.Format(_T("git.exe config user.name %s"),this->m_UserName);\r
-    cmd.Format(_T("git.exe config user.email %s"),this->m_UserEmail);\r
+    cmd.Format(_T("git.exe config %s user.name \"%s\""),global,this->m_UserName);\r
+       if(g_Git.Run(cmd,&out,CP_ACP))\r
+       {\r
+               CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+               return FALSE;\r
+       }\r
+       out.Empty();\r
+    cmd.Format(_T("git.exe config %s user.email \"%s\""),global,this->m_UserEmail);\r
+       if(g_Git.Run(cmd,&out,CP_ACP))\r
+       {\r
+               CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+               return FALSE;\r
+       }\r
 \r
     SetModified(FALSE);\r
        return ISettingsPropPage::OnApply();\r

diff --git a/src/TortoiseProc/Settings/SettingGitConfig.h b/src/TortoiseProc/Settings/SettingGitConfig.h
index f8d2b77..f81f04b 100644 (file)
--- a/src/TortoiseProc/Settings/SettingGitConfig.h
+++ b/src/TortoiseProc/Settings/SettingGitConfig.h
@@ -13,7 +13,7 @@ class CSettingGitConfig : public ISettingsPropPage
 public:\r
        CSettingGitConfig();\r
        virtual ~CSettingGitConfig();\r
-       UINT GetIconID() {return IDI_GENERAL;}\r
+       UINT GetIconID() {return IDI_GITCONFIG;}\r
 // Dialog Data\r
        enum { IDD = IDD_SETTINGIT_CONFIG };\r
 \r

diff --git a/src/TortoiseProc/Settings/SettingGitRemote.h b/src/TortoiseProc/Settings/SettingGitRemote.h
index 113b0da..ba6c5cf 100644 (file)
--- a/src/TortoiseProc/Settings/SettingGitRemote.h
+++ b/src/TortoiseProc/Settings/SettingGitRemote.h
@@ -14,7 +14,7 @@ class CSettingGitRemote : public ISettingsPropPage
 public:\r
        CSettingGitRemote();\r
        virtual ~CSettingGitRemote();\r
-       UINT GetIconID() {return IDI_GENERAL;}\r
+       UINT GetIconID() {return IDI_GITREMOTE;}\r
 // Dialog Data\r
        enum { IDD = IDD_SETTINREMOTE };\r
 \r

diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 12d91e4..1a08e0c 100644 (file)
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -82,6 +82,9 @@ void CSettings::AddPropPages()
 \r
        SetPageIcon(m_pSavedPage, m_pSavedPage->GetIconID());\r
 //     SetPageIcon(m_pHooksPage, m_pHooksPage->GetIconID());\r
+\r
+       SetPageIcon(m_pGitConfig, m_pGitConfig->GetIconID());\r
+       SetPageIcon(m_pGitRemote, m_pGitRemote->GetIconID());\r
        SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID());\r
        SetPageIcon(m_pTBlamePage, m_pTBlamePage->GetIconID());\r
 \r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 9e85335..9b996e3 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -588,11 +588,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -828,19 +828,19 @@
                                >\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
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -944,19 +944,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1048,11 +1048,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
@@ -1639,6 +1639,22 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath=".\Settings\SettingGitConfig.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitConfig.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitRemote.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitRemote.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Settings\Settings.cpp"\r
                                        >\r
                                </File>\r
@@ -1722,22 +1738,6 @@
                                        RelativePath=".\Settings\ToolAssocDlg.h"\r
                                        >\r
                                </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingGitConfig.cpp"\r
-                               >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingGitConfig.h"\r
-                               >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingGitRemote.cpp"\r
-                               >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingGitRemote.h"\r
-                               >\r
-                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="Switch"\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 0a7e4f9..7a9cbaf 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ

diff --git a/src/Utils/TreePropSheet/TreePropSheet.cpp b/src/Utils/TreePropSheet/TreePropSheet.cpp
index 2ec8bd4..8b57577 100644 (file)
--- a/src/Utils/TreePropSheet/TreePropSheet.cpp
+++ b/src/Utils/TreePropSheet/TreePropSheet.cpp
@@ -551,6 +551,7 @@ void CTreePropSheet::UpdateCaption()
        HTREEITEM       hItem = m_pwndPageTree->GetSelectedItem();\r
        if (!hItem)\r
                return;\r
+       \r
        CString         strCaption = m_pwndPageTree->GetItemText(hItem);\r
 \r
        // if empty page, then update empty page message\r
@@ -560,7 +561,16 @@ void CTreePropSheet::UpdateCaption()
        // if no captions are displayed, cancel here\r
        if (!m_pFrame->GetShowCaption())\r
                return;\r
+       \r
+       ::GetWindowText(hPage,strCaption.GetBufferSetLength(256),256);\r
+       strCaption.ReleaseBuffer();\r
 \r
+       int start=strCaption.ReverseFind(_T(':'));\r
+       if(start>0)\r
+       {\r
+               if(strCaption[start-1] == _T(':'))\r
+                       strCaption=strCaption.Right(strCaption.GetLength()-start-1);\r
+       }\r
        // get tab control, to the the images from\r
        CTabCtrl        *pTabCtrl = GetTabControl();\r
        if (!IsWindow(pTabCtrl->GetSafeHwnd()))\r