Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cyanfish/naps2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DEXPRO-Solutions-GmbH/naps2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 11 commits
  • 59 files changed
  • 3 contributors

Commits on Mar 12, 2024

  1. Add GitHub code owners file

    fabiante authored Mar 12, 2024
    Copy the full SHA
    8ca3fe5 View commit details
  2. Merge pull request #2 from DEXPRO-Solutions-GmbH/feat/codeowners

    Add GitHub code owners file
    fabiante authored Mar 12, 2024
    Copy the full SHA
    7f6abfa View commit details

Commits on Sep 19, 2024

  1. Add Squeeze Button

    PhilippDex authored and fabiante committed Sep 19, 2024
    Copy the full SHA
    1a01350 View commit details
  2. Copy the full SHA
    251d133 View commit details
  3. Copy the full SHA
    e097154 View commit details
  4. Copy the full SHA
    68af632 View commit details
  5. Upload function integrated.

    Button itself not yet optimally formatted.
    PhilippDex authored and fabiante committed Sep 19, 2024
    Copy the full SHA
    841ceb6 View commit details
  6. Button looks okay now.

    PhilippDex authored and fabiante committed Sep 19, 2024
    Copy the full SHA
    2230c93 View commit details
  7. .gitattributes hinzufügen.

    PhilippHall authored and fabiante committed Sep 19, 2024
    Copy the full SHA
    ee72e45 View commit details
  8. Projektdateien hinzufügen.

    PhilippHall authored and fabiante committed Sep 19, 2024
    Copy the full SHA
    6d2ddd6 View commit details
  9. Bug Fix

    PhilippDex authored and fabiante committed Sep 19, 2024
    Copy the full SHA
    7549471 View commit details
Showing with 1,423 additions and 576 deletions.
  1. +63 −0 .gitattributes
  2. +1 −0 .github/CODEOWNERS
  3. +3 −3 NAPS2.App.Gtk/NAPS2.App.Gtk.csproj
  4. +2 −2 NAPS2.App.Mac/NAPS2.App.Mac.csproj
  5. +5 −5 NAPS2.App.Tests/NAPS2.App.Tests.csproj
  6. +1 −1 NAPS2.App.WinForms/NAPS2.App.WinForms.csproj
  7. +3 −3 NAPS2.Escl.Tests/NAPS2.Escl.Tests.csproj
  8. +1 −1 NAPS2.Escl/NAPS2.Escl.csproj
  9. +1 −1 NAPS2.Images.Gdi/NAPS2.Images.Gdi.csproj
  10. +2 −2 NAPS2.Images.Gtk/NAPS2.Images.Gtk.csproj
  11. +1 −1 NAPS2.Images.ImageSharp/NAPS2.Images.ImageSharp.csproj
  12. +1 −1 NAPS2.Images.Mac/NAPS2.Images.Mac.csproj
  13. +2 −2 NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj
  14. +1 −1 NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj
  15. +5 −5 NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj
  16. +2 −2 NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj
  17. +13 −0 NAPS2.Lib/Config/CommonConfig.cs
  18. +11 −0 NAPS2.Lib/Config/ConfigSerializer.cs
  19. +14 −0 NAPS2.Lib/Config/InternalDefaults.cs
  20. +4 −0 NAPS2.Lib/Config/ObsoleteTypes/AppConfigV0.cs
  21. +4 −0 NAPS2.Lib/Config/ObsoleteTypes/UserConfigV0.cs
  22. +15 −14 NAPS2.Lib/Config/ToolbarButtons.cs
  23. +4 −0 NAPS2.Lib/EtoForms/Desktop/DesktopController.cs
  24. +5 −0 NAPS2.Lib/EtoForms/Desktop/DesktopSubFormController.cs
  25. +2 −1 NAPS2.Lib/EtoForms/Desktop/DesktopToolbarMenuType.cs
  26. +1 −0 NAPS2.Lib/EtoForms/Desktop/IDesktopSubFormController.cs
  27. +3 −0 NAPS2.Lib/EtoForms/Desktop/ImageListActions.cs
  28. +2 −0 NAPS2.Lib/EtoForms/Notifications/ISaveNotify.cs
  29. +5 −0 NAPS2.Lib/EtoForms/Notifications/Notify.cs
  30. +4 −0 NAPS2.Lib/EtoForms/Notifications/SaveNotifyStub.cs
  31. +4 −0 NAPS2.Lib/EtoForms/Notifications/StubNotify.cs
  32. +22 −0 NAPS2.Lib/EtoForms/Notifications/UploadedNotification.cs
  33. +16 −0 NAPS2.Lib/EtoForms/Notifications/UploadedNotificationView.cs
  34. +43 −0 NAPS2.Lib/EtoForms/Ui/DesktopCommands.cs
  35. +10 −6 NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
  36. +145 −0 NAPS2.Lib/EtoForms/Ui/SqueezeSettingsForm.cs
  37. +1 −0 NAPS2.Lib/EtoForms/Widgets/ImageListViewBehavior.cs
  38. +4 −0 NAPS2.Lib/EtoForms/Widgets/ListViewBehavior.cs
  39. +121 −101 NAPS2.Lib/Icons.Designer.cs
  40. +6 −0 NAPS2.Lib/Icons.resx
  41. BIN NAPS2.Lib/Icons/SQZUpload.png
  42. BIN NAPS2.Lib/Icons/inbox_out-white.png
  43. BIN NAPS2.Lib/Icons/thunderbird.png
  44. +86 −1 NAPS2.Lib/ImportExport/ExportController.cs
  45. +2 −0 NAPS2.Lib/ImportExport/IExportController.cs
  46. +33 −0 NAPS2.Lib/ImportExport/Squeeze/SqueezeSettings.cs
  47. +149 −139 NAPS2.Lib/Lang/Resources/MiscResources.Designer.cs
  48. +3 −0 NAPS2.Lib/Lang/Resources/MiscResources.resx
  49. +420 −263 NAPS2.Lib/Lang/Resources/UiStrings.Designer.cs
  50. +48 −0 NAPS2.Lib/Lang/Resources/UiStrings.de.resx
  51. +45 −0 NAPS2.Lib/Lang/Resources/UiStrings.resx
  52. +37 −5 NAPS2.Lib/NAPS2.Lib.csproj
  53. BIN NAPS2.Lib/Resources/SQZUpload.png
  54. +19 −0 NAPS2.Lib/Squeeze/SqueezeProfile.cs
  55. +12 −0 NAPS2.Lib/Squeeze/SqueezeSettings.cs
  56. +4 −4 NAPS2.Sdk.ScannerTests/NAPS2.Sdk.ScannerTests.csproj
  57. +5 −5 NAPS2.Sdk.Tests/NAPS2.Sdk.Tests.csproj
  58. +3 −3 NAPS2.Sdk/NAPS2.Sdk.csproj
  59. +4 −4 NAPS2.Tools/NAPS2.Tools.csproj
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @fabiante
6 changes: 3 additions & 3 deletions NAPS2.App.Gtk/NAPS2.App.Gtk.csproj
Original file line number Diff line number Diff line change
@@ -23,14 +23,14 @@

