diff options
Diffstat (limited to 'src/xsane-viewer.c')
| -rw-r--r-- | src/xsane-viewer.c | 1236 |
1 files changed, 936 insertions, 300 deletions
diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c index e9a8dd9..9fcae69 100644 --- a/src/xsane-viewer.c +++ b/src/xsane-viewer.c @@ -3,7 +3,7 @@ xsane-viewer.c Oliver Rauch <Oliver.Rauch@rauch-domain.de> - Copyright (C) 1998-2002 Oliver Rauch + Copyright (C) 1998-2005 Oliver Rauch This file is part of the XSANE package. This program is free software; you can redistribute it and/or modify @@ -23,7 +23,6 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ #include "xsane.h" -/* #include <sys/param.h> */ #include "xsane-back-gtk.h" #include "xsane-front-gtk.h" #include "xsane-preferences.h" @@ -41,11 +40,11 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ -static int xsane_viewer_zoom[] = {35, 50, 71, 100, 141, 200, 282, 400 }; -#define XSANE_VIEWER_ZOOM_ITEMS 8 +static int xsane_viewer_zoom[] = {9, 13, 18, 25, 35, 50, 71, 100, 141, 200, 282, 400 }; /* ---------------------------------------------------------------------------------------------------------------------- */ +static void xsane_viewer_set_sensitivity(Viewer *v, int sensitivity); static gint xsane_viewer_close_callback(GtkWidget *window, gpointer data); static void xsane_viewer_dialog_cancel(GtkWidget *window, gpointer data); static void xsane_viewer_save_callback(GtkWidget *window, gpointer data); @@ -62,10 +61,87 @@ static void xsane_viewer_rotate180_callback(GtkWidget *window, gpointer data); static void xsane_viewer_rotate270_callback(GtkWidget *window, gpointer data); static void xsane_viewer_mirror_x_callback(GtkWidget *window, gpointer data); static void xsane_viewer_mirror_y_callback(GtkWidget *window, gpointer data); -static GtkWidget *xsane_viewer_files_build_menu(Viewer *v); +static GtkWidget *xsane_viewer_file_build_menu(Viewer *v); +static GtkWidget *xsane_viewer_edit_build_menu(Viewer *v); static GtkWidget *xsane_viewer_filters_build_menu(Viewer *v); static int xsane_viewer_read_image(Viewer *v); -Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_filename); +Viewer *xsane_viewer_new(char *filename, int allow_reduction_to_lineart, char *output_filename, viewer_modification allow_modification); + +/* ---------------------------------------------------------------------------------------------------------------------- */ + +static void xsane_viewer_set_sensitivity(Viewer *v, int sensitivity) +{ + if (sensitivity) + { + v->block_actions = FALSE; + gtk_widget_set_sensitive(GTK_WIDGET(v->file_menu), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + + switch (v->allow_modification) + { + case VIEWER_NO_MODIFICATION: + gtk_widget_set_sensitive(GTK_WIDGET(v->save_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->ocr_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->clone_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_menu), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_menu), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_menu), FALSE); + + gtk_widget_set_sensitive(GTK_WIDGET(v->save), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->ocr), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->clone), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_button_box), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_button_box), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_button_box), FALSE); + break; + + case VIEWER_NO_NAME_AND_SIZE_MODIFICATION: + gtk_widget_set_sensitive(GTK_WIDGET(v->save_menu_item), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->ocr_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->clone_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_menu), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_menu), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_menu), FALSE); + + gtk_widget_set_sensitive(GTK_WIDGET(v->save), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->ocr), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->clone), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_button_box), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_button_box), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_button_box), FALSE); + break; + + case VIEWER_NO_NAME_MODIFICATION: + gtk_widget_set_sensitive(GTK_WIDGET(v->ocr_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->clone_menu_item), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->ocr), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->clone), FALSE); + /* fall through */ + + case VIEWER_FULL_MODIFICATION: + default: + gtk_widget_set_sensitive(GTK_WIDGET(v->save_menu_item), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_menu), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_menu), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_menu), TRUE); + + gtk_widget_set_sensitive(GTK_WIDGET(v->save), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_button_box), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_button_box), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_button_box), TRUE); + break; + } + } + else + { + v->block_actions = TRUE; + gtk_widget_set_sensitive(GTK_WIDGET(v->file_menu), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->edit_menu), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->filters_menu), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->geometry_menu), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + } +} /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -73,22 +149,41 @@ static gint xsane_viewer_close_callback(GtkWidget *widget, gpointer data) { Viewer *v, *list, **prev_list; + DBG(DBG_proc, "xsane_viewer_close_callback\n"); + v = (Viewer*) gtk_object_get_data(GTK_OBJECT(widget), "Viewer"); - DBG(DBG_proc, "xsane_viewer_close_callback\n"); + if (v->block_actions) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_close_callback: actions are blocked\n"); + return TRUE; + } if (!v->image_saved) { char buf[256]; snprintf(buf, sizeof(buf), WARN_VIEWER_IMAGE_NOT_SAVED); + xsane_viewer_set_sensitivity(v, FALSE); if (xsane_back_gtk_decision(ERR_HEADER_WARNING, (gchar **) warning_xpm, buf, BUTTON_DO_NOT_CLOSE, BUTTON_DISCARD_IMAGE, TRUE /* wait */)) { + xsane_viewer_set_sensitivity(v, TRUE); return TRUE; } } - remove(v->filename); + /* when no modification is allowed then we work with the original file */ + /* so we should not erase it */ + if (v->allow_modification != VIEWER_NO_MODIFICATION) + { + remove(v->filename); + } + + if (v->undo_filename) + { + remove(v->undo_filename); + } gtk_widget_destroy(v->top); @@ -109,6 +204,31 @@ static gint xsane_viewer_close_callback(GtkWidget *widget, gpointer data) list = list->next_viewer; } + if (v->active_dialog) + { + gtk_widget_destroy(v->active_dialog); + } + + if (v->filename) + { + free(v->filename); + } + + if (v->undo_filename) + { + free(v->undo_filename); + } + + if (v->output_filename) + { + free(v->output_filename); + } + + if (v->last_saved_filename) + { + free(v->last_saved_filename); + } + free(v); return TRUE; @@ -120,7 +240,8 @@ static void xsane_viewer_dialog_cancel(GtkWidget *window, gpointer data) { Viewer *v = (Viewer *) data; - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_set_sensitivity(v, TRUE); + v->active_dialog = NULL; } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -132,10 +253,20 @@ static void xsane_viewer_save_callback(GtkWidget *window, gpointer data) char *inputfilename; char windowname[256]; int output_format; + char *filetype = NULL; + int abort = 0; + char buf[256]; + + if (v->block_actions) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_save_callback: actions are blocked\n"); + return; + } DBG(DBG_proc, "xsane_viewer_save_callback\n"); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); if (v->output_filename) { @@ -143,37 +274,46 @@ static void xsane_viewer_save_callback(GtkWidget *window, gpointer data) } else { - int abort = 0; + strncpy(outputfilename, preferences.filename, sizeof(outputfilename)); + } - strcpy(outputfilename, preferences.filename); - + if (v->allow_modification == VIEWER_FULL_MODIFICATION) /* it is allowed to rename the image */ + { snprintf(windowname, sizeof(windowname), "%s %s %s", xsane.prog_name, WINDOW_VIEWER_OUTPUT_FILENAME, xsane.device_text); umask((mode_t) preferences.directory_umask); /* define new file permissions */ - abort = xsane_back_gtk_get_filename(windowname, outputfilename, sizeof(outputfilename), outputfilename, TRUE, TRUE, FALSE); + abort = xsane_back_gtk_get_filename(windowname, outputfilename, sizeof(outputfilename), outputfilename, &filetype, TRUE, TRUE, FALSE, TRUE); umask(XSANE_DEFAULT_UMASK); /* define new file permissions */ if (abort) { - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_set_sensitivity(v, TRUE); return; } } + if (v->output_filename) + { + free(v->output_filename); + } + + v->output_filename = strdup(outputfilename); + xsane_update_counter_in_filename(&v->output_filename, FALSE, 0, preferences.filename_counter_len); /* set correct counter length */ + if (preferences.overwrite_warning) /* test if filename already used */ { FILE *testfile; - testfile = fopen(outputfilename, "rb"); /* read binary (b for win32) */ + testfile = fopen(v->output_filename, "rb"); /* read binary (b for win32) */ if (testfile) /* filename used: skip */ { char buf[256]; fclose(testfile); - snprintf(buf, sizeof(buf), WARN_FILE_EXISTS, outputfilename); + snprintf(buf, sizeof(buf), WARN_FILE_EXISTS, v->output_filename); if (xsane_back_gtk_decision(ERR_HEADER_WARNING, (gchar **) warning_xpm, buf, BUTTON_OVERWRITE, BUTTON_CANCEL, TRUE /* wait */) == FALSE) { - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_set_sensitivity(v, TRUE); return; } } @@ -181,56 +321,41 @@ static void xsane_viewer_save_callback(GtkWidget *window, gpointer data) inputfilename = strdup(v->filename); - output_format = xsane_identify_output_format(outputfilename, 0); + output_format = xsane_identify_output_format(v->output_filename, filetype, 0); - if (v->reduce_to_lineart) /* reduce grayscale image to lineart before saving */ + if ((!v->allow_reduction_to_lineart) && (output_format == XSANE_PNM)) /* save PNM but do not reduce to lineart (if lineart) */ { - char dummyfilename[1024]; - - if (output_format != XSANE_PNM) + if (xsane_create_secure_file(v->output_filename)) /* remove possibly existing symbolic links for security */ { - xsane_back_gtk_make_path(sizeof(dummyfilename), dummyfilename, 0, 0, "xsane-viewer-", xsane.dev_name, ".ppm", XSANE_PATH_TMP); - } - else /* pbm: no further conversion, we save to destination filename */ - { - snprintf(dummyfilename, sizeof(dummyfilename), "%s", outputfilename); - if (xsane_create_secure_file(dummyfilename)) /* remove possibly existing symbolic links for security */ - { - char buf[256]; + char buf[256]; - snprintf(buf, sizeof(buf), "%s %s %s\n", ERR_DURING_SAVE, ERR_CREATE_SECURE_FILE, dummyfilename); - xsane_back_gtk_error(buf, TRUE); - return; /* error */ - } + snprintf(buf, sizeof(buf), "%s %s %s\n", ERR_DURING_SAVE, ERR_CREATE_SECURE_FILE, v->output_filename); + xsane_back_gtk_error(buf, TRUE); + xsane_viewer_set_sensitivity(v, TRUE); + return; /* error */ } - gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_PACKING_DATA); - gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); + snprintf(buf, sizeof(buf), "%s: %s", PROGRESS_SAVING_DATA, v->output_filename); + gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), buf); - /* the outputfile always is a temporary file, so we do not have to care about symlinks here */ - xsane_save_image_as_lineart(v->filename, dummyfilename, v->progress_bar, &v->cancel_save); - - free(inputfilename); - inputfilename = strdup(dummyfilename); + xsane_copy_file_by_name(v->output_filename, v->filename, v->progress_bar, &v->cancel_save); } - - - if ((!v->reduce_to_lineart) || (output_format != XSANE_PNM)) /* pbm already is saved above, otherwise save now */ + else { - gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_SAVING_DATA); - gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - - xsane_save_image_as(inputfilename, outputfilename, output_format, v->progress_bar, &v->cancel_save); - - gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); - gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); + xsane_save_image_as(v->output_filename, inputfilename, output_format, v->progress_bar, &v->cancel_save); } free(inputfilename); v->image_saved = TRUE; - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + v->last_saved_filename = strdup(v->output_filename); + snprintf(buf, sizeof(buf), "%s %s - %s", WINDOW_VIEWER, v->last_saved_filename, xsane.device_text); + gtk_window_set_title(GTK_WINDOW(v->top), buf); + + xsane_update_counter_in_filename(&v->output_filename, preferences.skip_existing_numbers, 1, preferences.filename_counter_len); + + xsane_viewer_set_sensitivity(v, TRUE); } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -241,15 +366,18 @@ static void xsane_viewer_ocr_callback(GtkWidget *window, gpointer data) char outputfilename[1024]; char *extensionptr; char windowname[256]; - char *arg[1000]; - int argnr; - pid_t pid; int abort = 0; - int i; + + if (v->block_actions) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_ocr_callback: actions are blocked\n"); + return; + } DBG(DBG_proc, "xsane_viewer_ocr_callback\n"); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); strncpy(outputfilename, preferences.filename, sizeof(outputfilename)-5); @@ -263,133 +391,153 @@ static void xsane_viewer_ocr_callback(GtkWidget *window, gpointer data) snprintf(windowname, sizeof(windowname), "%s %s %s", xsane.prog_name, WINDOW_OCR_OUTPUT_FILENAME, xsane.device_text); umask((mode_t) preferences.directory_umask); /* define new file permissions */ - abort = xsane_back_gtk_get_filename(windowname, outputfilename, sizeof(outputfilename), outputfilename, TRUE, TRUE, FALSE); + abort = xsane_back_gtk_get_filename(windowname, outputfilename, sizeof(outputfilename), outputfilename, NULL, TRUE, TRUE, FALSE, FALSE); umask(XSANE_DEFAULT_UMASK); /* define new file permissions */ if (abort) { - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_set_sensitivity(v, TRUE); return; } - argnr = xsane_parse_options(preferences.ocr_command, arg); + while (gtk_events_pending()) /* give gtk the chance to remove the file selection dialog */ + { + gtk_main_iteration(); + } - arg[argnr++] = strdup(preferences.ocr_inputfile_option); - arg[argnr++] = strdup(v->filename); + xsane_save_image_as_text(outputfilename, v->filename, v->progress_bar, &v->cancel_save); - arg[argnr++] = strdup(preferences.ocr_outputfile_option); - arg[argnr++] = strdup(outputfilename); + xsane_viewer_set_sensitivity(v, TRUE); +} - arg[argnr] = 0; +/* ---------------------------------------------------------------------------------------------------------------------- */ - pid = fork(); +static void xsane_viewer_clone_callback(GtkWidget *window, gpointer data) +{ + Viewer *v = (Viewer *) data; + char outfilename[256]; - if (pid == 0) /* new process */ + if (v->block_actions) /* actions blocked: return */ { - DBG(DBG_info, "trying to change user id fo new subprocess:\n"); - DBG(DBG_info, "old effective uid = %d\n", geteuid()); - setuid(getuid()); - DBG(DBG_info, "new effective uid = %d\n", geteuid()); - - execvp(arg[0], arg); /* does not return if successfully */ - DBG(DBG_error, "%s %s\n", ERR_FAILED_EXEC_OCR_CMD, preferences.ocr_command); - _exit(0); /* do not use exit() here! otherwise gtk gets in trouble */ + gdk_beep(); + DBG(DBG_info, "xsane_viewer_clone_callback: actions are blocked\n"); + return; } - for (i=0; i<argnr; i++) + DBG(DBG_proc, "xsane_viewer_clone_callback\n"); + + xsane_viewer_set_sensitivity(v, FALSE); + + xsane_back_gtk_make_path(sizeof(outfilename), outfilename, 0, 0, "xsane-viewer-", xsane.dev_name, ".ppm", XSANE_PATH_TMP); + gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_CLONING_DATA); + xsane_copy_file_by_name(outfilename, v->filename, v->progress_bar, &v->cancel_save); + + xsane_viewer_set_sensitivity(v, TRUE); + + if (v->last_saved_filename) { - free(arg[i]); + char buf[256]; + snprintf(buf, sizeof(buf), "%s%s", FILENAME_PREFIX_CLONE_OF, v->last_saved_filename); + xsane_viewer_new(outfilename, v->allow_reduction_to_lineart, buf, v->allow_modification); } - - while (pid) + else { - int status = 0; - pid_t pid_status = waitpid(pid, &status, WNOHANG); - - if (pid == pid_status) - { - pid = 0; /* ok, child process has terminated */ - } - - while (gtk_events_pending()) - { - gtk_main_iteration(); - } - } - - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_new(outfilename, v->allow_reduction_to_lineart, NULL, v->allow_modification); + } } /* ---------------------------------------------------------------------------------------------------------------------- */ -static void xsane_viewer_clone_callback(GtkWidget *window, gpointer data) +static void xsane_viewer_adjustment_float_changed(GtkAdjustment *adj_data, float *val) { - Viewer *v = (Viewer *) data; - FILE *outfile; - FILE *infile; - char outfilename[256]; - Image_info image_info; + *val = (float) adj_data->value; +} - DBG(DBG_proc, "xsane_viewer_clone_callback\n"); +/* ---------------------------------------------------------------------------------------------------------------------- */ - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); +static void xsane_viewer_adjustment_int_changed(GtkAdjustment *adj_data, int *val) +{ + *val = (int) adj_data->value; +} - infile = fopen(v->filename, "rb"); - if (!infile) - { - DBG(DBG_error, "could not load file %s\n", v->filename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); +/* ---------------------------------------------------------------------------------------------------------------------- */ - return; - } +static void xsane_viewer_button_changed(GtkWidget *button, int *val) +{ + *val = GTK_TOGGLE_BUTTON(button)->active; +} - xsane_read_pnm_header(infile, &image_info); +/* ---------------------------------------------------------------------------------------------------------------------- */ - DBG(DBG_info, "cloning image %s with geometry: %d x %d x %d, %d colors\n", v->filename, image_info.image_width, image_info.image_height, image_info.depth, image_info.colors); +static void xsane_viewer_scale_set_scale_value_and_adjustments(GtkAdjustment *adj_data, double *scale_val) +{ + GtkAdjustment *adj; + int image_width, image_height; - xsane_back_gtk_make_path(sizeof(outfilename), outfilename, 0, 0, "xsane-viewer-", xsane.dev_name, ".ppm", XSANE_PATH_TMP); + *scale_val = adj_data->value; - outfile = fopen(outfilename, "wb"); - if (!outfile) + image_width = (int) gtk_object_get_data(GTK_OBJECT(adj_data), "image_width"); + image_height = (int) gtk_object_get_data(GTK_OBJECT(adj_data), "image_height"); + + adj = (GtkAdjustment*) gtk_object_get_data(GTK_OBJECT(adj_data), "size-x-adjustment"); + if ((adj) && (image_width)) { - DBG(DBG_error, "could not save file %s\n", outfilename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + gtk_adjustment_set_value(adj, (*scale_val) * image_width); + } - return; + adj = (GtkAdjustment*) gtk_object_get_data(GTK_OBJECT(adj_data), "size-y-adjustment"); + if ((adj) && (image_height)) + { + gtk_adjustment_set_value(adj, (*scale_val) * image_height); } +} - gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), PROGRESS_CLONING_DATA); - gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); +/* ---------------------------------------------------------------------------------------------------------------------- */ - xsane_save_rotate_image(outfile, infile, &image_info, 0, v->progress_bar, &v->cancel_save); +static void xsane_viewer_scale_set_size_x_value_and_adjustments(GtkAdjustment *adj_data, double *scale_val) +{ + GtkAdjustment *adj; + int image_width, image_height; - fclose(infile); - fclose(outfile); + image_width = (int) gtk_object_get_data(GTK_OBJECT(adj_data), "image_width"); + image_height = (int) gtk_object_get_data(GTK_OBJECT(adj_data), "image_height"); - gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); - gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); + if (!image_width) + { + return; /* we are not able to calulate the scale value */ + } - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + *scale_val = adj_data->value / image_width; - xsane_viewer_new(outfilename, v->reduce_to_lineart, NULL); + adj = (GtkAdjustment*) gtk_object_get_data(GTK_OBJECT(adj_data), "scale-adjustment"); + if (adj) + { + gtk_adjustment_set_value(adj, *scale_val); + } } /* ---------------------------------------------------------------------------------------------------------------------- */ -static void xsane_viewer_spinbutton_float_changed(GtkWidget *spinbutton, gpointer data) +static void xsane_viewer_scale_set_size_y_value_and_adjustments(GtkAdjustment *adj_data, double *scale_val) { - float *val = (float *) data; + GtkAdjustment *adj; + int image_width, image_height; - *val = gtk_spin_button_get_value_as_float((GtkSpinButton *) spinbutton); -} + image_width = (int) gtk_object_get_data(GTK_OBJECT(adj_data), "image_width"); + image_height = (int) gtk_object_get_data(GTK_OBJECT(adj_data), "image_height"); -/* ---------------------------------------------------------------------------------------------------------------------- */ + if (!image_height) + { + return; /* we are not able to calulate the scale value */ + } -static void xsane_viewer_spinbutton_int_changed(GtkWidget *spinbutton, gpointer data) -{ - int *val = (int *) data; + *scale_val = adj_data->value / image_height; - *val = gtk_spin_button_get_value_as_int((GtkSpinButton *) spinbutton); + adj = (GtkAdjustment*) gtk_object_get_data(GTK_OBJECT(adj_data), "scale-adjustment"); + if (adj) + { + gtk_adjustment_set_value(adj, *scale_val); + } } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -398,14 +546,44 @@ static void xsane_viewer_scale_callback(GtkWidget *window, gpointer data) { Viewer *v = (Viewer *) data; GtkWidget *selection_dialog; + GtkWidget *frame; GtkWidget *hbox, *vbox; - GtkWidget *label, *spinbutton, *button; - GtkAdjustment *adjustment; + GtkWidget *button; + GtkObject *scale_widget, *scalex_widget, *scaley_widget; + GtkAdjustment *adjustment_size_x; + GtkAdjustment *adjustment_size_y; + GtkWidget *spinbutton; + GdkPixmap *pixmap; + GdkBitmap *mask; + GtkWidget *pixmapwidget; char buf[256]; + FILE *infile; + Image_info image_info; + + if (v->block_actions == TRUE) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_scale_callback: actions are blocked\n"); + return; + } DBG(DBG_proc, "xsane_viewer_scale_callback\n"); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); + v->block_actions = 2; /* do not set it to TRUE because we have to recall this dialog! */ + + infile = fopen(v->filename, "rb"); + if (!infile) + { + DBG(DBG_error, "could not load file %s\n", v->filename); + xsane_viewer_set_sensitivity(v, TRUE); + return; + } + + xsane_read_pnm_header(infile, &image_info); + + fclose(infile); + if (v->output_filename) { @@ -416,65 +594,187 @@ static void xsane_viewer_scale_callback(GtkWidget *window, gpointer data) snprintf(buf, sizeof(buf), WINDOW_SCALE); } - selection_dialog = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_position(GTK_WINDOW(selection_dialog), GTK_WIN_POS_MOUSE); - gtk_window_set_title(GTK_WINDOW(selection_dialog), buf); - xsane_set_window_icon(selection_dialog, 0); + if (v->active_dialog) /* use active dialog */ + { + selection_dialog = v->active_dialog; + gtk_container_foreach(GTK_CONTAINER(selection_dialog), (GtkCallback) gtk_widget_destroy, NULL); + if (!v->bind_scale) + { + v->y_scale_factor = v->x_scale_factor; + } + } + else /* first time the dialog is opened */ + { + selection_dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_resizable(GTK_WINDOW(selection_dialog), FALSE); + gtk_window_set_position(GTK_WINDOW(selection_dialog), GTK_WIN_POS_MOUSE); + gtk_window_set_title(GTK_WINDOW(selection_dialog), buf); + xsane_set_window_icon(selection_dialog, 0); + g_signal_connect(GTK_OBJECT(selection_dialog), "destroy", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); + + v->active_dialog = selection_dialog; + v->x_scale_factor = 1.0; + v->y_scale_factor = 1.0; + v->bind_scale = TRUE; + } - v->active_dialog = selection_dialog; + frame = gtk_frame_new(0); + gtk_container_set_border_width(GTK_CONTAINER(frame), 4); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(selection_dialog), frame); + gtk_widget_show(frame); vbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(selection_dialog), vbox); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); + gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); -#if 0 /* bind scale */ - button = gtk_check_button_new_with_label(BUTTON_SCALE_BIND); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 5); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), v->bind_scale); + g_signal_connect(GTK_OBJECT(button), "toggled", (GtkSignalFunc) xsane_viewer_button_changed, (void *) &v->bind_scale); + g_signal_connect_after(GTK_OBJECT(button), "toggled", (GtkSignalFunc) xsane_viewer_scale_callback, (void *) v); gtk_widget_show(button); -#endif - - /* x_scale factor: <-> */ - - v->x_scale_factor = 1.0; - hbox = gtk_hbox_new(FALSE, 2); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - gtk_widget_show(hbox); - - label = gtk_label_new(TEXT_X_SCALE_FACTOR); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10); - gtk_widget_show(label); - - adjustment = (GtkAdjustment *) gtk_adjustment_new(1.0, 0.01, 2.0, 0.01, 0.1, 0.0); - spinbutton = gtk_spin_button_new(adjustment, 0, 2); - gtk_signal_connect(GTK_OBJECT(spinbutton), "changed", (GtkSignalFunc) xsane_viewer_spinbutton_float_changed, (void *) &v->x_scale_factor); - gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), TRUE); - gtk_spin_button_set_shadow_type(GTK_SPIN_BUTTON(spinbutton), GTK_SHADOW_OUT); - gtk_box_pack_end(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 10); - gtk_widget_show(spinbutton); - - /* y_scale factor: <-> */ - - v->y_scale_factor = 1.0; - - hbox = gtk_hbox_new(FALSE, 2); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - gtk_widget_show(hbox); - - label = gtk_label_new(TEXT_Y_SCALE_FACTOR); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10); - gtk_widget_show(label); - - adjustment = (GtkAdjustment *) gtk_adjustment_new(1.0, 0.01, 2.0, 0.01, 0.1, 0.0); - spinbutton = gtk_spin_button_new(adjustment, 0, 2); - gtk_signal_connect(GTK_OBJECT(spinbutton), "changed", (GtkSignalFunc) xsane_viewer_spinbutton_float_changed, (void *) &v->y_scale_factor); - gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), TRUE); - gtk_spin_button_set_shadow_type(GTK_SPIN_BUTTON(spinbutton), GTK_SHADOW_OUT); - gtk_box_pack_end(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 10); - gtk_widget_show(spinbutton); + if (v->bind_scale) + { + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2); + gtk_widget_show(hbox); + + /* scale factor: <-> */ + xsane_range_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(hbox), zoom_xpm, + DESC_SCALE_FACTOR, + 0.01, 4.0, 0.01, 0.1, 2, &v->x_scale_factor, &scale_widget, + 0, xsane_viewer_scale_set_scale_value_and_adjustments, + TRUE); + + /* x-size */ + pixmap = gdk_pixmap_create_from_xpm_d(selection_dialog->window, &mask, xsane.bg_trans, (gchar **) size_x_xpm); + pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask); + gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 20); + gtk_widget_show(pixmapwidget); + gdk_drawable_unref(pixmap); + + adjustment_size_x = (GtkAdjustment *) gtk_adjustment_new(v->x_scale_factor * image_info.image_width , 0.01 * image_info.image_width, 4.0 * image_info.image_width, 1.0, 5.0, 0.0); + spinbutton = gtk_spin_button_new(adjustment_size_x, 0, 0); + g_signal_connect(GTK_OBJECT(adjustment_size_x), "value_changed", (GtkSignalFunc) xsane_viewer_scale_set_size_x_value_and_adjustments, (void *) &v->x_scale_factor); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), FALSE); + gtk_widget_set_size_request(spinbutton, 80, -1); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show(spinbutton); + xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, DESC_SCALE_WIDTH); + + /* y-size */ + pixmap = gdk_pixmap_create_from_xpm_d(selection_dialog->window, &mask, xsane.bg_trans, (gchar **) size_y_xpm); + pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask); + gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 20); + gtk_widget_show(pixmapwidget); + gdk_drawable_unref(pixmap); + + adjustment_size_y = (GtkAdjustment *) gtk_adjustment_new(v->x_scale_factor * image_info.image_height , 0.01 * image_info.image_height, 4.0 * image_info.image_height, 1.0, 5.0, 0.0); + spinbutton = gtk_spin_button_new(adjustment_size_y, 0, 0); + g_signal_connect(GTK_OBJECT(adjustment_size_y), "value_changed", (GtkSignalFunc) xsane_viewer_scale_set_size_y_value_and_adjustments, (void *) &v->x_scale_factor); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), FALSE); + gtk_widget_set_size_request(spinbutton, 80, -1); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show(spinbutton); + xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, DESC_SCALE_HEIGHT); + + gtk_object_set_data(GTK_OBJECT(scale_widget), "size-x-adjustment", (void *) adjustment_size_x); + gtk_object_set_data(GTK_OBJECT(scale_widget), "size-y-adjustment", (void *) adjustment_size_y); + gtk_object_set_data(GTK_OBJECT(scale_widget), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(scale_widget), "image_height", (void *) image_info.image_height); + + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "scale-adjustment", (void *) scale_widget); + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "size-y-adjustment", (void *) adjustment_size_y); + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "image_height", (void *) image_info.image_height); + + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "scale-adjustment", (void *) scale_widget); + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "size-x-adjustment", (void *) adjustment_size_x); + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "image_height", (void *) image_info.image_height); + } + else + { + /* X */ + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2); + gtk_widget_show(hbox); + + /* x_scale factor: <-> */ + xsane_range_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(hbox), zoom_x_xpm, + DESC_X_SCALE_FACTOR, + 0.01, 4.0, 0.01, 0.1, 2, &v->x_scale_factor, &scalex_widget, + 0, xsane_viewer_scale_set_scale_value_and_adjustments, + TRUE); + + /* x-size */ + pixmap = gdk_pixmap_create_from_xpm_d(selection_dialog->window, &mask, xsane.bg_trans, (gchar **) size_x_xpm); + pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask); + gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 20); + gtk_widget_show(pixmapwidget); + gdk_drawable_unref(pixmap); + + adjustment_size_x = (GtkAdjustment *) gtk_adjustment_new(v->x_scale_factor * image_info.image_width , 0.01 * image_info.image_width, 4.0 * image_info.image_width, 1.0, 5.0, 0.0); + spinbutton = gtk_spin_button_new(adjustment_size_x, 0, 0); + g_signal_connect(GTK_OBJECT(adjustment_size_x), "value_changed", (GtkSignalFunc) xsane_viewer_scale_set_size_x_value_and_adjustments, (void *) &v->x_scale_factor); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), FALSE); + gtk_widget_set_size_request(spinbutton, 80, -1); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show(spinbutton); + xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, DESC_SCALE_WIDTH); + + gtk_object_set_data(GTK_OBJECT(scalex_widget), "size-x-adjustment", (void *) adjustment_size_x); + gtk_object_set_data(GTK_OBJECT(scalex_widget), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(scalex_widget), "image_height", (void *) image_info.image_height); + + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "scale-adjustment", (void *) scalex_widget); + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(adjustment_size_x), "image_height", (void *) image_info.image_height); + + + /* Y */ + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2); + gtk_widget_show(hbox); + + /* y_scale factor: <-> */ + xsane_range_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(hbox), zoom_y_xpm, + DESC_Y_SCALE_FACTOR, + 0.01, 4.0, 0.01, 0.1, 2, &v->y_scale_factor, &scaley_widget, + 0, xsane_viewer_scale_set_scale_value_and_adjustments, + TRUE); + + /* y-size */ + pixmap = gdk_pixmap_create_from_xpm_d(selection_dialog->window, &mask, xsane.bg_trans, (gchar **) size_y_xpm); + pixmapwidget = gtk_image_new_from_pixmap(pixmap, mask); + gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 20); + gtk_widget_show(pixmapwidget); + gdk_drawable_unref(pixmap); + + adjustment_size_y = (GtkAdjustment *) gtk_adjustment_new(v->y_scale_factor * image_info.image_height , 0.01 * image_info.image_height, 4.0 * image_info.image_height, 1.0, 5.0, 0.0); + spinbutton = gtk_spin_button_new(adjustment_size_y, 0, 0); + g_signal_connect(GTK_OBJECT(adjustment_size_y), "value_changed", (GtkSignalFunc) xsane_viewer_scale_set_size_y_value_and_adjustments, (void *) &v->y_scale_factor); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), FALSE); + gtk_widget_set_size_request(spinbutton, 80, -1); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show(spinbutton); + xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, DESC_SCALE_HEIGHT); + + gtk_object_set_data(GTK_OBJECT(scaley_widget), "size-y-adjustment", (void *) adjustment_size_y); + gtk_object_set_data(GTK_OBJECT(scaley_widget), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(scaley_widget), "image_height", (void *) image_info.image_height); + + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "scale-adjustment", (void *) scaley_widget); + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "image_width", (void *) image_info.image_width); + gtk_object_set_data(GTK_OBJECT(adjustment_size_y), "image_height", (void *) image_info.image_height); + } /* Apply Cancel */ @@ -485,15 +785,16 @@ static void xsane_viewer_scale_callback(GtkWidget *window, gpointer data) button = gtk_button_new_with_label(BUTTON_APPLY); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_scale_image, (void *) v); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); + g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_scale_image, (void *) v); + g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); + gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_grab_default(button); gtk_widget_show(button); button = gtk_button_new_with_label(BUTTON_CANCEL); - gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); + g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); + g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_show(button); @@ -506,14 +807,22 @@ static void xsane_viewer_despeckle_callback(GtkWidget *window, gpointer data) { Viewer *v = (Viewer *) data; GtkWidget *selection_dialog; + GtkWidget *frame; GtkWidget *hbox, *vbox; GtkWidget *label, *spinbutton, *button; GtkAdjustment *adjustment; char buf[256]; + if (v->block_actions) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_despeckle_callback: actions are blocked\n"); + return; + } + DBG(DBG_proc, "xsane_viewer_despeckle_callback\n"); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); if (v->output_filename) { @@ -524,20 +833,28 @@ static void xsane_viewer_despeckle_callback(GtkWidget *window, gpointer data) snprintf(buf, sizeof(buf), WINDOW_DESPECKLE); } - selection_dialog = gtk_window_new(GTK_WINDOW_DIALOG); + selection_dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_position(GTK_WINDOW(selection_dialog), GTK_WIN_POS_MOUSE); gtk_window_set_title(GTK_WINDOW(selection_dialog), buf); xsane_set_window_icon(selection_dialog, 0); + g_signal_connect(GTK_OBJECT(selection_dialog), "destroy", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); v->active_dialog = selection_dialog; + frame = gtk_frame_new(0); + gtk_container_set_border_width(GTK_CONTAINER(frame), 4); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(selection_dialog), frame); + gtk_widget_show(frame); + vbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(selection_dialog), vbox); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); + gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); /* Despeckle radius: <-> */ - v->filter_radius = 2; + v->despeckle_radius = 2; hbox = gtk_hbox_new(FALSE, 2); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); @@ -549,9 +866,8 @@ static void xsane_viewer_despeckle_callback(GtkWidget *window, gpointer data) adjustment = (GtkAdjustment *) gtk_adjustment_new(2.0, 2.0, 10.0, 1.0, 5.0, 0.0); spinbutton = gtk_spin_button_new(adjustment, 0, 0); - gtk_signal_connect(GTK_OBJECT(spinbutton), "changed", (GtkSignalFunc) xsane_viewer_spinbutton_int_changed, (void *) &v->filter_radius); + g_signal_connect(GTK_OBJECT(adjustment), "value_changed", (GtkSignalFunc) xsane_viewer_adjustment_int_changed, (void *) &v->despeckle_radius); gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), TRUE); - gtk_spin_button_set_shadow_type(GTK_SPIN_BUTTON(spinbutton), GTK_SHADOW_OUT); gtk_box_pack_end(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 10); gtk_widget_show(spinbutton); @@ -564,15 +880,15 @@ static void xsane_viewer_despeckle_callback(GtkWidget *window, gpointer data) button = gtk_button_new_with_label(BUTTON_APPLY); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_despeckle_image, (void *) v); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); + g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_despeckle_image, (void *) v); + g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_grab_default(button); gtk_widget_show(button); button = gtk_button_new_with_label(BUTTON_CANCEL); - gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); + g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); + g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_show(button); @@ -585,14 +901,22 @@ static void xsane_viewer_blur_callback(GtkWidget *window, gpointer data) { Viewer *v = (Viewer *) data; GtkWidget *selection_dialog; + GtkWidget *frame; GtkWidget *hbox, *vbox; GtkWidget *label, *spinbutton, *button; GtkAdjustment *adjustment; char buf[256]; + if (v->block_actions) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_blur_callback: actions are blocked\n"); + return; + } + DBG(DBG_proc, "xsane_viewer_blur_callback\n"); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); if (v->output_filename) { @@ -603,21 +927,29 @@ static void xsane_viewer_blur_callback(GtkWidget *window, gpointer data) snprintf(buf, sizeof(buf), WINDOW_BLUR); } - selection_dialog = gtk_window_new(GTK_WINDOW_DIALOG); + selection_dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_position(GTK_WINDOW(selection_dialog), GTK_WIN_POS_MOUSE); gtk_window_set_title(GTK_WINDOW(selection_dialog), buf); xsane_set_window_icon(selection_dialog, 0); + g_signal_connect(GTK_OBJECT(selection_dialog), "destroy", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); v->active_dialog = selection_dialog; + frame = gtk_frame_new(0); + gtk_container_set_border_width(GTK_CONTAINER(frame), 4); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(selection_dialog), frame); + gtk_widget_show(frame); + vbox = gtk_vbox_new(FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); - gtk_container_add(GTK_CONTAINER(selection_dialog), vbox); + gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); + /* Blur radius: <-> */ - v->filter_radius = 2; + v->blur_radius = 1.0; hbox = gtk_hbox_new(FALSE, 2); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); @@ -627,11 +959,10 @@ static void xsane_viewer_blur_callback(GtkWidget *window, gpointer data) gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10); gtk_widget_show(label); - adjustment = (GtkAdjustment *) gtk_adjustment_new(2.0, 2.0, 20.0, 1.0, 5.0, 0.0); - spinbutton = gtk_spin_button_new(adjustment, 0, 0); - gtk_signal_connect(GTK_OBJECT(spinbutton), "changed", (GtkSignalFunc) xsane_viewer_spinbutton_int_changed, (void *) &v->filter_radius); + adjustment = (GtkAdjustment *) gtk_adjustment_new(1.0, 1.0, 20.0, 0.1, 1.0, 0.0); + spinbutton = gtk_spin_button_new(adjustment, 0, 2); + g_signal_connect(GTK_OBJECT(adjustment), "value_changed", (GtkSignalFunc) xsane_viewer_adjustment_float_changed, (void *) &v->blur_radius); gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton), TRUE); - gtk_spin_button_set_shadow_type(GTK_SPIN_BUTTON(spinbutton), GTK_SHADOW_OUT); gtk_box_pack_end(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 10); gtk_widget_show(spinbutton); @@ -644,14 +975,14 @@ static void xsane_viewer_blur_callback(GtkWidget *window, gpointer data) button = gtk_button_new_with_label(BUTTON_APPLY); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_blur_image, (void *) v); + g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_blur_image, (void *) v); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_grab_default(button); gtk_widget_show(button); button = gtk_button_new_with_label(BUTTON_CANCEL); - gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); - gtk_signal_connect_object(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); + g_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc) xsane_viewer_dialog_cancel, (void *) v); + g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GtkSignalFunc) gtk_widget_destroy, (GtkObject *) selection_dialog); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_show(button); @@ -660,6 +991,42 @@ static void xsane_viewer_blur_callback(GtkWidget *window, gpointer data) /* ---------------------------------------------------------------------------------------------------------------------- */ +static void xsane_viewer_undo_callback(GtkWidget *window, gpointer data) +{ + Viewer *v = (Viewer *) data; + + DBG(DBG_proc, "xsane_viewer_undo_callback\n"); + + if (!v->undo_filename) + { + DBG(DBG_info, "no undo file\n"); + return; + } + + DBG(DBG_info, "removing file %s\n", v->filename); + remove(v->filename); + + DBG(DBG_info, "using undo file %s\n", v->undo_filename); + v->filename = v->undo_filename; + + v->undo_filename = NULL; + v->image_saved = FALSE; + + xsane_viewer_read_image(v); + + if (v->last_saved_filename) + { + char buf[256]; + snprintf(buf, sizeof(buf), "%s (%s) - %s", WINDOW_VIEWER, v->last_saved_filename, xsane.device_text); + gtk_window_set_title(GTK_WINDOW(v->top), buf); + } + + gtk_widget_set_sensitive(GTK_WIDGET(v->undo), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo_menu_item), FALSE); +} + +/* ---------------------------------------------------------------------------------------------------------------------- */ + static void xsane_viewer_scale_image(GtkWidget *window, gpointer data) { FILE *outfile; @@ -672,14 +1039,13 @@ static void xsane_viewer_scale_image(GtkWidget *window, gpointer data) gtk_widget_destroy(v->active_dialog); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); infile = fopen(v->filename, "rb"); if (!infile) { DBG(DBG_error, "could not load file %s\n", v->filename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); - + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -693,8 +1059,7 @@ static void xsane_viewer_scale_image(GtkWidget *window, gpointer data) if (!outfile) { DBG(DBG_error, "could not save file %s\n", outfilename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); - + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -702,6 +1067,11 @@ static void xsane_viewer_scale_image(GtkWidget *window, gpointer data) gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); + if (v->bind_scale) + { + v->y_scale_factor = v->x_scale_factor; + } + xsane_save_scaled_image(outfile, infile, &image_info, v->x_scale_factor, v->y_scale_factor, v->progress_bar, &v->cancel_save); fclose(infile); @@ -710,16 +1080,31 @@ static void xsane_viewer_scale_image(GtkWidget *window, gpointer data) gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - DBG(DBG_info, "removing file %s\n", v->filename); - remove(v->filename); - free(v->filename); + if (v->undo_filename) + { + DBG(DBG_info, "removing file %s\n", v->undo_filename); + remove(v->undo_filename); + free(v->undo_filename); + } + + v->undo_filename = v->filename; + DBG(DBG_info, "undo file is %s\n", v->undo_filename); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo_menu_item), TRUE); v->filename = strdup(outfilename); v->image_saved = FALSE; xsane_viewer_read_image(v); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + if (v->last_saved_filename) + { + char buf[256]; + snprintf(buf, sizeof(buf), "%s (%s) - %s", WINDOW_VIEWER, v->last_saved_filename, xsane.device_text); + gtk_window_set_title(GTK_WINDOW(v->top), buf); + } + + xsane_viewer_set_sensitivity(v, TRUE); } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -736,14 +1121,13 @@ static void xsane_viewer_despeckle_image(GtkWidget *window, gpointer data) gtk_widget_destroy(v->active_dialog); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); infile = fopen(v->filename, "rb"); if (!infile) { DBG(DBG_error, "could not load file %s\n", v->filename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); - + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -757,8 +1141,7 @@ static void xsane_viewer_despeckle_image(GtkWidget *window, gpointer data) if (!outfile) { DBG(DBG_error, "could not save file %s\n", outfilename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); - + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -766,7 +1149,7 @@ static void xsane_viewer_despeckle_image(GtkWidget *window, gpointer data) gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - xsane_save_despeckle_image(outfile, infile, &image_info, v->filter_radius, v->progress_bar, &v->cancel_save); + xsane_save_despeckle_image(outfile, infile, &image_info, v->despeckle_radius, v->progress_bar, &v->cancel_save); fclose(infile); fclose(outfile); @@ -774,16 +1157,31 @@ static void xsane_viewer_despeckle_image(GtkWidget *window, gpointer data) gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - DBG(DBG_info, "removing file %s\n", v->filename); - remove(v->filename); - free(v->filename); + if (v->undo_filename) + { + DBG(DBG_info, "removing file %s\n", v->undo_filename); + remove(v->undo_filename); + free(v->undo_filename); + } + + v->undo_filename = v->filename; + DBG(DBG_info, "undo file is %s\n", v->undo_filename); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo_menu_item), TRUE); v->filename = strdup(outfilename); v->image_saved = FALSE; xsane_viewer_read_image(v); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + if (v->last_saved_filename) + { + char buf[256]; + snprintf(buf, sizeof(buf), "%s (%s) - %s", WINDOW_VIEWER, v->last_saved_filename, xsane.device_text); + gtk_window_set_title(GTK_WINDOW(v->top), buf); + } + + xsane_viewer_set_sensitivity(v, TRUE); } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -800,14 +1198,13 @@ static void xsane_viewer_blur_image(GtkWidget *window, gpointer data) gtk_widget_destroy(v->active_dialog); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); infile = fopen(v->filename, "rb"); if (!infile) { DBG(DBG_error, "could not load file %s\n", v->filename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); - + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -821,8 +1218,7 @@ static void xsane_viewer_blur_image(GtkWidget *window, gpointer data) if (!outfile) { DBG(DBG_error, "could not save file %s\n", outfilename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); - + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -830,7 +1226,7 @@ static void xsane_viewer_blur_image(GtkWidget *window, gpointer data) gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - xsane_save_blur_image(outfile, infile, &image_info, v->filter_radius, v->progress_bar, &v->cancel_save); + xsane_save_blur_image(outfile, infile, &image_info, v->blur_radius, v->progress_bar, &v->cancel_save); fclose(infile); fclose(outfile); @@ -838,16 +1234,31 @@ static void xsane_viewer_blur_image(GtkWidget *window, gpointer data) gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - DBG(DBG_info, "removing file %s\n", v->filename); - remove(v->filename); - free(v->filename); + if (v->undo_filename) + { + DBG(DBG_info, "removing file %s\n", v->undo_filename); + remove(v->undo_filename); + free(v->undo_filename); + } + + v->undo_filename = v->filename; + DBG(DBG_info, "undo file is %s\n", v->undo_filename); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo_menu_item), TRUE); v->filename = strdup(outfilename); v->image_saved = FALSE; xsane_viewer_read_image(v); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + if (v->last_saved_filename) + { + char buf[256]; + snprintf(buf, sizeof(buf), "%s (%s) - %s", WINDOW_VIEWER, v->last_saved_filename, xsane.device_text); + gtk_window_set_title(GTK_WINDOW(v->top), buf); + } + + xsane_viewer_set_sensitivity(v, TRUE); } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -859,15 +1270,22 @@ static void xsane_viewer_rotate(Viewer *v, int rotation) char outfilename[256]; Image_info image_info; + if (v->block_actions) /* actions blocked: return */ + { + gdk_beep(); + DBG(DBG_info, "xsane_viewer_rotate: actions are blocked\n"); + return; + } + DBG(DBG_proc, "xsane_viewer_rotate(%d)\n", rotation); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); + xsane_viewer_set_sensitivity(v, FALSE); infile = fopen(v->filename, "rb"); if (!infile) { DBG(DBG_error, "could not load file %s\n", v->filename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -882,7 +1300,7 @@ static void xsane_viewer_rotate(Viewer *v, int rotation) if (!outfile) { DBG(DBG_error, "could not save file %s\n", outfilename); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + xsane_viewer_set_sensitivity(v, TRUE); return; } @@ -906,16 +1324,31 @@ static void xsane_viewer_rotate(Viewer *v, int rotation) gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); gtk_progress_bar_update(GTK_PROGRESS_BAR(v->progress_bar), 0.0); - DBG(DBG_info, "removing file %s\n", v->filename); - remove(v->filename); - free(v->filename); + if (v->undo_filename) + { + DBG(DBG_info, "removing file %s\n", v->undo_filename); + remove(v->undo_filename); + free(v->undo_filename); + } + + v->undo_filename = v->filename; + DBG(DBG_info, "undo file is %s\n", v->undo_filename); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo_menu_item), TRUE); v->filename = strdup(outfilename); v->image_saved = FALSE; xsane_viewer_read_image(v); - gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); + if (v->last_saved_filename) + { + char buf[256]; + snprintf(buf, sizeof(buf), "%s (%s) - %s", WINDOW_VIEWER, v->last_saved_filename, xsane.device_text); + gtk_window_set_title(GTK_WINDOW(v->top), buf); + } + + xsane_viewer_set_sensitivity(v, TRUE); } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -985,57 +1418,58 @@ static void xsane_viewer_zoom_callback(GtkWidget *widget, gpointer data) /* ---------------------------------------------------------------------------------------------------------------------- */ -static GtkWidget *xsane_viewer_files_build_menu(Viewer *v) +static GtkWidget *xsane_viewer_file_build_menu(Viewer *v) { GtkWidget *menu, *item; - DBG(DBG_proc, "xsane_viewer_files_build_menu\n"); + DBG(DBG_proc, "xsane_viewer_file_build_menu\n"); menu = gtk_menu_new(); - gtk_accel_group_attach(xsane.accelerator_group, GTK_OBJECT(menu)); + gtk_menu_set_accel_group(GTK_MENU(menu), xsane.accelerator_group); /* XSane save dialog */ item = gtk_menu_item_new_with_label(MENU_ITEM_SAVE_IMAGE); #if 0 - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); #endif gtk_menu_append(GTK_MENU(menu), item); - gtk_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_save_callback, v); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_save_callback, v); gtk_widget_show(item); + v->save_menu_item = item; + /* XSane save as text (ocr) */ - /* Clone */ - - item = gtk_menu_item_new_with_label(MENU_ITEM_CLONE); + item = gtk_menu_item_new_with_label(MENU_ITEM_OCR); #if 0 - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); #endif gtk_menu_append(GTK_MENU(menu), item); - gtk_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_clone_callback, v); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_ocr_callback, v); gtk_widget_show(item); + v->ocr_menu_item = item; - - /* Scale */ + /* Clone */ - item = gtk_menu_item_new_with_label(MENU_ITEM_SCALE); + item = gtk_menu_item_new_with_label(MENU_ITEM_CLONE); #if 0 - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); #endif gtk_menu_append(GTK_MENU(menu), item); - gtk_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_scale_callback, v); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_clone_callback, v); gtk_widget_show(item); + v->clone_menu_item = item; /* Close */ item = gtk_menu_item_new_with_label(MENU_ITEM_CLOSE); #if 0 - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); #endif gtk_container_add(GTK_CONTAINER(menu), item); gtk_object_set_data(GTK_OBJECT(item), "Viewer", (void *) v); - gtk_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_close_callback, v); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_close_callback, v); gtk_widget_show(item); return menu; @@ -1043,6 +1477,31 @@ static GtkWidget *xsane_viewer_files_build_menu(Viewer *v) /* ---------------------------------------------------------------------------------------------------------------------- */ +static GtkWidget *xsane_viewer_edit_build_menu(Viewer *v) +{ + GtkWidget *menu, *item; + + DBG(DBG_proc, "xsane_viewer_edit_build_menu\n"); + + menu = gtk_menu_new(); + gtk_menu_set_accel_group(GTK_MENU(menu), xsane.accelerator_group); + + /* undo */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_UNDO); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_menu_append(GTK_MENU(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_undo_callback, v); + gtk_widget_show(item); + v->undo_menu_item = item; + + return menu; +} + +/* ---------------------------------------------------------------------------------------------------------------------- */ + static GtkWidget *xsane_viewer_filters_build_menu(Viewer *v) { GtkWidget *menu, *item; @@ -1050,30 +1509,127 @@ static GtkWidget *xsane_viewer_filters_build_menu(Viewer *v) DBG(DBG_proc, "xsane_viewer_filters_build_menu\n"); menu = gtk_menu_new(); - gtk_accel_group_attach(xsane.accelerator_group, GTK_OBJECT(menu)); + gtk_menu_set_accel_group(GTK_MENU(menu), xsane.accelerator_group); /* Despeckle */ item = gtk_menu_item_new_with_label(MENU_ITEM_DESPECKLE); #if 0 - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); #endif gtk_menu_append(GTK_MENU(menu), item); - gtk_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_despeckle_callback, v); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_despeckle_callback, v); gtk_widget_show(item); + v->despeckle_menu_item = item; /* Blur */ item = gtk_menu_item_new_with_label(MENU_ITEM_BLUR); #if 0 - gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); #endif gtk_container_add(GTK_CONTAINER(menu), item); - gtk_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_blur_callback, v); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_blur_callback, v); gtk_widget_show(item); + v->blur_menu_item = item; - return menu; + return menu; +} + +/* ---------------------------------------------------------------------------------------------------------------------- */ + +static GtkWidget *xsane_viewer_geometry_build_menu(Viewer *v) +{ + GtkWidget *menu, *item; + + DBG(DBG_proc, "xsane_viewer_geometry_build_menu\n"); + + menu = gtk_menu_new(); + gtk_menu_set_accel_group(GTK_MENU(menu), xsane.accelerator_group); + + + /* Scale */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_SCALE); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_menu_append(GTK_MENU(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_scale_callback, v); + gtk_widget_show(item); + + + /* insert separator: */ + + item = gtk_menu_item_new(); + gtk_menu_append(GTK_MENU(menu), item); + gtk_widget_show(item); + + + /* rotate90 */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_ROTATE90); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_1, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_menu_append(GTK_MENU(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_rotate90_callback, v); + gtk_widget_show(item); + + + /* rotate180 */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_ROTATE180); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_2, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_rotate180_callback, v); + gtk_widget_show(item); + + + /* rotate270 */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_ROTATE270); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_3, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_rotate270_callback, v); + gtk_widget_show(item); + + + /* insert separator: */ + + item = gtk_menu_item_new(); + gtk_menu_append(GTK_MENU(menu), item); + gtk_widget_show(item); + + + /* mirror_x */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_MIRROR_X); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_X, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_mirror_x_callback, v); + gtk_widget_show(item); + + + /* mirror_y */ + + item = gtk_menu_item_new_with_label(MENU_ITEM_MIRROR_Y); +#if 0 + gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_Y, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); +#endif + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_viewer_mirror_y_callback, v); + gtk_widget_show(item); + + + return menu; } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -1241,7 +1797,7 @@ static int xsane_viewer_read_image(Viewer *v) size_unit = "KB"; } - if (v->reduce_to_lineart) + if (v->allow_reduction_to_lineart) { snprintf(buf, sizeof(buf), TEXT_VIEWER_IMAGE_INFO, image_info.image_width, image_info.image_height, 1, image_info.colors, image_info.resolution_x, image_info.resolution_y, size, size_unit); @@ -1266,7 +1822,16 @@ static int xsane_viewer_read_image(Viewer *v) height = gdk_screen_height(); } - gtk_window_set_default_size(GTK_WINDOW(v->top), width, height); +#ifdef HAVE_GTK2 + if (GTK_WIDGET_REALIZED(v->top)) + { + gtk_window_resize(GTK_WINDOW(v->top), width, height); + } + else +#endif + { + gtk_window_set_default_size(GTK_WINDOW(v->top), width, height); + } free(row); free(src_row); @@ -1277,7 +1842,7 @@ static int xsane_viewer_read_image(Viewer *v) /* ---------------------------------------------------------------------------------------------------------------------- */ -Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_filename) +Viewer *xsane_viewer_new(char *filename, int allow_reduction_to_lineart, char *output_filename, viewer_modification allow_modification) { char buf[256]; Viewer *v; @@ -1299,16 +1864,32 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil memset(v, 0, sizeof(*v)); v->filename = strdup(filename); - v->reduce_to_lineart = reduce_to_lineart; + v->undo_filename = NULL; + v->allow_reduction_to_lineart = allow_reduction_to_lineart; v->zoom = 1.0; v->image_saved = FALSE; + v->allow_modification = allow_modification; v->next_viewer = xsane.viewer_list; xsane.viewer_list = v; + if (v->allow_modification == VIEWER_NO_MODIFICATION) + { + v->image_saved = TRUE; + } + if (output_filename) { v->output_filename = strdup(output_filename); - snprintf(buf, sizeof(buf), "%s %s - %s", WINDOW_VIEWER, v->output_filename, xsane.device_text); + + if (v->image_saved) + { + snprintf(buf, sizeof(buf), "%s %s - %s", WINDOW_VIEWER, v->output_filename, xsane.device_text); + } + else + { + /* add brackets around filename because file is not saved */ + snprintf(buf, sizeof(buf), "%s (%s) - %s", WINDOW_VIEWER, v->output_filename, xsane.device_text); + } } else { @@ -1318,9 +1899,9 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil v->top = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(v->top), buf); xsane_set_window_icon(v->top, 0); - gtk_accel_group_attach(xsane.accelerator_group, GTK_OBJECT(v->top)); + gtk_window_add_accel_group(GTK_WINDOW(v->top), xsane.accelerator_group); gtk_object_set_data(GTK_OBJECT(v->top), "Viewer", (void *) v); - gtk_signal_connect(GTK_OBJECT(v->top), "delete_event", GTK_SIGNAL_FUNC(xsane_viewer_close_callback), NULL); + g_signal_connect(GTK_OBJECT(v->top), "delete_event", GTK_SIGNAL_FUNC(xsane_viewer_close_callback), NULL); /* set the main vbox */ vbox = gtk_vbox_new(FALSE, 0); @@ -1333,19 +1914,37 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil menubar = gtk_menu_bar_new(); gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - /* "Files" submenu: */ + /* "File" submenu: */ menubar_item = gtk_menu_item_new_with_label(MENU_FILE); gtk_container_add(GTK_CONTAINER(menubar), menubar_item); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_item), xsane_viewer_files_build_menu(v)); -/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); */ + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_item), xsane_viewer_file_build_menu(v)); +/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); */ + gtk_widget_show(menubar_item); + v->file_menu = menubar_item; + + /* "Edit" submenu: */ + menubar_item = gtk_menu_item_new_with_label(MENU_EDIT); + gtk_container_add(GTK_CONTAINER(menubar), menubar_item); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_item), xsane_viewer_edit_build_menu(v)); +/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); */ gtk_widget_show(menubar_item); + v->edit_menu = menubar_item; /* "Filters" submenu: */ menubar_item = gtk_menu_item_new_with_label(MENU_FILTERS); gtk_container_add(GTK_CONTAINER(menubar), menubar_item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_item), xsane_viewer_filters_build_menu(v)); -/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); */ +/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); */ gtk_widget_show(menubar_item); + v->filters_menu = menubar_item; + + /* "Geometry" submenu: */ + menubar_item = gtk_menu_item_new_with_label(MENU_GEOMETRY); + gtk_container_add(GTK_CONTAINER(menubar), menubar_item); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_item), xsane_viewer_geometry_build_menu(v)); +/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); */ + gtk_widget_show(menubar_item); + v->geometry_menu = menubar_item; gtk_widget_show(menubar); @@ -1363,17 +1962,49 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil gtk_box_pack_start(GTK_BOX(vbox), v->button_box, FALSE, FALSE, 0); gtk_widget_show(v->button_box); - v->save = xsane_button_new_with_pixmap(v->top->window, v->button_box, file_xpm, DESC_VIEWER_SAVE, (GtkSignalFunc) xsane_viewer_save_callback, v); - v->ocr = xsane_button_new_with_pixmap(v->top->window, v->button_box, ocr_xpm, DESC_VIEWER_OCR, (GtkSignalFunc) xsane_viewer_ocr_callback, v); + + /* top hbox for file icons */ + v->file_button_box = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(v->file_button_box), 0); + gtk_box_pack_start(GTK_BOX(v->button_box), v->file_button_box, FALSE, FALSE, 0); + gtk_widget_show(v->file_button_box); + + v->save = xsane_button_new_with_pixmap(v->top->window, v->file_button_box, save_xpm, DESC_VIEWER_SAVE, (GtkSignalFunc) xsane_viewer_save_callback, v); + v->ocr = xsane_button_new_with_pixmap(v->top->window, v->file_button_box, ocr_xpm, DESC_VIEWER_OCR, (GtkSignalFunc) xsane_viewer_ocr_callback, v); v->clone = xsane_button_new_with_pixmap(v->top->window, v->button_box, clone_xpm, DESC_VIEWER_CLONE, (GtkSignalFunc) xsane_viewer_clone_callback, v); - v->scale = xsane_button_new_with_pixmap(v->top->window, v->button_box, scale_xpm, DESC_VIEWER_SCALE, (GtkSignalFunc) xsane_viewer_scale_callback, v); - v->despeckle = xsane_button_new_with_pixmap(v->top->window, v->button_box, despeckle_xpm, DESC_VIEWER_DESPECKLE, (GtkSignalFunc) xsane_viewer_despeckle_callback, v); - v->blur = xsane_button_new_with_pixmap(v->top->window, v->button_box, blur_xpm, DESC_VIEWER_BLUR, (GtkSignalFunc) xsane_viewer_blur_callback, v); - v->rotate90 = xsane_button_new_with_pixmap(v->top->window, v->button_box, rotate90_xpm, DESC_VIEWER_ROTATE90, (GtkSignalFunc) xsane_viewer_rotate90_callback, v); - v->rotate180 = xsane_button_new_with_pixmap(v->top->window, v->button_box, rotate180_xpm, DESC_VIEWER_ROTATE180, (GtkSignalFunc) xsane_viewer_rotate180_callback, v); - v->rotate270 = xsane_button_new_with_pixmap(v->top->window, v->button_box, rotate270_xpm, DESC_VIEWER_ROTATE270, (GtkSignalFunc) xsane_viewer_rotate270_callback, v); - v->mirror_x = xsane_button_new_with_pixmap(v->top->window, v->button_box, mirror_x_xpm, DESC_VIEWER_MIRROR_X, (GtkSignalFunc) xsane_viewer_mirror_x_callback, v); - v->mirror_y = xsane_button_new_with_pixmap(v->top->window, v->button_box, mirror_y_xpm, DESC_VIEWER_MIRROR_Y, (GtkSignalFunc) xsane_viewer_mirror_y_callback, v); + + + /* top hbox for edit icons */ + v->edit_button_box = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(v->edit_button_box), 0); + gtk_box_pack_start(GTK_BOX(v->button_box), v->edit_button_box, FALSE, FALSE, 0); + gtk_widget_show(v->edit_button_box); + + v->undo = xsane_button_new_with_pixmap(v->top->window, v->edit_button_box, undo_xpm, DESC_VIEWER_UNDO, (GtkSignalFunc) xsane_viewer_undo_callback, v); + + + /* top hbox for filter icons */ + v->filters_button_box = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(v->filters_button_box), 0); + gtk_box_pack_start(GTK_BOX(v->button_box), v->filters_button_box, FALSE, FALSE, 0); + gtk_widget_show(v->filters_button_box); + + v->despeckle = xsane_button_new_with_pixmap(v->top->window, v->filters_button_box, despeckle_xpm, DESC_VIEWER_DESPECKLE, (GtkSignalFunc) xsane_viewer_despeckle_callback, v); + v->blur = xsane_button_new_with_pixmap(v->top->window, v->filters_button_box, blur_xpm, DESC_VIEWER_BLUR, (GtkSignalFunc) xsane_viewer_blur_callback, v); + + + /* top hbox for geometry icons */ + v->geometry_button_box = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(v->geometry_button_box), 0); + gtk_box_pack_start(GTK_BOX(v->button_box), v->geometry_button_box, FALSE, FALSE, 0); + gtk_widget_show(v->geometry_button_box); + + xsane_button_new_with_pixmap(v->top->window, v->geometry_button_box, scale_xpm, DESC_VIEWER_SCALE, (GtkSignalFunc) xsane_viewer_scale_callback, v); + xsane_button_new_with_pixmap(v->top->window, v->geometry_button_box, rotate90_xpm, DESC_ROTATE90, (GtkSignalFunc) xsane_viewer_rotate90_callback, v); + xsane_button_new_with_pixmap(v->top->window, v->geometry_button_box, rotate180_xpm, DESC_ROTATE180, (GtkSignalFunc) xsane_viewer_rotate180_callback, v); + xsane_button_new_with_pixmap(v->top->window, v->geometry_button_box, rotate270_xpm, DESC_ROTATE270, (GtkSignalFunc) xsane_viewer_rotate270_callback, v); + xsane_button_new_with_pixmap(v->top->window, v->geometry_button_box, mirror_x_xpm, DESC_MIRROR_X, (GtkSignalFunc) xsane_viewer_mirror_x_callback, v); + xsane_button_new_with_pixmap(v->top->window, v->geometry_button_box, mirror_y_xpm, DESC_MIRROR_Y, (GtkSignalFunc) xsane_viewer_mirror_y_callback, v); /* "Zoom" submenu: */ @@ -1384,12 +2015,13 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil zoom_menu = gtk_menu_new(); selection = 0; - for (i = 0; i < XSANE_VIEWER_ZOOM_ITEMS; i++) + + for (i = 0; i < sizeof(xsane_viewer_zoom) / sizeof(int); i++) { snprintf(buf, sizeof(buf), "%d %%", xsane_viewer_zoom[i]); zoom_menu_item = gtk_menu_item_new_with_label(buf); gtk_menu_append(GTK_MENU(zoom_menu), zoom_menu_item); - gtk_signal_connect(GTK_OBJECT(zoom_menu_item), "activate", (GtkSignalFunc) xsane_viewer_zoom_callback, v); + g_signal_connect(GTK_OBJECT(zoom_menu_item), "activate", (GtkSignalFunc) xsane_viewer_zoom_callback, v); gtk_object_set_data(GTK_OBJECT(zoom_menu_item), "Selection", (void *) xsane_viewer_zoom[i]); gtk_widget_show(zoom_menu_item); if (v->zoom*100 == xsane_viewer_zoom[i]) @@ -1399,13 +2031,13 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil } gtk_option_menu_set_menu(GTK_OPTION_MENU(zoom_option_menu), zoom_menu); gtk_option_menu_set_history(GTK_OPTION_MENU(zoom_option_menu), selection); -/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); */ +/* gtk_widget_add_accelerator(menubar_item, "select", xsane.accelerator_group, GDK_F, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED); */ gtk_widget_show(zoom_menu); scrolled_window = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); gtk_widget_show(scrolled_window); @@ -1426,23 +2058,27 @@ Viewer *xsane_viewer_new(char *filename, int reduce_to_lineart, char *output_fil gtk_box_pack_start(GTK_BOX(hbox), v->image_info_label, FALSE, FALSE, 2); gtk_widget_show(v->image_info_label); - gtk_widget_show(v->top); if (xsane_viewer_read_image(v)) /* read image and add preview to the viewport */ { /* error */ } + gtk_widget_show(v->top); v->progress_bar = (GtkProgressBar *) gtk_progress_bar_new(); #if 0 - gtk_widget_set_usize(v->progress_bar, 0, 25); + gtk_widget_set_size_request(v->progress_bar, 0, 25); #endif gtk_box_pack_start(GTK_BOX(vbox), (GtkWidget *) v->progress_bar, FALSE, FALSE, 0); gtk_progress_set_show_text(GTK_PROGRESS(v->progress_bar), TRUE); gtk_progress_set_format_string(GTK_PROGRESS(v->progress_bar), ""); gtk_widget_show(GTK_WIDGET(v->progress_bar)); + xsane_viewer_set_sensitivity(v, TRUE); + + gtk_widget_set_sensitive(GTK_WIDGET(v->undo), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(v->undo_menu_item), FALSE); + return v; } - |