From: Frank Li <lznuaa@gmail.com>
Date: Fri, 16 Oct 2009 05:43:29 +0000 (+0800)
Subject: Add proptery page for git
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb7ae598fda7b7cd0af5e4e0a43c15a5eb96a72f;p=tortoisegit%2FTortoiseGitJp.git

Add proptery page for git

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

diff --git a/src/TortoiseShell/SVNPropertyPage.cpp b/src/TortoiseShell/SVNPropertyPage.cpp
index cc87844..2f0817b 100644
--- a/src/TortoiseShell/SVNPropertyPage.cpp
+++ b/src/TortoiseShell/SVNPropertyPage.cpp
@@ -1,4 +1,4 @@
-// TortoiseGit - a Windows shell extension for easy version control
+// TortoiseSVN - a Windows shell extension for easy version control
 
 // Copyright (C) 2003-2008 - TortoiseGit
 
@@ -219,6 +219,7 @@ void CGitPropertyPage::Time64ToTimeString(__time64_t time, TCHAR * buf, size_t b
 
 void CGitPropertyPage::InitWorkfileView()
 {
+#if 0
 	GitStatus svn = GitStatus();
 	TCHAR tbuf[MAX_STRING_LENGTH];
 	if (filenames.size() == 1)
@@ -361,7 +362,72 @@ void CGitPropertyPage::InitWorkfileView()
 				ShowWindow(GetDlgItem(m_hwnd, IDC_REPOURLUNESCAPED), SW_HIDE);
 			}
 		}
-	} 
+	}
+#endif
 }
 
 
+// CShellExt member functions (needed for IShellPropSheetExt)
+STDMETHODIMP CShellExt::AddPages (LPFNADDPROPSHEETPAGE lpfnAddPage,
+                                  LPARAM lParam)
+{
+
+	CString ProjectTopDir;
+
+	for (std::vector<stdstring>::iterator I = files_.begin(); I != files_.end(); ++I)
+	{
+		/*
+		GitStatus svn = GitStatus();
+		if (svn.GetStatus(CTGitPath(I->c_str())) == (-2))
+			return NOERROR;			// file/directory not under version control
+
+		if (svn.status->entry == NULL)
+			return NOERROR;
+		*/
+		if( CTGitPath(I->c_str()).HasAdminDir(&ProjectTopDir))
+			break;
+		else
+			return NOERROR;
+	}
+
+	if (files_.size() == 0)
+		return NOERROR;
+
+	LoadLangDll();
+    PROPSHEETPAGE psp;
+	SecureZeroMemory(&psp, sizeof(PROPSHEETPAGE));
+	HPROPSHEETPAGE hPage;
+	CGitPropertyPage *sheetpage = new CGitPropertyPage(files_);
+
+    psp.dwSize = sizeof (psp);
+    psp.dwFlags = PSP_USEREFPARENT | PSP_USETITLE | PSP_USEICONID | PSP_USECALLBACK;	
+	psp.hInstance = g_hResInst;
+	psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGE);
+    psp.pszIcon = MAKEINTRESOURCE(IDI_APPSMALL);
+    psp.pszTitle = _T("Git");
+    psp.pfnDlgProc = (DLGPROC) PageProc;
+    psp.lParam = (LPARAM) sheetpage;
+    psp.pfnCallback = PropPageCallbackProc;
+    psp.pcRefParent = &g_cRefThisDll;
+
+    hPage = CreatePropertySheetPage (&psp);
+
+	if (hPage != NULL)
+	{
+        if (!lpfnAddPage (hPage, lParam))
+        {
+            delete sheetpage;
+            DestroyPropertySheetPage (hPage);
+        }
+	}
+
+    return NOERROR;
+}
+
+
+
+STDMETHODIMP CShellExt::ReplacePage (UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/)
+{
+    return E_FAIL;
+}
+
diff --git a/src/TortoiseShell/ShellExt.cpp b/src/TortoiseShell/ShellExt.cpp
index 60537b3..6c87ea4 100644
--- a/src/TortoiseShell/ShellExt.cpp
+++ b/src/TortoiseShell/ShellExt.cpp
@@ -28,6 +28,7 @@
 //#include "..\version.h"
 //#include "libintl.h"
 #undef swprintf
+#include "SVNPropertyPage.h"
 
 std::set<CShellExt *> g_exts;
 
@@ -289,59 +290,3 @@ UINT __stdcall CShellExt::CopyCallback(HWND /*hWnd*/, UINT wFunc, UINT /*wFlags*
 	// will retry anyway, so we just leave here immediately.
 	return IDYES;
 }
-// CShellExt member functions (needed for IShellPropSheetExt)
-STDMETHODIMP CShellExt::AddPages (LPFNADDPROPSHEETPAGE lpfnAddPage,
-                                  LPARAM lParam)
-{
-#if 0
-	for (std::vector<stdstring>::iterator I = files_.begin(); I != files_.end(); ++I)
-	{
-		GitStatus svn = GitStatus();
-		if (svn.GetStatus(CTGitPath(I->c_str())) == (-2))
-			return NOERROR;			// file/directory not under version control
-
-		if (svn.status->entry == NULL)
-			return NOERROR;
-	}
-
-	if (files_.size() == 0)
-		return NOERROR;
-
-	LoadLangDll();
-    PROPSHEETPAGE psp;
-	SecureZeroMemory(&psp, sizeof(PROPSHEETPAGE));
-	HPROPSHEETPAGE hPage;
-	CGitPropertyPage *sheetpage = new CGitPropertyPage(files_);
-
-    psp.dwSize = sizeof (psp);
-    psp.dwFlags = PSP_USEREFPARENT | PSP_USETITLE | PSP_USEICONID | PSP_USECALLBACK;	
-	psp.hInstance = g_hResInst;
-	psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGE);
-    psp.pszIcon = MAKEINTRESOURCE(IDI_APPSMALL);
-    psp.pszTitle = _T("Subversion");
-    psp.pfnDlgProc = (DLGPROC) PageProc;
-    psp.lParam = (LPARAM) sheetpage;
-    psp.pfnCallback = PropPageCallbackProc;
-    psp.pcRefParent = &g_cRefThisDll;
-
-    hPage = CreatePropertySheetPage (&psp);
-
-	if (hPage != NULL)
-	{
-        if (!lpfnAddPage (hPage, lParam))
-        {
-            delete sheetpage;
-            DestroyPropertySheetPage (hPage);
-        }
-	}
-#endif
-    return NOERROR;
-}
-
-
-
-STDMETHODIMP CShellExt::ReplacePage (UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/)
-{
-    return E_FAIL;
-}
-
diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index 62ef7d3..0bdba0d 100644
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -555,6 +555,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\SVNPropertyPage.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\Git\TGitPath.cpp"
 				>
 			</File>