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 --- 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 ++ 20 files changed, 877 insertions(+), 1080 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 (limited to 'data') 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 - - - - - -