Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* fix spellchecker

* Rename to Text Extractor

* Missing mention

* Another missing mention
This commit is contained in:
Jaime Bernardo
2022-08-31 18:29:20 +01:00
committed by GitHub
parent 96f34ee4e9
commit 086eb58d80
24 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings-ui/Settings.UI.Library/EnabledModules.cs
View File

@@ -257,7 +257,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
private bool powerOCR = true;
[JsonPropertyName("PowerOCR")]
[JsonPropertyName("TextExtractor")]
public bool PowerOCR
{
get => powerOCR;

2
src/settings-ui/Settings.UI.Library/PowerOcrSettings.cs
View File

@@ -11,7 +11,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerOcrSettings : BasePTModuleSettings, ISettingsConfig
{
public const string ModuleName = "PowerOCR";
public const string ModuleName = "TextExtractor";
[JsonPropertyName("properties")]
public PowerOcrProperties Properties { get; set; }

2
src/settings-ui/Settings.UI.Library/SndPowerOcrSettings.cs
View File

@@ -9,7 +9,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndPowerOcrSettings
{
[JsonPropertyName("PowerOCR")]
[JsonPropertyName("TextExtractor")]
public PowerOcrSettings Settings { get; set; }
public SndPowerOcrSettings()

2
src/settings-ui/Settings.UI/App.xaml.cs
View File

@@ -123,7 +123,7 @@ namespace Microsoft.PowerToys.Settings.UI
case "KBM": StartupPage = typeof(Views.KeyboardManagerPage); break;
case "MouseUtils": StartupPage = typeof(Views.MouseUtilsPage); break;
case "PowerAccent": StartupPage = typeof(Views.PowerAccentPage); break;
case "PowerOCR": StartupPage = typeof(Views.PowerOcrPage); break;
case "TextExtractor": StartupPage = typeof(Views.PowerOcrPage); break;
case "PowerRename": StartupPage = typeof(Views.PowerRenamePage); break;
case "FileExplorer": StartupPage = typeof(Views.PowerPreviewPage); break;
case "ShortcutGuide": StartupPage = typeof(Views.ShortcutGuidePage); break;

2
src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
View File

@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums
KBM,
MouseUtils,
PowerAccent,
PowerOCR,
TextExtractor,
PowerRename,
Run,
ShortcutGuide,

10
src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml
View File

@@ -9,7 +9,7 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
<controls:OOBEPageControl x:Uid="Oobe_PowerOCR"
<controls:OOBEPageControl x:Uid="Oobe_TextExtractor"
HeroImage="ms-appx:///Assets/Modules/OOBE/PowerOCR.gif">
<controls:OOBEPageControl.PageContent>
@@ -17,19 +17,19 @@
<TextBlock x:Uid="Oobe_HowToUse"
Style="{ThemeResource OobeSubtitleStyle}" />
<controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_PowerOCR_HowToUse" />
<controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_TextExtractor_HowToUse" />
<TextBlock x:Uid="Oobe_TipsAndTricks"
Style="{ThemeResource OobeSubtitleStyle}"/>
<toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_PowerOCR_TipsAndTricks" />
<toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_TextExtractor_TipsAndTricks" />
<StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
<Button x:Uid="OOBE_Settings"
Click="SettingsLaunchButton_Click"/>
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerOCR" Style="{StaticResource TextButtonStyle}">
<TextBlock x:Uid="LearnMore_PowerOCR"
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor" Style="{StaticResource TextButtonStyle}">
<TextBlock x:Uid="LearnMore_TextExtractor"
TextWrapping="Wrap" />
</HyperlinkButton>
</StackPanel>

2
src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml.cs
View File

@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
public OobePowerOCR()
{
this.InitializeComponent();
ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.PowerOCR]);
ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.TextExtractor]);
DataContext = ViewModel;
}

2
src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
View File

@@ -104,7 +104,7 @@
ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerOCR" Tag="PowerOCR">
<muxc:NavigationViewItem x:Uid="Shell_TextExtractor" Tag="TextExtractor">
<muxc:NavigationViewItem.Icon>
<BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png"

6
src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
View File

