[TextExtractor]Rename PowerOCR to Text Extractor (#20178)

* [Image To Text]Rename PowerOCR to Image To Text

* fix spellchecker

* Rename to Text Extractor

* Missing mention

* Another missing mention

src/modules/PowerOCR/PowerOCR/App.xaml.cs

@@ -35,7 +35,7 @@ public partial class App : Application, IDisposable
         _instanceMutex = new Mutex(true, @"Local\PowerToys_PowerOCR_InstanceMutex", out bool createdNew);
         if (!createdNew)
         {
-            Logger.LogWarning("Another running PowerOCR instance was detected. Exiting PowerOCR");
+            Logger.LogWarning("Another running TextExtractor instance was detected. Exiting TextExtractor");
             _instanceMutex = null;
             Environment.Exit(0);
             return;
@@ -46,11 +46,11 @@ public partial class App : Application, IDisposable
             try
             {
                 _ = int.TryParse(e.Args[0], out _powerToysRunnerPid);
-                Logger.LogInfo($"PowerOCR started from the PowerToys Runner. Runner pid={_powerToysRunnerPid}");
+                Logger.LogInfo($"TextExtractor started from the PowerToys Runner. Runner pid={_powerToysRunnerPid}");
 
                 RunnerHelper.WaitForPowerToysRunner(_powerToysRunnerPid, () =>
                 {
-                    Logger.LogInfo("PowerToys Runner exited. Exiting PowerOCR");
+                    Logger.LogInfo("PowerToys Runner exited. Exiting TextExtractor");
                     Environment.Exit(0);
                 });
                 var userSettings = new UserSettings(new Helpers.ThrottledActionInvoker());
@@ -58,12 +58,12 @@ public partial class App : Application, IDisposable
             }
             catch (Exception ex)
             {
-                Logger.LogError($"PowerOCR got an exception on start: {ex}");
+                Logger.LogError($"TextExtractor got an exception on start: {ex}");
             }
         }
         else
         {
-            Logger.LogInfo($"PowerOCR started detached from PowerToys Runner.");
+            Logger.LogInfo($"TextExtractor started detached from PowerToys Runner.");
             _powerToysRunnerPid = -1;
             var userSettings = new UserSettings(new Helpers.ThrottledActionInvoker());
             keyboardMonitor = new KeyboardMonitor(userSettings);

src/modules/PowerOCR/PowerOCR/Helpers/Logger.cs

@@ -14,7 +14,7 @@ namespace PowerOCR.Helpers
     public static class Logger
     {
         private static readonly IFileSystem _fileSystem = new FileSystem();
-        private static readonly string ApplicationLogPath = Path.Combine(Constants.AppDataPath(), "PowerOCR\\Logs");
+        private static readonly string ApplicationLogPath = Path.Combine(Constants.AppDataPath(), "TextExtractor\\Logs");
 
         static Logger()
         {

src/modules/PowerOCR/PowerOCR/OCROverlay.xaml

@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:PowerOCR"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="PowerOCR"
+    Title="TextExtractor"
     Width="800"
     Height="450"
     ShowActivated="False"

src/modules/PowerOCR/PowerOCR/Settings/UserSettings.cs

@@ -17,7 +17,7 @@ namespace PowerOCR.Settings
     public class UserSettings : IUserSettings
     {
         private readonly ISettingsUtils _settingsUtils;
-        private const string PowerOcrModuleName = "PowerOCR";
+        private const string PowerOcrModuleName = "TextExtractor";
         private const string DefaultActivationShortcut = "Win + Shift + O";
         private const int MaxNumberOfRetry = 5;
         private const int SettingsReadOnChangeDelayInMs = 300;
@@ -56,7 +56,7 @@ namespace PowerOCR.Settings
 
                             if (!_settingsUtils.SettingsExists(PowerOcrModuleName))
                             {
-                                Logger.LogInfo("PowerOCR settings.json was missing, creating a new one");
+                                Logger.LogInfo("TextExtractor settings.json was missing, creating a new one");
                                 var defaultPowerOcrSettings = new PowerOcrSettings();
                                 defaultPowerOcrSettings.Save(_settingsUtils);
                             }

src/modules/PowerOCR/PowerOCRModuleInterface/PowerOcrConstants.h

@@ -4,5 +4,5 @@
 namespace PowerOcrConstants
 {
     // Name of the powertoy module.
-    inline const std::wstring ModuleKey = L"PowerOCR";
+    inline const std::wstring ModuleKey = L"TextExtractor";
 }

src/modules/PowerOCR/PowerOCRModuleInterface/Resources.resx

@@ -117,10 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="PowerOCR_Name" xml:space="preserve">
-    <value>PowerOCR</value>
+  <data name="TextExtractor_Name" xml:space="preserve">
+    <value>Text Extractor</value>
   </data>
-  <data name="PowerOCR_Settings_Desc" xml:space="preserve">
+  <data name="TextExtractor_Settings_Desc" xml:space="preserve">
     <value>This feature requires Windows 10 version 1903 or higher</value>
   </data>
 </root>

src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp

@@ -21,6 +21,7 @@ BOOL APIENTRY DllMain(HMODULE hModule,
     {
     case DLL_PROCESS_ATTACH:
         Trace::RegisterProvider();
+        break;
     case DLL_THREAD_ATTACH:
         break;
     case DLL_THREAD_DETACH:
@@ -83,17 +84,17 @@ private:
             }
             catch (...)
             {
-                Logger::error("Failed to initialize PowerOCR start shortcut");
+                Logger::error("Failed to initialize TextExtractor start shortcut");
             }
         }
         else
         {
-            Logger::info("PowerOCR settings are empty");
+            Logger::info("TextExtractor settings are empty");
         }
 
         if (!m_hotkey.key)
         {
-            Logger::info("PowerOCR is going to use default shortcut");
+            Logger::info("TextExtractor is going to use default shortcut");
             m_hotkey.win = true;
             m_hotkey.alt = false;
             m_hotkey.shift = true;
@@ -109,7 +110,7 @@ private:
 
     void launch_process()
     {
-        Logger::trace(L"Starting PowerOCR process");
+        Logger::trace(L"Starting TextExtractor process");
         unsigned long powertoys_pid = GetCurrentProcessId();
 
         std::wstring executable_args = L"";
@@ -122,11 +123,11 @@ private:
         sei.lpParameters = executable_args.data();
         if (ShellExecuteExW(&sei))
         {
-            Logger::trace("Successfully started the PowerOCR process");
+            Logger::trace("Successfully started the TextExtractor process");
         }
         else
         {
-            Logger::error( L"PowerOCR failed to start. {}", get_last_error_or_default(GetLastError()));
+            Logger::error( L"TextExtractor failed to start. {}", get_last_error_or_default(GetLastError()));
         }
 
         m_hProcess = sei.hProcess;
@@ -153,9 +154,9 @@ private:
 public:
     PowerOCR()
     {
-        app_name = GET_RESOURCE_STRING(IDS_POWEROCR_NAME);
+        app_name = GET_RESOURCE_STRING(IDS_TEXTEXTRACTOR_NAME);
         app_key = PowerOcrConstants::ModuleKey;
-        LoggerHelpers::init_logger(app_key, L"ModuleInterface", "PowerOCR");
+        LoggerHelpers::init_logger(app_key, L"ModuleInterface", "TextExtractor");
         m_hInvokeEvent = CreateDefaultEvent(CommonSharedConstants::SHOW_POWEROCR_SHARED_EVENT);
         init_settings();
     }
@@ -171,7 +172,7 @@ public:
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
-        Logger::trace("PowerOCR::destroy()");
+        Logger::trace("TextExtractor::destroy()");
         delete this;
     }
 
@@ -193,9 +194,9 @@ public:
 
         // Create a Settings object.
         PowerToysSettings::Settings settings(hinstance, get_name());
-        settings.set_description(GET_RESOURCE_STRING(IDS_POWEROCR_SETTINGS_DESC));
+        settings.set_description(GET_RESOURCE_STRING(IDS_TEXTEXTRACTOR_SETTINGS_DESC));
 
-        settings.set_overview_link(L"https://aka.ms/PowerToysOverview_PowerOCR");
+        settings.set_overview_link(L"https://aka.ms/PowerToysOverview_TextExtractor");
 
         return settings.serialize_to_buffer(buffer, buffer_size);
     }
@@ -227,7 +228,7 @@ public:
 
     virtual void enable()
     {
-        Logger::trace("PowerOCR::enable()");
+        Logger::trace("TextExtractor::enable()");
         ResetEvent(m_hInvokeEvent);
         launch_process();
         m_enabled = true;
@@ -236,7 +237,7 @@ public:
 
     virtual void disable()
     {
-        Logger::trace("PowerOCR::disable()");
+        Logger::trace("TextExtractor::disable()");
         if (m_enabled)
         {
             ResetEvent(m_hInvokeEvent);
@@ -251,7 +252,7 @@ public:
     {
         if (m_enabled)
         {
-            Logger::trace(L"PowerOCR hotkey pressed");
+            Logger::trace(L"TextExtractor hotkey pressed");
             if (!is_process_running())
             {
                 launch_process();

src/modules/PowerOCR/PowerOCRModuleInterface/resource.base.h

@@ -5,7 +5,7 @@
 //////////////////////////////
 // Non-localizable
 
-#define FILE_DESCRIPTION "PowerToys PowerOCR"
+#define FILE_DESCRIPTION "PowerToys TextExtractor"
 #define INTERNAL_NAME "PowerToys.PowerOCR"
 #define ORIGINAL_FILENAME "PowerToys.PowerOCR.dll"