From 26d8dd51f3ecc4bd6861ed5155acb3090a1983d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Jun 2024 20:45:42 +0200 Subject: New upstream version 46.0 --- .gitlab-ci.yml | 12 +- NEWS | 14 + README.md | 13 +- build-aux/flatpak/org.gnome.SimpleScan.json | 110 +- build-aux/snap/snapcraft.yaml | 7 +- data/icons/scalable/actions/flip-before.svg | 2 + data/icons/scalable/actions/flip-even.svg | 2 + data/icons/scalable/actions/flip-odd.svg | 2 + data/icons/scalable/actions/interleave-after.svg | 2 + data/icons/scalable/actions/interleave-before.svg | 2 + .../scalable/actions/interleave-reverse-after.svg | 2 + data/icons/scalable/actions/reverse-after.svg | 2 + data/icons/scalable/actions/reverse-before.svg | 2 + .../scalable/actions/right-large-symbolic.svg | 2 + data/meson.build | 25 +- data/org.gnome.SimpleScan.appdata.xml.in | 171 +++ data/simple-scan.appdata.xml.in | 156 -- data/simple-scan.gresource.xml | 15 + data/ui/app-window.ui | 946 ++++-------- data/ui/authorize-dialog.ui | 131 +- data/ui/drivers-dialog.ui | 137 ++ data/ui/help-overlay.ui | 24 - data/ui/preferences-dialog.ui | 191 +-- data/ui/reorder-pages-dialog.ui | 92 ++ data/ui/reorder-pages-item.ui | 51 + help/C/adf.page | 7 +- help/C/brightness-contrast.page | 6 +- help/C/dpi.page | 9 +- help/C/figures/preferences.png | Bin 18646 -> 46262 bytes help/C/figures/scan_toolbar.png | Bin 27643 -> 17368 bytes help/C/figures/scanner_selection.png | Bin 0 -> 8453 bytes help/C/quality.page | 17 +- help/C/scanner.page | 2 + help/C/scanning.page | 2 +- help/da/da.po | 185 ++- help/de/de.po | 243 ++-- help/eu/eu.po | 137 +- help/fr/fr.po | 156 +- help/gl/gl.po | 216 +-- help/hu/figures/preferences.png | Bin 19414 -> 50657 bytes help/hu/figures/scan_toolbar.png | Bin 29385 -> 17204 bytes help/hu/figures/scanner_selection.png | Bin 0 -> 16990 bytes help/hu/hu.po | 208 +-- help/id/id.po | 184 ++- help/meson.build | 3 +- help/pl/figures/preferences.png | Bin 25073 -> 0 bytes help/pl/figures/scan_toolbar.png | Bin 36128 -> 0 bytes help/pl/pl.po | 170 ++- help/ru/ru.po | 195 ++- help/sv/figures/preferences.png | Bin 60735 -> 20636 bytes help/sv/figures/scan_toolbar.png | Bin 40825 -> 19939 bytes help/sv/figures/scanner_selection.png | Bin 0 -> 12686 bytes help/sv/sv.po | 142 +- help/tr/tr.po | 176 ++- help/uk/uk.po | 204 ++- meson.build | 26 +- po/LINGUAS | 1 + po/POTFILES.in | 5 +- po/POTFILES.skip | 1 + po/be.po | 623 ++++---- po/ca.po | 721 +++++----- po/cs.po | 632 ++++---- po/da.po | 610 ++++---- po/de.po | 631 ++++---- po/el.po | 810 ++++++----- po/en_GB.po | 827 ++++++----- po/eo.po | 1201 ++++++++-------- po/es.po | 629 ++++---- po/eu.po | 652 ++++----- po/fa.po | 745 +++++----- po/fi.po | 625 ++++---- po/fr.po | 633 ++++---- po/fur.po | 740 +++++----- po/gl.po | 612 ++++---- po/he.po | 665 ++++----- po/hu.po | 637 ++++---- po/id.po | 641 ++++----- po/is.po | 109 +- po/ka.po | 846 +++++------ po/kab.po | 1061 ++++++++++++++ po/kk.po | 670 +++++---- po/ko.po | 610 ++++---- po/lt.po | 622 ++++---- po/lv.po | 670 +++++---- po/nb.po | 1005 +++++++------ po/nl.po | 672 +++++---- po/oc.po | 629 ++++---- po/pa.po | 902 ++++++------ po/pl.po | 628 ++++---- po/pt.po | 613 ++++---- po/pt_BR.po | 121 +- po/ro.po | 804 ++++++----- po/ru.po | 633 ++++---- po/sk.po | 614 ++++---- po/sl.po | 629 ++++---- po/sr.po | 666 +++++---- po/sv.po | 626 ++++---- po/tr.po | 644 ++++----- po/uk.po | 649 ++++----- po/zh_CN.po | 675 +++++---- po/zh_TW.po | 792 +++++----- simple-scan.doap | 7 - src/app-window.vala | 1518 +++++++------------- src/authorize-dialog.vala | 71 +- src/autosave-manager.vala | 10 +- src/book-view.vala | 176 ++- src/book.vala | 11 +- src/drivers-dialog.vala | 200 +++ src/meson.build | 6 +- src/page-icon.vala | 135 -- src/page-texture.vala | 663 +++++++++ src/page-view.vala | 503 +------ src/page.vala | 30 +- src/preferences-dialog.vala | 229 +-- src/reorder-pages-dialog.vala | 60 + src/simple-scan.vala | 21 +- 116 files changed, 18789 insertions(+), 17783 deletions(-) create mode 100644 data/icons/scalable/actions/flip-before.svg create mode 100644 data/icons/scalable/actions/flip-even.svg create mode 100644 data/icons/scalable/actions/flip-odd.svg create mode 100644 data/icons/scalable/actions/interleave-after.svg create mode 100644 data/icons/scalable/actions/interleave-before.svg create mode 100644 data/icons/scalable/actions/interleave-reverse-after.svg create mode 100644 data/icons/scalable/actions/reverse-after.svg create mode 100644 data/icons/scalable/actions/reverse-before.svg create mode 100644 data/icons/scalable/actions/right-large-symbolic.svg create mode 100644 data/org.gnome.SimpleScan.appdata.xml.in delete mode 100644 data/simple-scan.appdata.xml.in create mode 100644 data/ui/drivers-dialog.ui create mode 100644 data/ui/reorder-pages-dialog.ui create mode 100644 data/ui/reorder-pages-item.ui create mode 100644 help/C/figures/scanner_selection.png create mode 100644 help/hu/figures/scanner_selection.png delete mode 100644 help/pl/figures/preferences.png delete mode 100644 help/pl/figures/scan_toolbar.png create mode 100644 help/sv/figures/scanner_selection.png create mode 100644 po/kab.po create mode 100644 src/drivers-dialog.vala delete mode 100644 src/page-icon.vala create mode 100644 src/page-texture.vala create mode 100644 src/reorder-pages-dialog.vala diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15a10c0..f7cea83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,12 +7,14 @@ build:snap: artifacts: paths: ['./*.snap'] expire_in: 3 days + # TODO: Fix GTK4 snap package build + allow_failure: true build-ubuntu: image: ubuntu:rolling before_script: - apt-get update - - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates + - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-4-dev libadwaita-1-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates script: - meson _build - ninja -C _build install @@ -20,7 +22,7 @@ build-ubuntu: build-fedora: image: fedora:latest before_script: - - dnf install -y meson vala gettext itstool fribidi-devel gtk3-devel gobject-introspection-devel libgusb-devel colord-devel PackageKit-glib-devel libwebp-devel sane-backends-devel git + - dnf install -y meson vala gettext itstool fribidi-devel gtk4-devel libadwaita-devel gobject-introspection-devel libgusb-devel colord-devel PackageKit-glib-devel libwebp-devel sane-backends-devel git script: - meson _build - ninja -C _build install @@ -28,7 +30,7 @@ build-fedora: build-arch: image: archlinux/base:latest before_script: - - pacman -Syu --noconfirm meson vala gettext itstool fribidi gtk3 gobject-introspection libgusb colord libwebp sane git + - pacman -Syu --noconfirm meson vala gettext itstool fribidi gtk4 libadwaita gobject-introspection libgusb colord libwebp sane git script: - meson _build - ninja -C _build install @@ -42,8 +44,6 @@ flatpak: FLATPAK_MODULE: "simple-scan" APP_ID: "org.gnome.SimpleScan" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" - BUNDLE: "simple-scan-dev.flatpak" + BUNDLE: "simple-scan.flatpak" extends: '.flatpak' - # Make CI pass while I figure things out - allow_failure: true diff --git a/NEWS b/NEWS index 36c48c8..22ea8db 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +Overview of changes in simple-scan 46.0 +~~~~~~~~~~~~~~ +Released: 2024-03-18 + + * Updated translations + +Overview of changes in simple-scan 46.beta +~~~~~~~~~~~~~~ +Released: 2024-02-23 + + * Switch to GTK4 and libadwaita + * Implement redesign + * Updated translations + Overview of changes in simple-scan 44.0 ~~~~~~~~~~~~~~ Released: 2023-03-19 diff --git a/README.md b/README.md index 75b5b57..b7f1558 100644 --- a/README.md +++ b/README.md @@ -26,18 +26,18 @@ Install the dependencies For Ubuntu/Debian: ``` -$ sudo apt install -y meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates +$ sudo apt install -y meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-4-dev libadwaita-1 libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates ``` For Fedora: ``` -$ sudo dnf install -y meson vala gettext itstool fribidi-devel gtk3-devel gobject-introspection-devel libgusb-devel colord-devel PackageKit-glib-devel libwebp-devel sane-backends-devel git +$ sudo dnf install -y meson vala gettext itstool fribidi-devel gtk4-devel libadwaita-devel gobject-introspection-devel libgusb-devel colord-devel PackageKit-glib-devel libwebp-devel sane-backends-devel git ``` For Arch Linux: ``` -sudo pacman -S meson vala gettext itstool fribidi gtk3 gobject-introspection libgusb colord libwebp sane git +sudo pacman -S meson vala gettext itstool fribidi gtk4 libadwaita gobject-introspection libgusb colord libwebp sane git ``` @@ -54,13 +54,6 @@ $ ninja -C _build all install $ XDG_DATA_DIRS=_install/share:$XDG_DATA_DIRS ./_install/bin/simple-scan ``` -If libhandy is used as a subproject (i.e. system libhandy not found or -too old), then make sure to use the resulting .so file as well when -running, e.g. by using the `LD_LIBRARY_PATH` variable: -``` -$ LD_LIBRARY_PATH=_install/lib/x86_64-linux-gnu XDG_DATA_DIRS=_install/share:$XDG_DATA_DIRS ./_install/bin/simple-scan -``` - # Debugging There is a `--debug` command line switch to enable more verbose logging: diff --git a/build-aux/flatpak/org.gnome.SimpleScan.json b/build-aux/flatpak/org.gnome.SimpleScan.json index 1acdaa2..54643d4 100644 --- a/build-aux/flatpak/org.gnome.SimpleScan.json +++ b/build-aux/flatpak/org.gnome.SimpleScan.json @@ -57,34 +57,99 @@ ] }, { - "name" : "udev", - "config-opts" : [ - "--disable-hwdb", - "--disable-logging", - "--disable-gudev", - "--disable-introspection", - "--disable-keymap", - "--disable-mtd_probe" + "name": "python3-jinja2", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"jinja2\" --no-build-isolation" ], - "cleanup" : [ - "/include", + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/1d/97/2288fe498044284f39ab8950703e88abbac2abbdf65524d576157af70556/MarkupSafe-2.1.1.tar.gz", + "sha256": "7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/bc/c3/f068337a370801f372f2f8f6bad74a5c140f6fda3d9de154052708dd3c65/Jinja2-3.1.2-py3-none-any.whl", + "sha256": "6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61" + } + ] + }, + { + "name": "systemd", + "buildsystem": "meson", + "config-opts": [ + "--libdir=lib", + "-Drootprefix=/app", + "-Drootlibdir=/app/lib", + "-Dsysconfdir=/app/etc", + "-Ddocdir=/app/share/doc", + "-Dsysvinit-path=/app/etc/init.d", + + "-Dfdisk=false", + "-Ddbus=false", + "-Dutmp=false", + "-Dhibernate=false", + "-Dldconfig=false", + "-Dresolve=false", + "-Defi=false", + "-Dtpm=false", + "-Denvironment-d=false", + "-Dbinfmt=false", + "-Dcoredump=false", + "-Dlogind=false", + "-Dhostnamed=false", + "-Dlocaled=false", + "-Dmachined=false", + "-Dportabled=false", + "-Dnetworkd=false", + "-Dtimedated=false", + "-Dtimesyncd=false", + "-Dremote=false", + "-Dnss-myhostname=false", + "-Dnss-mymachines=false", + "-Dnss-resolve=false", + "-Dnss-systemd=false", + "-Dfirstboot=false", + "-Drandomseed=false", + "-Dbacklight=false", + "-Dvconsole=false", + "-Dquotacheck=false", + "-Dsysusers=false", + "-Dtmpfiles=false", + "-Dimportd=false", + "-Dhwdb=false", + "-Drfkill=false", + "-Dman=false", + "-Dhtml=false", + "-Dbashcompletiondir=no", + "-Dzshcompletiondir=no" + ], + "cleanup": [ + "/bin", "/etc", - "/libexec", - "/sbin", - "/lib/pkgconfig", - "/man", - "/share/aclocal", + "/lib/libudev*", + "/lib/kernel", + "/lib/modprobe.d", + "/lib/rpm", + "/lib/sysctl.d", + "/lib/systemd", + "/lib/udev", + "/share/dbus-1", "/share/doc", - "/share/gtk-doc", + "/share/factory", + "/share/glib-2.0", + "/share/icons", "/share/man", "/share/pkgconfig", - "*.la", - "*.a" + "/share/polkit-1", + "/share/runtime" ], - "sources" : [ + "sources": [ { - "type" : "git", - "url" : "https://github.com/gentoo/eudev.git" + "type": "git", + "url": "https://github.com/systemd/systemd.git", + "tag": "v251" } ] }, @@ -92,8 +157,7 @@ "name" : "gudev", "buildsystem" : "meson", "config-opts" : [ - "-Dtests=disabled", - "-Dintrospection=disabled" + "-Dtests=disabled" ], "sources" : [ { diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml index a2b5b20..2a50893 100644 --- a/build-aux/snap/snapcraft.yaml +++ b/build-aux/snap/snapcraft.yaml @@ -6,7 +6,7 @@ description: | grade: stable # must be 'stable' to release into candidate/stable channels confinement: strict -base: core20 +base: core22 slots: # for GtkApplication registration @@ -28,7 +28,7 @@ apps: - io-ports-control - raw-usb command: usr/bin/simple-scan - extensions: [ gnome-3-38 ] + extensions: [ gnome ] desktop: usr/share/applications/simple-scan.desktop environment: GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas @@ -81,7 +81,8 @@ parts: - libcolord-dev - libdbus-glib-1-dev - libglib2.0-dev - - libgtk-3-dev + - libgtk-4-dev + - libadwaita-1-dev - libgdk-pixbuf2.0-dev - libgusb-dev - libgirepository1.0-dev diff --git a/data/icons/scalable/actions/flip-before.svg b/data/icons/scalable/actions/flip-before.svg new file mode 100644 index 0000000..3fdb241 --- /dev/null +++ b/data/icons/scalable/actions/flip-before.svg @@ -0,0 +1,2 @@ + +image/svg+xml1234 \ No newline at end of file diff --git a/data/icons/scalable/actions/flip-even.svg b/data/icons/scalable/actions/flip-even.svg new file mode 100644 index 0000000..b8a97e6 --- /dev/null +++ b/data/icons/scalable/actions/flip-even.svg @@ -0,0 +1,2 @@ + +image/svg+xml1234 \ No newline at end of file diff --git a/data/icons/scalable/actions/flip-odd.svg b/data/icons/scalable/actions/flip-odd.svg new file mode 100644 index 0000000..5e335ce --- /dev/null +++ b/data/icons/scalable/actions/flip-odd.svg @@ -0,0 +1,2 @@ + +image/svg+xml1234 \ No newline at end of file diff --git a/data/icons/scalable/actions/interleave-after.svg b/data/icons/scalable/actions/interleave-after.svg new file mode 100644 index 0000000..cba0f3f --- /dev/null +++ b/data/icons/scalable/actions/interleave-after.svg @@ -0,0 +1,2 @@ + +image/svg+xml635241 \ No newline at end of file diff --git a/data/icons/scalable/actions/interleave-before.svg b/data/icons/scalable/actions/interleave-before.svg new file mode 100644 index 0000000..88d4ad8 --- /dev/null +++ b/data/icons/scalable/actions/interleave-before.svg @@ -0,0 +1,2 @@ + +image/svg+xml654321 \ No newline at end of file diff --git a/data/icons/scalable/actions/interleave-reverse-after.svg b/data/icons/scalable/actions/interleave-reverse-after.svg new file mode 100644 index 0000000..dfd3a40 --- /dev/null +++ b/data/icons/scalable/actions/interleave-reverse-after.svg @@ -0,0 +1,2 @@ + +image/svg+xml435261 \ No newline at end of file diff --git a/data/icons/scalable/actions/reverse-after.svg b/data/icons/scalable/actions/reverse-after.svg new file mode 100644 index 0000000..a3f7bd8 --- /dev/null +++ b/data/icons/scalable/actions/reverse-after.svg @@ -0,0 +1,2 @@ + +image/svg+xml123456 \ No newline at end of file diff --git a/data/icons/scalable/actions/reverse-before.svg b/data/icons/scalable/actions/reverse-before.svg new file mode 100644 index 0000000..f159483 --- /dev/null +++ b/data/icons/scalable/actions/reverse-before.svg @@ -0,0 +1,2 @@ + +image/svg+xml654321 \ No newline at end of file diff --git a/data/icons/scalable/actions/right-large-symbolic.svg b/data/icons/scalable/actions/right-large-symbolic.svg new file mode 100644 index 0000000..1b59d17 --- /dev/null +++ b/data/icons/scalable/actions/right-large-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/data/meson.build b/data/meson.build index cf6e4ae..fb8959b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -15,22 +15,43 @@ i18n.merge_file (input: 'simple-scan.desktop.in', po_dir: '../po', type: 'desktop') -i18n.merge_file (input: 'simple-scan.appdata.xml.in', - output: 'simple-scan.appdata.xml', +appdata_file = i18n.merge_file (input: 'org.gnome.SimpleScan.appdata.xml.in', + output: 'org.gnome.SimpleScan.appdata.xml', install: true, install_dir: join_paths (datadir, 'metainfo'), po_dir: '../po') +# Validate Appdata +appstreamcli = find_program('appstreamcli', required: false) +if appstreamcli.found() + test('validate-appdata', + appstreamcli, + args: ['validate', '--no-net', '--explain', appdata_file.full_path()], + depends: appdata_file) +endif + install_man ('simple-scan.1') resource_files = files([ 'icons/scalable/actions/scan-type-adf-symbolic.svg', 'icons/scalable/actions/scan-type-batch-symbolic.svg', 'icons/scalable/actions/crop-symbolic.svg', + 'icons/scalable/actions/right-large-symbolic.svg', + 'icons/scalable/actions/interleave-before.svg', + 'icons/scalable/actions/interleave-after.svg', + 'icons/scalable/actions/interleave-reverse-after.svg', + 'icons/scalable/actions/reverse-before.svg', + 'icons/scalable/actions/reverse-after.svg', + 'icons/scalable/actions/flip-before.svg', + 'icons/scalable/actions/flip-even.svg', + 'icons/scalable/actions/flip-odd.svg', 'ui/app-window.ui', 'ui/authorize-dialog.ui', + 'ui/drivers-dialog.ui', 'ui/help-overlay.ui', 'ui/preferences-dialog.ui', + 'ui/reorder-pages-item.ui', + 'ui/reorder-pages-dialog.ui', ]) resources = gnome.compile_resources ('resources', 'simple-scan.gresource.xml', dependencies: resource_files, diff --git a/data/org.gnome.SimpleScan.appdata.xml.in b/data/org.gnome.SimpleScan.appdata.xml.in new file mode 100644 index 0000000..18db3e8 --- /dev/null +++ b/data/org.gnome.SimpleScan.appdata.xml.in @@ -0,0 +1,171 @@ + + + org.gnome.SimpleScan + CC0-1.0 + GPL-3.0+ + Document Scanner + Make a digital copy of your photos and documents + +

