--rwEMma7ioTxnRzrJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline
Hello, the attached patch adds the filename counter feature (the same as used in the Save mode) to the Viewer mode of Xsane. Peter PS: The patch can be downloaded from the following link: http://www.ciselant.de/projects/xsane_dev/ -- ------------------------------------------------------------------------ Peter Seiderer E-Mail: [email protected] --rwEMma7ioTxnRzrJ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-xsane-0.86-viewer_with_filename_counter-0.1" Index: xsane/src/xsane-scan.c diff -u xsane/src/xsane-scan.c:1.1.1.1 xsane/src/xsane-scan.c:1.1.1.1.8.1 --- xsane/src/xsane-scan.c:1.1.1.1 Mon Apr 22 18:38:41 2002 +++ xsane/src/xsane-scan.c Fri Jun 28 14:24:09 2002 @@ -1115,7 +1115,7 @@ if (xsane.xsane_mode == XSANE_VIEWER) { - xsane_viewer_new(xsane.dummy_filename, xsane.expand_lineart_to_grayscale, 0); + xsane_viewer_new(xsane.dummy_filename, xsane.expand_lineart_to_grayscale, xsane.output_filename); xsane.expand_lineart_to_grayscale = 0; } @@ -1439,7 +1439,7 @@ } #endif - if ( (xsane.xsane_mode == XSANE_SAVE) && (xsane.mode == XSANE_STANDALONE) ) + if ( ((xsane.xsane_mode == XSANE_SAVE)||(xsane.xsane_mode == XSANE_VIEWER)) && (xsane.mode == XSANE_STANDALONE) ) { if (!xsane.force_filename) /* user filename selection active */ { Index: xsane/src/xsane-viewer.c diff -u xsane/src/xsane-viewer.c:1.2 xsane/src/xsane-viewer.c:1.2.4.1 --- xsane/src/xsane-viewer.c:1.2 Thu Apr 25 11:38:07 2002 +++ xsane/src/xsane-viewer.c Fri Jun 28 14:24:09 2002 @@ -138,21 +138,17 @@ char *inputfilename; char windowname[256]; int output_format; + int abort = 0; DBG(DBG_proc, "xsane_viewer_save_callback\n"); gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), FALSE); - if (v->output_filename) - { + if (v->output_filename) { strncpy(outputfilename, v->output_filename, sizeof(outputfilename)); - } - else - { - int abort = 0; - - strcpy(outputfilename, preferences.filename); - + } else { + strncpy(outputfilename, preferences.filename, sizeof(outputfilename)); + } 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 */ @@ -164,7 +160,6 @@ gtk_widget_set_sensitive(GTK_WIDGET(v->button_box), TRUE); return; } - } if (preferences.overwrite_warning) /* test if filename already used */ { Index: xsane/src/xsane.c diff -u xsane/src/xsane.c:1.2 xsane/src/xsane.c:1.2.4.1 --- xsane/src/xsane.c:1.2 Thu Apr 25 11:38:07 2002 +++ xsane/src/xsane.c Fri Jun 28 14:24:09 2002 @@ -1639,7 +1639,7 @@ } - if (xsane.xsane_mode == XSANE_SAVE) + if ( ((xsane.xsane_mode == XSANE_SAVE) || (xsane.xsane_mode == XSANE_VIEWER)) ) { xsane.copy_number_entry = NULL; --rwEMma7ioTxnRzrJ--