@@ -109,9 +109,9 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
IsNew = true,
});
Modules.Insert((int)PowerToysModules.PowerOCR, new OobePowerToysModule()
Modules.Insert((int)PowerToysModules.TextExtractor, new OobePowerToysModule()
{
ModuleName = "PowerOCR",
ModuleName = "TextExtractor",
IsNew = true,
});
@@ -191,7 +191,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
case "KBM": NavigationFrame.Navigate(typeof(OobeKBM)); break;
case "PowerAccent": NavigationFrame.Navigate(typeof(OobePowerAccent)); break;
case "PowerRename": NavigationFrame.Navigate(typeof(OobePowerRename)); break;
case "PowerOCR": NavigationFrame.Navigate(typeof(OobePowerOCR)); break;
case "TextExtractor": NavigationFrame.Navigate(typeof(OobePowerOCR)); break;
case "FileExplorer": NavigationFrame.Navigate(typeof(OobeFileExplorer)); break;
case "ShortcutGuide": NavigationFrame.Navigate(typeof(OobeShortcutGuide)); break;
case "VideoConference": NavigationFrame.Navigate(typeof(OobeVideoConference)); break;

40
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -2328,38 +2328,38 @@ Activate by holding the key for the character you want to add an accent to, then
<data name="PowerAccent_ToolbarPosition_Right.Content" xml:space="preserve">
<value>Right</value>
</data>
<data name="LearnMore_PowerOcr.Text" xml:space="preserve">
<value>Learn more about PowerOCR</value>
<data name="LearnMore_TextExtractor.Text" xml:space="preserve">
<value>Learn more about Text Extractor</value>
</data>
<data name="PowerOCR.ModuleDescription" xml:space="preserve">
<value>PowerOCR is a convenient way to copy text from anywhere on screen</value>
<data name="TextExtractor.ModuleDescription" xml:space="preserve">
<value>Text Extractor is a convenient way to copy text from anywhere on screen</value>
</data>
<data name="PowerOCR.ModuleTitle" xml:space="preserve">
<value>PowerOCR</value>
<data name="TextExtractor.ModuleTitle" xml:space="preserve">
<value>Text Extractor</value>
</data>
<data name="PowerOCR_EnableToggleControl_HeaderText.Header" xml:space="preserve">
<value>Enable PowerOCR</value>
<data name="TextExtractor_EnableToggleControl_HeaderText.Header" xml:space="preserve">
<value>Enable Text Extractor</value>
</data>
<data name="Shell_PowerOcr.Content" xml:space="preserve">
<value>PowerOCR</value>
<data name="Shell_TextExtractor.Content" xml:space="preserve">
<value>Text Extractor</value>
</data>
<data name="Launch_PowerOCR.Content" xml:space="preserve">
<value>Launch PowerOCR</value>
<data name="Launch_TextExtractor.Content" xml:space="preserve">
<value>Launch Text Extractor</value>
</data>
<data name="Oobe_PowerOCR.Title" xml:space="preserve">
<value>PowerOCR</value>
<data name="Oobe_TextExtractor.Title" xml:space="preserve">
<value>Text Extractor</value>
</data>
<data name="Oobe_PowerOCR_HowToUse.Text" xml:space="preserve">
<value>to open PowerOCR and then selecting a region to copy the text from.</value>
<data name="Oobe_TextExtractor_HowToUse.Text" xml:space="preserve">
<value>to open Text Extractor and then selecting a region to copy the text from.</value>
</data>
<data name="Oobe_PowerOCR_TipsAndTricks.Text" xml:space="preserve">
<data name="Oobe_TextExtractor_TipsAndTricks.Text" xml:space="preserve">
<value>Hold the shift key to move the selection region around.</value>
</data>
<data name="PowerOCR.SecondaryLinksHeader" xml:space="preserve">
<data name="TextExtractor.SecondaryLinksHeader" xml:space="preserve">
<value>Attribution</value>
</data>
<data name="Oobe_PowerOCR.Description" xml:space="preserve">
<value>PowerOCR works like Snipping Tool, but copies the text out of the selected region using OCR and puts it on the clipboard.</value>
<data name="Oobe_TextExtractor.Description" xml:space="preserve">
<value>Text Extractor works like Snipping Tool, but copies the text out of the selected region using OCR and puts it on the clipboard.</value>
</data>
<data name="FileExplorerPreview_ToggleSwitch_Monaco_Try_Format.Description" xml:space="preserve">
<value>Applies to json and xml. Files remain unchanged.</value>

6
src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml
View File

@@ -9,11 +9,11 @@
AutomationProperties.LandmarkType="Main"
mc:Ignorable="d">
<controls:SettingsPageControl x:Uid="PowerOCR" ModuleImageSource="ms-appx:///Assets/Modules/PowerOCR.png">
<controls:SettingsPageControl x:Uid="TextExtractor" ModuleImageSource="ms-appx:///Assets/Modules/PowerOCR.png">
<controls:SettingsPageControl.ModuleContent>
<StackPanel Orientation="Vertical">
<controls:Setting x:Uid="PowerOCR_EnableToggleControl_HeaderText">
<controls:Setting x:Uid="TextExtractor_EnableToggleControl_HeaderText">
<controls:Setting.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png" />
</controls:Setting.Icon>
@@ -35,7 +35,7 @@
</controls:SettingsPageControl.ModuleContent>
<controls:SettingsPageControl.PrimaryLinks>
<controls:PageLink x:Uid="LearnMore_PowerOcr" Link="https://aka.ms/PowerToysOverview_PowerOCR" />
<controls:PageLink x:Uid="LearnMore_TextExtractor" Link="https://aka.ms/PowerToysOverview_TextExtractor" />
</controls:SettingsPageControl.PrimaryLinks>
<controls:SettingsPageControl.SecondaryLinks>
<controls:PageLink Text="Based upon Joseph Finney's Text Grab" Link="https://github.com/TheJoeFin/Text-Grab"/>

2
src/settings-ui/Settings.UI/Views/ShellPage.xaml
View File

@@ -109,7 +109,7 @@
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerOcr"
<muxc:NavigationViewItem x:Uid="Shell_TextExtractor"
helpers:NavHelper.NavigateTo="views:PowerOcrPage">
<muxc:NavigationViewItem.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png"