<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.2.0" />

<ProjectReference Include="..\NAPS2.Lib.Gtk\NAPS2.Lib.Gtk.csproj" />

<PackageReference Include="Eto.Platform.Gtk" Version="2.8.2" />
<PackageReference Include="Eto.Platform.Gtk" Version="2.8.3" />
<!-- This shouldn't need a reference normally, but otherwise "dotnet restore" doesn't pick
it up, which breaks the flatpak build. -->
<PackageReference Include="Microsoft.NETCore.App" Version="2.1.*" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
</ItemGroup>

<ItemGroup>
4 changes: 2 additions & 2 deletions NAPS2.App.Mac/NAPS2.App.Mac.csproj
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@
<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Sane.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.2.0" />

<ProjectReference Include="..\NAPS2.Lib.Mac\NAPS2.Lib.Mac.csproj" />

<PackageReference Include="Eto.Platform.macOS" Version="2.8.2" />
<PackageReference Include="Eto.Platform.macOS" Version="2.8.3" />
</ItemGroup>

<ItemGroup>
10 changes: 5 additions & 5 deletions NAPS2.App.Tests/NAPS2.App.Tests.csproj
Original file line number Diff line number Diff line change
@@ -14,15 +14,15 @@

<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.2.0" />

<ProjectReference Include="..\NAPS2.Lib.Tests\NAPS2.Lib.Tests.csproj" />

<PackageReference Include="Appium.WebDriver" Version="4.4.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion NAPS2.App.WinForms/NAPS2.App.WinForms.csproj
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@

<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.2.0" />

<ProjectReference Include="..\NAPS2.App.Worker\NAPS2.App.Worker.csproj" />
<ProjectReference Include="..\NAPS2.Lib.WinForms\NAPS2.Lib.WinForms.csproj" />
6 changes: 3 additions & 3 deletions NAPS2.Escl.Tests/NAPS2.Escl.Tests.csproj
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
2 changes: 1 addition & 1 deletion NAPS2.Escl/NAPS2.Escl.csproj
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="Makaretu.Dns" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

