Skip to content

Commit 70eeda9

Browse files
TheJoeFinTheJoeFin
authored
Merge pull request #407 from TheJoeFin/dev
v4.3
2 parents 571c754 + 27ac332 commit 70eeda9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1880
-1186
lines changed

‎.github/workflows/buildDev.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ on:
55

66
env:
77
PROJECT_PATH: "Text-Grab/Text-Grab.csproj"
8+
TEST_PATH: "Tests/Tests.csproj"
89

910
jobs:
1011
build:
1112
runs-on: windows-latest
1213
steps:
13-
- uses: actions/checkout@v2
14-
15-
- uses: actions/setup-dotnet@v1
14+
- uses: actions/checkout@v4
15+
- name: Setup .NET
16+
uses: actions/setup-dotnet@v3
1617
with:
17-
dotnet-version: "6.0.x"
18-
19-
# - run: dotnet build ${{ env.PROJECT_PATH }} -c Release
18+
dotnet-version: "8.0.x"
19+
- name: Install dependencies
20+
run: dotnet restore ${{ env.PROJECT_PATH }}
21+
- name: Build
22+
run: dotnet build ${{ env.PROJECT_PATH }}
23+
- name: Test
24+
run: dotnet test ${{ env.TEST_PATH }}
2025

21-
# - run: dotnet test ${{ env.PROJECT_PATH }} -c Release --no-build --no-restore --verbosity normal
22-
23-
- run: dotnet publish ${{ env.PROJECT_PATH }} -c Release --self-contained -r win-x64 -p:PublishSingleFile=true -o publish
26+
- name: Build for release and Publish
27+
run: dotnet publish ${{ env.PROJECT_PATH }} -c Release --self-contained -r win-x64 -p:PublishSingleFile=true -o publish
2428

2529
- name: Upload artifact
26-
uses: actions/upload-artifact@v2
30+
uses: actions/upload-artifact@v3
2731
with:
2832
name: Text-Grab
29-
path: .publish/*.exe
30-
# Text-Grab\Text-Grab\Text-Grab\bin\Release\net6.0-windows10.0.20348.0\win-x64\publish\
31-
# Text-Grab\Text-Grab\bin\Release\net6.0-windows10.0.20348.0\win-x64\publish\Text-Grab.exe
32-
33-
# "C:\Users\josep\source\repos\TheJoeFin\Text-Grab\Text-Grab\bin\Release\net6.0-windows10.0.20348.0\win-x64\publish\Text-Grab.exe"
33+
path: .\publish

‎GOALS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is a test to see if this file will show up in the top bar of the repo.

‎Tests/OcrTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ 300 Brown
174174
Assert.Equal(expectedResult, stringBuilder.ToString());
175175
}
176176

177-
// [WpfFact]
177+
178+
[WpfFact(Skip ="since the hocr is not being used from Tesseract it will not be tested for now")]
178179
public async Task TesseractHocr()
179180
{
180181
int intialLinesToSkip = 12;

‎Tests/Tests.csproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows10.0.20348</TargetFramework>
4+
<TargetFramework>net8.0-windows10.0.20348</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
13-
<PackageReference Include="xunit" Version="2.6.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16-
<PrivateAssets>all</PrivateAssets>
17-
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="6.0.0">
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23577-04" />
13+
<PackageReference Include="xunit" Version="2.6.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
1915
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2016
<PrivateAssets>all</PrivateAssets>
2117
</PackageReference>

‎Text-Grab-Package/Package.appxmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Identity
1212
Name="40087JoeFinApps.TextGrab"
1313
Publisher="CN=153F3B0F-BA3D-4964-8098-71AC78A1DF6A"
14-
Version="4.2.0.0" />
14+
Version="4.3.0.0" />
1515

1616
<Properties>
1717
<DisplayName>Text Grab</DisplayName>

‎Text-Grab/App.config

+7-4
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@
6868
<value>True</value>
6969
</setting>
7070
<setting name="FullscreenGrabHotKey" serializeAs="String">
71-
<value>F</value>
71+
<value />
7272
</setting>
7373
<setting name="GrabFrameHotkey" serializeAs="String">
74-
<value>G</value>
74+
<value />
7575
</setting>
7676
<setting name="EditWindowHotKey" serializeAs="String">
77-
<value>E</value>
77+
<value />
7878
</setting>
7979
<setting name="EditWindowIsWordWrapOn" serializeAs="String">
8080
<value>True</value>
@@ -92,7 +92,7 @@
9292
<value />
9393
</setting>
9494
<setting name="LookupHotKey" serializeAs="String">
95-
<value>Q</value>
95+
<value />
9696
</setting>
9797
<setting name="TryToReadBarcodes" serializeAs="String">
9898
<value>True</value>
@@ -130,6 +130,9 @@
130130
<setting name="TesseractPath" serializeAs="String">
131131
<value />
132132
</setting>
133+
<setting name="ShortcutKeySets" serializeAs="String">
134+
<value />
135+
</setting>
133136
</Text_Grab.Properties.Settings>
134137
</userSettings>
135138
</configuration>

‎Text-Grab/App.xaml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<ResourceDictionary Source="/Styles/ButtonStyles.xaml" />
1818
<ResourceDictionary Source="/Styles/TextBoxStyles.xaml" />
1919
<ResourceDictionary Source="/Styles/GridViewStyles.xaml" />
20-
<ResourceDictionary Source="/Styles/ComboBoxStyles.xaml" />
2120
<ResourceDictionary Source="/Styles/DataGridStyles.xaml" />
2221
</ResourceDictionary.MergedDictionaries>
2322
<ControlTemplate x:Key="MenuItemTemplate1" TargetType="{x:Type MenuItem}">

‎Text-Grab/Controls/AddOrRemoveWindow.xaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,18 @@
171171
Grid.Row="7"
172172
HorizontalAlignment="Center"
173173
VerticalAlignment="Bottom"
174+
ButtonSymbol="ArrowClockwise24"
174175
ButtonText="Apply"
175176
Command="{x:Static local:AddOrRemoveWindow.ApplyCmd}"
176-
IsSymbol="True"
177-
SymbolText="" />
177+
IsSymbol="True" />
178178
<local:CollapsibleButton
179179
x:Name="DoneButton"
180180
Grid.Row="7"
181181
HorizontalAlignment="Center"
182182
VerticalAlignment="Bottom"
183+
ButtonSymbol="Checkmark24"
183184
ButtonText="Done"
184-
Command="{x:Static local:AddOrRemoveWindow.AddRemoveCmd}"
185-
SymbolText="" />
185+
Command="{x:Static local:AddOrRemoveWindow.AddRemoveCmd}" />
186186
</StackPanel>
187187
</Grid>
188188
</ui:FluentWindow>

0 commit comments

Comments
 (0)