mirror
/
sane-project-frontends
kopia lustrzana https://gitlab.com/sane-project/frontends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Set sensitivity to false when scanning or previewing. This change fixes some 

problems that accour when preview ist started again while preview is running.
See bug #300220, #300219, and #300218.
33-incorporate-downstream-patches
Henning Geinitz 2004-04-02 19:23:31 +00:00
rodzic 5d73974220
commit 52b1cce372
3 zmienionych plików z 19 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
Changelog
Wyświetl plik

@ -1,3 +1,10 @@
2004-04-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
* src/preview.c src/xscanimage.c: Set sensitivity to false when
scanning or previewing. This change fixes some problems that
accour when preview ist started again while preview is running.
See bug #300220, #300219, and #300218.
2004-04-02 Julien BLACHE <jb@jblache.org>
* src/xscanimage.c: fix select_device_callback() to return 0, fixing
a minor yet annoying bug in the device chooser (radio buttons didn't

3
src/preview.c
Wyświetl plik

@ -842,6 +842,7 @@ scan_done (Preview *p)
gtk_widget_set_sensitive (p->cancel, FALSE);
gtk_widget_set_sensitive (p->preview, TRUE);
gsg_set_sensitivity (p->dialog, TRUE);
gtk_widget_set_sensitive (p->dialog->window->parent->parent->parent, TRUE);
}
static void
@ -855,6 +856,7 @@ scan_start (Preview *p)
gtk_widget_set_sensitive (p->cancel, TRUE);
gtk_widget_set_sensitive (p->preview, FALSE);
gsg_set_sensitivity (p->dialog, FALSE);
gtk_widget_set_sensitive (p->dialog->window->parent->parent->parent, FALSE);
/* clear old preview: */
memset (p->preview_row, 0xff, 3*p->preview_width);
@ -1420,6 +1422,7 @@ preview_scan (Preview *p)
int i;
SANE_Status status;
save_option (p, p->dialog->well_known.dpi,
&p->saved_dpi, &p->saved_dpi_valid);
for (i = 0; i < 4; ++i)

15
src/xscanimage.c
Wyświetl plik

@ -120,6 +120,7 @@ enum
static struct
{
GtkWidget *shell;
GtkWidget *menubar;
GtkWidget *hruler;
GtkWidget *vruler;
GtkWidget *info_label;
@ -972,6 +973,7 @@ scan_done (void)
if (scan_win.preview)
gtk_widget_set_sensitive (scan_win.preview->preview, TRUE);
gtk_widget_set_sensitive (scan_win.scan_button, TRUE);
gtk_widget_set_sensitive (scan_win.menubar, TRUE);
if (scan_win.input_tag >= 0)
{
@ -1045,6 +1047,7 @@ scan_start (void)
if (scan_win.preview)
gtk_widget_set_sensitive (scan_win.preview->preview, FALSE);
gtk_widget_set_sensitive (scan_win.scan_button, FALSE);
gtk_widget_set_sensitive (scan_win.menubar, FALSE);
#ifdef HAVE_LIBGIMP_GIMP_H
if (scan_win.mode == SANE_GIMP_EXTENSION && scan_win.tile)
@ -1715,7 +1718,7 @@ static void
device_dialog (void)
{
GtkWidget *vbox, *hbox, *button, *frame, *scrolled_window, *dialog_window, *label, *text;
GtkWidget *menubar, *menubar_item;
GtkWidget *menubar_item;
const gchar *devname;
DBG(DBG_debug, "device_dialog\n");
@ -1737,24 +1740,24 @@ device_dialog (void)
/* create the menubar */
menubar = gtk_menu_bar_new ();
gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0);
scan_win.menubar = gtk_menu_bar_new ();
gtk_box_pack_start (GTK_BOX (vbox), scan_win.menubar, FALSE, FALSE, 0);
/* "Files" submenu: */
menubar_item = gtk_menu_item_new_with_label ("File");
gtk_container_add (GTK_CONTAINER (menubar), menubar_item);
gtk_container_add (GTK_CONTAINER (scan_win.menubar), menubar_item);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_item),
files_build_menu ());
gtk_widget_show (menubar_item);
/* "Preferences" submenu: */
menubar_item = gtk_menu_item_new_with_label ("Preferences");
gtk_container_add (GTK_CONTAINER (menubar), menubar_item);
gtk_container_add (GTK_CONTAINER (scan_win.menubar), menubar_item);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_item),
pref_build_menu ());
gtk_widget_show (menubar_item);
gtk_widget_show (menubar);
gtk_widget_show (scan_win.menubar);
/* if we're running in standalone mode, provide a output filename box: */
if (scan_win.mode == STANDALONE)