* Ensure rename dialog is centered

* Ensure children are renamed before parent items
* Add settings handler
* Replace old text referencing smart rename with power rename

src/modules/powerrename/dll/PowerRenameExt.cpp

@@ -4,6 +4,8 @@
 #include <PowerRenameItem.h>
 #include <PowerRenameManager.h>
 #include <trace.h>
+#include <Helpers.h>
+#include <Settings.h>
 #include "resource.h"
 
 extern HINSTANCE g_hInst;
@@ -14,24 +16,6 @@ struct InvokeStruct
     IStream* pstrm;
 };
 
-const wchar_t powerRenameRegPath[] = L"Software\\Microsoft\\PowerRename";
-const wchar_t powerRenameRegEnabledName[] = L"Enabled";
-
-bool CPowerRenameMenu::IsEnabled()
-{
-    DWORD type = REG_DWORD;
-    DWORD dwEnabled = 0;
-    DWORD cb = sizeof(dwEnabled);
-    SHGetValue(HKEY_CURRENT_USER, powerRenameRegPath, powerRenameRegEnabledName, &type, &dwEnabled, &cb);
-    return (dwEnabled == 0) ? false : true;
-}
-
-bool CPowerRenameMenu::SetEnabled(_In_ bool enabled)
-{
-    DWORD dwEnabled = enabled ? 1 : 0;
-    return SUCCEEDED(HRESULT_FROM_WIN32(SHSetValueW(HKEY_CURRENT_USER, powerRenameRegPath, powerRenameRegEnabledName, REG_DWORD, &dwEnabled, sizeof(dwEnabled))));
-}
-
 CPowerRenameMenu::CPowerRenameMenu()
 {
     DllAddRef();
@@ -60,7 +44,7 @@ HRESULT CPowerRenameMenu::s_CreateInstance(_In_opt_ IUnknown*, _In_ REFIID riid,
 HRESULT CPowerRenameMenu::Initialize(_In_opt_ PCIDLIST_ABSOLUTE, _In_ IDataObject *pdtobj, HKEY)
 {
     // Check if we have disabled ourselves
-    if (!IsEnabled())
+    if (!CSettings::GetEnabled())
         return E_FAIL;
 
     // Cache the data object to be used later
@@ -72,7 +56,11 @@ HRESULT CPowerRenameMenu::Initialize(_In_opt_ PCIDLIST_ABSOLUTE, _In_ IDataObjec
 HRESULT CPowerRenameMenu::QueryContextMenu(HMENU hMenu, UINT index, UINT uIDFirst, UINT, UINT uFlags)
 {
     // Check if we have disabled ourselves
-    if (!IsEnabled())
+    if (!CSettings::GetEnabled())
+        return E_FAIL;
+
+    // Check if we should only be on the extended context menu
+    if (CSettings::GetExtendedContextMenuOnly() && (!(uFlags & CMF_EXTENDEDVERBS)))
         return E_FAIL;
 
     HRESULT hr = E_UNEXPECTED;
@@ -80,8 +68,34 @@ HRESULT CPowerRenameMenu::QueryContextMenu(HMENU hMenu, UINT index, UINT uIDFirs
     {
         wchar_t menuName[64] = { 0 };
         LoadString(g_hInst, IDS_POWERRENAME, menuName, ARRAYSIZE(menuName));
-        InsertMenu(hMenu, index, MF_STRING | MF_BYPOSITION, uIDFirst++, menuName);
-        hr = MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, 1);
+
+        MENUITEMINFO mii;
+        mii.cbSize = sizeof(MENUITEMINFO);
+        mii.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_ID | MIIM_STATE;
+        mii.wID = uIDFirst++;
+        mii.fType = MFT_STRING;
+        mii.dwTypeData = (PWSTR)menuName;
+        mii.fState = MFS_ENABLED;
+
+        if (CSettings::GetShowIconOnMenu())
+        {
+            HICON hIcon = (HICON)LoadImage(g_hInst, MAKEINTRESOURCE(IDI_RENAME), IMAGE_ICON, 16, 16, 0);
+            if (hIcon)
+            {
+                mii.fMask |= MIIM_BITMAP;
+                mii.hbmpItem = CreateBitmapFromIcon(hIcon);
+                DestroyIcon(hIcon);
+            }
+        }
+
+        if (!InsertMenuItem(hMenu, index, TRUE, &mii))
+        {
+            hr = HRESULT_FROM_WIN32(GetLastError());
+        }
+        else
+        {
+            hr = MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, 1);
+        }
     }
 
     return hr;
@@ -91,7 +105,7 @@ HRESULT CPowerRenameMenu::InvokeCommand(_In_ LPCMINVOKECOMMANDINFO pici)
 {
     HRESULT hr = E_FAIL;
 
-    if (IsEnabled() &&
+    if (CSettings::GetEnabled() &&
         (IS_INTRESOURCE(pici->lpVerb)) &&
         (LOWORD(pici->lpVerb) == 0))
     {
@@ -129,7 +143,7 @@ DWORD WINAPI CPowerRenameMenu::s_PowerRenameUIThreadProc(_In_ void* pData)
     HRESULT hr = CoGetInterfaceAndReleaseStream(pInvokeData->pstrm, IID_PPV_ARGS(&spdo));
     if (SUCCEEDED(hr))
     {
-        // Create the smart rename manager
+        // Create the rename manager
         CComPtr<IPowerRenameManager> spsrm;
         hr = CPowerRenameManager::s_CreateInstance(&spsrm);
         if (SUCCEEDED(hr))
@@ -140,10 +154,10 @@ DWORD WINAPI CPowerRenameMenu::s_PowerRenameUIThreadProc(_In_ void* pData)
             if (SUCCEEDED(hr))
             {
                 // Pass the factory to the manager
-                hr = spsrm->put_smartRenameItemFactory(spsrif);
+                hr = spsrm->put_renameItemFactory(spsrif);
                 if (SUCCEEDED(hr))
                 {
-                    // Create the smart rename UI instance and pass the smart rename manager
+                    // Create the rename UI instance and pass the rename manager
                     CComPtr<IPowerRenameUI> spsrui;
                     hr = CPowerRenameUI::s_CreateInstance(spsrm, spdo, false, &spsrui);
                     if (SUCCEEDED(hr))

src/modules/powerrename/dll/dllmain.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "PowerRenameExt.h"
 #include <interface/powertoy_module_interface.h>
+#include <settings.h>
 #include <trace.h>
 #include <common/settings_objects.h>
 
@@ -9,10 +10,10 @@ HINSTANCE g_hInst = 0;
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
-class CSmartRenameClassFactory : public IClassFactory
+class CPowerRenameClassFactory : public IClassFactory
 {
 public:
-    CSmartRenameClassFactory(_In_ REFCLSID clsid) :
+    CPowerRenameClassFactory(_In_ REFCLSID clsid) :
         m_refCount(1),
         m_clsid(clsid)
     {
@@ -24,7 +25,7 @@ public:
     {
         static const QITAB qit[] =
         {
-            QITABENT(CSmartRenameClassFactory, IClassFactory),
+            QITABENT(CPowerRenameClassFactory, IClassFactory),
             { 0 }
         };
         return QISearch(this, qit, riid, ppv);
@@ -82,7 +83,7 @@ public:
     }
 
 private:
-    ~CSmartRenameClassFactory()
+    ~CPowerRenameClassFactory()
     {
         DllRelease();
     }
@@ -122,7 +123,7 @@ STDAPI DllGetClassObject(_In_ REFCLSID clsid, _In_ REFIID riid, _Outptr_ void **
 {
     *ppv = NULL;
     HRESULT hr = E_OUTOFMEMORY;
-    CSmartRenameClassFactory *pClassFactory = new CSmartRenameClassFactory(clsid);
+    CPowerRenameClassFactory *pClassFactory = new CPowerRenameClassFactory(clsid);
     if (pClassFactory)
     {
         hr = pClassFactory->QueryInterface(riid, ppv);
@@ -235,13 +236,13 @@ public:
 
     void init_settings()
     {
-        m_enabled = CPowerRenameMenu::IsEnabled();
+        m_enabled = CSettings::GetEnabled();
         Trace::EnablePowerRename(m_enabled);
     }
 
     void save_settings()
     {
-        CPowerRenameMenu::SetEnabled(m_enabled);
+        CSettings::SetEnabled(m_enabled);
         Trace::EnablePowerRename(m_enabled);
     }
 

src/modules/powerrename/dll/resource.h

@@ -1,4 +1,5 @@
 #define IDS_POWERRENAME                 801
+#define IDI_RENAME                      132
 
 // Next default values for new objects
 //