diff --git a/Cargo.lock b/Cargo.lock index ac7392a..b0fd939 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "ink-notes" -version = "0.45.1" +version = "0.45.2" dependencies = [ "ab_glyph", "android_logger", diff --git a/Cargo.toml b/Cargo.toml index a5971cd..eac2ed7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink-notes" -version = "0.45.1" +version = "0.45.2" edition = "2021" description = "Notizbuch-App für Stift, Touch und Maus unter Linux" repository = "https://gitea.pansi.eu/harald/ink-notes" diff --git a/packaging/eu.pansi.ink-notes.metainfo.xml b/packaging/eu.pansi.ink-notes.metainfo.xml index 8036c5d..4c38256 100644 --- a/packaging/eu.pansi.ink-notes.metainfo.xml +++ b/packaging/eu.pansi.ink-notes.metainfo.xml @@ -84,6 +84,11 @@ + + +

A change from another device that arrives while you are writing on the same page is no longer overwritten; it is kept as a conflict copy.

+
+

Fixes from a review of the whole project, mainly for the safety of your notes: switching notebooks, the trash, copied notebook folders, scaled strokes and imports of broken files.

diff --git a/packaging/ink-notes.metainfo.xml b/packaging/ink-notes.metainfo.xml index 8036c5d..4c38256 100644 --- a/packaging/ink-notes.metainfo.xml +++ b/packaging/ink-notes.metainfo.xml @@ -84,6 +84,11 @@ + + +

A change from another device that arrives while you are writing on the same page is no longer overwritten; it is kept as a conflict copy.

+
+

Fixes from a review of the whole project, mainly for the safety of your notes: switching notebooks, the trash, copied notebook folders, scaled strokes and imports of broken files.

diff --git a/packaging/release-notes.md.tmpl b/packaging/release-notes.md.tmpl index 6869616..bbd7a6b 100644 --- a/packaging/release-notes.md.tmpl +++ b/packaging/release-notes.md.tmpl @@ -3,6 +3,7 @@ Notebook app for pen, touch and mouse on Linux (tested on Zorin OS 18 / Ubuntu 24.04). ### Highlights: +- **Sync while writing**: If a change from another device reached a page just while you were writing on it, saving your stroke overwrote that change. Now your version is saved and theirs is kept as a page of its own ("Conflict copy: …"), as for other sync conflicts; if you changed nothing on the page, their version is simply taken over - **Safer notes**: A review of the whole project fixed a number of rare errors. Notebooks deleted after not being edited for 30 days were removed from the trash at the next start instead of 30 days later. If saving failed while switching notebooks, pages could end up in the other notebook, and an open text field moved along; the app now saves first and stays in the notebook if that fails. A copied notebook folder is a notebook of its own instead of opening the original. Strokes keep their width after scaling and a restart, shapes are exported to PDF with their line width, and a page that could not be loaded always shows its warning. Importing broken Rnote, Saber, SVG or PDF files can no longer make a page unreadable or stop the PDF display. One invalid value in the settings file no longer resets all settings, and updates are only installed if the signed package is newer than the running version - **My colors**: Under the presets of the color menus (pen, highlighter, text), "➕ Save color" keeps the current shade in a row of your own colors – up to 12, shared by all three tools and kept across restarts; 🗑 removes the selected one (Issue #56) - **Copy and paste in text fields**: Ctrl+C, Ctrl+X and Ctrl+V in a text field now use the system clipboard, so text moves between ink-notes and other apps. Before, they only worked within the app (Issue #57)