+ A really easy way to scan both text and images. + You can crop out the bad parts of an image and rotate it if it is the wrong way round. + You can print your scans, export them to pdf, or save them in a range of image formats. +

+

+ This app uses the SANE framework to support most existing scanners. +

+ + + + https://gitlab.gnome.org/GNOME/simple-scan/raw/HEAD/data/screenshots/simple-scan-1.png + + + https://apps.gnome.org/SimpleScan/ + https://gitlab.gnome.org/GNOME/simple-scan/issues + https://www.gnome.org/donate/ + https://gitlab.gnome.org/GNOME/simple-scan + https://l10n.gnome.org/module/simple-scan/ + + The GNOME Project + + The GNOME Project + + + + +
    +
  • Switch to GTK4 and libadwaita
    • +
  • Implement redesign
    • +
  • Updated translations
    • +
+ + + + +
    +
  • Add shortcut for Preferences (Ctrl+comma: Opens the preferences window).
    • +
  • Add buttons to change orientation of even/odd pages - usecase for Reversing Automatic Document Feeder (RADF) scanners.
    • +
  • Fix image size after cropping.
    • +
  • Updated translations.
    • +
+ + + + +
    +
  • Updated translations.
    • +
+ + + + +
    +
  • Clarify project license.
    • +
  • Updated translations.
    • +
