Moved main project into own directory.

GeReV · Mar 20, 2022 · 9aba4e3 · 9aba4e3
1 parent 8e3a957
commit 9aba4e3
Showing 158 changed files with 12 additions and 9 deletions.
diff --git a/HocrEditor.Tesseract/TesseractService.cs b/HocrEditor.Tesseract/TesseractService.cs
@@ -1,9 +1,10 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
-using HocrEditor.Tesseract;
 
-internal sealed class TesseractService : IDisposable
+namespace HocrEditor.Tesseract;
+
+public sealed class TesseractService : IDisposable
 {
     private bool isDisposed;
     private readonly object lck = new();
@@ -18,7 +19,7 @@ public TesseractService(string tesseractPath)
 
     public string[] GetLanguages() => tesseractApi.GetAvailableLanguages();
 
-    public async Task<string> PerformOcr(string filename, IEnumerable<string> languages, Rectangle region = new())
+    public async Task<string> Recognize(string filename, IEnumerable<string> languages, Rectangle region = new())
     {
         if (isDisposed)
         {

diff --git a/HocrEditor.sln b/HocrEditor.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HocrEditor", "HocrEditor.csproj", "{B13D9609-0058-47EA-BE3D-D8D2C4BC5DB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HocrEditor", "HocrEditor\HocrEditor.csproj", "{B13D9609-0058-47EA-BE3D-D8D2C4BC5DB8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HocrEditor.Tesseract", "HocrEditor.Tesseract\HocrEditor.Tesseract.csproj", "{903AE18A-649C-41CE-A987-3503F6C7A430}"
 EndProject

diff --git a/App.xaml → HocrEditor/App.xaml b/App.xaml → HocrEditor/App.xaml
diff --git a/App.xaml.cs → HocrEditor/App.xaml.cs b/App.xaml.cs → HocrEditor/App.xaml.cs
diff --git a/AssemblyInfo.cs → HocrEditor/AssemblyInfo.cs b/AssemblyInfo.cs → HocrEditor/AssemblyInfo.cs
diff --git a/...iors/BringTreeViewItemIntoViewBehavior.cs → ...iors/BringTreeViewItemIntoViewBehavior.cs b/...iors/BringTreeViewItemIntoViewBehavior.cs → ...iors/BringTreeViewItemIntoViewBehavior.cs
diff --git a/...iors/TreeViewMultipleSelectionBehavior.cs → ...iors/TreeViewMultipleSelectionBehavior.cs b/...iors/TreeViewMultipleSelectionBehavior.cs → ...iors/TreeViewMultipleSelectionBehavior.cs
diff --git a/Commands/AppendSelectNodesCommand.cs → ...itor/Commands/AppendSelectNodesCommand.cs b/Commands/AppendSelectNodesCommand.cs → ...itor/Commands/AppendSelectNodesCommand.cs
diff --git a/Commands/AsyncCommandBase.cs → HocrEditor/Commands/AsyncCommandBase.cs b/Commands/AsyncCommandBase.cs → HocrEditor/Commands/AsyncCommandBase.cs
diff --git a/Commands/CommandBase.cs → HocrEditor/Commands/CommandBase.cs b/Commands/CommandBase.cs → HocrEditor/Commands/CommandBase.cs
diff --git a/Commands/ConvertToImageCommand.cs → HocrEditor/Commands/ConvertToImageCommand.cs b/Commands/ConvertToImageCommand.cs → HocrEditor/Commands/ConvertToImageCommand.cs
diff --git a/Commands/CreateNodeCommand.cs → HocrEditor/Commands/CreateNodeCommand.cs b/Commands/CreateNodeCommand.cs → HocrEditor/Commands/CreateNodeCommand.cs
diff --git a/Commands/CropNodesCommand.cs → HocrEditor/Commands/CropNodesCommand.cs b/Commands/CropNodesCommand.cs → HocrEditor/Commands/CropNodesCommand.cs
diff --git a/Commands/CycleSelectionCommand.cs → HocrEditor/Commands/CycleSelectionCommand.cs b/Commands/CycleSelectionCommand.cs → HocrEditor/Commands/CycleSelectionCommand.cs
diff --git a/Commands/DeleteNodesCommand.cs → HocrEditor/Commands/DeleteNodesCommand.cs b/Commands/DeleteNodesCommand.cs → HocrEditor/Commands/DeleteNodesCommand.cs
diff --git a/Commands/DeselectNodesCommand.cs → HocrEditor/Commands/DeselectNodesCommand.cs b/Commands/DeselectNodesCommand.cs → HocrEditor/Commands/DeselectNodesCommand.cs
diff --git a/Commands/ExclusiveSelectNodesCommand.cs → ...r/Commands/ExclusiveSelectNodesCommand.cs b/Commands/ExclusiveSelectNodesCommand.cs → ...r/Commands/ExclusiveSelectNodesCommand.cs
diff --git a/Commands/MergeNodesCommand.cs → HocrEditor/Commands/MergeNodesCommand.cs b/Commands/MergeNodesCommand.cs → HocrEditor/Commands/MergeNodesCommand.cs
diff --git a/Commands/MoveNodesCommand.cs → HocrEditor/Commands/MoveNodesCommand.cs b/Commands/MoveNodesCommand.cs → HocrEditor/Commands/MoveNodesCommand.cs
diff --git a/Commands/OcrRegionCommand.cs → HocrEditor/Commands/OcrRegionCommand.cs b/Commands/OcrRegionCommand.cs → HocrEditor/Commands/OcrRegionCommand.cs
@@ -10,6 +10,7 @@
 using HocrEditor.Core;
 using HocrEditor.Helpers;
 using HocrEditor.Services;
+using HocrEditor.Tesseract;
 using HocrEditor.ViewModels;
 using HtmlAgilityPack;
 using Rect = HocrEditor.Models.Rect;
@@ -50,7 +51,7 @@ protected override Task ExecuteAsyncImpl(Rect selectionBounds, CancellationToken
                 {
                     using var service = new TesseractService(tesseractPath);
 
-                    var body = await service.PerformOcr(
+                    var body = await service.Recognize(
                         hocrPageViewModel.Image,
                         Settings.TesseractSelectedLanguages,
                         region

diff --git a/Commands/PasteCommand.cs → HocrEditor/Commands/PasteCommand.cs b/Commands/PasteCommand.cs → HocrEditor/Commands/PasteCommand.cs
diff --git a/Commands/ReverseChildNodesCommand.cs → ...itor/Commands/ReverseChildNodesCommand.cs b/Commands/ReverseChildNodesCommand.cs → ...itor/Commands/ReverseChildNodesCommand.cs
diff --git a/Commands/RoutedCommands.cs → HocrEditor/Commands/RoutedCommands.cs b/Commands/RoutedCommands.cs → HocrEditor/Commands/RoutedCommands.cs
diff --git a/Commands/UndoRedo/CollectionAddCommand`1.cs → ...mmands/UndoRedo/CollectionAddCommand`1.cs b/Commands/UndoRedo/CollectionAddCommand`1.cs → ...mmands/UndoRedo/CollectionAddCommand`1.cs
diff --git a/Commands/UndoRedo/CollectionClearCommand.cs → ...mmands/UndoRedo/CollectionClearCommand.cs b/Commands/UndoRedo/CollectionClearCommand.cs → ...mmands/UndoRedo/CollectionClearCommand.cs
diff --git a/Commands/UndoRedo/CollectionInsertCommand.cs → ...mands/UndoRedo/CollectionInsertCommand.cs b/Commands/UndoRedo/CollectionInsertCommand.cs → ...mands/UndoRedo/CollectionInsertCommand.cs
diff --git a/Commands/UndoRedo/CollectionMoveCommand.cs → ...ommands/UndoRedo/CollectionMoveCommand.cs b/Commands/UndoRedo/CollectionMoveCommand.cs → ...ommands/UndoRedo/CollectionMoveCommand.cs
diff --git a/...nds/UndoRedo/CollectionRemoveAtCommand.cs → ...nds/UndoRedo/CollectionRemoveAtCommand.cs b/...nds/UndoRedo/CollectionRemoveAtCommand.cs → ...nds/UndoRedo/CollectionRemoveAtCommand.cs
diff --git a/Commands/UndoRedo/CollectionRemoveCommand.cs → ...mands/UndoRedo/CollectionRemoveCommand.cs b/Commands/UndoRedo/CollectionRemoveCommand.cs → ...mands/UndoRedo/CollectionRemoveCommand.cs
diff --git a/...nds/UndoRedo/CollectionRemoveCommand`1.cs → ...nds/UndoRedo/CollectionRemoveCommand`1.cs b/...nds/UndoRedo/CollectionRemoveCommand`1.cs → ...nds/UndoRedo/CollectionRemoveCommand`1.cs
diff --git a/...ands/UndoRedo/CollectionReplaceCommand.cs → ...ands/UndoRedo/CollectionReplaceCommand.cs b/...ands/UndoRedo/CollectionReplaceCommand.cs → ...ands/UndoRedo/CollectionReplaceCommand.cs
diff --git a/Commands/UndoRedo/NodeCommands.cs → HocrEditor/Commands/UndoRedo/NodeCommands.cs b/Commands/UndoRedo/NodeCommands.cs → HocrEditor/Commands/UndoRedo/NodeCommands.cs
diff --git a/...doRedo/ObservableCollectionMoveCommand.cs → ...doRedo/ObservableCollectionMoveCommand.cs b/...doRedo/ObservableCollectionMoveCommand.cs → ...doRedo/ObservableCollectionMoveCommand.cs
diff --git a/Commands/UndoRedo/PageRemoveNodesCommand.cs → ...mmands/UndoRedo/PageRemoveNodesCommand.cs b/Commands/UndoRedo/PageRemoveNodesCommand.cs → ...mmands/UndoRedo/PageRemoveNodesCommand.cs
diff --git a/Commands/UndoRedo/PropertyChangeCommand.cs → ...ommands/UndoRedo/PropertyChangeCommand.cs b/Commands/UndoRedo/PropertyChangeCommand.cs → ...ommands/UndoRedo/PropertyChangeCommand.cs
diff --git a/Commands/UndoRedo/UndoRedoCommand.cs → ...itor/Commands/UndoRedo/UndoRedoCommand.cs b/Commands/UndoRedo/UndoRedoCommand.cs → ...itor/Commands/UndoRedo/UndoRedoCommand.cs
diff --git a/Commands/UndoableAsyncCommandBase.cs → ...itor/Commands/UndoableAsyncCommandBase.cs b/Commands/UndoableAsyncCommandBase.cs → ...itor/Commands/UndoableAsyncCommandBase.cs
diff --git a/Commands/UndoableCommandBase.cs → HocrEditor/Commands/UndoableCommandBase.cs b/Commands/UndoableCommandBase.cs → HocrEditor/Commands/UndoableCommandBase.cs
diff --git a/Commands/WordSplitCommand.cs → HocrEditor/Commands/WordSplitCommand.cs b/Commands/WordSplitCommand.cs → HocrEditor/Commands/WordSplitCommand.cs
diff --git a/Controls/CanvasSelection.cs → HocrEditor/Controls/CanvasSelection.cs b/Controls/CanvasSelection.cs → HocrEditor/Controls/CanvasSelection.cs
diff --git a/Controls/DocumentCanvas.Renderer.cs → ...ditor/Controls/DocumentCanvas.Renderer.cs b/Controls/DocumentCanvas.Renderer.cs → ...ditor/Controls/DocumentCanvas.Renderer.cs
diff --git a/Controls/DocumentCanvas.xaml → HocrEditor/Controls/DocumentCanvas.xaml b/Controls/DocumentCanvas.xaml → HocrEditor/Controls/DocumentCanvas.xaml
diff --git a/Controls/DocumentCanvas.xaml.cs → HocrEditor/Controls/DocumentCanvas.xaml.cs b/Controls/DocumentCanvas.xaml.cs → HocrEditor/Controls/DocumentCanvas.xaml.cs
diff --git a/Controls/DocumentCanvasTool.cs → HocrEditor/Controls/DocumentCanvasTool.cs b/Controls/DocumentCanvasTool.cs → HocrEditor/Controls/DocumentCanvasTool.cs
diff --git a/Controls/DocumentPageList.xaml → HocrEditor/Controls/DocumentPageList.xaml b/Controls/DocumentPageList.xaml → HocrEditor/Controls/DocumentPageList.xaml
diff --git a/Controls/DocumentPageList.xaml.cs → HocrEditor/Controls/DocumentPageList.xaml.cs b/Controls/DocumentPageList.xaml.cs → HocrEditor/Controls/DocumentPageList.xaml.cs
diff --git a/Controls/DocumentTreeView.xaml → HocrEditor/Controls/DocumentTreeView.xaml b/Controls/DocumentTreeView.xaml → HocrEditor/Controls/DocumentTreeView.xaml
diff --git a/Controls/DocumentTreeView.xaml.cs → HocrEditor/Controls/DocumentTreeView.xaml.cs b/Controls/DocumentTreeView.xaml.cs → HocrEditor/Controls/DocumentTreeView.xaml.cs
diff --git a/Controls/DocumentTreeViewDragHandler.cs → ...r/Controls/DocumentTreeViewDragHandler.cs b/Controls/DocumentTreeViewDragHandler.cs → ...r/Controls/DocumentTreeViewDragHandler.cs
diff --git a/Controls/DocumentTreeViewDropHandler.cs → ...r/Controls/DocumentTreeViewDropHandler.cs b/Controls/DocumentTreeViewDropHandler.cs → ...r/Controls/DocumentTreeViewDropHandler.cs
diff --git a/Controls/EditableTextBlock.xaml → HocrEditor/Controls/EditableTextBlock.xaml b/Controls/EditableTextBlock.xaml → HocrEditor/Controls/EditableTextBlock.xaml
diff --git a/Controls/EditableTextBlock.xaml.cs → ...Editor/Controls/EditableTextBlock.xaml.cs b/Controls/EditableTextBlock.xaml.cs → ...Editor/Controls/EditableTextBlock.xaml.cs
diff --git a/Controls/LanguagesButton.xaml → HocrEditor/Controls/LanguagesButton.xaml b/Controls/LanguagesButton.xaml → HocrEditor/Controls/LanguagesButton.xaml
diff --git a/Controls/LanguagesButton.xaml.cs → HocrEditor/Controls/LanguagesButton.xaml.cs b/Controls/LanguagesButton.xaml.cs → HocrEditor/Controls/LanguagesButton.xaml.cs
diff --git a/Controls/LazyLoadImage.cs → HocrEditor/Controls/LazyLoadImage.cs b/Controls/LazyLoadImage.cs → HocrEditor/Controls/LazyLoadImage.cs
diff --git a/Controls/NodesChangedEventArgs.cs → HocrEditor/Controls/NodesChangedEventArgs.cs b/Controls/NodesChangedEventArgs.cs → HocrEditor/Controls/NodesChangedEventArgs.cs
diff --git a/Controls/NodesEditedEventArgs.cs → HocrEditor/Controls/NodesEditedEventArgs.cs b/Controls/NodesEditedEventArgs.cs → HocrEditor/Controls/NodesEditedEventArgs.cs
diff --git a/Controls/NodesMovedEventArgs.cs → HocrEditor/Controls/NodesMovedEventArgs.cs b/Controls/NodesMovedEventArgs.cs → HocrEditor/Controls/NodesMovedEventArgs.cs
diff --git a/Controls/ResizeHandle.cs → HocrEditor/Controls/ResizeHandle.cs b/Controls/ResizeHandle.cs → HocrEditor/Controls/ResizeHandle.cs
diff --git a/Controls/WordSplitEventArgs.cs → HocrEditor/Controls/WordSplitEventArgs.cs b/Controls/WordSplitEventArgs.cs → HocrEditor/Controls/WordSplitEventArgs.cs
diff --git a/Converters/BooleanNegateConverter.cs → ...itor/Converters/BooleanNegateConverter.cs b/Converters/BooleanNegateConverter.cs → ...itor/Converters/BooleanNegateConverter.cs
diff --git a/Converters/NullableBitmapSourceConverter.cs → ...nverters/NullableBitmapSourceConverter.cs b/Converters/NullableBitmapSourceConverter.cs → ...nverters/NullableBitmapSourceConverter.cs
diff --git a/Converters/NullableToBooleanConverter.cs → .../Converters/NullableToBooleanConverter.cs b/Converters/NullableToBooleanConverter.cs → .../Converters/NullableToBooleanConverter.cs
diff --git a/Converters/RadioButtonCheckedConverter.cs → ...Converters/RadioButtonCheckedConverter.cs b/Converters/RadioButtonCheckedConverter.cs → ...Converters/RadioButtonCheckedConverter.cs
diff --git a/Converters/ValueConverterGroup.cs → HocrEditor/Converters/ValueConverterGroup.cs b/Converters/ValueConverterGroup.cs → HocrEditor/Converters/ValueConverterGroup.cs
diff --git a/Core/Converter.cs → HocrEditor/Core/Converter.cs b/Core/Converter.cs → HocrEditor/Core/Converter.cs
diff --git a/Core/Ensure.cs → HocrEditor/Core/Ensure.cs b/Core/Ensure.cs → HocrEditor/Core/Ensure.cs
diff --git a/Core/ForwardingCommand.cs → HocrEditor/Core/ForwardingCommand.cs b/Core/ForwardingCommand.cs → HocrEditor/Core/ForwardingCommand.cs
diff --git a/Core/ForwardingCommandBinding.cs → HocrEditor/Core/ForwardingCommandBinding.cs b/Core/ForwardingCommandBinding.cs → HocrEditor/Core/ForwardingCommandBinding.cs
diff --git a/Core/ForwardingCommandBindingCollection.cs → ...ore/ForwardingCommandBindingCollection.cs b/Core/ForwardingCommandBindingCollection.cs → ...ore/ForwardingCommandBindingCollection.cs
diff --git a/Core/IconPosition.cs → HocrEditor/Core/IconPosition.cs b/Core/IconPosition.cs → HocrEditor/Core/IconPosition.cs
diff --git a/Core/Iso15924/Script.cs → HocrEditor/Core/Iso15924/Script.cs b/Core/Iso15924/Script.cs → HocrEditor/Core/Iso15924/Script.cs
diff --git a/Core/ObservableHashSet.cs → HocrEditor/Core/ObservableHashSet.cs b/Core/ObservableHashSet.cs → HocrEditor/Core/ObservableHashSet.cs
diff --git a/Core/RangeObservableCollection.cs → HocrEditor/Core/RangeObservableCollection.cs b/Core/RangeObservableCollection.cs → HocrEditor/Core/RangeObservableCollection.cs
diff --git a/Core/Settings.cs → HocrEditor/Core/Settings.cs b/Core/Settings.cs → HocrEditor/Core/Settings.cs
diff --git a/Core/UndoRedoManager.cs → HocrEditor/Core/UndoRedoManager.cs b/Core/UndoRedoManager.cs → HocrEditor/Core/UndoRedoManager.cs
diff --git a/Core/WindowBase.cs → HocrEditor/Core/WindowBase.cs b/Core/WindowBase.cs → HocrEditor/Core/WindowBase.cs
diff --git a/FodyWeavers.xml → HocrEditor/FodyWeavers.xml b/FodyWeavers.xml → HocrEditor/FodyWeavers.xml
diff --git a/FodyWeavers.xsd → HocrEditor/FodyWeavers.xsd b/FodyWeavers.xsd → HocrEditor/FodyWeavers.xsd
diff --git a/Helpers/BindingHelpers.cs → HocrEditor/Helpers/BindingHelpers.cs b/Helpers/BindingHelpers.cs → HocrEditor/Helpers/BindingHelpers.cs
diff --git a/Helpers/CollectionViewExtensions.cs → ...ditor/Helpers/CollectionViewExtensions.cs b/Helpers/CollectionViewExtensions.cs → ...ditor/Helpers/CollectionViewExtensions.cs
diff --git a/Helpers/CommandHelpers.cs → HocrEditor/Helpers/CommandHelpers.cs b/Helpers/CommandHelpers.cs → HocrEditor/Helpers/CommandHelpers.cs
diff --git a/Helpers/DependencyObjectExtensions.cs → ...tor/Helpers/DependencyObjectExtensions.cs b/Helpers/DependencyObjectExtensions.cs → ...tor/Helpers/DependencyObjectExtensions.cs
diff --git a/Helpers/DisposableExtensions.cs → HocrEditor/Helpers/DisposableExtensions.cs b/Helpers/DisposableExtensions.cs → HocrEditor/Helpers/DisposableExtensions.cs
diff --git a/Helpers/EnumerableExtensions.cs → HocrEditor/Helpers/EnumerableExtensions.cs b/Helpers/EnumerableExtensions.cs → HocrEditor/Helpers/EnumerableExtensions.cs
diff --git a/Helpers/HocrNodeTypeHelper.cs → HocrEditor/Helpers/HocrNodeTypeHelper.cs b/Helpers/HocrNodeTypeHelper.cs → HocrEditor/Helpers/HocrNodeTypeHelper.cs
diff --git a/Helpers/HtmlDocumentExtensions.cs → HocrEditor/Helpers/HtmlDocumentExtensions.cs b/Helpers/HtmlDocumentExtensions.cs → HocrEditor/Helpers/HtmlDocumentExtensions.cs
diff --git a/Helpers/IconButton.cs → HocrEditor/Helpers/IconButton.cs b/Helpers/IconButton.cs → HocrEditor/Helpers/IconButton.cs
diff --git a/Helpers/MarginSetter.cs → HocrEditor/Helpers/MarginSetter.cs b/Helpers/MarginSetter.cs → HocrEditor/Helpers/MarginSetter.cs
diff --git a/Helpers/NodeHelpers.cs → HocrEditor/Helpers/NodeHelpers.cs b/Helpers/NodeHelpers.cs → HocrEditor/Helpers/NodeHelpers.cs
diff --git a/Helpers/RecursiveSelectHelper.cs → HocrEditor/Helpers/RecursiveSelectHelper.cs b/Helpers/RecursiveSelectHelper.cs → HocrEditor/Helpers/RecursiveSelectHelper.cs
diff --git a/Helpers/SKCanvasExtensions.cs → HocrEditor/Helpers/SKCanvasExtensions.cs b/Helpers/SKCanvasExtensions.cs → HocrEditor/Helpers/SKCanvasExtensions.cs
diff --git a/Helpers/SKHelpers.cs → HocrEditor/Helpers/SKHelpers.cs b/Helpers/SKHelpers.cs → HocrEditor/Helpers/SKHelpers.cs
diff --git a/Helpers/SelectionHelper.cs → HocrEditor/Helpers/SelectionHelper.cs b/Helpers/SelectionHelper.cs → HocrEditor/Helpers/SelectionHelper.cs
diff --git a/Helpers/TreeViewItemExtensions.cs → HocrEditor/Helpers/TreeViewItemExtensions.cs b/Helpers/TreeViewItemExtensions.cs → HocrEditor/Helpers/TreeViewItemExtensions.cs
diff --git a/Helpers/UndoRedoCommandExtensions.cs → ...itor/Helpers/UndoRedoCommandExtensions.cs b/Helpers/UndoRedoCommandExtensions.cs → ...itor/Helpers/UndoRedoCommandExtensions.cs
diff --git a/Helpers/Win32WindowExtensions.cs → HocrEditor/Helpers/Win32WindowExtensions.cs b/Helpers/Win32WindowExtensions.cs → HocrEditor/Helpers/Win32WindowExtensions.cs
diff --git a/HocrEditor.csproj → HocrEditor/HocrEditor.csproj b/HocrEditor.csproj → HocrEditor/HocrEditor.csproj
@@ -130,7 +130,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="HocrEditor.Tesseract\HocrEditor.Tesseract.csproj" />
+      <ProjectReference Include="..\HocrEditor.Tesseract\HocrEditor.Tesseract.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/Icons/arrow-curve-180-left.png → HocrEditor/Icons/arrow-curve-180-left.png b/Icons/arrow-curve-180-left.png → HocrEditor/Icons/arrow-curve-180-left.png
diff --git a/Icons/arrow-curve.png → HocrEditor/Icons/arrow-curve.png b/Icons/arrow-curve.png → HocrEditor/Icons/arrow-curve.png
diff --git a/Icons/broom.png → HocrEditor/Icons/broom.png b/Icons/broom.png → HocrEditor/Icons/broom.png
diff --git a/Icons/clipboard-paste.png → HocrEditor/Icons/clipboard-paste.png b/Icons/clipboard-paste.png → HocrEditor/Icons/clipboard-paste.png
diff --git a/Icons/disk-black.png → HocrEditor/Icons/disk-black.png b/Icons/disk-black.png → HocrEditor/Icons/disk-black.png
diff --git a/Icons/document--plus.png → HocrEditor/Icons/document--plus.png b/Icons/document--plus.png → HocrEditor/Icons/document--plus.png
diff --git a/Icons/document-copy.png → HocrEditor/Icons/document-copy.png b/Icons/document-copy.png → HocrEditor/Icons/document-copy.png
diff --git a/Icons/document-hf-select-footer.png → ...ditor/Icons/document-hf-select-footer.png b/Icons/document-hf-select-footer.png → ...ditor/Icons/document-hf-select-footer.png
diff --git a/Icons/document-text.png → HocrEditor/Icons/document-text.png b/Icons/document-text.png → HocrEditor/Icons/document-text.png
diff --git a/Icons/document.png → HocrEditor/Icons/document.png b/Icons/document.png → HocrEditor/Icons/document.png
diff --git a/Icons/edit-direction-rtl.png → HocrEditor/Icons/edit-direction-rtl.png b/Icons/edit-direction-rtl.png → HocrEditor/Icons/edit-direction-rtl.png
diff --git a/Icons/edit-direction.png → HocrEditor/Icons/edit-direction.png b/Icons/edit-direction.png → HocrEditor/Icons/edit-direction.png
diff --git a/Icons/edit-heading.png → HocrEditor/Icons/edit-heading.png b/Icons/edit-heading.png → HocrEditor/Icons/edit-heading.png
diff --git a/Icons/edit-indent.png → HocrEditor/Icons/edit-indent.png b/Icons/edit-indent.png → HocrEditor/Icons/edit-indent.png
diff --git a/Icons/edit-language.png → HocrEditor/Icons/edit-language.png b/Icons/edit-language.png → HocrEditor/Icons/edit-language.png
diff --git a/Icons/edit-lipsum.png → HocrEditor/Icons/edit-lipsum.png b/Icons/edit-lipsum.png → HocrEditor/Icons/edit-lipsum.png
diff --git a/Icons/edit-number.png → HocrEditor/Icons/edit-number.png b/Icons/edit-number.png → HocrEditor/Icons/edit-number.png
diff --git a/Icons/edit-padding-top.png → HocrEditor/Icons/edit-padding-top.png b/Icons/edit-padding-top.png → HocrEditor/Icons/edit-padding-top.png
diff --git a/Icons/edit-padding.png → HocrEditor/Icons/edit-padding.png b/Icons/edit-padding.png → HocrEditor/Icons/edit-padding.png
diff --git a/Icons/edit-pilcrow.png → HocrEditor/Icons/edit-pilcrow.png b/Icons/edit-pilcrow.png → HocrEditor/Icons/edit-pilcrow.png
diff --git a/Icons/edit-quotation.png → HocrEditor/Icons/edit-quotation.png b/Icons/edit-quotation.png → HocrEditor/Icons/edit-quotation.png
diff --git a/Icons/edit-rule.png → HocrEditor/Icons/edit-rule.png b/Icons/edit-rule.png → HocrEditor/Icons/edit-rule.png
diff --git a/Icons/edit.png → HocrEditor/Icons/edit.png b/Icons/edit.png → HocrEditor/Icons/edit.png
diff --git a/Icons/folder-open-document.png → HocrEditor/Icons/folder-open-document.png b/Icons/folder-open-document.png → HocrEditor/Icons/folder-open-document.png
diff --git a/Icons/image-import.png → HocrEditor/Icons/image-import.png b/Icons/image-import.png → HocrEditor/Icons/image-import.png
diff --git a/Icons/image.png → HocrEditor/Icons/image.png b/Icons/image.png → HocrEditor/Icons/image.png
diff --git a/Icons/layers-group.png → HocrEditor/Icons/layers-group.png b/Icons/layers-group.png → HocrEditor/Icons/layers-group.png
diff --git a/Icons/minus-circle.png → HocrEditor/Icons/minus-circle.png b/Icons/minus-circle.png → HocrEditor/Icons/minus-circle.png
diff --git a/Icons/plus-small.png → HocrEditor/Icons/plus-small.png b/Icons/plus-small.png → HocrEditor/Icons/plus-small.png
diff --git a/Icons/ruler-crop.png → HocrEditor/Icons/ruler-crop.png b/Icons/ruler-crop.png → HocrEditor/Icons/ruler-crop.png
diff --git a/Icons/selection-select-input.png → HocrEditor/Icons/selection-select-input.png b/Icons/selection-select-input.png → HocrEditor/Icons/selection-select-input.png
diff --git a/Icons/selection.png → HocrEditor/Icons/selection.png b/Icons/selection.png → HocrEditor/Icons/selection.png
diff --git a/Icons/sort-alphabet-descending.png → ...Editor/Icons/sort-alphabet-descending.png b/Icons/sort-alphabet-descending.png → ...Editor/Icons/sort-alphabet-descending.png
diff --git a/Icons/spectacle.png → HocrEditor/Icons/spectacle.png b/Icons/spectacle.png → HocrEditor/Icons/spectacle.png
diff --git a/Icons/sql-join-outer.png → HocrEditor/Icons/sql-join-outer.png b/Icons/sql-join-outer.png → HocrEditor/Icons/sql-join-outer.png
diff --git a/Icons/ui-splitter.png → HocrEditor/Icons/ui-splitter.png b/Icons/ui-splitter.png → HocrEditor/Icons/ui-splitter.png
diff --git a/MainWindow.xaml → HocrEditor/MainWindow.xaml b/MainWindow.xaml → HocrEditor/MainWindow.xaml
diff --git a/MainWindow.xaml.cs → HocrEditor/MainWindow.xaml.cs b/MainWindow.xaml.cs → HocrEditor/MainWindow.xaml.cs
@@ -9,7 +9,7 @@
 using HocrEditor.Controls;
 using HocrEditor.Core;
 using HocrEditor.Helpers;
-using HocrEditor.Services;
+using HocrEditor.Tesseract;
 using HocrEditor.ViewModels;
 
 namespace HocrEditor

diff --git a/Models/HocrDocument.cs → HocrEditor/Models/HocrDocument.cs b/Models/HocrDocument.cs → HocrEditor/Models/HocrDocument.cs
diff --git a/Models/HocrNode.cs → HocrEditor/Models/HocrNode.cs b/Models/HocrNode.cs → HocrEditor/Models/HocrNode.cs
diff --git a/Models/HocrNodeType.cs → HocrEditor/Models/HocrNodeType.cs b/Models/HocrNodeType.cs → HocrEditor/Models/HocrNodeType.cs
diff --git a/Models/HocrNodes.cs → HocrEditor/Models/HocrNodes.cs b/Models/HocrNodes.cs → HocrEditor/Models/HocrNodes.cs
diff --git a/Models/Rect.cs → HocrEditor/Models/Rect.cs b/Models/Rect.cs → HocrEditor/Models/Rect.cs
diff --git a/Resources/iso15924.txt → HocrEditor/Resources/iso15924.txt b/Resources/iso15924.txt → HocrEditor/Resources/iso15924.txt
diff --git a/Services/HocrParser.cs → HocrEditor/Services/HocrParser.cs b/Services/HocrParser.cs → HocrEditor/Services/HocrParser.cs
diff --git a/Services/HocrWriter.cs → HocrEditor/Services/HocrWriter.cs b/Services/HocrWriter.cs → HocrEditor/Services/HocrWriter.cs
diff --git a/ViewModels/ClipboardViewModel.cs → HocrEditor/ViewModels/ClipboardViewModel.cs b/ViewModels/ClipboardViewModel.cs → HocrEditor/ViewModels/ClipboardViewModel.cs
diff --git a/ViewModels/HocrDocumentViewModel.cs → ...ditor/ViewModels/HocrDocumentViewModel.cs b/ViewModels/HocrDocumentViewModel.cs → ...ditor/ViewModels/HocrDocumentViewModel.cs
diff --git a/ViewModels/HocrNodeTypeViewModel.cs → ...ditor/ViewModels/HocrNodeTypeViewModel.cs b/ViewModels/HocrNodeTypeViewModel.cs → ...ditor/ViewModels/HocrNodeTypeViewModel.cs
diff --git a/ViewModels/HocrNodeViewModel.cs → HocrEditor/ViewModels/HocrNodeViewModel.cs b/ViewModels/HocrNodeViewModel.cs → HocrEditor/ViewModels/HocrNodeViewModel.cs
diff --git a/ViewModels/HocrPageViewModel.Commands.cs → .../ViewModels/HocrPageViewModel.Commands.cs b/ViewModels/HocrPageViewModel.Commands.cs → .../ViewModels/HocrPageViewModel.Commands.cs
diff --git a/ViewModels/HocrPageViewModel.cs → HocrEditor/ViewModels/HocrPageViewModel.cs b/ViewModels/HocrPageViewModel.cs → HocrEditor/ViewModels/HocrPageViewModel.cs
diff --git a/ViewModels/IUndoRedoCommandsService.cs → ...or/ViewModels/IUndoRedoCommandsService.cs b/ViewModels/IUndoRedoCommandsService.cs → ...or/ViewModels/IUndoRedoCommandsService.cs
diff --git a/ViewModels/MainWindowViewModel.cs → HocrEditor/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs → HocrEditor/ViewModels/MainWindowViewModel.cs
@@ -12,6 +12,7 @@
 using HocrEditor.Helpers;
 using HocrEditor.Models;
 using HocrEditor.Services;
+using HocrEditor.Tesseract;
 using JetBrains.Annotations;
 using Microsoft.Toolkit.Mvvm.Input;
 using HtmlDocument = HtmlAgilityPack.HtmlDocument;
@@ -264,7 +265,7 @@ private void Import()
 
                             using var service = new TesseractService(tesseractPath);
 
-                            var body = await service.PerformOcr(page.Image, languages);
+                            var body = await service.Recognize(page.Image, languages);
 
                             var doc = new HtmlDocument();
                             doc.LoadHtml(body);

diff --git a/ViewModels/NodeVisibility.cs → HocrEditor/ViewModels/NodeVisibility.cs b/ViewModels/NodeVisibility.cs → HocrEditor/ViewModels/NodeVisibility.cs
diff --git a/ViewModels/SelectionTool.cs → HocrEditor/ViewModels/SelectionTool.cs b/ViewModels/SelectionTool.cs → HocrEditor/ViewModels/SelectionTool.cs
diff --git a/ViewModels/TesseractLanguage.cs → HocrEditor/ViewModels/TesseractLanguage.cs b/ViewModels/TesseractLanguage.cs → HocrEditor/ViewModels/TesseractLanguage.cs
diff --git a/ViewModels/ViewModelBase.cs → HocrEditor/ViewModels/ViewModelBase.cs b/ViewModels/ViewModelBase.cs → HocrEditor/ViewModels/ViewModelBase.cs
diff --git a/appsettings.json → HocrEditor/appsettings.json b/appsettings.json → HocrEditor/appsettings.json
diff --git a/dotnet-releaser.toml b/dotnet-releaser.toml
@@ -2,7 +2,7 @@
 profile = "custom"
 
 [msbuild]
-project = "./HocrEditor.csproj"
+project = "./HocrEditor/HocrEditor.csproj"
 [github]
 user = "GeReV"
 repo = "HocrEditor"