2 changes: 1 addition & 1 deletion NAPS2.Images.Gdi/NAPS2.Images.Gdi.csproj
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

<ItemGroup>
<ProjectReference Include="..\NAPS2.Images\NAPS2.Images.csproj" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.3" />
</ItemGroup>

<ItemGroup>
4 changes: 2 additions & 2 deletions NAPS2.Images.Gtk/NAPS2.Images.Gtk.csproj
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@
<PackageTags>naps2</PackageTags>
</PropertyGroup>

<Import Project="..\NAPS2.Setup\targets\SdkPackageTargets.targets"/>
<Import Project="..\NAPS2.Setup\targets\SdkPackageTargets.targets" />

<ItemGroup>
<ProjectReference Include="..\NAPS2.Images\NAPS2.Images.csproj" />
<PackageReference Include="GtkSharp" Version="3.24.24.38" />
<PackageReference Include="GtkSharp" Version="3.24.24.95" />
</ItemGroup>

<ItemGroup>
2 changes: 1 addition & 1 deletion NAPS2.Images.ImageSharp/NAPS2.Images.ImageSharp.csproj
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
</ItemGroup>

<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
2 changes: 1 addition & 1 deletion NAPS2.Images.Mac/NAPS2.Images.Mac.csproj
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@

<ItemGroup>
<ProjectReference Include="..\NAPS2.Images\NAPS2.Images.csproj" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.8.2" Condition="'$(TargetFramework)' == 'net6'" />
<PackageReference Include="Eto.Platform.Mac64" Version="2.8.3" Condition="'$(TargetFramework)' == 'net6'" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6'">
4 changes: 2 additions & 2 deletions NAPS2.Lib.Gtk/NAPS2.Lib.Gtk.csproj
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
<ItemGroup>
<ProjectReference Include="..\NAPS2.Images.Gtk\NAPS2.Images.Gtk.csproj" />
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
<PackageReference Include="Eto.Forms" Version="2.8.2" />
<PackageReference Include="Eto.Platform.Gtk" Version="2.8.2" />
<PackageReference Include="Eto.Forms" Version="2.8.3" />
<PackageReference Include="Eto.Platform.Gtk" Version="2.8.3" />
</ItemGroup>

<ItemGroup>
2 changes: 1 addition & 1 deletion NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
<ItemGroup>
<ProjectReference Include="..\NAPS2.Images.Mac\NAPS2.Images.Mac.csproj" />
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
<PackageReference Include="Eto.Platform.macOS" Version="2.8.2" />
<PackageReference Include="Eto.Platform.macOS" Version="2.8.3" />
</ItemGroup>

<ItemGroup>
10 changes: 5 additions & 5 deletions NAPS2.Lib.Tests/NAPS2.Lib.Tests.csproj
Original file line number Diff line number Diff line change
@@ -19,12 +19,12 @@
<ProjectReference Include="..\NAPS2.Sdk.Tests\NAPS2.Sdk.Tests.csproj" />

<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
4 changes: 2 additions & 2 deletions NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
<ItemGroup>
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
<ProjectReference Include="..\NAPS2.Images.Gdi\NAPS2.Images.Gdi.csproj" />
<PackageReference Include="Eto.Forms" Version="2.8.2" />
<PackageReference Include="Eto.Platform.Windows" Version="2.8.2" />
<PackageReference Include="Eto.Forms" Version="2.8.3" />
<PackageReference Include="Eto.Platform.Windows" Version="2.8.3" />
</ItemGroup>

<ItemGroup>
13 changes: 13 additions & 0 deletions NAPS2.Lib/Config/CommonConfig.cs
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
using NAPS2.Remoting.Server;
using NAPS2.Scan;
using NAPS2.Scan.Batch;
using NAPS2.ImportExport.Squeeze;

namespace NAPS2.Config;

@@ -189,4 +190,16 @@ public class CommonConfig
[Common]
public bool DisableScannerSharing { get; set; }

[User]
public bool KeepSettings { get; set; }


// Squeeze changes

[Config]
[Common]
public SqueezeSettings SqueezeSettings { get; set; } = new();

[User]
public bool RememberSqueezeSettings { get; set; }
}
11 changes: 11 additions & 0 deletions NAPS2.Lib/Config/ConfigSerializer.cs
Original file line number Diff line number Diff line change
@@ -122,6 +122,9 @@ private ConfigStorage<CommonConfig> AppConfigV0ToCommonConfigDefault(AppConfigV0
storage.Set(x => x.OcrAfterScanning, c.OcrDefaultAfterScanning);
storage.Set(x => x.EventLogging, c.EventLogging);
storage.Set(x => x.KeyboardShortcuts, c.KeyboardShortcuts ?? new KeyboardShortcuts());
// Squeeze Storage
storage.Set(x => x.KeepSettings, c.KeepSettings);

return storage;
}