+ + + + +
    +
  • Skip virtual devices when detecting scanners.
    • +
  • Add support for postprocessing scripts.
    • +
  • Save Window state to user's .config folder instead of user's .cache folder.
    • +
  • Updates 'About' dialog to match with other GNOME apps.
    • +
  • Delete autosave records after creating new document [#278].
    • +
  • Fix replacing underscore with space.
    • +
  • Fix autosave of Page Side property [#273]
    • +
  • Add the device name to the label if there are several identical models.
    • +
  • Fix incorrect scan button tooltips.
    • +
  • Updated translations.
    • +
+ + + + +
    +
  • Add duplex scanning support for Canon DR-C240.
    • +
  • Add missing centered ADF source option from Brother driver.
    • +
  • Updated translations.
    • +
+ + + + +
    +
  • Fix automatic size detection on Brother scanners.
    • +
  • Updated translations.
    • +
+ + + + +

+ Updated translations. +

+ + + + +

+ Updated translations. +

+ + + + +

+ This is an unstable release in the 40 development series, + with the following changes: +

+
    +
  • Don't repeat vendor name in the device name
    • +
  • GNOME 40 consistency updates
    • +
  • Fix crop size after decreasing page size
    • +
  • UI fixes: change crop icon, improve layout of buttons
    • +
  • Add redetect button to device list
    • +
  • Add new resolution 200 DPI
    • +
  • Add zero second delay for Multiple Pages from FlatBed
    • +
  • Display an error, when no documents found in the feeder
    • +
  • Rename 'Start again' button to 'New document'
    • +
  • Fix crash on lexmark backend
    • +
+

This release also updates translations.

+ + + + +

+ Updated translations. +

+ + + + +

+ First stable release for GNOME 3.38, with the updated translations. +

+ + + + +

+ This is an unstable release in the 3.37 development series, + with the following improvements: +

+
    +
  • Display error message if simple-scan is unable to open simple-scan.log
    • +
  • Fix scanning on Epson devices, when Automatic Page Size is enabled
    • +
+

This release also updates translations.

+ + + + + + + + robert.ancell_AT_canonical.com + simple-scan + simple-scan.desktop + diff --git a/data/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in deleted file mode 100644 index 1f10b94..0000000 --- a/data/simple-scan.appdata.xml.in +++ /dev/null @@ -1,156 +0,0 @@ - - - simple-scan.desktop - CC0-1.0 - GPL-3.0+ - Document Scanner - Make a digital copy of your photos and documents - -

- A really easy way to scan both text and images. - You can crop out the bad parts of an image and rotate it if it is the wrong way round. - You can print your scans, export them to pdf, or save them in a range of image formats. -

-

- This app uses the SANE framework to support most existing scanners. -

- - - - https://gitlab.gnome.org/GNOME/simple-scan/raw/HEAD/data/screenshots/simple-scan-1.png - - - https://gitlab.gnome.org/GNOME/simple-scan - https://gitlab.gnome.org/GNOME/simple-scan/issues - https://www.gnome.org/friends/ - https://gitlab.gnome.org/GNOME/simple-scan - The GNOME Project - - - -
    -
  • Add shortcut for Preferences (Ctrl+comma: Opens the preferences window).
    • -
  • Add buttons to change orientation of even/odd pages - usecase for Reversing Automatic Document Feeder (RADF) scanners.
    • -
  • Fix image size after cropping.
    • -
  • Updated translations.
    • -
- - - - -
    -
  • Updated translations.
    • -
- - - - -
    -
  • Clarify project license.
    • -
  • Updated translations.
    • -
- - - - -
    -
  • Skip virtual devices when detecting scanners.
    • -
  • Add support for postprocessing scripts.
    • -
  • Save Window state to user's .config folder instead of user's .cache folder.
    • -
  • Updates 'About' dialog to match with other GNOME apps.
    • -
  • Delete autosave records after creating new document [#278].
    • -
  • Fix replacing underscore with space.
    • -
  • Fix autosave of Page Side property [#273]
    • -
  • Add the device name to the label if there are several identical models.
    • -
  • Fix incorrect scan button tooltips.
    • -
  • Updated translations.
    • -
- - - - -
    -
  • Add duplex scanning support for Canon DR-C240.
    • -
  • Add missing centered ADF source option from Brother driver.
    • -
  • Updated translations.
    • -
- - - - -
    -
  • Fix automatic size detection on Brother scanners.
    • -
  • Updated translations.
    • -
- - - - -

- Updated translations. -

- - - - -

- Updated translations. -

- - - - -

- This is an unstable release in the 40 development series, - with the following changes: -

-
    -
  • Don't repeat vendor name in the device name
    • -
  • GNOME 40 consistency updates
    • -
  • Fix crop size after decreasing page size
    • -
  • UI fixes: change crop icon, improve layout of buttons
    • -
  • Add redetect button to device list
    • -
  • Add new resolution 200 DPI
    • -
  • Add zero second delay for Multiple Pages from FlatBed
    • -
  • Display an error, when no documents found in the feeder
    • -
  • Rename 'Start again' button to 'New document'
    • -
  • Fix crash on lexmark backend
    • -
-

This release also updates translations.

- - - - -

- Updated translations. -

- - - - -

- First stable release for GNOME 3.38, with the updated translations. -

- - - - -

- This is an unstable release in the 3.37 development series, - with the following improvements: -

-
    -
  • Display error message if simple-scan is unable to open simple-scan.log
    • -
  • Fix scanning on Epson devices, when Automatic Page Size is enabled
    • -
-

This release also updates translations.

- - - - - - - - robert.ancell_AT_canonical.com - simple-scan - diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml index b913b39..77a207c 100644 --- a/data/simple-scan.gresource.xml +++ b/data/simple-scan.gresource.xml @@ -4,10 +4,25 @@ ui/app-window.ui ui/preferences-dialog.ui ui/authorize-dialog.ui + ui/drivers-dialog.ui + ui/reorder-pages-item.ui + ui/reorder-pages-dialog.ui ui/help-overlay.ui icons/scalable/actions/scan-type-adf-symbolic.svg icons/scalable/actions/scan-type-batch-symbolic.svg icons/scalable/actions/crop-symbolic.svg + icons/scalable/actions/right-large-symbolic.svg + + icons/scalable/actions/interleave-before.svg + icons/scalable/actions/interleave-after.svg + icons/scalable/actions/interleave-reverse-after.svg + + icons/scalable/actions/reverse-before.svg + icons/scalable/actions/reverse-after.svg + + icons/scalable/actions/flip-before.svg + icons/scalable/actions/flip-even.svg + icons/scalable/actions/flip-odd.svg diff --git a/data/ui/app-window.ui b/data/ui/app-window.ui index 744b8c2..05ac374 100644 --- a/data/ui/app-window.ui +++ b/data/ui/app-window.ui @@ -1,505 +1,186 @@ - - - - True - - - True - Rotate _Left - True - - - - - - - True - Rotate _Right - True - - - - - - - True - _Crop - True - - - True - - - True - _None - True - True - True - - - - - - True - A_4 - True - True - no_crop_menuitem - - - - - - True - A_5 - True - True - no_crop_menuitem - - - - - - True - True - True - no_crop_menuitem - - - - - - True - _Letter - True - True - no_crop_menuitem - - - - - - True - Le_gal - True - True - no_crop_menuitem - - - - - - True - 4×6 - True - True - no_crop_menuitem - - - - - - True - A_3 - True - True - no_crop_menuitem - - - - - - True - _Custom - True - True - no_crop_menuitem - - - - - - True - - - - - True - False - _Rotate Crop - True - - - - - - - - - - True - Move Left - - - - - - - True - Move Right - True - - - - - - - gtk-copy - True - False - True - True - - - - - - - gtk-delete - True - True - True - - - - - - - - - - - - - - - - - True - 12 - 12 - 12 - 12 - vertical - 6 - - - True - False - False - - - - True - 12 - 12 - 6 - 6 - 12 - - - True - scanner-symbolic - - - False - True - 0 - - - - - True - _Single Page - True - - - False - True - 1 - - - - - - - False - True - 0 - - - - - True - False - False - scan_single_radio - - - - True - 12 - 12 - 6 - 6 - 12 - - - True - scan-type-adf-symbolic - - - False - True - 0 - - - - - True - All Pages From _Feeder - True - - - False - True - 1 - - - - - - - False - True - 1 - - - - - True - False - False - scan_single_radio - - - - True - 12 - 12 - 6 - 6 - 12 - - - True - scan-type-batch-symbolic - - - False - True - 0 - - - - - True - _Multiple Pages From Flatbed - True - - - False - True - 1 - - - - - - - False - True - 2 - - - - - True - False - 12 - False - - - - True - 12 - 12 - 6 - 6 - 12 - - - True - x-office-document-symbolic - - - False - True - 0 - - - - - True - _Text - True - - - False - True - 1 - - - - - - - False - True - 3 - - - - - True - False - False - text_radio - - - - True - 12 - 12 - 6 - 6 - 12 - - - True - image-x-generic-symbolic - - - False - True - 0 - - - - - True - _Image - True - - - False - True - 1 - - - - - - - False - True - 4 - - - - - _Preferences - 40 - True - True - True - 12 - True - - - - False - True - 5 - - - - - -