Helper as Executable

.github/workflows/dotnet.yml

@@ -5,16 +5,35 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
         os: [windows-2022, ubuntu-24.04, macos-15]
     steps:
     - name: Install OS dependencies
       if: matrix.os == 'ubuntu-24.04'
-      run: sudo apt-get install -y fonts-liberation2 fonts-noto-core fonts-noto-cjk
+      run: sudo apt-get update && sudo apt-get install -y fonts-liberation2 fonts-noto-core fonts-noto-cjk patchelf
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+    - name: Install Python dependencies for signature fields
+      run: pip install -r scripts/requirements-signature-fields.txt
+    - name: Install Python build dependencies for signature helper
+      run: pip install nuitka ordered-set
+    - name: Build signature helper (macOS/Linux)
+      if: matrix.os != 'windows-2022'
+      run: python scripts/build_embedder_helper.py --platform auto
+    - name: Build signature helper (Windows)
+      if: matrix.os == 'windows-2022'
+      shell: cmd
+      run: |
+        for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSINSTALL=%%i
+        call "%VSINSTALL%\Common7\Tools\VsDevCmd.bat" && python scripts\build_embedder_helper.py --platform windows
     - name: Setup .NET 9
       uses: actions/setup-dotnet@v4
       with:
@@ -24,6 +43,36 @@ jobs:
       run: dotnet workload install macos
     - name: Build
       run: dotnet run --project NAPS2.Tools -- build debug -v
+    - name: Copy signature helper into debug output (Windows)
+      if: matrix.os == 'windows-2022'
+      shell: pwsh
+      run: |
+        Get-ChildItem -Path "NAPS2.App.WinForms/bin" -Recurse -Directory -Filter "net9-windows" |
+          ForEach-Object {
+            $toolsDir = Join-Path $_.FullName "tools"
+            New-Item -ItemType Directory -Force -Path $toolsDir | Out-Null
+            Copy-Item -Force "build/windows/naps2-signature-helper.exe" (Join-Path $toolsDir "naps2-signature-helper.exe")
+          }
+    - name: Copy signature helper into debug output (Linux)
+      if: matrix.os == 'ubuntu-24.04'
+      shell: bash
+      run: |
+        set -euo pipefail
+        while IFS= read -r -d '' dir; do
+          mkdir -p "$dir/tools"
+          cp build/linux/naps2-signature-helper "$dir/tools/naps2-signature-helper"
+          chmod +x "$dir/tools/naps2-signature-helper"
+        done < <(find NAPS2.App.Gtk/bin -type d -name net9 -path '*/Debug*/*' -print0)
+    - name: Copy signature helper into debug output (macOS)
+      if: matrix.os == 'macos-15'
+      shell: bash
+      run: |
+        set -euo pipefail
+        while IFS= read -r -d '' app; do
+          mkdir -p "$app/Contents/tools"
+          cp build/macos/naps2-signature-helper "$app/Contents/tools/naps2-signature-helper"
+          chmod +x "$app/Contents/tools/naps2-signature-helper"
+        done < <(find NAPS2.App.Mac/bin -type d -name "NAPS2.app" -path '*/Debug*/*' -print0)
     - name: Test
       if: matrix.os != 'macos-15'
       run: dotnet run --project NAPS2.Tools -- test -v --nogui
@@ -36,3 +85,21 @@ jobs:
     - name: Test (ImageSharp images)
       if: matrix.os == 'ubuntu-24.04'
       run: dotnet run --project NAPS2.Tools -- test -v --nogui --images is --scope sdk
+    - name: Upload Windows binary
+      if: matrix.os == 'windows-2022'
+      uses: actions/upload-artifact@v4
+      with:
+        name: naps2-windows-debug
+        path: NAPS2.App.WinForms/bin/Debug*/net9-windows/
+    - name: Upload Linux binary
+      if: matrix.os == 'ubuntu-24.04'
+      uses: actions/upload-artifact@v4
+      with:
+        name: naps2-linux-debug
+        path: NAPS2.App.Gtk/bin/Debug*/net9/
+    - name: Upload macOS binary
+      if: matrix.os == 'macos-15'
+      uses: actions/upload-artifact@v4
+      with:
+        name: naps2-macos-debug
+        path: NAPS2.App.Mac/bin/Debug*/net9-macos/

.gitignore

@@ -5,4 +5,7 @@ packages/
 *.suo
 .vs/
 .idea/
