diff --git a/src/modules/PowerOCR/PowerOCR/App.xaml b/src/modules/PowerOCR/PowerOCR/App.xaml index a8dcd7c7a0..2831d1d4f3 100644 --- a/src/modules/PowerOCR/PowerOCR/App.xaml +++ b/src/modules/PowerOCR/PowerOCR/App.xaml @@ -12,8 +12,6 @@ - - diff --git a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml index c22453aae1..100b5de9ef 100644 --- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml +++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml @@ -3,12 +3,13 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:PowerOCR" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:p="clr-namespace:PowerOCR.Properties" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" Title="TextExtractor" Width="200" Height="200" + ui:Design.Background="Transparent" AllowsTransparency="True" Background="Transparent" Loaded="Window_Loaded" @@ -23,19 +24,22 @@ mc:Ignorable="d"> - - @@ -70,23 +74,23 @@ + Header="{x:Static p:Resources.Settings}" /> + Header="{x:Static p:Resources.Cancel}" /> @@ -96,7 +100,6 @@ Padding="4,8,12,8" HorizontalAlignment="Center" VerticalAlignment="Top" - d:Background="White" d:Visibility="Visible" Background="{DynamicResource ApplicationBackgroundBrush}" CornerRadius="8" @@ -104,75 +107,60 @@ + Opacity="0.28" + RenderingBias="Performance" + ShadowDepth="1" /> + - + ToolTip="{x:Static p:Resources.ResultTextSingleLineShortcut}"> + - + ToolTip="{x:Static p:Resources.ResultTextTableShortcut}"> + diff --git a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs index e79d0d3ea4..60ec8b3a3a 100644 --- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs +++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs @@ -49,7 +49,7 @@ public partial class OCROverlay : Window Top = screenRectangle.Top >= 0 ? screenRectangle.Top : screenRectangle.Top + (screenRectangle.Height / 2); InitializeComponent(); - + Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this, Wpf.Ui.Controls.WindowBackdropType.None); PopulateLanguageMenu(); } diff --git a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj index 5b59ab9ef8..4116b0889c 100644 --- a/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj +++ b/src/modules/PowerOCR/PowerOCR/PowerOCR.csproj @@ -61,4 +61,20 @@ + + + + True + True + Resources.resx + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + diff --git a/src/modules/PowerOCR/PowerOCR/Properties/Resources.Designer.cs b/src/modules/PowerOCR/PowerOCR/Properties/Resources.Designer.cs new file mode 100644 index 0000000000..f50fd9ff68 --- /dev/null +++ b/src/modules/PowerOCR/PowerOCR/Properties/Resources.Designer.cs @@ -0,0 +1,135 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace PowerOCR.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PowerOCR.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Cancel. + /// + public static string Cancel { + get { + return ResourceManager.GetString("Cancel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cancel (Esc). + /// + public static string CancelShortcut { + get { + return ResourceManager.GetString("CancelShortcut", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Format result as a single line. + /// + public static string ResultTextSingleLine { + get { + return ResourceManager.GetString("ResultTextSingleLine", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Format result as a single line (S). + /// + public static string ResultTextSingleLineShortcut { + get { + return ResourceManager.GetString("ResultTextSingleLineShortcut", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Format result as a table. + /// + public static string ResultTextTable { + get { + return ResourceManager.GetString("ResultTextTable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Format result as a table (T). + /// + public static string ResultTextTableShortcut { + get { + return ResourceManager.GetString("ResultTextTableShortcut", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Selected language. + /// + public static string SelectedLang { + get { + return ResourceManager.GetString("SelectedLang", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Settings. + /// + public static string Settings { + get { + return ResourceManager.GetString("Settings", resourceCulture); + } + } + } +} diff --git a/src/modules/PowerOCR/PowerOCR/Properties/Resources.resx b/src/modules/PowerOCR/PowerOCR/Properties/Resources.resx new file mode 100644 index 0000000000..df6947f018 --- /dev/null +++ b/src/modules/PowerOCR/PowerOCR/Properties/Resources.resx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cancel + + + Cancel (Esc) + (Esc) indicates the keyboard shortcut + + + Format result as a single line + + + Format result as a single line (S) + (S) indicates the keyboard shortcut + + + Format result as a table + + + Format result as a table (T) + (T) indicates the keyboard shortcut + + + Selected language + + + Settings + + \ No newline at end of file diff --git a/src/modules/PowerOCR/PowerOCR/Styles/ButtonStyles.xaml b/src/modules/PowerOCR/PowerOCR/Styles/ButtonStyles.xaml deleted file mode 100644 index fab21fb3ee..0000000000 --- a/src/modules/PowerOCR/PowerOCR/Styles/ButtonStyles.xaml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - - - - - - - M 0,0 L 3.5,4 L 7,0 Z - M 0,4 L 3.5,0 L 7,4 Z - M 0,0 L 4,3.5 L 0,7 Z - F1 M 10.0,1.2 L 4.7,9.1 L 4.5,9.1 L 0,5.2 L 1.3,3.5 L 4.3,6.1L 8.3,0 L 10.0,1.2 Z - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/modules/PowerOCR/PowerOCR/Styles/Colors.xaml b/src/modules/PowerOCR/PowerOCR/Styles/Colors.xaml deleted file mode 100644 index 97fa005753..0000000000 --- a/src/modules/PowerOCR/PowerOCR/Styles/Colors.xaml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file