From 87ebc2af1f0417b3bc38a233e28ff673eff4fa51 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Sat, 27 Aug 2011 10:54:21 +0200 Subject: Imported Upstream version 3.1.5 --- data/Makefile.am | 12 +- data/Makefile.in | 60 ++++------ data/icons/Makefile.in | 9 +- data/org.gnome.SimpleScan.gschema.xml.in | 92 ++++++++++++++ data/simple-scan.schemas.in | 199 ------------------------------- data/simple-scan.ui | 8 +- 6 files changed, 130 insertions(+), 250 deletions(-) create mode 100644 data/org.gnome.SimpleScan.gschema.xml.in delete mode 100644 data/simple-scan.schemas.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index d406905..c99f807 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,16 +8,16 @@ utilities_in_files = simple-scan.desktop.in utilities_DATA = $(utilities_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = simple-scan.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ +gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ man1_MANS = simple-scan.1 -EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS) +EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS) DISTCLEANFILES = \ Makefile.in \ $(schema_DATA) \ - $(utilities_DATA) + $(utilities_DATA) \ + $(gsettings_SCHEMAS) diff --git a/data/Makefile.in b/data/Makefile.in index da951ec..7745f03 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -39,6 +39,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) @@ -78,11 +79,11 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)" \ - "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)" +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(uidir)" \ + "$(DESTDIR)$(utilitiesdir)" NROFF = nroff MANS = $(man1_MANS) -DATA = $(schema_DATA) $(ui_DATA) $(utilities_DATA) +DATA = $(ui_DATA) $(utilities_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -128,6 +129,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COLORD_CFLAGS = @COLORD_CFLAGS@ +COLORD_LIBS = @COLORD_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -142,11 +145,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -186,6 +189,7 @@ SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@ SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ +VALAC = @VALAC@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ @@ -207,6 +211,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host_alias = @host_alias@ htmldir = @htmldir@ includedir = @includedir@ @@ -237,15 +242,14 @@ ui_DATA = simple-scan.ui utilitiesdir = $(datadir)/applications utilities_in_files = simple-scan.desktop.in utilities_DATA = $(utilities_in_files:.desktop.in=.desktop) -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = simple-scan.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) +gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml man1_MANS = simple-scan.1 -EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS) +EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS) DISTCLEANFILES = \ Makefile.in \ $(schema_DATA) \ - $(utilities_DATA) + $(utilities_DATA) \ + $(gsettings_SCHEMAS) all: all-recursive @@ -314,26 +318,6 @@ uninstall-man1: test -z "$$files" || { \ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemadir)" && rm -f $$files install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @@ -586,7 +570,7 @@ check: check-recursive all-am: Makefile $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -635,8 +619,7 @@ info: info-recursive info-am: -install-data-am: install-man install-schemaDATA install-uiDATA \ - install-utilitiesDATA +install-data-am: install-man install-uiDATA install-utilitiesDATA install-dvi: install-dvi-recursive @@ -680,8 +663,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-man uninstall-schemaDATA uninstall-uiDATA \ - uninstall-utilitiesDATA +uninstall-am: uninstall-man uninstall-uiDATA uninstall-utilitiesDATA uninstall-man: uninstall-man1 @@ -696,16 +678,16 @@ uninstall-man: uninstall-man1 install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-schemaDATA install-strip install-uiDATA \ + install-ps-am install-strip install-uiDATA \ install-utilitiesDATA installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ tags-recursive uninstall uninstall-am uninstall-man \ - uninstall-man1 uninstall-schemaDATA uninstall-uiDATA \ - uninstall-utilitiesDATA + uninstall-man1 uninstall-uiDATA uninstall-utilitiesDATA @INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index b60ce6c..415ccbd 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -38,6 +38,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) @@ -60,6 +61,8 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COLORD_CFLAGS = @COLORD_CFLAGS@ +COLORD_LIBS = @COLORD_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -74,11 +77,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -118,6 +121,7 @@ SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@ SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ +VALAC = @VALAC@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ @@ -139,6 +143,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host_alias = @host_alias@ htmldir = @htmldir@ includedir = @includedir@ diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in new file mode 100644 index 0000000..2a6047f --- /dev/null +++ b/data/org.gnome.SimpleScan.gschema.xml.in @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + 600 + <_summary>Window width in pixels + + + 400 + <_summary>Window height in pixels + + + false + <_summary>TRUE if the application window is maximized + + + '' + <_summary>Device to scan from + <_description>SANE device to acquire images from. + + + 'photo' + + + + + <_summary>Type of document being scanned + <_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing. + + + 'top-to-bottom' + <_summary>Direction of scan + <_description>The direction of the scanner across the scanned page. + + + 595 + <_summary>Width of scanned image in pixels + <_description>The width of scanned image in pixels. This value is updated to what the last scanned page was. + + + 842 + <_summary>Height of scanned image in pixels + <_description>The height of scanned image in pixels. This value is updated to what the last scanned page was. + + + 0 + <_summary>Width of paper in tenths of a mm + <_description>The width of the paper in tenths of a mm (or 0 for automatic paper detection). + + + 0 + <_summary>Height of paper in tenths of a mm + <_description>The height of the paper in tenths of a mm (or 0 for automatic paper detection). + + + 72 + <_summary>Resolution of last scanned image + <_description>The resolution in dots-per-inch of the previously scanned image. + + + 150 + <_summary>Resolution for text scans + <_description>The resolution in dots-per-inch to use when scanning text. + + + 300 + <_summary>Resolution for photo scans + <_description>The resolution in dots-per-inch to use when scanning photos. + + + 'both' + <_summary>Page side to scan + <_description>The page side to scan. + + + '' + <_summary>Directory to save files to + <_description>The directory to save files to. Defaults to the documents directory if unset. + + + diff --git a/data/simple-scan.schemas.in b/data/simple-scan.schemas.in deleted file mode 100644 index 1a5a90d..0000000 --- a/data/simple-scan.schemas.in +++ /dev/null @@ -1,199 +0,0 @@ - - - - /apps/simple-scan/window_width - /schemas/apps/simple-scan/window_width - simple-scan - int - 600 - - Window width in pixels - - - - /apps/simple-scan/window_height - /schemas/apps/simple-scan/window_height - simple-scan - int - 400 - - Window height in pixels - - - - /apps/simple-scan/window_is_maximized - /schemas/apps/simple-scan/window_is_maximized - simple-scan - bool - FALSE - - TRUE if the application window is maximized - - - - /apps/simple-scan/selected_device - /schemas/apps/simple-scan/selected_device - simple-scan - string - - - Device to scan from - - SANE device to acquire images from. - - - - - /apps/simple-scan/document_type - /schemas/apps/simple-scan/document_type - simple-scan - string - photo - - Type of document being scanned - - Type of document being scanned. - 'text' for text documents, 'photo' for photos. - This setting decides on the scan resolution, colors and post-processing. - - - - - /apps/simple-scan/scan_direction - /schemas/apps/simple-scan/scan_direction - simple-scan - string - top-to-bottom - - Direction of scan - - The direction of the scanner across the scanned page. It can be one of the following: - 'top-to-bottom' - 'bottom-to-top' - 'left-to-right' - 'right-to-left' - - - - - /apps/simple-scan/page_width - /schemas/apps/simple-scan/page_width - simple-scan - int - 595 - - Width of scanned image in pixels - - The width of scanned image in pixels. This value is updated to what the last scanned page was. - - - - - /apps/simple-scan/page_height - /schemas/apps/simple-scan/page_height - simple-scan - int - 842 - - Height of scanned image in pixels - - The height of scanned image in pixels. This value is updated to what the last scanned page was. - - - - - /apps/simple-scan/paper_width - /schemas/apps/simple-scan/paper_width - simple-scan - int - 0 - - Width of paper in tenths of a mm - - The width of the paper in tenths of a mm (or 0 for automatic paper detection). - - - - - /apps/simple-scan/paper_height - /schemas/apps/simple-scan/paper_height - simple-scan - int - 0 - - Height of paper in tenths of a mm - - The height of the paper in tenths of a mm (or 0 for automatic paper detection). - - - - - /apps/simple-scan/page_dpi - /schemas/apps/simple-scan/page_dpi - simple-scan - int - 72 - - Resolution of last scanned image - - The resolution in dots-per-inch of the previously scanned image. - - - - - /apps/simple-scan/text_dpi - /schemas/apps/simple-scan/text_dpi - simple-scan - int - 150 - - Resolution for text scans - - The resolution in dots-per-inch to use when scanning text. - - - - - /apps/simple-scan/photo_dpi - /schemas/apps/simple-scan/photo_dpi - simple-scan - int - 300 - - Resolution for photo scans - - The resolution in dots-per-inch to use when scanning photos. - - - - - /apps/simple-scan/page_side - /schemas/apps/simple-scan/page_side - simple-scan - string - both - - Page side to scan - - The page side to scan. It can be one of the following: - 'both' - 'front' - 'back' - - - - - /apps/simple-scan/save_directory - /schemas/apps/simple-scan/save_directory - simple-scan - string - - - Directory to save files to - - The directory to save files to. Defaults to the documents directory if unset. - - - - - diff --git a/data/simple-scan.ui b/data/simple-scan.ui index 7dcd2d7..102a7a8 100644 --- a/data/simple-scan.ui +++ b/data/simple-scan.ui @@ -924,21 +924,21 @@ - + - both + 3 Front and Back - front + 1 Front - back + 2 Back -- cgit v1.2.3