Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Merge main into feature/spreadsheet-print-studio

KnifeLemonc9a4d0cb9b5f
diff --cc docs/ENGINES.md
index b1acf881,40cc80c9..4ceb32f9
--- a/docs/ENGINES.md
+++ b/docs/ENGINES.md
@@@ -7,12 -7,12 +7,12 @@@ Filee chooses engines automatically. Se
|---|---|---|
| ImageMagick (Magick.NET) | built in (library) | JPG, PNG, WEBP, TIFF, BMP, GIF, ICO, AVIF, JPEG XL, JPEG 2000, PSD/PSB, TGA, PPM, MNG, QOI, DDS, PCX, CUR, XPM, XBM, WBMP, PAM, PFM, SGI, Sun Raster, MIFF ↔ each other, and **APNG** (Filee's own reader and writer); HEIC (written with FFmpeg), XCF, camera RAW (LibRaw), DICOM (uncompressed ones by Filee's own reader), Photo CD, OpenEXR, Radiance HDR, EMF/WMF (Windows) and the photo of an iPhone LIVP read |
| Windows Imaging Component | part of Windows (Windows only) | **JPEG XR** (JXR, WDP, HDP; HDR screenshots of Windows) → the images ImageMagick writes, and PDF, ICNS, HEIC and SVG through PNG; HDR tone-mapped to SDR |
- | Vector graphics | built in (Svg.Skia, SkiaSharp, ACadSharp) | **SVG/SVGZ → PDF (vector) and images**, SVG ↔ SVGZ, **SVG → DXF** (→ DWG with the CAD engine), **raster images → SVG (tracing)**, PDF-compatible AI → PDF |
+ | Vector graphics | built in (Svg.Skia, SkiaSharp, ACadSharp) | **SVG/SVGZ → PDF (vector) and images**, SVG ↔ SVGZ, **SVG → DXF** (→ DWG with the CAD engine), **raster images → SVG (tracing)**, PDF-compatible AI → PDF, **HP-GL / HP-GL/2 plot files (PLT) → SVG**, PDF and images (pen moves, packed PE polylines, arcs and filled polygons; text labels are not drawn), **Tajima DST embroidery → SVG** (stitches as lines, a palette colour per thread; → PNG, JPG, PDF from there) |
| ICNS | built in | images → ICNS (16–1024 px), ICNS → images |
- | PDFsharp | built in (library) | images → PDF, merge, split, page ranges, spreadsheet print-studio assembly, **compression** (smaller PDFs, see below) |
-| PDFsharp | built in (library) | images → PDF, merge, split, page ranges, **compression** (smaller PDFs, see below), PDFs without their metadata |
++| PDFsharp | built in (library) | images → PDF, merge, split, page ranges, spreadsheet print-studio assembly, **compression** (smaller PDFs, see below), PDFs without their metadata |
| PDFium | built in (library) | PDF → images (multi-page TIFF/GIF supported) |
| Unhwp | built in (library) | HWP/HWPX → TXT, Markdown, HTML (pictures in a `<name>_files` folder next to the Markdown, embedded in the HTML) |
- | Text & Markdown (Markdig) | built in (library) | **Markdown → HTML, TXT**; **TXT, LOG, PY, PAC, BAT, COMMAND → UTF-8 TXT**, preserving source text without running scripts (and → PDF / DOCX through the HWPX writer, rhwp or LibreOffice) |
+ | Text & Markdown (Markdig) | built in (library) | **Markdown → HTML, TXT**; **TXT, LOG, PY, PAC, BAT, COMMAND, LUA, CSS, PS1 → UTF-8 TXT**, preserving source text without running scripts (and → PDF / DOCX through the HWPX writer, rhwp or LibreOffice) |
| Spreadsheets (ExcelDataReader for XLS) | built in (library) | **XLSX, XLS, ODS, CSV, TSV → XLSX, ODS, CSV, TSV** (one CSV / TSV per sheet) |
| Office Open XML | built in | **DOCM / DOTX / DOTM ↔ DOCX, XLSM / XLTX ↔ XLSX, PPTM / POTX / POTM / PPSX ↔ PPTX** (macros removed for macro-free types) |
| Fonts | built in | **TTF, OTF, WOFF, WOFF2, EOT ↔ each other**; CFF (PostScript) outlines become TrueType for TTF and EOT |
diff --cc src/Filee.App/Services/WindowService.cs
index e5ada4e6,3445db6d..5eeaeee2
--- a/src/Filee.App/Services/WindowService.cs
+++ b/src/Filee.App/Services/WindowService.cs
@@@ -78,34 -77,11 +80,36 @@@ public sealed class WindowService(ILoca
win.Activate();
}
+ /// <summary>Opens the non-destructive XLSX print studio. One workbook owns one window and print plan.</summary>
+ public void ShowSpreadsheetPrintStudio(string file)
+ {
+ SpreadsheetPrintStudioViewModel vm;
+ try
+ {
+ vm = ActivatorUtilities.CreateInstance<SpreadsheetPrintStudioViewModel>(services, file);
+ }
+ catch (Exception ex) when (ex is not OutOfMemoryException)
+ {
+ services.GetService<ILogger<WindowService>>()?.LogWarning(ex, "Could not open spreadsheet print studio for {File}", file);
+ _ = MessageAsync(null, ex.Message);
+ return;
+ }
+ var window = new SpreadsheetPrintStudioWindow { DataContext = vm };
+ window.Closed += (_, _) =>
+ {
+ _spreadsheetStudios.Remove(window);
+ trimmer.Request();
+ };
+ _spreadsheetStudios.Add(window);
+ window.Show();
+ window.Activate();
+ }
+
/// <summary>
/// Shows (or brings to front) the main window, optionally on a page. Going to the tray closes it
- /// (<see cref="MainWindow.HideToTray"/>): a new one opens where and on the page the last one was.
+ /// (<see cref="MainWindow.HideToTray"/>): a new one opens where and on the page the last one was. There is never
+ /// more than one: a call made while one is being built (a tray click handled meanwhile) goes to that one, and one
+ /// that is being released is left to close while a new one opens.
/// </summary>
public void ShowMain(string? page = null)
{
diff --cc src/Filee.Core/Presets/BuiltInData.cs
index 433da1ab,e6fe44ac..07d58294
--- a/src/Filee.Core/Presets/BuiltInData.cs
+++ b/src/Filee.Core/Presets/BuiltInData.cs
@@@ -424,7 -507,7 +512,7 @@@ public static class BuiltInDat
NameKey = "profile.spreadsheets",
Extensions = ExtensionsOf(FormatCategory.Spreadsheet),
PresetIds = ["to-pdf", "to-xlsx", "to-csv", "to-json", "to-ods", "to-hwpx", "to-hwp", "to-html", "merge-pdf"],
- BackPresetIds = ["tool-sheet-studio", "to-docx", "to-md", "to-txt", "to-yaml", "to-xml", "to-vcf", "to-png", "zip-all"],
- BackPresetIds = ["to-docx", "to-md", "to-txt", "to-yaml", "to-xml", "to-vcf", "to-ics", "to-png", "zip-all"],
++ BackPresetIds = ["tool-sheet-studio", "to-docx", "to-md", "to-txt", "to-yaml", "to-xml", "to-vcf", "to-ics", "to-png", "zip-all"],
};
/// <summary>PowerPoint and OpenDocument slides (split from "office" in settings schema 5).</summary>
diff --cc src/Filee.Core/Settings/AppSettings.cs
index 508c929c,0e732dd0..bd3c2d01
--- a/src/Filee.Core/Settings/AppSettings.cs
+++ b/src/Filee.Core/Settings/AppSettings.cs
@@@ -112,7 -112,7 +112,7 @@@ public sealed class DonutSetting
public sealed class AppSettings
{
/// <summary>Current schema version. Increase when the format changes and add a migration.</summary>
- public const int CurrentSchemaVersion = 34;
- public const int CurrentSchemaVersion = 40;
++ public const int CurrentSchemaVersion = 42;
public int SchemaVersion { get; set; } = CurrentSchemaVersion;
diff --cc src/Filee.Core/Settings/UserDataStore.cs
index 0727a335,048dc125..96b9eebe
--- a/src/Filee.Core/Settings/UserDataStore.cs
+++ b/src/Filee.Core/Settings/UserDataStore.cs
@@@ -750,23 -750,60 +750,78 @@@ internal static class SettingsMigration
// v32: logs and script source, Video CD DAT and Workbench archives learn their donuts; custom claims stay put.
if (from < 32)
changed |= LearnExtensions(profiles, out _, ["log", "py", "pac", "bat", "command", "dat", "wbpz"]);
- // v34: a non-destructive print studio for XLSX → PDF, on the back of the spreadsheet donut. Existing custom
- // donuts are untouched, and a full spreadsheet donut keeps the preset in the library for manual use.
+ // v33: HAR network logs and raw H.265 / H.264 camera streams learn their donuts (custom claims stay put), and
+ // "Trim transparent borders" comes in after "Remove background".
+ if (from < 33)
+ {
+ changed |= LearnExtensions(profiles, out _, ["har", "h265", "265", "hevc", "h264", "264"]);
+ // "Trim transparent borders" after "Remove background", in the library and on the images donut's back face
+ // when it has room and the user hasn't put it there.
+ if (BuiltInData.TrimPresets().Single() is var trim && presets.All(p => p.Id != trim.Id))
+ {
+ var at = presets.FindIndex(p => p.Id == "remove-background");
+ presets.Insert(at < 0 ? presets.Count : at + 1, trim);
+ changed = true;
+ }
+ if (profiles.FirstOrDefault(p => p.Id == "images") is { BackPresetIds: { } back } images
+ && !back.Contains("trim-transparent") && !images.PresetIds.Contains("trim-transparent")
+ && back.Count < ToolbarProfile.MaxSlices)
+ {
+ var after = back.IndexOf("remove-background");
+ back.Insert(after < 0 ? back.Count(id => id != "zip-all") : after + 1, "trim-transparent");
+ changed = true;
+ }
+ }
+ // v34: Lua scripts and CSS style sheets learn the text donut; custom claims stay put.
if (from < 34)
+ changed |= LearnExtensions(profiles, out _, ["lua", "css"]);
+ // v35: HP-GL plot files learn their donut; custom claims stay put.
+ if (from < 35)
+ changed |= LearnExtensions(profiles, out _, ["plt", "hpgl", "hpg", "hgl"]);
+ // v36: iCalendar (.ics, .ical) on the data donut, and "iCalendar" (CSV → ICS) after "vCard" on the back of the
+ // spreadsheets donut when it has room; custom claims stay put.
+ if (from < 36)
+ {
+ changed |= LearnExtensions(profiles, out _, ["ics", "ical"]);
+ changed |= AddCalendarPreset(presets, profiles);
+ }
+ // v37: everyday tools (compress image / video / audio, video from images, extract audio, merge videos / audio,
+ // remove metadata), after "Motion Photo (Android)" as in a new library, and on the back faces of the
+ // built-in donuts before "One ZIP" where they have room and the user hasn't put them there already.
+ // "Extract audio" replaces the plain M4A slice on the video donut's back.
+ if (from < 37)
+ changed |= AddMediaTools(presets, profiles);
+ // v38: Tajima embroidery designs (.dst) learn the vector donut; custom claims stay put.
+ if (from < 38)
+ changed |= LearnExtensions(profiles, out _, ["dst"]);
+ // v39: PowerShell scripts (.ps1) learn the text donut; custom claims stay put.
+ if (from < 39)
+ changed |= LearnExtensions(profiles, out _, ["ps1"]);
+ // v40: "Searchable PDF" (text recognition), after "Compress PDF" as in a new library, on no donut.
+ if (from < 40 && !presets.Any(p => p.Id == "searchable-pdf"))
+ {
+ var at = presets.FindIndex(p => p.Id == "compress-pdf");
+ presets.Insert(at < 0 ? presets.Count : at + 1, BuiltInData.OcrPresets().Single());
+ changed = true;
+ }
++ // v42: the print studio for XLSX → PDF (a tool), after "Crop" as in a new library, and first on the back of the
++ // spreadsheets donut when it has room and the user hasn't put it on either face.
++ if (from < 42)
+ {
+ const string id = "tool-sheet-studio";
+ if (presets.All(p => p.Id != id))
+ {
- presets.Add(BuiltInData.CreatePresets().Single(p => p.Id == id));
++ var at = presets.FindIndex(p => p.Id == "tool-crop");
++ presets.Insert(at < 0 ? presets.Count : at + 1, BuiltInData.CreatePresets().Single(p => p.Id == id));
+ changed = true;
+ }
- if (profiles.FirstOrDefault(p => p.Id == "spreadsheets") is { BackPresetIds: { } back }
- && !back.Contains(id) && back.Count < ToolbarProfile.MaxSlices)
++ if (profiles.FirstOrDefault(p => p.Id == "spreadsheets") is { BackPresetIds: { } back } spreadsheets
++ && !back.Contains(id) && !spreadsheets.PresetIds.Contains(id) && back.Count < ToolbarProfile.MaxSlices)
+ {
+ back.Insert(0, id);
+ changed = true;
+ }
+ }
return changed;
}
diff --cc tests/Filee.Core.Tests/UserDataStoreTests.cs
index e9e9efd1,4b06239b..15d907f1
--- a/tests/Filee.Core.Tests/UserDataStoreTests.cs
+++ b/tests/Filee.Core.Tests/UserDataStoreTests.cs
@@@ -1321,22 -1392,6 +1392,38 @@@ public class UserDataStoreTest
Assert.False(SettingsMigrations.ApplyToLibrary(25, presets, profiles)); // once only
}
+ [Fact]
- public void Version_33_libraries_get_the_spreadsheet_print_studio_on_the_back()
++ public void Version_41_libraries_get_the_spreadsheet_print_studio_after_crop_and_on_the_back()
+ {
+ var presets = BuiltInData.CreatePresets();
+ presets.RemoveAll(p => p.Id == "tool-sheet-studio");
+ var profiles = BuiltInData.CreateProfiles();
+ profiles.Single(p => p.Id == "spreadsheets").BackPresetIds!.Remove("tool-sheet-studio");
+
- Assert.True(SettingsMigrations.ApplyToLibrary(33, presets, profiles));
++ Assert.True(SettingsMigrations.ApplyToLibrary(41, presets, profiles));
+
+ var studio = presets.Single(p => p.Id == "tool-sheet-studio");
+ Assert.Equal((PresetKind.Tool, "pdf"), (studio.Kind, studio.TargetFormat));
++ Assert.Equal(presets.FindIndex(p => p.Id == "tool-crop") + 1, presets.IndexOf(studio)); // as in a new library
+ Assert.Equal("tool-sheet-studio", profiles.Single(p => p.Id == "spreadsheets").BackPresetIds![0]);
- Assert.False(SettingsMigrations.ApplyToLibrary(33, presets, profiles));
++ Assert.False(SettingsMigrations.ApplyToLibrary(41, presets, profiles));
++ }
++
++ [Fact]
++ public void Version_41_libraries_keep_the_print_studio_off_the_back_when_the_front_has_it()
++ {
++ var presets = BuiltInData.CreatePresets();
++ var profiles = BuiltInData.CreateProfiles();
++ var spreadsheets = profiles.Single(p => p.Id == "spreadsheets");
++ spreadsheets.BackPresetIds!.Remove("tool-sheet-studio");
++ spreadsheets.PresetIds.Add("tool-sheet-studio"); // the user put it on the front
++
++ SettingsMigrations.ApplyToLibrary(41, presets, profiles);
++
++ Assert.DoesNotContain("tool-sheet-studio", spreadsheets.BackPresetIds);
++ Assert.Single(presets, p => p.Id == "tool-sheet-studio");
+ }
+
[Fact]
public void Back_from_an_older_Filee_tool_crop_works_again_and_keeps_the_users_changes()
{