From fb2110257723e366a12cda3bf51f9b36fc70e8e9 Mon Sep 17 00:00:00 2001 From: Ordissimo Date: Thu, 5 Jun 2025 20:37:57 +0200 Subject: [PATCH] Add spinner dialog --- po/en.po | 122 +++++++++++++++---------------- po/en_GB.po | 144 +++++++++++++++++++------------------ po/fr.po | 145 +++++++++++++++++++------------------ src/xscanimage.c | 182 ++++++++++++++++++++++++++++++----------------- 4 files changed, 324 insertions(+), 269 deletions(-) diff --git a/po/en.po b/po/en.po index 245e786..b893421 100644 --- a/po/en.po +++ b/po/en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: sconfig\n" "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n" -"POT-Creation-Date: 2025-06-03 20:39-0700\n" +"POT-Creation-Date: 2025-06-05 20:15+0200\n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" msgid "Failed to set value of option %s: %s." msgstr "" -#: src/gtkglue.c:281 src/xscanimage.c:1635 src/xscanimage.c:2092 +#: src/gtkglue.c:281 src/xscanimage.c:1640 src/xscanimage.c:2097 msgid "OK" msgstr "" @@ -27,7 +27,7 @@ msgstr "" msgid "Ok" msgstr "" -#: src/gtkglue.c:312 src/xscanimage.c:1643 src/xscanimage.c:2101 +#: src/gtkglue.c:312 src/xscanimage.c:1648 src/xscanimage.c:2106 msgid "Cancel" msgstr "" @@ -49,200 +49,208 @@ msgstr "" msgid "Error obtaining option count." msgstr "" -#: src/xscanimage.c:325 src/xscanimage.c:371 +#: src/xscanimage.c:330 src/xscanimage.c:376 msgid "Front-end to the SANE interface" msgstr "" -#: src/xscanimage.c:326 src/xscanimage.c:372 +#: src/xscanimage.c:331 src/xscanimage.c:377 msgid "" "This function provides access to scanners and other image acquisition " "devices through the SANE (Scanner Access Now Easy) interface." msgstr "" -#: src/xscanimage.c:328 src/xscanimage.c:329 src/xscanimage.c:375 -#: src/xscanimage.c:376 +#: src/xscanimage.c:333 src/xscanimage.c:334 src/xscanimage.c:380 +#: src/xscanimage.c:381 msgid "Andy Beck, Tristan Tarrant, and David Mosberger" msgstr "" -#: src/xscanimage.c:330 src/xscanimage.c:377 +#: src/xscanimage.c:335 src/xscanimage.c:382 msgid "8th June 1997" msgstr "" -#: src/xscanimage.c:331 +#: src/xscanimage.c:336 msgid "/File/Acquire/xscanimage/Device dialog..." msgstr "" -#: src/xscanimage.c:332 src/xscanimage.c:377 +#: src/xscanimage.c:337 src/xscanimage.c:382 msgid "RGB, GRAY" msgstr "" -#: src/xscanimage.c:522 +#: src/xscanimage.c:527 #, c-format msgid "%dxunknown: unknown size" msgstr "" -#: src/xscanimage.c:546 +#: src/xscanimage.c:551 #, c-format msgid "Invalid parameters." msgstr "" -#: src/xscanimage.c:569 +#: src/xscanimage.c:574 #, c-format msgid "Failed to create file: %s." msgstr "" -#: src/xscanimage.c:825 +#: src/xscanimage.c:830 #, c-format msgid "Error during read: %s." msgstr "" -#: src/xscanimage.c:997 +#: src/xscanimage.c:1002 #, c-format msgid "%s.input_available: bad frame format %d\n" msgstr "" -#: src/xscanimage.c:1008 +#: src/xscanimage.c:1013 #, c-format msgid "Cannot handle depth %d." msgstr "" -#: src/xscanimage.c:1172 +#: src/xscanimage.c:1177 #, c-format msgid "Scanner is warming up." msgstr "" -#: src/xscanimage.c:1173 +#: src/xscanimage.c:1178 msgid "Warming up ..." msgstr "" -#: src/xscanimage.c:1198 +#: src/xscanimage.c:1203 #, c-format msgid "Failed to start scanner: %s" msgstr "" -#: src/xscanimage.c:1208 +#: src/xscanimage.c:1213 #, c-format msgid "Failed to get parameters: %s" msgstr "" -#: src/xscanimage.c:1219 +#: src/xscanimage.c:1224 #, c-format msgid "Hand-Scanner mode not supported" msgstr "" -#: src/xscanimage.c:1262 +#: src/xscanimage.c:1267 #, c-format msgid "Separate channel transfers are not supported with %d bits/channel." msgstr "" -#: src/xscanimage.c:1292 +#: src/xscanimage.c:1297 #, c-format msgid "Receiving %s data for `%s'..." msgstr "" -#: src/xscanimage.c:1306 +#: src/xscanimage.c:1311 #, c-format msgid "The Gimp doesn't support images with %d bits/channel." msgstr "" -#: src/xscanimage.c:1355 +#: src/xscanimage.c:1360 #, c-format msgid "Receiving %s data for GIMP..." msgstr "" -#: src/xscanimage.c:1473 +#: src/xscanimage.c:1478 msgid "Exit" msgstr "" -#: src/xscanimage.c:1577 +#: src/xscanimage.c:1582 msgid "preview options" msgstr "" -#: src/xscanimage.c:1603 +#: src/xscanimage.c:1608 msgid "Use private colormap" msgstr "" -#: src/xscanimage.c:1621 +#: src/xscanimage.c:1626 msgid "Gamma correction value" msgstr "" -#: src/xscanimage.c:1733 +#: src/xscanimage.c:1738 msgid "Show advanced options" msgstr "" -#: src/xscanimage.c:1743 +#: src/xscanimage.c:1748 msgid "Show tooltips" msgstr "" -#: src/xscanimage.c:1753 +#: src/xscanimage.c:1758 msgid "Show two column display" msgstr "" -#: src/xscanimage.c:1763 +#: src/xscanimage.c:1768 msgid "Length unit" msgstr "" -#: src/xscanimage.c:1769 +#: src/xscanimage.c:1774 msgid "millimeters" msgstr "" -#: src/xscanimage.c:1774 +#: src/xscanimage.c:1779 msgid "centimeters" msgstr "" -#: src/xscanimage.c:1779 +#: src/xscanimage.c:1784 msgid "inches" msgstr "" -#: src/xscanimage.c:1804 +#: src/xscanimage.c:1809 msgid "Preview options..." msgstr "" -#: src/xscanimage.c:1815 +#: src/xscanimage.c:1820 msgid "Save device settings" msgstr "" -#: src/xscanimage.c:1821 +#: src/xscanimage.c:1826 msgid "Restore device settings" msgstr "" -#: src/xscanimage.c:1892 src/xcam.c:1717 +#: src/xscanimage.c:1897 src/xcam.c:1717 msgid "File" msgstr "" -#: src/xscanimage.c:1899 src/xcam.c:1731 +#: src/xscanimage.c:1904 src/xcam.c:1731 msgid "Preferences" msgstr "" -#: src/xscanimage.c:1910 +#: src/xscanimage.c:1915 msgid "Output" msgstr "" -#: src/xscanimage.c:1920 +#: src/xscanimage.c:1925 msgid "Filename" msgstr "" -#: src/xscanimage.c:1931 +#: src/xscanimage.c:1936 msgid "Browse" msgstr "" -#: src/xscanimage.c:1981 +#: src/xscanimage.c:1986 msgid "0x0: 0KB" msgstr "" -#: src/xscanimage.c:1989 +#: src/xscanimage.c:1994 msgid "Scan" msgstr "" -#: src/xscanimage.c:1995 +#: src/xscanimage.c:2000 msgid "Preview Window" msgstr "" -#: src/xscanimage.c:2054 +#: src/xscanimage.c:2059 msgid "Select device" msgstr "" -#: src/xscanimage.c:2114 +#: src/xscanimage.c:2206 +msgid "Searching for scanners..." +msgstr "" + +#: src/xscanimage.c:2211 +msgid "Search for devices in progress..." +msgstr "" + +#: src/xscanimage.c:2228 #, c-format msgid "" "Usage: %s [OPTION]... [DEVICE]\n" @@ -254,25 +262,11 @@ msgid "" "-V, --version print version information\n" msgstr "" -#: src/xscanimage.c:2171 +#: src/xscanimage.c:2285 #, c-format msgid "%s: GIMP support missing.\n" msgstr "" -#: src/xscanimage.c:2246 -#, c-format -msgid "%s: device %d is unavailable.\n" -msgstr "" - -#: src/xscanimage.c:2271 -msgid "" -"No scanners were identified. If you were expecting something\n" -" different, check that the scanner is plugged in, turned on and\n" -" detected by sane-find-scanner (if appropriate). Please read\n" -" the documentation which came with this software (README, FAQ,\n" -" manpages).\n" -msgstr "" - #: src/xcam.c:1253 #, c-format msgid "Failed to start webcam: %s." diff --git a/po/en_GB.po b/po/en_GB.po index 39bbd49..93114ff 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: SANE frontends\n" "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n" -"POT-Creation-Date: 2025-06-03 20:39-0700\n" +"POT-Creation-Date: 2025-06-05 20:15+0200\n" "PO-Revision-Date: \n" "Last-Translator: Ralph Little \n" "Language-Team: \n" @@ -25,7 +25,7 @@ msgstr "Failed to determine home directory: %s." msgid "Failed to set value of option %s: %s." msgstr "Failed to set value of option %s: %s." -#: src/gtkglue.c:281 src/xscanimage.c:1635 src/xscanimage.c:2092 +#: src/gtkglue.c:281 src/xscanimage.c:1640 src/xscanimage.c:2097 msgid "OK" msgstr "OK" @@ -33,7 +33,7 @@ msgstr "OK" msgid "Ok" msgstr "Ok" -#: src/gtkglue.c:312 src/xscanimage.c:1643 src/xscanimage.c:2101 +#: src/gtkglue.c:312 src/xscanimage.c:1648 src/xscanimage.c:2106 msgid "Cancel" msgstr "Cancel" @@ -55,11 +55,11 @@ msgstr "Failed to open device `%s': %s." msgid "Error obtaining option count." msgstr "Error obtaining option count." -#: src/xscanimage.c:325 src/xscanimage.c:371 +#: src/xscanimage.c:330 src/xscanimage.c:376 msgid "Front-end to the SANE interface" msgstr "Front-end to the SANE interface" -#: src/xscanimage.c:326 src/xscanimage.c:372 +#: src/xscanimage.c:331 src/xscanimage.c:377 msgid "" "This function provides access to scanners and other image acquisition " "devices through the SANE (Scanner Access Now Easy) interface." @@ -67,190 +67,198 @@ msgstr "" "This function provides access to scanners and other image acquisition " "devices through the SANE (Scanner Access Now Easy) interface." -#: src/xscanimage.c:328 src/xscanimage.c:329 src/xscanimage.c:375 -#: src/xscanimage.c:376 +#: src/xscanimage.c:333 src/xscanimage.c:334 src/xscanimage.c:380 +#: src/xscanimage.c:381 msgid "Andy Beck, Tristan Tarrant, and David Mosberger" msgstr "Andy Beck, Tristan Tarrant, and David Mosberger" -#: src/xscanimage.c:330 src/xscanimage.c:377 +#: src/xscanimage.c:335 src/xscanimage.c:382 msgid "8th June 1997" msgstr "8th June 1997" -#: src/xscanimage.c:331 +#: src/xscanimage.c:336 msgid "/File/Acquire/xscanimage/Device dialog..." msgstr "/File/Acquire/xscanimage/Device dialog..." -#: src/xscanimage.c:332 src/xscanimage.c:377 +#: src/xscanimage.c:337 src/xscanimage.c:382 msgid "RGB, GRAY" msgstr "RGB, GRAY" -#: src/xscanimage.c:522 +#: src/xscanimage.c:527 #, c-format msgid "%dxunknown: unknown size" msgstr "%dxunknown: unknown size" -#: src/xscanimage.c:546 +#: src/xscanimage.c:551 #, c-format msgid "Invalid parameters." msgstr "Invalid parameters." -#: src/xscanimage.c:569 +#: src/xscanimage.c:574 #, c-format msgid "Failed to create file: %s." msgstr "Failed to create file: %s." -#: src/xscanimage.c:825 +#: src/xscanimage.c:830 #, c-format msgid "Error during read: %s." msgstr "Error during read: %s." -#: src/xscanimage.c:997 +#: src/xscanimage.c:1002 #, c-format msgid "%s.input_available: bad frame format %d\n" msgstr "%s.input_available: bad frame format %d\n" -#: src/xscanimage.c:1008 +#: src/xscanimage.c:1013 #, c-format msgid "Cannot handle depth %d." msgstr "Cannot handle depth %d." -#: src/xscanimage.c:1172 +#: src/xscanimage.c:1177 #, c-format msgid "Scanner is warming up." msgstr "Scanner is warming up." -#: src/xscanimage.c:1173 +#: src/xscanimage.c:1178 msgid "Warming up ..." msgstr "Warming up ..." -#: src/xscanimage.c:1198 +#: src/xscanimage.c:1203 #, c-format msgid "Failed to start scanner: %s" msgstr "Failed to start scanner: %s" -#: src/xscanimage.c:1208 +#: src/xscanimage.c:1213 #, c-format msgid "Failed to get parameters: %s" msgstr "Failed to get parameters: %s" -#: src/xscanimage.c:1219 +#: src/xscanimage.c:1224 #, c-format msgid "Hand-Scanner mode not supported" msgstr "Hand-Scanner mode not supported" -#: src/xscanimage.c:1262 +#: src/xscanimage.c:1267 #, c-format msgid "Separate channel transfers are not supported with %d bits/channel." msgstr "Separate channel transfers are not supported with %d bits/channel." -#: src/xscanimage.c:1292 +#: src/xscanimage.c:1297 #, c-format msgid "Receiving %s data for `%s'..." msgstr "Receiving %s data for `%s'..." -#: src/xscanimage.c:1306 +#: src/xscanimage.c:1311 #, c-format msgid "The Gimp doesn't support images with %d bits/channel." msgstr "The Gimp doesn't support images with %d bits/channel." -#: src/xscanimage.c:1355 +#: src/xscanimage.c:1360 #, c-format msgid "Receiving %s data for GIMP..." msgstr "Receiving %s data for GIMP..." -#: src/xscanimage.c:1473 +#: src/xscanimage.c:1478 msgid "Exit" msgstr "Exit" -#: src/xscanimage.c:1577 +#: src/xscanimage.c:1582 msgid "preview options" msgstr "preview options" -#: src/xscanimage.c:1603 +#: src/xscanimage.c:1608 msgid "Use private colormap" msgstr "Use private colourmap" -#: src/xscanimage.c:1621 +#: src/xscanimage.c:1626 msgid "Gamma correction value" msgstr "Gamma correction value" -#: src/xscanimage.c:1733 +#: src/xscanimage.c:1738 msgid "Show advanced options" msgstr "Show advanced options" -#: src/xscanimage.c:1743 +#: src/xscanimage.c:1748 msgid "Show tooltips" msgstr "Show tooltips" -#: src/xscanimage.c:1753 +#: src/xscanimage.c:1758 msgid "Show two column display" msgstr "Show two column display" -#: src/xscanimage.c:1763 +#: src/xscanimage.c:1768 msgid "Length unit" msgstr "Length unit" -#: src/xscanimage.c:1769 +#: src/xscanimage.c:1774 msgid "millimeters" msgstr "millimetres" -#: src/xscanimage.c:1774 +#: src/xscanimage.c:1779 msgid "centimeters" msgstr "centimetres" -#: src/xscanimage.c:1779 +#: src/xscanimage.c:1784 msgid "inches" msgstr "inches" -#: src/xscanimage.c:1804 +#: src/xscanimage.c:1809 msgid "Preview options..." msgstr "Preview options..." -#: src/xscanimage.c:1815 +#: src/xscanimage.c:1820 msgid "Save device settings" msgstr "Save device settings" -#: src/xscanimage.c:1821 +#: src/xscanimage.c:1826 msgid "Restore device settings" msgstr "Restore device settings" -#: src/xscanimage.c:1892 src/xcam.c:1717 +#: src/xscanimage.c:1897 src/xcam.c:1717 msgid "File" msgstr "File" -#: src/xscanimage.c:1899 src/xcam.c:1731 +#: src/xscanimage.c:1904 src/xcam.c:1731 msgid "Preferences" msgstr "Preferences" -#: src/xscanimage.c:1910 +#: src/xscanimage.c:1915 msgid "Output" msgstr "Output" -#: src/xscanimage.c:1920 +#: src/xscanimage.c:1925 msgid "Filename" msgstr "Filename" -#: src/xscanimage.c:1931 +#: src/xscanimage.c:1936 msgid "Browse" msgstr "Browse" -#: src/xscanimage.c:1981 +#: src/xscanimage.c:1986 msgid "0x0: 0KB" msgstr "0x0: 0KB" -#: src/xscanimage.c:1989 +#: src/xscanimage.c:1994 msgid "Scan" msgstr "Scan" -#: src/xscanimage.c:1995 +#: src/xscanimage.c:2000 msgid "Preview Window" msgstr "Preview Window" -#: src/xscanimage.c:2054 +#: src/xscanimage.c:2059 msgid "Select device" msgstr "Select device" -#: src/xscanimage.c:2114 +#: src/xscanimage.c:2206 +msgid "Searching for scanners..." +msgstr "Searching for scanners..." + +#: src/xscanimage.c:2211 +msgid "Search for devices in progress..." +msgstr "Search for devices in progress..." + +#: src/xscanimage.c:2228 #, c-format msgid "" "Usage: %s [OPTION]... [DEVICE]\n" @@ -269,30 +277,11 @@ msgstr "" "-h, --help display this help message and exit\n" "-V, --version print version information\n" -#: src/xscanimage.c:2171 +#: src/xscanimage.c:2285 #, c-format msgid "%s: GIMP support missing.\n" msgstr "%s: GIMP support missing.\n" -#: src/xscanimage.c:2246 -#, c-format -msgid "%s: device %d is unavailable.\n" -msgstr "%s: device %d is unavailable.\n" - -#: src/xscanimage.c:2271 -msgid "" -"No scanners were identified. If you were expecting something\n" -" different, check that the scanner is plugged in, turned on and\n" -" detected by sane-find-scanner (if appropriate). Please read\n" -" the documentation which came with this software (README, FAQ,\n" -" manpages).\n" -msgstr "" -"No scanners were identified. If you were expecting something\n" -" different, check that the scanner is plugged in, turned on and\n" -" detected by sane-find-scanner (if appropriate). Please read\n" -" the documentation which came with this software (README, FAQ,\n" -" manpages).\n" - #: src/xcam.c:1253 #, c-format msgid "Failed to start webcam: %s." @@ -664,6 +653,23 @@ msgid "" "List of available devices:" msgstr "" +#, c-format +#~ msgid "%s: device %d is unavailable.\n" +#~ msgstr "%s: device %d is unavailable.\n" + +#~ msgid "" +#~ "No scanners were identified. If you were expecting something\n" +#~ " different, check that the scanner is plugged in, turned on and\n" +#~ " detected by sane-find-scanner (if appropriate). Please read\n" +#~ " the documentation which came with this software (README, FAQ,\n" +#~ " manpages).\n" +#~ msgstr "" +#~ "No scanners were identified. If you were expecting something\n" +#~ " different, check that the scanner is plugged in, turned on and\n" +#~ " detected by sane-find-scanner (if appropriate). Please read\n" +#~ " the documentation which came with this software (README, FAQ,\n" +#~ " manpages).\n" + #, fuzzy, c-format #~| msgid "" #~| "Appareil :\n" diff --git a/po/fr.po b/po/fr.po index f121c7e..d1c9734 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sconfig-plugin-bluez\n" "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n" -"POT-Creation-Date: 2025-06-03 20:39-0700\n" +"POT-Creation-Date: 2025-06-05 20:15+0200\n" "PO-Revision-Date: 2021-07-20 13:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "Échec pour trouver le dossier home : %s." msgid "Failed to set value of option %s: %s." msgstr "Échec de la restauration de la valeur de l'option %s : %s." -#: src/gtkglue.c:281 src/xscanimage.c:1635 src/xscanimage.c:2092 +#: src/gtkglue.c:281 src/xscanimage.c:1640 src/xscanimage.c:2097 msgid "OK" msgstr "Ok" @@ -35,7 +35,7 @@ msgstr "Ok" msgid "Ok" msgstr "Ok" -#: src/gtkglue.c:312 src/xscanimage.c:1643 src/xscanimage.c:2101 +#: src/gtkglue.c:312 src/xscanimage.c:1648 src/xscanimage.c:2106 msgid "Cancel" msgstr "Annuler" @@ -57,202 +57,210 @@ msgstr "Échec de l'ouverture du periphérique %s : %s." msgid "Error obtaining option count." msgstr "" -#: src/xscanimage.c:325 src/xscanimage.c:371 +#: src/xscanimage.c:330 src/xscanimage.c:376 msgid "Front-end to the SANE interface" msgstr "Interface utilisateur pour l'interface SANE" -#: src/xscanimage.c:326 src/xscanimage.c:372 +#: src/xscanimage.c:331 src/xscanimage.c:377 msgid "" "This function provides access to scanners and other image acquisition " "devices through the SANE (Scanner Access Now Easy) interface." msgstr "" -#: src/xscanimage.c:328 src/xscanimage.c:329 src/xscanimage.c:375 -#: src/xscanimage.c:376 +#: src/xscanimage.c:333 src/xscanimage.c:334 src/xscanimage.c:380 +#: src/xscanimage.c:381 msgid "Andy Beck, Tristan Tarrant, and David Mosberger" msgstr "Andy Beck, Tristan Tarrant, et David Mosberger" -#: src/xscanimage.c:330 src/xscanimage.c:377 +#: src/xscanimage.c:335 src/xscanimage.c:382 msgid "8th June 1997" msgstr "8 juin 1997" -#: src/xscanimage.c:331 +#: src/xscanimage.c:336 msgid "/File/Acquire/xscanimage/Device dialog..." msgstr "" -#: src/xscanimage.c:332 src/xscanimage.c:377 +#: src/xscanimage.c:337 src/xscanimage.c:382 msgid "RGB, GRAY" msgstr "RVB, GRIS" -#: src/xscanimage.c:522 +#: src/xscanimage.c:527 #, c-format msgid "%dxunknown: unknown size" msgstr "" -#: src/xscanimage.c:546 +#: src/xscanimage.c:551 #, c-format msgid "Invalid parameters." msgstr "Paramètres invalides." -#: src/xscanimage.c:569 +#: src/xscanimage.c:574 #, c-format msgid "Failed to create file: %s." msgstr "Échec de la création du fichier : %s." -#: src/xscanimage.c:825 +#: src/xscanimage.c:830 #, c-format msgid "Error during read: %s." msgstr "Erreur lors de la lecture : %s." -#: src/xscanimage.c:997 +#: src/xscanimage.c:1002 #, c-format msgid "%s.input_available: bad frame format %d\n" msgstr "%s.input_available : format de trame incorrect %d\n" -#: src/xscanimage.c:1008 +#: src/xscanimage.c:1013 #, c-format msgid "Cannot handle depth %d." msgstr "Impossible de gérer une profondeur de %d." -#: src/xscanimage.c:1172 +#: src/xscanimage.c:1177 #, c-format msgid "Scanner is warming up." msgstr "Le scanner est en cours de préchauffage." -#: src/xscanimage.c:1173 +#: src/xscanimage.c:1178 msgid "Warming up ..." msgstr "Préchauffage en cours ..." -#: src/xscanimage.c:1198 +#: src/xscanimage.c:1203 #, c-format msgid "Failed to start scanner: %s" msgstr "Échec du démarrage du scanner : %s" -#: src/xscanimage.c:1208 +#: src/xscanimage.c:1213 #, c-format msgid "Failed to get parameters: %s" msgstr "Échec de l'obtention des paramètres : %s." -#: src/xscanimage.c:1219 +#: src/xscanimage.c:1224 #, c-format msgid "Hand-Scanner mode not supported" msgstr "Mode scanner manuel non pris en charge" -#: src/xscanimage.c:1262 +#: src/xscanimage.c:1267 #, c-format msgid "Separate channel transfers are not supported with %d bits/channel." msgstr "" "Les transferts de canaux séparés ne sont pas pris en charge avec %d bits par " "canal." -#: src/xscanimage.c:1292 +#: src/xscanimage.c:1297 #, c-format msgid "Receiving %s data for `%s'..." msgstr "Réception des données %s pour '%s'..." -#: src/xscanimage.c:1306 +#: src/xscanimage.c:1311 #, c-format msgid "The Gimp doesn't support images with %d bits/channel." msgstr "GIMP ne prend pas en charge les images avec %d bits par canal." -#: src/xscanimage.c:1355 +#: src/xscanimage.c:1360 #, c-format msgid "Receiving %s data for GIMP..." msgstr "Réception des données %s pour GIMP..." -#: src/xscanimage.c:1473 +#: src/xscanimage.c:1478 msgid "Exit" msgstr "Quitter" -#: src/xscanimage.c:1577 +#: src/xscanimage.c:1582 msgid "preview options" msgstr "options d'aperçu" -#: src/xscanimage.c:1603 +#: src/xscanimage.c:1608 msgid "Use private colormap" msgstr "Utiliser une palette de couleurs privée" -#: src/xscanimage.c:1621 +#: src/xscanimage.c:1626 msgid "Gamma correction value" msgstr "Valeur de correction gamma" -#: src/xscanimage.c:1733 +#: src/xscanimage.c:1738 msgid "Show advanced options" msgstr "Afficher les options avancées" -#: src/xscanimage.c:1743 +#: src/xscanimage.c:1748 msgid "Show tooltips" msgstr "Afficher les infobulles" -#: src/xscanimage.c:1753 +#: src/xscanimage.c:1758 msgid "Show two column display" msgstr "Afficher sur deux colonnes" -#: src/xscanimage.c:1763 +#: src/xscanimage.c:1768 msgid "Length unit" msgstr "Unité de longueur" -#: src/xscanimage.c:1769 +#: src/xscanimage.c:1774 msgid "millimeters" msgstr "millimètres" -#: src/xscanimage.c:1774 +#: src/xscanimage.c:1779 msgid "centimeters" msgstr "centimètres" -#: src/xscanimage.c:1779 +#: src/xscanimage.c:1784 msgid "inches" msgstr "pouces" -#: src/xscanimage.c:1804 +#: src/xscanimage.c:1809 msgid "Preview options..." msgstr "Options d'aperçu..." -#: src/xscanimage.c:1815 +#: src/xscanimage.c:1820 msgid "Save device settings" msgstr "Enregistrer les paramètres du périphérique" -#: src/xscanimage.c:1821 +#: src/xscanimage.c:1826 msgid "Restore device settings" msgstr "Restaurer les paramètres du périphérique" -#: src/xscanimage.c:1892 src/xcam.c:1717 +#: src/xscanimage.c:1897 src/xcam.c:1717 msgid "File" msgstr "Fichier" -#: src/xscanimage.c:1899 src/xcam.c:1731 +#: src/xscanimage.c:1904 src/xcam.c:1731 msgid "Preferences" msgstr "Préférences" -#: src/xscanimage.c:1910 +#: src/xscanimage.c:1915 msgid "Output" msgstr "Sortie" -#: src/xscanimage.c:1920 +#: src/xscanimage.c:1925 msgid "Filename" msgstr "Nom du fichier" -#: src/xscanimage.c:1931 +#: src/xscanimage.c:1936 msgid "Browse" msgstr "Parcourir" -#: src/xscanimage.c:1981 +#: src/xscanimage.c:1986 msgid "0x0: 0KB" msgstr "0x0: 0KB" -#: src/xscanimage.c:1989 +#: src/xscanimage.c:1994 msgid "Scan" msgstr "Numériser" -#: src/xscanimage.c:1995 +#: src/xscanimage.c:2000 msgid "Preview Window" msgstr "Fenêtre d'aperçu" -#: src/xscanimage.c:2054 +#: src/xscanimage.c:2059 msgid "Select device" msgstr "Sélectionner un périphérique" -#: src/xscanimage.c:2114 +#: src/xscanimage.c:2206 +msgid "Searching for scanners..." +msgstr "Recherche de scanners..." + +#: src/xscanimage.c:2211 +msgid "Search for devices in progress..." +msgstr "Recherche des périphériques en cours..." + +#: src/xscanimage.c:2228 #, c-format msgid "" "Usage: %s [OPTION]... [DEVICE]\n" @@ -271,30 +279,11 @@ msgstr "" "-h, --help afficher ce message d'aide et quitter\n" "-V, --version afficher les informations de version\n" -#: src/xscanimage.c:2171 +#: src/xscanimage.c:2285 #, c-format msgid "%s: GIMP support missing.\n" msgstr "%s: Support GIMP manquant.\n" -#: src/xscanimage.c:2246 -#, c-format -msgid "%s: device %d is unavailable.\n" -msgstr "%s : le périphérique %d est indisponible.\n" - -#: src/xscanimage.c:2271 -msgid "" -"No scanners were identified. If you were expecting something\n" -" different, check that the scanner is plugged in, turned on and\n" -" detected by sane-find-scanner (if appropriate). Please read\n" -" the documentation which came with this software (README, FAQ,\n" -" manpages).\n" -msgstr "" -"Aucun scanner n'a été détecté. Si vous vous attendiez à un résultat\n" -" différent, vérifiez que le scanner est branché, allumé et\n" -" détecté par sane-find-scanner (si applicable). Veuillez consulter\n" -" la documentation fournie avec ce logiciel (README, FAQ,\n" -" pages de manuel).\n" - #: src/xcam.c:1253 #, c-format msgid "Failed to start webcam: %s." @@ -656,3 +645,21 @@ msgid "" "\n" "List of available devices:" msgstr "" + +#, c-format +#~ msgid "%s: device %d is unavailable.\n" +#~ msgstr "%s : le périphérique %d est indisponible.\n" + +#~ msgid "" +#~ "No scanners were identified. If you were expecting something\n" +#~ " different, check that the scanner is plugged in, turned on and\n" +#~ " detected by sane-find-scanner (if appropriate). Please read\n" +#~ " the documentation which came with this software (README, FAQ,\n" +#~ " manpages).\n" +#~ msgstr "" +#~ "Aucun scanner n'a été détecté. Si vous vous attendiez à un résultat\n" +#~ " différent, vérifiez que le scanner est branché, allumé et\n" +#~ " détecté par sane-find-scanner (si applicable). Veuillez " +#~ "consulter\n" +#~ " la documentation fournie avec ce logiciel (README, FAQ,\n" +#~ " pages de manuel).\n" diff --git a/src/xscanimage.c b/src/xscanimage.c index 98d2289..cd0a73f 100644 --- a/src/xscanimage.c +++ b/src/xscanimage.c @@ -197,6 +197,11 @@ calc_little_endian (void) return FALSE; } +typedef struct { + GtkWidget *dialog; + GtkWidget *spinner; +} ScanUI; + #ifdef HAVE_LIBGIMP_GIMP_H static int @@ -2108,6 +2113,115 @@ choose_device (void) return 0; } +static gboolean on_scan_finished(gpointer data) { + ScanUI *ui = (ScanUI *)data; + char *defdevname; + + gtk_spinner_stop(GTK_SPINNER(ui->spinner)); + gtk_widget_destroy(ui->dialog); + g_free(ui); + + if ((defdevname = getenv ("SANE_DEFAULT_DEVICE")) != NULL) + { + int i; + for (i = 0; devlist[i] != 0; i++) + { + if (strcmp (devlist[i]->name, defdevname) == 0) + { + defdev = i; + break; + } + } + if (defdev < 0) + DBG (DBG_error, "default device is `%s' wasn't found by " + "sane_get_devices() \n", defdevname); + else + DBG (DBG_info, "default device is `%s'\n", defdevname); + } + for (ndevs = 0; devlist && devlist[ndevs]; ++ndevs); + + if (seldev >= 0) + { + if (seldev >= ndevs) + { + fprintf (stderr, "%s: device %d is unavailable.\n", + prog_name, seldev); + quit_xscanimage (); + } + device_dialog (); + if (!dialog) + quit_xscanimage (); + } + else + { + if (ndevs > 0) + { + seldev = 0; + if (ndevs == 1) + { + device_dialog (); + if (!dialog) + quit_xscanimage (); + } + else + choose_device (); + } + else + { + DBG (DBG_fatal, + "No scanners were identified. If you were expecting something\n" + " different, check that the scanner is plugged in, turned on and\n" + " detected by sane-find-scanner (if appropriate). Please read\n" + " the documentation which came with this software (README, FAQ,\n" + " manpages).\n"); + quit_xscanimage (); + } + } + return G_SOURCE_REMOVE; +} + +static gpointer scan_thread_func(gpointer data) { + SANE_Status status; + ScanUI *ui = (ScanUI *)data; + + status = sane_get_devices((const SANE_Device ***)&devlist, SANE_FALSE); + + // Appeler ici la suite du traitement si besoin + if (status != SANE_STATUS_GOOD) + { + DBG (DBG_fatal, "init: sane_get_devices failed: %s\n", + sane_strstatus (status)); + exit (1); + } + + // Retourner à l’UI + g_idle_add(on_scan_finished, ui); + return NULL; +} + +void show_scan_progress_and_start() { + ScanUI *ui = g_new0(ScanUI, 1); + + ui->dialog = gtk_dialog_new(); + gtk_window_set_title(GTK_WINDOW(ui->dialog), _("Searching for scanners...")); + gtk_window_set_modal(GTK_WINDOW(ui->dialog), TRUE); + + GtkWidget *content_area = gtk_dialog_get_content_area(GTK_DIALOG(ui->dialog)); + + GtkWidget *label = gtk_label_new(_("Search for devices in progress...")); + gtk_box_pack_start(GTK_BOX(content_area), label, FALSE, FALSE, 5); + + ui->spinner = gtk_spinner_new(); + gtk_box_pack_start(GTK_BOX(content_area), ui->spinner, FALSE, FALSE, 5); + + gtk_widget_show_all(ui->dialog); + gtk_spinner_start(GTK_SPINNER(ui->spinner)); + + gtk_spinner_start(GTK_SPINNER(ui->spinner)); + + g_thread_new("scan_thread", scan_thread_func, ui); +} + static void usage (void) { @@ -2197,34 +2311,7 @@ init (int argc, char **argv) if (seldev < 0) { - char *defdevname; - - status = sane_get_devices (&devlist, SANE_FALSE); - if (status != SANE_STATUS_GOOD) - { - DBG (DBG_fatal, "init: sane_get_devices failed: %s\n", - sane_strstatus (status)); - exit (1); - } - - if ((defdevname = getenv ("SANE_DEFAULT_DEVICE")) != NULL) - { - int i; - - for (i = 0; devlist[i] != 0; i++) - { - if (strcmp (devlist[i]->name, defdevname) == 0) - { - defdev = i; - break; - } - } - if (defdev < 0) - DBG (DBG_error, "default device is `%s' wasn't found by " - "sane_get_devices() \n", defdevname); - else - DBG (DBG_info, "default device is `%s'\n", defdevname); - } + show_scan_progress_and_start (); } DBG (DBG_debug, "init: finished\n"); } @@ -2237,45 +2324,6 @@ interface (int argc, char **argv) DBG (DBG_debug, "interface\n"); init (argc, argv); - for (ndevs = 0; devlist[ndevs]; ++ndevs); - - if (seldev >= 0) - { - if (seldev >= ndevs) - { - fprintf (stderr, _("%s: device %d is unavailable.\n"), - prog_name, seldev); - quit_xscanimage (); - } - device_dialog (); - if (!dialog) - quit_xscanimage (); - } - else - { - if (ndevs > 0) - { - seldev = 0; - if (ndevs == 1) - { - device_dialog (); - if (!dialog) - quit_xscanimage (); - } - else - choose_device (); - } - else - { - DBG (DBG_fatal, - _("No scanners were identified. If you were expecting something\n" - " different, check that the scanner is plugged in, turned on and\n" - " detected by sane-find-scanner (if appropriate). Please read\n" - " the documentation which came with this software (README, FAQ,\n" - " manpages).\n")); - quit_xscanimage (); - } - } gtk_quit_flag = 1; DBG (DBG_debug, "interface: now running gtk_main ()\n"); gtk_main ();