-.nuget/
+.nuget/
+build_output.log
+build/*
+naps2.egg-info/*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/pyHanko"]
+	path = third_party/pyHanko
+	url = https://github.com/MatthiasValvekens/pyHanko.git

.python-version

@@ -0,0 +1 @@
+3.11

NAPS2.App.Mac/NAPS2.App.Mac.csproj

@@ -8,6 +8,7 @@
     <ApplicationIcon>../NAPS2.Lib/Icons/favicon.ico</ApplicationIcon>
 
     <SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
+    <TargetPlatformVersion>15.0</TargetPlatformVersion>
     <RuntimeIdentifiers Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64;osx-arm64</RuntimeIdentifiers>
     <TrimMode>partial</TrimMode>
 

NAPS2.Images.Mac/NAPS2.Images.Mac.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6;net8;net8-macos</TargetFrameworks>
+        <TargetFrameworks>net6;net8;net9-macos</TargetFrameworks>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -17,22 +17,22 @@
 
     <ItemGroup>
         <ProjectReference Include="..\NAPS2.Images\NAPS2.Images.csproj" />
-        <PackageReference Include="Eto.Platform.Mac64" Version="2.8.3" Condition="'$(TargetFramework)' != 'net8-macos'" />
+        <PackageReference Include="Eto.Platform.Mac64" Version="2.8.3" Condition="'$(TargetFramework)' != 'net9-macos'" />
     </ItemGroup>
 
-    <PropertyGroup Condition="'$(TargetFramework)' != 'net8-macos'">
+    <PropertyGroup Condition="'$(TargetFramework)' != 'net9-macos'">
         <DefineConstants>MONOMAC</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' != 'net8-macos'">
+    <ItemGroup Condition="'$(TargetFramework)' != 'net9-macos'">
         <Using Include="MonoMac.AppKit" />
         <Using Include="MonoMac.CoreGraphics" />
         <Using Include="MonoMac.Foundation" />
         <Using Include="MonoMac.ImageIO" />
         <Using Include="MonoMac.MobileCoreServices" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net8-macos'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net9-macos'">
         <Using Include="AppKit" />
         <Using Include="CoreGraphics" />
         <Using Include="Foundation" />

NAPS2.Lib.Mac/EtoForms/Ui/MacDesktopForm.cs

@@ -110,6 +110,7 @@ protected override void CreateToolbarsAndMenus()
                     .Append(Commands.ZoomOut)
                     .Separator()
                     .Append(Commands.Crop)
+                    .Append(Commands.SignatureField)
                     .Append(Commands.BrightCont)
                     .Append(Commands.HueSat)
                     .Append(Commands.BlackWhite)

NAPS2.Lib/EtoForms/Desktop/DesktopSubFormController.cs

@@ -39,6 +39,7 @@ public IDesktopSubFormController WithSelection(Func<ListSelection<UiImage>> sele
     public void ShowSharpenForm() => ShowImageForm<SharpenForm>();
     public void ShowSplitForm() => ShowImageForm<SplitForm>();
     public void ShowRotateForm() => ShowImageForm<RotateForm>();
+    public void ShowSignatureFieldForm() => ShowImageForm<SignatureFieldForm>();
 
     public void ShowCombineForm()
     {

NAPS2.Lib/EtoForms/Desktop/IDesktopSubFormController.cs

@@ -11,6 +11,7 @@ public interface IDesktopSubFormController
     void ShowSplitForm();
     void ShowCombineForm();
     void ShowRotateForm();
+    void ShowSignatureFieldForm();
     void ShowProfilesForm();
     void ShowOcrForm();
     void ShowBatchScanForm();

NAPS2.Lib/EtoForms/Ui/AboutForm.cs

@@ -53,7 +53,7 @@ protected override void BuildLayout()
                 C.NoWrap(AssemblyHelper.Product),
                 L.Row(
                     L.Column(
-                        C.NoWrap(string.Format(MiscResources.Version, AssemblyHelper.Version)),
+                        C.NoWrap(string.Format(MiscResources.Version, AssemblyHelper.DisplayVersion)),
                         C.UrlLink(NAPS2_HOMEPAGE)
                     ),
                     Config.Get(c => c.HiddenButtons).HasFlag(ToolbarButtons.Donate)
@@ -95,4 +95,4 @@ private LayoutElement GetUpdateWidget()
         return new UpdateCheckWidget(_updateChecker, Config);
 #endif
     }
-}
+}

NAPS2.Lib/EtoForms/Ui/DesktopCommands.cs

@@ -147,6 +147,11 @@ public DesktopCommands(DesktopController desktopController, DesktopScanControlle
             Text = UiStrings.Crop,
             IconName = "transform_crop_small"
         };
+        SignatureField = new ActionCommand(desktopSubFormController.ShowSignatureFieldForm)
+        {
+            Text = "Place Signature Field",
+            IconName = "document_sign_small"
+        };
         BrightCont = new ActionCommand(desktopSubFormController.ShowBrightnessContrastForm)
         {
             Text = UiStrings.BrightnessContrast,
@@ -381,6 +386,7 @@ public DesktopCommands WithSelection(Func<ListSelection<UiImage>> selectionFunc)
     public ActionCommand ImageMenu { get; set; }
     public ActionCommand ViewImage { get; set; }
     public ActionCommand Crop { get; set; }
+    public ActionCommand SignatureField { get; set; }
     public ActionCommand BrightCont { get; set; }
     public ActionCommand HueSat { get; set; }
     public ActionCommand BlackWhite { get; set; }

NAPS2.Lib/EtoForms/Ui/DesktopForm.cs

@@ -321,6 +321,7 @@ protected virtual void CreateToolbarsAndMenus()
                 .Append(Commands.ViewImage)
                 .Separator()
                 .Append(Commands.Crop)
+                .Append(Commands.SignatureField)
                 .Append(Commands.BrightCont)
                 .Append(Commands.HueSat)
                 .Append(Commands.BlackWhite)