Fixed scan_button sensitivity after a failure

at sane_start time, e.g. no documents. Formerly the button was left
inactive.
This bug already got on my nerves for quite some time now 8-).
merge-requests/2/head
Rene Rebe 2006-03-01 11:07:34 +00:00
rodzic 059076f5d8
commit 749cc8af23
2 zmienionych plików z 12 dodań i 0 usunięć

Wyświetl plik

@ -1,3 +1,10 @@
2006-03-01 Rene Rebe <rene@exactcode.de>
* src/xscanimage.c: Fixed scan_button sensitivity after a failure
at sane_start time, e.g. no documents. Formerly the button was left
inactive.
2006-01-18 Gerhard Jaeger <gerhard@gjaeger.de> 2006-01-18 Gerhard Jaeger <gerhard@gjaeger.de>
* src/xscanimage.c: Fixed bug reported by Johannes Meixner, see * src/xscanimage.c: Fixed bug reported by Johannes Meixner, see

Wyświetl plik

@ -4,6 +4,7 @@
Andreas Beck <becka@sunserver1.rz.uni-duesseldorf.de> Andreas Beck <becka@sunserver1.rz.uni-duesseldorf.de>
Tristan Tarrant <ttarrant@etnoteam.it> Tristan Tarrant <ttarrant@etnoteam.it>
David Mosberger-Tang <davidm@azstarnet.com> David Mosberger-Tang <davidm@azstarnet.com>
Rene Rebe <rene@exactcode.de>
Copyright (C) 1997, 1998 Andreas Beck, Tristan Tarrant, and David Copyright (C) 1997, 1998 Andreas Beck, Tristan Tarrant, and David
Mosberger Mosberger
@ -1092,6 +1093,7 @@ scan_start (void)
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
gsg_set_sensitivity (dialog, TRUE); gsg_set_sensitivity (dialog, TRUE);
gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
snprintf (buf, sizeof (buf), "Failed to start scanner: %s", snprintf (buf, sizeof (buf), "Failed to start scanner: %s",
sane_strstatus (status)); sane_strstatus (status));
gsg_error (buf); gsg_error (buf);
@ -1112,6 +1114,7 @@ scan_start (void)
if (scan_win.param.lines == -1) if (scan_win.param.lines == -1)
{ {
gsg_set_sensitivity (dialog, TRUE); gsg_set_sensitivity (dialog, TRUE);
gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
snprintf (buf, sizeof (buf), "Hand-Scanner mode not supported"); snprintf (buf, sizeof (buf), "Hand-Scanner mode not supported");
gsg_error (buf); gsg_error (buf);
scan_done (); scan_done ();
@ -1153,6 +1156,7 @@ scan_start (void)
if (scan_win.param.depth > 8) if (scan_win.param.depth > 8)
{ {
gsg_set_sensitivity (dialog, TRUE); gsg_set_sensitivity (dialog, TRUE);
gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
snprintf (buf, sizeof (buf), snprintf (buf, sizeof (buf),
"Separate channel transfers are not supported " "Separate channel transfers are not supported "
"with %d bits/channel.", scan_win.param.depth); "with %d bits/channel.", scan_win.param.depth);
@ -1197,6 +1201,7 @@ scan_start (void)
if (scan_win.param.depth > 8) if (scan_win.param.depth > 8)
{ {
gsg_set_sensitivity (dialog, TRUE); gsg_set_sensitivity (dialog, TRUE);
gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
snprintf (buf, sizeof (buf), "The Gimp doesn't support images " snprintf (buf, sizeof (buf), "The Gimp doesn't support images "
"with %d bits/channel.", scan_win.param.depth); "with %d bits/channel.", scan_win.param.depth);
gsg_error (buf); gsg_error (buf);