Merge pull request #407 from TheJoeFin/dev

v4.3
TheJoeFin · Dec 16, 2023 · 70eeda9 · 70eeda9
2 parents 571c754 + 27ac332
commit 70eeda9
Show file tree

Hide file tree

Showing 46 changed files with 1,880 additions and 1,186 deletions.
diff --git a/.github/workflows/buildDev.yml b/.github/workflows/buildDev.yml
@@ -5,29 +5,29 @@ on:
 
 env:
   PROJECT_PATH: "Text-Grab/Text-Grab.csproj"
+  TEST_PATH: "Tests/Tests.csproj"
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "6.0.x"
-
-      # - run: dotnet build ${{ env.PROJECT_PATH }} -c Release
+          dotnet-version: "8.0.x"
+      - name: Install dependencies
+        run: dotnet restore ${{ env.PROJECT_PATH }}
+      - name: Build
+        run: dotnet build ${{ env.PROJECT_PATH }}
+      - name: Test
+        run: dotnet test ${{ env.TEST_PATH }}
 
-      # - run: dotnet test ${{ env.PROJECT_PATH }} -c Release --no-build --no-restore --verbosity normal
-
-      - run: dotnet publish ${{ env.PROJECT_PATH }} -c Release --self-contained -r win-x64 -p:PublishSingleFile=true -o publish
+      - name: Build for release and Publish
+        run: dotnet publish ${{ env.PROJECT_PATH }} -c Release --self-contained -r win-x64 -p:PublishSingleFile=true -o publish
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Text-Grab
-          path: .publish/*.exe
-          #     Text-Grab\Text-Grab\Text-Grab\bin\Release\net6.0-windows10.0.20348.0\win-x64\publish\
-          #     Text-Grab\Text-Grab\bin\Release\net6.0-windows10.0.20348.0\win-x64\publish\Text-Grab.exe
-
-          # "C:\Users\josep\source\repos\TheJoeFin\Text-Grab\Text-Grab\bin\Release\net6.0-windows10.0.20348.0\win-x64\publish\Text-Grab.exe"
+          path: .\publish
diff --git a/GOALS b/GOALS
@@ -0,0 +1 @@
+This is a test to see if this file will show up in the top bar of the repo. 
diff --git a/Tests/OcrTests.cs b/Tests/OcrTests.cs
@@ -174,7 +174,8 @@ 300	Brown
         Assert.Equal(expectedResult, stringBuilder.ToString());
     }
 
-    // [WpfFact]
+
+    [WpfFact(Skip ="since the hocr is not being used from Tesseract it will not be tested for now")]
     public async Task TesseractHocr()
     {
         int intialLinesToSkip = 12;

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,21 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.20348</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.20348</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23577-04" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <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.2.0.0" />
+    Version="4.3.0.0" />
 
   <Properties>
     <DisplayName>Text Grab</DisplayName>

diff --git a/Text-Grab/App.config b/Text-Grab/App.config
@@ -68,13 +68,13 @@
                 <value>True</value>
             </setting>
             <setting name="FullscreenGrabHotKey" serializeAs="String">
-                <value>F</value>
+                <value />
             </setting>
             <setting name="GrabFrameHotkey" serializeAs="String">
-                <value>G</value>
+                <value />
             </setting>
             <setting name="EditWindowHotKey" serializeAs="String">
-                <value>E</value>
+                <value />
             </setting>
             <setting name="EditWindowIsWordWrapOn" serializeAs="String">
                 <value>True</value>
@@ -92,7 +92,7 @@
                 <value />
             </setting>
             <setting name="LookupHotKey" serializeAs="String">
-                <value>Q</value>
+                <value />
             </setting>
             <setting name="TryToReadBarcodes" serializeAs="String">
                 <value>True</value>
@@ -130,6 +130,9 @@
             <setting name="TesseractPath" serializeAs="String">
                 <value />
             </setting>
+            <setting name="ShortcutKeySets" serializeAs="String">
+                <value />
+            </setting>
         </Text_Grab.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Text-Grab/App.xaml b/Text-Grab/App.xaml
@@ -17,7 +17,6 @@
                 <ResourceDictionary Source="/Styles/ButtonStyles.xaml" />
                 <ResourceDictionary Source="/Styles/TextBoxStyles.xaml" />
                 <ResourceDictionary Source="/Styles/GridViewStyles.xaml" />
-                <ResourceDictionary Source="/Styles/ComboBoxStyles.xaml" />
                 <ResourceDictionary Source="/Styles/DataGridStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <ControlTemplate x:Key="MenuItemTemplate1" TargetType="{x:Type MenuItem}">

diff --git a/Text-Grab/Controls/AddOrRemoveWindow.xaml b/Text-Grab/Controls/AddOrRemoveWindow.xaml
@@ -171,18 +171,18 @@
                 Grid.Row="7"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Bottom"
+                ButtonSymbol="ArrowClockwise24"
                 ButtonText="Apply"
                 Command="{x:Static local:AddOrRemoveWindow.ApplyCmd}"
-                IsSymbol="True"
-                SymbolText="" />
+                IsSymbol="True" />
             <local:CollapsibleButton
                 x:Name="DoneButton"
                 Grid.Row="7"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Bottom"
+                ButtonSymbol="Checkmark24"
                 ButtonText="Done"
-                Command="{x:Static local:AddOrRemoveWindow.AddRemoveCmd}"
-                SymbolText="" />
+                Command="{x:Static local:AddOrRemoveWindow.AddRemoveCmd}" />
         </StackPanel>
     </Grid>
 </ui:FluentWindow>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This is a test to see if this file will show up in the top bar of the repo.