X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTortoiseShell%2FShellExt.h;h=906589a3c55e0ee22b831d5b6c5f25eae35b60f1;hb=389f217684bc8d9aed6ad0df8ca429d444964b64;hp=16a4793a3a787bd33ab69c1b99690a1004c2d6a8;hpb=103b96ec7f3fc1627384365c22fb7c98ebf31013;p=tortoisegit%2FTortoiseGitJp.git

diff --git a/src/TortoiseShell/ShellExt.h b/src/TortoiseShell/ShellExt.h
index 16a4793..906589a 100644
--- a/src/TortoiseShell/ShellExt.h
+++ b/src/TortoiseShell/ShellExt.h
@@ -24,7 +24,7 @@
 #include "ShellCache.h"
 #include "RemoteCacheLink.h"
 #include "GitStatus.h"
-//#include "SVNFolderStatus.h"
+#include "GitFolderStatus.h"
 #include "uxtheme.h"
 
 extern	UINT				g_cRefThisDll;			// Reference count of this DLL.
@@ -141,15 +141,22 @@ protected:
 		ShellMenuUnIgnoreSub,
 		ShellMenuUnIgnoreCaseSensitive,
 		ShellMenuUnIgnore,
-		ShellMenuLock,
-		ShellMenuUnlock,
-		ShellMenuUnlockForce,
+//		ShellMenuLock,
+//		ShellMenuUnlock,
+//		ShellMenuUnlockForce,
 		ShellMenuProperties,
 		ShellMenuDelUnversioned,
 		ShellMenuClipPaste,
 		ShellMenuPull,
 		ShellMenuPush,
 		ShellMenuClone,
+		ShellMenuBranch,
+		ShellMenuTag,
+		ShellMenuFormatPatch,
+		ShellMenuImportPatch,
+		ShellMenuCherryPick,
+		ShellMenuFetch,
+		ShellMenuRebase,
 		ShellMenuLastEntry			// used to mark the menu array end
 	};
 
@@ -198,21 +205,21 @@ protected:
 	stdstring itemshorturl;
 	stdstring ignoredprops;
 	stdstring owner;
-//	git_revnum_t columnrev;			///< holds the corresponding revision to the file/dir above
+	git_revnum_t columnrev;			///< holds the corresponding revision to the file/dir above
 	git_wc_status_kind	filestatus;
 	std::map<UINT, HBITMAP> bitmaps;
 
-//	SVNFolderStatus		m_CachedStatus;		// status cache
+	GitFolderStatus		m_CachedStatus;		// status cache
 	CRemoteCacheLink	m_remoteCacheLink;
 
 	FN_GetBufferedPaintBits pfnGetBufferedPaintBits;
 	FN_BeginBufferedPaint pfnBeginBufferedPaint;
 	FN_EndBufferedPaint pfnEndBufferedPaint;
 
-#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))
+#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))
 private:
 	void			InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, GitCommands com, UINT uFlags);
-	void			InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons);
+	void			InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons, UINT uFlags);
 	stdstring		WriteFileListToTempFile();
 	bool			WriteClipboardPathsToTempFile(stdstring& tempfile);
 	LPCTSTR			GetMenuTextFromResource(int id);