Merge pull request #456 from TheJoeFin/settings-save-tess-change

TheJoeFin · web-flow · commit 6f953551de9d · 2024-04-23T14:21:55.000-05:00
Settings save tess change
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -10,8 +10,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24080-01" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/Text-Grab-Package/Package.appxmanifest b/Text-Grab-Package/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="40087JoeFinApps.TextGrab"
     Publisher="CN=153F3B0F-BA3D-4964-8098-71AC78A1DF6A"
-    Version="4.4.1.0" />
+    Version="4.4.2.0" />
 
   <Properties>
     <DisplayName>Text Grab</DisplayName>
diff --git a/Text-Grab/Controls/BottomBarSettings.xaml b/Text-Grab/Controls/BottomBarSettings.xaml
@@ -55,7 +55,7 @@
             VerticalAlignment="Top"
             Background="{ui:ThemeResource CardBackgroundFillColorSecondaryBrush}"
             CornerRadius="8">
-            <ListView
+            <ui:ListView
                 x:Name="LeftListBox"
                 d:ItemsSource="{d:SampleData ItemCount=5}"
                 ItemContainerStyle="{StaticResource GridViewListItem}"
@@ -105,7 +105,7 @@
                         </GridViewColumn>
                     </GridView>
                 </ListView.View>
-            </ListView>
+            </ui:ListView>
         </Border>
         <StackPanel
             Grid.Row="1"
@@ -156,7 +156,7 @@
                 VerticalAlignment="Top"
                 Background="{ui:ThemeResource CardBackgroundFillColorSecondaryBrush}"
                 CornerRadius="8">
-                <ListView
+                <ui:ListView
                     x:Name="RightListBox"
                     d:ItemsSource="{d:SampleData ItemCount=1}"
                     ItemContainerStyle="{StaticResource GridViewListItem}"
@@ -203,7 +203,7 @@
                             </GridViewColumn>
                         </GridView>
                     </ListView.View>
-                </ListView>
+                </ui:ListView>
             </Border>
 
             <StackPanel
diff --git a/Text-Grab/Controls/FindAndReplaceWindow.xaml b/Text-Grab/Controls/FindAndReplaceWindow.xaml
@@ -181,7 +181,7 @@
                     VerticalAlignment="Center"
                     VerticalContentAlignment="Center">
                     <TextBlock Style="{StaticResource TextBodyNormal}">
-                        Search With Regex
+                        Use Regex
                     </TextBlock>
                 </ui:ToggleSwitch>
 
@@ -215,15 +215,14 @@
             Text="Matches" />
 
         <Border Grid.Row="3" Background="{ui:ThemeResource SolidBackgroundFillColorBaseAltBrush}">
-            <ListView
+            <ui:ListView
                 x:Name="ResultsListView"
                 Grid.Row="2"
                 Background="Transparent"
                 Foreground="{ui:ThemeResource TextFillColorPrimaryBrush}"
                 ScrollViewer.CanContentScroll="True"
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                SelectionChanged="ResultsListView_SelectionChanged"
-                Style="{DynamicResource ListViewDarkStyle}">
+                SelectionChanged="ResultsListView_SelectionChanged">
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <Grid>
@@ -265,7 +264,7 @@
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ListView>
+            </ui:ListView>
         </Border>
     </Grid>
 </ui:FluentWindow>
diff --git a/Text-Grab/Pages/GeneralSettings.xaml b/Text-Grab/Pages/GeneralSettings.xaml
@@ -27,7 +27,7 @@
                 x:Name="VersionTextblock"
                 VerticalAlignment="Center"
                 Style="{StaticResource TextBodyNormal}"
-                Text="Version 4.4.1" />
+                Text="Version 4.4.2" />
 
             <ui:HyperlinkButton
                 x:Name="OpenExeFolderButton"
diff --git a/Text-Grab/Pages/LanguageSettings.xaml b/Text-Grab/Pages/LanguageSettings.xaml
@@ -26,7 +26,7 @@
                 Content="How to install OCR languages with PowerShell"
                 NavigateUri="https://learn.microsoft.com/en-us/windows/powertoys/text-extractor#how-to-query-for-ocr-language-packs" />
             <!--  Show the commands to execute to add other languages  -->
-            <ListView
+            <ui:ListView
                 x:Name="WindowsLanguagesListView"
                 MaxWidth="600"
                 HorizontalAlignment="Left">
@@ -37,7 +37,7 @@
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ListView>
+            </ui:ListView>
         </StackPanel>
         <StackPanel
             x:Name="TesseractLanguagesStackPanel"
@@ -61,7 +61,7 @@
                     <TextBlock Text="Open Tesseract Language Data Folder" />
                 </StackPanel>
             </ui:HyperlinkButton>
-            <ListView
+            <ui:ListView
                 x:Name="TesseractLanguagesListView"
                 MaxWidth="600"
                 HorizontalAlignment="Left">
@@ -72,7 +72,7 @@
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
-            </ListView>
+            </ui:ListView>
 
             <TextBlock Margin="0,20,0,0" Style="{StaticResource TextBodyNormal}">
                 Download and install languages from Tesseract GitHub<LineBreak />