@@ -167,6 +170,9 @@ void SetIfLocked<T>(Expression<Func<CommonConfig, T>> accessor, T value, string
SetIfLocked(x => x.KeepSession, c.KeepSession, nameof(c.KeepSession));
SetIfLocked(x => x.SingleInstance, c.SingleInstance, nameof(c.SingleInstance));

//Squeeze change
SetIfLocked(x => x.KeepSettings, c.KeepSettings, nameof(c.KeepSettings));

return storage;
}

@@ -209,6 +215,11 @@ private static ConfigStorage<CommonConfig> UserConfigV0ToCommonConfig(UserConfig
storage.Set(x => x.EmailSettings, c.EmailSettings);
storage.Set(x => x.EmailSetup, c.EmailSetup);
storage.Set(x => x.ThumbnailSize, c.ThumbnailSize);

// Squeeze change
storage.Set(x => x.SqueezeSettings, c.SqueezeSettings);


if (c.LastBatchSettings != null)
{
storage.Set(x => x.BatchSettings, c.LastBatchSettings);
14 changes: 14 additions & 0 deletions NAPS2.Lib/Config/InternalDefaults.cs
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
using NAPS2.Pdf;
using NAPS2.Scan;
using NAPS2.Scan.Batch;
using NAPS2.ImportExport.Squeeze;

namespace NAPS2.Config;

@@ -56,6 +57,7 @@ public static CommonConfig GetCommonConfig() =>
DesktopToolStripDock = DockStyle.Top,
EventLogging = EventType.None,
ShowPageNumbers = false,
KeepSettings = false,
PdfSettings = new PdfSettings
{
Metadata = new PdfMetadata
@@ -95,6 +97,18 @@ public static CommonConfig GetCommonConfig() =>
TiffCompression = TiffCompression.Auto
},
RememberImageSettings = false,

// Squeeze changes
SqueezeSettings = new SqueezeSettings
{
SQZURL = "URL",
SQZClient = "Mandant",
SQZUserName = "Benutzername",
SQZPassword = "",
SQZClassID = 1
},
RememberSqueezeSettings = false,

EmailSettings = new EmailSettings
{
AttachmentName = "Scan.pdf"
4 changes: 4 additions & 0 deletions NAPS2.Lib/Config/ObsoleteTypes/AppConfigV0.cs
Original file line number Diff line number Diff line change
@@ -87,4 +87,8 @@ public class AppConfigV0
public EventType EventLogging { get; set; }

public KeyboardShortcuts? KeyboardShortcuts { get; set; }

// Squeeze changes

public bool KeepSettings { get; set; }
}
4 changes: 4 additions & 0 deletions NAPS2.Lib/Config/ObsoleteTypes/UserConfigV0.cs
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
using NAPS2.Ocr;
using NAPS2.Scan;
using NAPS2.Scan.Batch;
using NAPS2.ImportExport.Squeeze;

namespace NAPS2.Config.ObsoleteTypes;

@@ -54,4 +55,7 @@ public class UserConfigV0
public KeyboardShortcuts? KeyboardShortcuts { get; set; }

public List<NamedPageSize>? CustomPageSizePresets { get; set; }

// Squeeze change
public SqueezeSettings SqueezeSettings { get; set; } = new();
}
29 changes: 15 additions & 14 deletions NAPS2.Lib/Config/ToolbarButtons.cs
Original file line number Diff line number Diff line change
@@ -9,18 +9,19 @@ public enum ToolbarButtons
Profiles = 1 << 2,
Ocr = 1 << 3,
Import = 1 << 4,
SavePdf = 1 << 5,
SaveImages = 1 << 6,
EmailPdf = 1 << 7,
Print = 1 << 8,
Image = 1 << 9,
Rotate = 1 << 10,
Move = 1 << 11,
Reorder = 1 << 12,
Delete = 1 << 13,
Clear = 1 << 14,
Language = 1 << 15,
Settings = 1 << 16,
About = 1 << 17,
Donate = 1 << 18
Squeeze = 1 << 5,
SavePdf = 1 << 6,
SaveImages = 1 << 7,
EmailPdf = 1 << 8,
Print = 1 << 9,
Image = 1 << 10,
Rotate = 1 << 11,
Move = 1 << 12,
Reorder = 1 << 13,
Delete = 1 << 14,
Clear = 1 << 15,
Language = 1 << 16,
Settings = 1 << 17,
About = 1 << 18,
Donate = 1 << 19
}
Loading