mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-06 11:16:51 +02:00
[PowerRename] Fluent UX (#13678)
* PowerRename new UI * Add scrollviewer * Don't deploy PowerRenameUI_new * Visual updates * Visual updates * Updates * Update Resources.resw * Added docs button * Update MainWindow.xaml * Wire Docs button * RegEx -> regular expressions * Update Show only renamed list on search/replace text changed * Update Show only renamed list on search/replace text changed - proper fix Set searchTerm to NULL when cleared - fix Show only renamed files on clear searchTerm * Files/folders input error handling * Fix renaming with keeping UI window opened After renaming folder, all of it's children need path update. Without path update, further renaming of children items would fail. * Update only children, not all items with greater depth * Fix dictionary false positives * Remove .NET dep * Rename PowerRenameUI_new to PowerRenameUILib Rename executable PowerRenameUIHost to PowerRename Co-authored-by: Laute <Niels.Laute@philips.com>
This commit is contained in:
@@ -41,6 +41,12 @@ IFACEMETHODIMP CMockPowerRenameManagerEvents::OnUpdate(_In_ IPowerRenameItem* pI
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
IFACEMETHODIMP CMockPowerRenameManagerEvents::OnRename(_In_ IPowerRenameItem* pItem)
|
||||
{
|
||||
m_itemRenamed = pItem;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
IFACEMETHODIMP CMockPowerRenameManagerEvents::OnError(_In_ IPowerRenameItem* pItem)
|
||||
{
|
||||
m_itemError = pItem;
|
||||
@@ -71,22 +77,9 @@ IFACEMETHODIMP CMockPowerRenameManagerEvents::OnRenameStarted()
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
IFACEMETHODIMP CMockPowerRenameManagerEvents::OnRenameCompleted()
|
||||
IFACEMETHODIMP CMockPowerRenameManagerEvents::OnRenameCompleted(bool closeUIWindowAfterRenaming)
|
||||
{
|
||||
m_renameCompleted = true;
|
||||
m_closeUIWindowAfterRenaming = closeUIWindowAfterRenaming;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT CMockPowerRenameManagerEvents::s_CreateInstance(_In_ IPowerRenameManager* psrm, _Outptr_ IPowerRenameUI** ppsrui)
|
||||
{
|
||||
*ppsrui = nullptr;
|
||||
CMockPowerRenameManagerEvents* events = new CMockPowerRenameManagerEvents();
|
||||
HRESULT hr = E_OUTOFMEMORY;
|
||||
if (events != nullptr)
|
||||
{
|
||||
hr = events->QueryInterface(IID_PPV_ARGS(ppsrui));
|
||||
events->Release();
|
||||
}
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
@@ -20,14 +20,13 @@ public:
|
||||
// IPowerRenameManagerEvents
|
||||
IFACEMETHODIMP OnItemAdded(_In_ IPowerRenameItem* renameItem);
|
||||
IFACEMETHODIMP OnUpdate(_In_ IPowerRenameItem* renameItem);
|
||||
IFACEMETHODIMP OnRename(_In_ IPowerRenameItem* renameItem);
|
||||
IFACEMETHODIMP OnError(_In_ IPowerRenameItem* renameItem);
|
||||
IFACEMETHODIMP OnRegExStarted(_In_ DWORD threadId);
|
||||
IFACEMETHODIMP OnRegExCanceled(_In_ DWORD threadId);
|
||||
IFACEMETHODIMP OnRegExCompleted(_In_ DWORD threadId);
|
||||
IFACEMETHODIMP OnRenameStarted();
|
||||
IFACEMETHODIMP OnRenameCompleted();
|
||||
|
||||
static HRESULT s_CreateInstance(_In_ IPowerRenameManager* psrm, _Outptr_ IPowerRenameUI** ppsrui);
|
||||
IFACEMETHODIMP OnRenameCompleted(bool closeUIWindowAfterRenaming);
|
||||
|
||||
~CMockPowerRenameManagerEvents()
|
||||
{
|
||||
@@ -35,11 +34,13 @@ public:
|
||||
|
||||
CComPtr<IPowerRenameItem> m_itemAdded;
|
||||
CComPtr<IPowerRenameItem> m_itemUpdated;
|
||||
CComPtr<IPowerRenameItem> m_itemRenamed;
|
||||
CComPtr<IPowerRenameItem> m_itemError;
|
||||
bool m_regExStarted = false;
|
||||
bool m_regExCanceled = false;
|
||||
bool m_regExCompleted = false;
|
||||
bool m_renameStarted = false;
|
||||
bool m_renameCompleted = false;
|
||||
bool m_closeUIWindowAfterRenaming = false;
|
||||
long m_refCount = 0;
|
||||
};
|
||||
@@ -40,7 +40,7 @@
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>$(OutDir)PowerRenameLib.lib;$(OutDir)PowerRenameUI.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;$(SolutionDir)$(Platform)\$(Configuration)\obj\PowerRenameUI\PowerRenameUI.res;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>$(OutDir)PowerRenameLib.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;$(OutDir)PowerRenameLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -16,7 +16,7 @@ EXTERN_C IMAGE_DOS_HEADER __ImageBase;
|
||||
|
||||
#define HINST_THISCOMPONENT ((HINSTANCE)&__ImageBase)
|
||||
|
||||
HINSTANCE g_hInst = HINST_THISCOMPONENT;
|
||||
HINSTANCE g_hostHInst = HINST_THISCOMPONENT;
|
||||
|
||||
namespace PowerRenameManagerTests
|
||||
{
|
||||
@@ -89,7 +89,7 @@ namespace PowerRenameManagerTests
|
||||
bool replaceSuccess = false;
|
||||
for (int step = 0; step < 20; step++)
|
||||
{
|
||||
replaceSuccess = mgr->Rename(0) == S_OK;
|
||||
replaceSuccess = mgr->Rename(0, true) == S_OK;
|
||||
if (replaceSuccess)
|
||||
{
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user