diff --git a/Text-Grab/Pages/LanguageSettings.xaml.cs b/Text-Grab/Pages/LanguageSettings.xaml.cs
@@ -21,25 +21,27 @@ namespace Text_Grab.Pages;
 /// </summary>
 public partial class LanguageSettings : Page
 {
-    private bool usingTesseract;
     private readonly Settings DefaultSettings = AppUtilities.TextGrabSettings;
 
 
     public LanguageSettings()
     {
         InitializeComponent();
-        usingTesseract = DefaultSettings.UseTesseract && TesseractHelper.CanLocateTesseractExe();
     }
 
     private async void Page_Loaded(object sender, RoutedEventArgs e)
     {
         LoadWindowsLanguages();
 
-        if (usingTesseract)
+        if (DefaultSettings.UseTesseract)
         {
             TesseractLanguagesStackPanel.Visibility = Visibility.Visible;
             await LoadTesseractContent();
         }
+        else
+        {
+            TesseractLanguagesStackPanel.Visibility = Visibility.Collapsed;
+        }
     }
 
     private void LoadWindowsLanguages()
diff --git a/Text-Grab/Pages/TesseractSettings.xaml.cs b/Text-Grab/Pages/TesseractSettings.xaml.cs
@@ -38,6 +38,7 @@ private void TesseractPathTextBox_TextChanged(object sender, TextChangedEventArg
             UseTesseractCheckBox.IsEnabled = false;
 
         DefaultSettings.TesseractPath = pathText;
+        DefaultSettings.Save();
     }
 
     private void OpenPathButton_Click(object sender, RoutedEventArgs args)
@@ -76,6 +77,7 @@ private void UseTesseractCheckBox_Checked(object sender, RoutedEventArgs e)
             return;
 
         DefaultSettings.UseTesseract = useTesseractSwitch.IsChecked is true;
+        DefaultSettings.Save();
     }
 
     private void Page_Loaded(object sender, RoutedEventArgs e)
@@ -84,6 +86,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
         {
             UseTesseractCheckBox.IsChecked = DefaultSettings.UseTesseract;
             TesseractPathTextBox.Text = DefaultSettings.TesseractPath;
+            settingsSet = true;
             return;
         }
 
diff --git a/Text-Grab/Text-Grab.csproj b/Text-Grab/Text-Grab.csproj
@@ -71,7 +71,7 @@
 		<PackageReference Include="Humanizer.Core" Version="2.14.1" />
 		<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
 		<PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.1.24081.2" />
-		<PackageReference Include="WPF-UI" Version="3.0.0" />
+		<PackageReference Include="WPF-UI" Version="3.0.4" />
 		<PackageReference Include="WpfScreenHelper" Version="2.1.0" />
 		<PackageReference Include="ZXing.Net" Version="0.16.9" />
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />

Original file line number	Diff line number	Diff line change
`@@ -21,25 +21,27 @@ namespace Text_Grab.Pages;`
`21`	`21`	`/// </summary>`
`22`	`22`	`public partial class LanguageSettings : Page`
`23`	`23`	`{`
`24`		`- private bool usingTesseract;`
`25`	`24`	`private readonly Settings DefaultSettings = AppUtilities.TextGrabSettings;`
`26`	`25`
`27`	`26`
`28`	`27`	`public LanguageSettings()`
`29`	`28`	`{`
`30`	`29`	`InitializeComponent();`
`31`		`- usingTesseract = DefaultSettings.UseTesseract && TesseractHelper.CanLocateTesseractExe();`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`private async void Page_Loaded(object sender, RoutedEventArgs e)`
`35`	`33`	`{`
`36`	`34`	`LoadWindowsLanguages();`
`37`	`35`
`38`		`- if (usingTesseract)`
	`36`	`+ if (DefaultSettings.UseTesseract)`
`39`	`37`	`{`
`40`	`38`	`TesseractLanguagesStackPanel.Visibility = Visibility.Visible;`
`41`	`39`	`await LoadTesseractContent();`
`42`	`40`	`}`
	`41`	`+ else`
	`42`	`+ {`
	`43`	`+ TesseractLanguagesStackPanel.Visibility = Visibility.Collapsed;`
	`44`	`+ }`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`private void LoadWindowsLanguages()`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ private void TesseractPathTextBox_TextChanged(object sender, TextChangedEventArg`
`38`	`38`	`UseTesseractCheckBox.IsEnabled = false;`
`39`	`39`
`40`	`40`	`DefaultSettings.TesseractPath = pathText;`
	`41`	`+ DefaultSettings.Save();`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`private void OpenPathButton_Click(object sender, RoutedEventArgs args)`
`@@ -76,6 +77,7 @@ private void UseTesseractCheckBox_Checked(object sender, RoutedEventArgs e)`
`76`	`77`	`return;`
`77`	`78`
`78`	`79`	`DefaultSettings.UseTesseract = useTesseractSwitch.IsChecked is true;`
	`80`	`+ DefaultSettings.Save();`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`private void Page_Loaded(object sender, RoutedEventArgs e)`
`@@ -84,6 +86,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)`
`84`	`86`	`{`
`85`	`87`	`UseTesseractCheckBox.IsChecked = DefaultSettings.UseTesseract;`
`86`	`88`	`TesseractPathTextBox.Text = DefaultSettings.TesseractPath;`
	`89`	`+ settingsSet = true;`
`87`	`90`	`return;`
`88`	`91`	`}`
`89`	`92`