We are currently indexing your data, so search results may be incomplete until we finish.
fogcreek shellext: renamed classes for consistency, part 1
Changeset 76b734f5c15f…
Parent 554daff290c0…
by
Changes to 7 files · Browse files at 76b734f5c15f Showing diff from parent 554daff290c0 Diff from another changeset...
|
|
|
@@ -17,7 +17,7 @@ // According to http://msdn.microsoft.com/en-us/library/bb776094%28VS.85%29.aspx
// the help texts for the commands should be reasonably short (under 40 characters)
-static const MenuDescription CMenuMenuDescList[] =
+static const CMenuDescription MenuDescList[] =
{
{"commit", L"Commit...",
L"Commit changes in repository",
@@ -125,7 +125,7 @@;
-void CShellExtCMenuBase::AddMenuList(UINT idCmd, const CString& name)
+void CTortoiseHgCmenuBase::AddMenuList(UINT idCmd, const CString& name)
{
ATLTRACE("AddMenuList: idCmd = %d, name = '%s'\n", idCmd, name);
myMenuIdMap[idCmd] = myDescMap[name];
@@ -159,7 +159,7 @@ RegCloseKey(hkey);
}
-void CShellExtCMenuBase::InitMenuMaps(const MenuDescription *menuDescs, int sz)
+void CTortoiseHgCmenuBase::InitMenuMaps(const CMenuDescription *menuDescs, int sz)
{
if (myDescMap.IsEmpty())
{
@@ -168,7 +168,7 @@
for (int i = 0; i < sz; i++)
{
- MenuDescription md = menuDescs[i];
+ CMenuDescription md = menuDescs[i];
if (md.name.IsEmpty())
{
@@ -286,10 +286,10 @@}
-void CShellExtCMenuBase::InsertMenuItemByName(HMENU hMenu, const CString& name, UINT indexMenu,
+void CTortoiseHgCmenuBase::InsertMenuItemByName(HMENU hMenu, const CString& name, UINT indexMenu,
UINT idCmd, UINT idCmdFirst, const CStringW& prefix)
{
- const MenuDescriptionMap::CPair* pPair = myDescMap.Lookup(name);
+ const CMenuDescriptionMap::CPair* pPair = myDescMap.Lookup(name);
if (pPair == NULL)
{
ATLTRACE("***** InsertMenuItemByName: can't find menu info for '%s'\n", (LPCTSTR)name);
@@ -297,7 +297,7 @@ }
- const MenuDescription& md = pPair->m_value;
+ const CMenuDescription& md = pPair->m_value;
AddMenuList(idCmd - idCmdFirst, name);
InsertMenuItemWithIcon1(
hMenu, indexMenu, idCmd, prefix + md.menuText, md.iconName);
@@ -364,8 +364,7 @@ return 0;
}
-void
-CShellExtCMenuBase::TweakMenuForVista(HMENU hMenu)
+void CTortoiseHgCmenuBase::TweakMenuForVista(HMENU hMenu)
{
if (!SysInfo::Instance().IsVistaOrLater())
return;
@@ -382,10 +381,10 @@
// IContextMenu
STDMETHODIMP
-CShellExtCMenuBase::QueryContextMenu(
+CTortoiseHgCmenuBase::QueryContextMenu(
HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
{
- ATLTRACE("CShellExtCMenu::QueryContextMenu\n");
+ ATLTRACE("CTortoiseHgCmenuBase::QueryContextMenu\n");
UINT idCmd = idCmdFirst;
BOOL bAppendItems = TRUE;
@@ -405,12 +404,12 @@ bool hasthgmenu = false;
if (HasTortoiseMenu(hMenu, hasthgmenu) == 0 && hasthgmenu)
{
- ATLTRACE("CShellExtCMenu::QueryContextMenu: "
+ ATLTRACE("CTortoiseHgCmenuBase::QueryContextMenu: "
"TortoiseHg menu entry already in menu -> skipping");
return S_OK;
}
- InitMenuMaps(CMenuMenuDescList, sizeof(CMenuMenuDescList) / sizeof(MenuDescription));
+ InitMenuMaps(MenuDescList, sizeof(MenuDescList) / sizeof(CMenuDescription));
CString promoted_string = "commit,workbench"; // default value if key not found
GetRegistryConfig("PromotedItems", promoted_string);
@@ -458,7 +457,7 @@ }
}
- ATLTRACE("CShellExtCMenu::QueryContextMenu: isHgrepo = %d, fileMenu = %d\n",
+ ATLTRACE("CTortoiseHgCmenuBase::QueryContextMenu: isHgrepo = %d, fileMenu = %d\n",
isHgrepo, fileMenu);
/* We have three menu types: files-selected, no-files-selected, no-repo */
@@ -524,7 +523,7 @@
}
- ATLTRACE(" CShellExtCMenu::QueryContextMenu: adding main THG menu\n");
+ ATLTRACE(" CTortoiseHgCmenuBase::QueryContextMenu: adding main THG menu\n");
InsertSubMenuItemWithIcon2(hMenu, hSubMenu, indexMenu++, idCmd++,
TortoiseHgMenuEntryString, "hg.ico");
@@ -539,16 +538,16 @@
STDMETHODIMP
-CShellExtCMenuBase::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
+CTortoiseHgCmenuBase::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
{
- ATLTRACE("CShellExtCMenu::InvokeCommand");
+ ATLTRACE("CTortoiseHgCmenuBase::InvokeCommand");
HRESULT hr = E_INVALIDARG;
if (!HIWORD(lpcmi->lpVerb))
{
UINT idCmd = LOWORD(lpcmi->lpVerb);
- ATLTRACE("CShellExtCMenu::InvokeCommand: idCmd = %d\n", idCmd);
- const MenuIdCmdMap::CPair* p = myMenuIdMap.Lookup(idCmd);
+ ATLTRACE("CTortoiseHgCmenuBase::InvokeCommand: idCmd = %d\n", idCmd);
+ const CMenuIdCmdMap::CPair* p = myMenuIdMap.Lookup(idCmd);
if (p != NULL)
{
RunDialog(p->m_value.name);
@@ -556,7 +555,7 @@ }
else
{
- ATLTRACE("***** CShellExtCMenu::InvokeCommand: action not found "
+ ATLTRACE("***** CTortoiseHgCmenuBase::InvokeCommand: action not found "
"for idCmd %d\n", idCmd);
}
}
@@ -565,7 +564,7 @@
STDMETHODIMP
-CShellExtCMenuBase::GetCommandString(
+CTortoiseHgCmenuBase::GetCommandString(
UINT_PTR idCmd, UINT uFlags, UINT FAR *reserved,
LPSTR pszName, UINT cchMax)
{
@@ -593,17 +592,17 @@ sflags = "GCS_VERBA"; break;
}
- ATLTRACE("CShellExtCMenu::GetCommandString: idCmd = %d, uFlags = %d (%s), "
+ ATLTRACE("CTortoiseHgCmenuBase::GetCommandString: idCmd = %d, uFlags = %d (%s), "
"cchMax = %d\n", idCmd, uFlags, sflags, cchMax);
- const MenuIdCmdMap::CPair* p = myMenuIdMap.Lookup((UINT)idCmd);
+ const CMenuIdCmdMap::CPair* p = myMenuIdMap.Lookup((UINT)idCmd);
if (p == NULL)
{
- ATLTRACE("***** CShellExtCMenu::GetCommandString: idCmd not found\n");
+ ATLTRACE("***** CTortoiseHgCmenuBase::GetCommandString: idCmd not found\n");
}
else
{
- ATLTRACE("CShellExtCMenu::GetCommandString: name = '%s'\n", p->m_value.name);
+ ATLTRACE("CTortoiseHgCmenuBase::GetCommandString: name = '%s'\n", p->m_value.name);
if (uFlags == GCS_HELPTEXTW)
{
@@ -613,7 +612,7 @@ size_t size = p->m_value.helpText.GetLength();
if (size >= 40)
{
- ATLTRACE("***** CShellExtCMenu::GetCommandString: warning: "
+ ATLTRACE("***** CTortoiseHgCmenuBase::GetCommandString: warning: "
"length of help text is %d, which is not reasonably "
"short (<40)\n", size);
}
@@ -642,7 +641,7 @@
if (cchMax < 1)
{
- ATLTRACE("CShellExtCMenu::GetCommandString: cchMax = %d (is <1)\n", cchMax);
+ ATLTRACE("CTortoiseHgCmenuBase::GetCommandString: cchMax = %d (is <1)\n", cchMax);
return res;
}
@@ -659,7 +658,7 @@
size = wcslen(src);
- ATLTRACE(L"CShellExtCMenu::GetCommandString: res = %d, "
+ ATLTRACE(L"CTortoiseHgCmenuBase::GetCommandString: res = %d, "
L"pszName (wide) = '%s'\n", (int)res, dest);
}
else
@@ -684,7 +683,7 @@
STDMETHODIMP
-CShellExtCMenuBase::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam)
+CTortoiseHgCmenuBase::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam)
{
LRESULT res;
return HandleMenuMsg2(uMsg, wParam, lParam, &res);
@@ -692,7 +691,7 @@
STDMETHODIMP
-CShellExtCMenuBase::HandleMenuMsg2(
+CTortoiseHgCmenuBase::HandleMenuMsg2(
UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
{
// A great tutorial on owner drawn menus in shell extension can be found
@@ -742,7 +741,7 @@}
-void CShellExtCMenuBase::RunDialog(const CString& cmd)
+void CTortoiseHgCmenuBase::RunDialog(const CString& cmd)
{
CString dir = GetTHgProgRoot();
if (dir.IsEmpty())
@@ -829,9 +828,9 @@ InitStatus::check();
}
-void CShellExtCMenuBase::PrintDebugHeader(LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj)
+void CTortoiseHgCmenuBase::PrintDebugHeader(LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj)
{
- ATLTRACE("CShellExtCMenu::Initialize\n");
+ ATLTRACE("CTortoiseHgCmenuBase::Initialize\n");
// get installed MSI product id (for debugging purposes for now)
#ifdef _M_X64
@@ -865,7 +864,7 @@ ATLTRACE(" pDataObj: %p\n", pDataObj);
}
-STDMETHODIMP CShellExtCMenuBase::Initialize(
+STDMETHODIMP CTortoiseHgCmenuBase::Initialize(
LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hRegKey)
{
TCHAR name[MAX_PATH+1];
@@ -932,10 +931,10 @@}
-CShellExtCMenuBase::CShellExtCMenuBase()
+CTortoiseHgCmenuBase::CTortoiseHgCmenuBase()
{
}
-CShellExtCMenu::CShellExtCMenu()
+CTortoiseHgCmenu::CTortoiseHgCmenu()
{
}
|
|
@@ -1,7 +1,7 @@ #ifndef _CShellExtCMenu_h_
#define _CShellExtCMenu_h_
-struct MenuDescription
+struct CMenuDescription
{
CString name;
CStringW menuText;
@@ -10,10 +10,10 @@ UINT idCmd;
};
-typedef CAtlMap<CString, MenuDescription> MenuDescriptionMap;
-typedef CAtlMap<UINT, MenuDescription> MenuIdCmdMap;
+typedef CAtlMap<CString, CMenuDescription> CMenuDescriptionMap;
+typedef CAtlMap<UINT, CMenuDescription> CMenuIdCmdMap;
-class CShellExtCMenuBase :
+class CTortoiseHgCmenuBase :
public CComObjectRootEx<CComMultiThreadModel>,
public IContextMenu3,
public IShellExtInit
@@ -21,22 +21,22 @@protected:
CAtlArray<CString> myFiles;
CString myFolder;
- MenuDescriptionMap myDescMap;
- MenuIdCmdMap myMenuIdMap;
+ CMenuDescriptionMap myDescMap;
+ CMenuIdCmdMap myMenuIdMap;
virtual void RunDialog(const CString& cmd);
void TweakMenuForVista(HMENU menu);
void PrintDebugHeader(LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj);
- void InitMenuMaps(const MenuDescription *menuDescs, int sz);
+ void InitMenuMaps(const CMenuDescription *menuDescs, int sz);
void InsertMenuItemByName(HMENU hMenu, const CString& name, UINT indexMenu,
UINT idCmd, UINT idCmdFirst, const CStringW& prefix);
void AddMenuList(UINT idCmd, const CString& name);
public:
- CShellExtCMenuBase();
+ CTortoiseHgCmenuBase();
- BEGIN_COM_MAP(CShellExtCMenuBase)
+ BEGIN_COM_MAP(CTortoiseHgCmenuBase)
COM_INTERFACE_ENTRY(IContextMenu)
COM_INTERFACE_ENTRY(IContextMenu2)
COM_INTERFACE_ENTRY(IContextMenu3)
@@ -60,12 +60,12 @@ LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hKeyID);
};
-class CShellExtCMenu :
- public CShellExtCMenuBase,
- public CComCoClass<CShellExtCMenu, &CLSID_TortoiseHgCmenu>
+class CTortoiseHgCmenu :
+ public CTortoiseHgCmenuBase,
+ public CComCoClass<CTortoiseHgCmenu, &CLSID_TortoiseHgCmenu>
{
public:
- CShellExtCMenu();
+ CTortoiseHgCmenu();
DECLARE_REGISTRY_RESOURCEID(IDR_CMENU)
};
|
||
|
@@ -8,7 +8,7 @@ // According to http://msdn.microsoft.com/en-us/library/bb776094%28VS.85%29.aspx
// the help texts for the commands should be reasonably short (under 40 characters)
-static const MenuDescription CDndMenuDescList[] =
+static const CMenuDescription CDndMenuDescList[] =
{
{"drag_move", L"Hg Move versioned item(s) here",
L"", "hg.ico", 0},
@@ -30,7 +30,7 @@
// IContextMenu
STDMETHODIMP
-CShellExtDnd::QueryContextMenu(
+CTortoiseHgDropHandler::QueryContextMenu(
HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
{
ATLTRACE("CShellExtDnd::QueryContextMenu\n");
@@ -44,7 +44,7 @@
UINT idCmd = idCmdFirst;
- InitMenuMaps(CDndMenuDescList, sizeof(CDndMenuDescList) / sizeof(MenuDescription));
+ InitMenuMaps(CDndMenuDescList, sizeof(CDndMenuDescList) / sizeof(CMenuDescription));
const char* entries_string = DropMenu;
CAtlList<CString> entries;
@@ -68,17 +68,17 @@}
-void CShellExtDnd::RunDialog(const CString& cmd)
+void CTortoiseHgDropHandler::RunDialog(const CString& cmd)
{
if (cmd == "drag_move" || cmd == "drag_copy") {
//Append the current directory as the dest
myFiles.Add(myFolder);
}
- CShellExtCMenuBase::RunDialog(cmd);
+ CTortoiseHgCmenuBase::RunDialog(cmd);
}
-STDMETHODIMP CShellExtDnd::Initialize(
+STDMETHODIMP CTortoiseHgDropHandler::Initialize(
LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hRegKey)
{
TCHAR name[MAX_PATH+1];
@@ -159,12 +159,6 @@ }
}
-
-CShellExtDnd::CShellExtDnd()
+CTortoiseHgDropHandler::CTortoiseHgDropHandler()
{
}
-
-
-CShellExtDnd::~CShellExtDnd()
-{
-}
|
||
|
@@ -4,17 +4,16 @@ #include "CShellExtCMenu.h"
-// CShellExtCMenuBase implements IContextMenu3, IShellExtInit
-class CShellExtDnd : public CShellExtCMenuBase,
- public CComCoClass<CShellExtDnd, &CLSID_TortoiseHgDropHandler>
+// CTortoiseHgCmenuBase implements IContextMenu3, IShellExtInit
+class CTortoiseHgDropHandler : public CTortoiseHgCmenuBase,
+ public CComCoClass<CTortoiseHgDropHandler, &CLSID_TortoiseHgDropHandler>
{
protected:
virtual void RunDialog(const CString& cmd);
public:
- explicit CShellExtDnd();
- ~CShellExtDnd();
+ CTortoiseHgDropHandler();
DECLARE_REGISTRY_RESOURCEID(IDR_DRAGDROP)
|
||
|
@@ -6,9 +6,9 @@ #include "RegistryConfig.h"
#include "CShellExtOverlay.h"
-CComAutoCriticalSection CShellExtOverlay::m_cs;
+CComAutoCriticalSection CTortoiseHgOverlay::m_cs;
-STDMETHODIMP CShellExtOverlay::GetOverlayInfo(
+STDMETHODIMP CTortoiseHgOverlay::GetOverlayInfo(
LPWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags)
{
ATLTRACE("CShellExtOverlay::GetOverlayInfo: myTortoiseClass = '%c'\n", myTortoiseClass);
@@ -20,14 +20,14 @@}
-STDMETHODIMP CShellExtOverlay::GetPriority(int *pPriority)
+STDMETHODIMP CTortoiseHgOverlay::GetPriority(int *pPriority)
{
*pPriority = 1;
return S_OK;
}
-STDMETHODIMP CShellExtOverlay::IsMemberOf(LPCWSTR pwszPath, DWORD /* dwAttrib */)
+STDMETHODIMP CTortoiseHgOverlay::IsMemberOf(LPCWSTR pwszPath, DWORD /* dwAttrib */)
{
CComCritSecLock<CComAutoCriticalSection> lock(m_cs);
@@ -70,31 +70,27 @@}
-CShellExtOverlay::CShellExtOverlay(char tortoiseClass) :
+CTortoiseHgOverlay::CTortoiseHgOverlay(char tortoiseClass) :
myTortoiseClass(tortoiseClass)
{
}
-CShellExtOverlay::~CShellExtOverlay()
-{
-}
-
CTortoiseHgNormal::CTortoiseHgNormal() :
- CShellExtOverlay('C')
+ CTortoiseHgOverlay('C')
{
}
CTortoiseHgAdded::CTortoiseHgAdded() :
- CShellExtOverlay('A')
+ CTortoiseHgOverlay('A')
{
}
CTortoiseHgModified::CTortoiseHgModified() :
- CShellExtOverlay('M')
+ CTortoiseHgOverlay('M')
{
}
CTortoiseHgUnversioned::CTortoiseHgUnversioned() :
- CShellExtOverlay('?')
+ CTortoiseHgOverlay('?')
{
}
|
||
|
@@ -1,7 +1,7 @@ #ifndef _CShellExtOverlay_h_
#define _CShellExtOverlay_h_
-class CShellExtOverlay :
+class CTortoiseHgOverlay :
public CComObjectRootEx<CComMultiThreadModel>,
public IShellIconOverlayIdentifier
{
@@ -9,11 +9,10 @@
const char myTortoiseClass;
-public:
- explicit CShellExtOverlay(char Class);
- ~CShellExtOverlay();
+protected:
+ explicit CTortoiseHgOverlay(char Class);
- BEGIN_COM_MAP(CShellExtOverlay)
+ BEGIN_COM_MAP(CTortoiseHgOverlay)
COM_INTERFACE_ENTRY(IShellIconOverlayIdentifier)
END_COM_MAP()
@@ -25,7 +24,7 @@};
class CTortoiseHgNormal :
- public CShellExtOverlay,
+ public CTortoiseHgOverlay,
public CComCoClass<CTortoiseHgNormal, &CLSID_TortoiseHgNormal>
{
public:
@@ -35,7 +34,7 @@};
class CTortoiseHgAdded :
- public CShellExtOverlay,
+ public CTortoiseHgOverlay,
public CComCoClass<CTortoiseHgAdded, &CLSID_TortoiseHgAdded>
{
public:
@@ -45,7 +44,7 @@};
class CTortoiseHgModified :
- public CShellExtOverlay,
+ public CTortoiseHgOverlay,
public CComCoClass<CTortoiseHgModified, &CLSID_TortoiseHgNormal>
{
public:
@@ -55,7 +54,7 @@};
class CTortoiseHgUnversioned :
- public CShellExtOverlay,
+ public CTortoiseHgOverlay,
public CComCoClass<CTortoiseHgUnversioned, &CLSID_TortoiseHgNormal>
{
public:
|
||
|
@@ -13,8 +13,8 @@ CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
- OBJECT_ENTRY(CLSID_TortoiseHgCmenu, CShellExtCMenu)
- OBJECT_ENTRY(CLSID_TortoiseHgDropHandler, CShellExtDnd)
+ OBJECT_ENTRY(CLSID_TortoiseHgCmenu, CTortoiseHgCmenu)
+ OBJECT_ENTRY(CLSID_TortoiseHgDropHandler, CTortoiseHgDropHandler)
OBJECT_ENTRY(CLSID_TortoiseHgNormal, CTortoiseHgNormal)
OBJECT_ENTRY(CLSID_TortoiseHgAdded, CTortoiseHgAdded)
OBJECT_ENTRY(CLSID_TortoiseHgModified, CTortoiseHgModified)
|
||
Add a tag
Loading...