From e9ca3b0060facd753744602a3baca5a1effdbd83 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Thu, 10 Apr 2014 15:37:02 +0100 Subject: Imported Upstream version 3.12.0 --- data/Makefile.am | 1 + data/Makefile.in | 3 +- data/icons/Makefile.in | 2 +- data/org.gnome.SimpleScan.gschema.xml.in | 38 -- data/simple-scan-menu.ui | 62 +++ data/simple-scan.gresource.xml | 1 + data/simple-scan.ui | 776 ++++++++++++++++++------------- 7 files changed, 508 insertions(+), 375 deletions(-) create mode 100644 data/simple-scan-menu.ui (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index b436f12..e737488 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,6 +16,7 @@ dist_man1_MANS = simple-scan.1 EXTRA_DIST = simple-scan.desktop.in \ org.gnome.SimpleScan.gschema.xml.in \ simple-scan.ui \ + simple-scan-menu.ui \ simple-scan.gresource.xml DISTCLEANFILES = \ diff --git a/data/Makefile.in b/data/Makefile.in index c0f39f2..b7b43b8 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -333,6 +333,7 @@ dist_man1_MANS = simple-scan.1 EXTRA_DIST = simple-scan.desktop.in \ org.gnome.SimpleScan.gschema.xml.in \ simple-scan.ui \ + simple-scan-menu.ui \ simple-scan.gresource.xml DISTCLEANFILES = \ diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index 3c5fe33..659daaf 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in index da50c8a..3ce3d12 100644 --- a/data/org.gnome.SimpleScan.gschema.xml.in +++ b/data/org.gnome.SimpleScan.gschema.xml.in @@ -1,10 +1,4 @@ - - - - - - @@ -12,18 +6,6 @@ - - 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 @@ -38,21 +20,6 @@ <_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 @@ -73,11 +40,6 @@ <_summary>Contrast of scan <_description>The contrast adjustment from -100 to 100 (0 being none). - - 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 diff --git a/data/simple-scan-menu.ui b/data/simple-scan-menu.ui new file mode 100644 index 0000000..ee5e7ea --- /dev/null +++ b/data/simple-scan-menu.ui @@ -0,0 +1,62 @@ + + + + +
+ + New Document + app.new_document + N]]> + +
+
+ + Document +
+ + Save + app.save + S]]> + + + Save As... + app.save_as + S]]> + + + Email... + app.email + E]]> + + + Print... + app.print + P]]> + +
+ +
+
+ + Preferences + app.preferences + +
+
+ + Help + app.help + + + + About + app.about + + + Quit + app.quit + Q]]> + +
+ + diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml index b6fe6a6..7aa3b12 100644 --- a/data/simple-scan.gresource.xml +++ b/data/simple-scan.gresource.xml @@ -2,5 +2,6 @@ simple-scan.ui + simple-scan-menu.ui diff --git a/data/simple-scan.ui b/data/simple-scan.ui index eb4ae02..eba3c72 100644 --- a/data/simple-scan.ui +++ b/data/simple-scan.ui @@ -1,97 +1,350 @@ - + + - - - + + + False + 12 + False + True + normal + True + simple_scan_window + + + True + False + vertical + 12 + + + True + False + end + + + _Authorize + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 5 + vertical + 12 + + + True + False + To connect to ? you need to authorize + + + True + True + 0 + + + + + True + False + 6 + 6 + + + True + True + True + ● + + + 1 + 0 + 1 + 1 + + + + + True + True + True + False + ● + + + 1 + 1 + 1 + 1 + + + + + True + False + _Username for resource: + True + username_entry + + + 0 + 0 + 1 + 1 + + + + + True + False + _Password: + True + password_entry + + + 0 + 1 + 1 + 1 + + + + + False + True + 1 + + + + + False + True + 1 + + + + + + authorize_button + + + + -100 + 100 + 1 + 10 + + + -100 + 100 + 1 + 10 + + + + + + + + + + + True + False + mail-send + + + True + False + gtk-help + + + + + + + + + + + text + Text + + + photo + Photo + + + + + + + + + + + + + 3 + Front and Back + + + 1 + Front + + + 2 + Back + + + + + + + + + + + + + + + + + + + + + + + 100 + 1 + 10 + + + False Simple Scan scanner - - - + + + - + True + False + vertical True + False True + False _Document True True + False gtk-new True + False True True - + Sc_an True + False True False True + False True + False Single _Page True - + True + False All Pages From _Feeder True - + True False + False _Stop Scan True - + True + False True + False Text True True - + True + False Photo True True True text_menuitem - + @@ -103,10 +356,11 @@ gtk-save True False + False True True - + @@ -114,61 +368,68 @@ gtk-save-as True False + False True True - + _Email True + False True email_image False - + gtk-print True + False True True - + True + False gtk-preferences True + False True True - + True + False gtk-quit True + False True True - - + + @@ -178,129 +439,145 @@ True + False _Page True True + False True + False Rotate _Left True - + True + False Rotate _Right True - + True + False _Crop True True + False True + False _None True True True - + True + False A_4 True True no_crop_menuitem - + True + False A_5 True True no_crop_menuitem - + True + False A_6 True True no_crop_menuitem - + True + False _Letter True True no_crop_menuitem - + True + False Le_gal True True no_crop_menuitem - + True - 4×6 + False + 4×6 True True no_crop_menuitem - + True + False _Custom True True no_crop_menuitem - + True + False True False + False _Rotate Crop True - + @@ -310,18 +587,20 @@ True + False Move Left - + True + False Move Right True - + @@ -329,20 +608,22 @@ gtk-copy True False + False True True - + - + gtk-delete True + False True True - + @@ -352,29 +633,33 @@ True + False _Help True True + False _Contents True + False True help_image False - + gtk-about True + False True True - + @@ -384,23 +669,26 @@ False + True 0 True + False True + False Start a new document New True gtk-new - + False @@ -410,28 +698,31 @@ True + False Scan a single page from the scanner True Scan True scanner scan_toolbutton_menu - + False + False True False + False Save document to a file True Save True gtk-save - + False @@ -442,11 +733,12 @@ True False + False Stop the current scan Stop True gtk-stop - + False @@ -456,6 +748,7 @@ True + False False @@ -465,11 +758,12 @@ True + False Rotate the page to the left (counter-clockwise) Rotate Left True object-rotate-left - + False @@ -479,11 +773,12 @@ True + False Rotate the page to the right (clockwise) Rotate Right True object-rotate-right - + False @@ -493,12 +788,13 @@ True + False Crop the selected page True Crop True object-crop - + False @@ -508,6 +804,7 @@ False + True 1 @@ -517,139 +814,42 @@ - - - - - - - - - - text - Text - - - photo - Photo - - - - + - - + + - - 12 + + False + 7 + Preferences False - True + scanner normal - True simple_scan_window + + - + True - 12 - - - True - 5 - 12 - - - True - To connect to ? you need to authorize - - - 0 - - - - - True - 2 - 2 - 6 - 6 - - - True - True - ● - - - 1 - 2 - GTK_FILL - - - - - True - True - False - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - _Username for resource: - True - username_entry - - - GTK_FILL - GTK_FILL - - - - - True - _Password: - True - password_entry - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - False - 1 - - - - - 1 - - + False + vertical + 2 - + True + False end - - _Authorize + + gtk-close True True True - True + True False @@ -660,173 +860,168 @@ False + True end 0 - - - - authorize_button - - - - 7 - Preferences - False - scanner - normal - simple_scan_window - - - - - True - 2 - + True + False 5 - 7 - 2 - 6 6 + 6 True + False 0 Scan S_ource: True device_combo - GTK_FILL - GTK_FILL + 0 + 0 + 1 + 1 True + False + True device_store on - + 1 - 2 - GTK_FILL + 0 + 1 + 1 True + False 0 _Text Resolution: True text_dpi_combo + 0 1 - 2 - GTK_FILL - GTK_FILL + 1 + 1 True + False 0 _Photo Resolution: True photo_dpi_combo + 0 2 - 3 - GTK_FILL - GTK_FILL + 1 + 1 True + False + True text_dpi_store 1 - 2 1 - 2 - GTK_FILL + 1 + 1 True + False + True photo_dpi_store 1 - 2 2 - 3 - GTK_FILL + 1 + 1 True + False 0 Scan Side: True photo_dpi_combo + 0 3 - 4 - GTK_FILL - GTK_FILL + 1 + 1 True + False + True page_side_store 1 - 2 3 - 4 - GTK_FILL + 1 + 1 True + False 0 Page Size: True photo_dpi_combo + 0 4 - 5 - GTK_FILL - GTK_FILL + 1 + 1 True + False + True paper_size_store 1 - 2 4 - 5 - GTK_FILL + 1 + 1 @@ -836,27 +1031,27 @@ 0 Brightness: True - brightness_adjustment + 0 5 - 6 - GTK_FILL - GTK_FILL + 1 + 1 True True + True brightness_adjustment False 1 - 2 5 - 6 + 1 + 1 @@ -869,24 +1064,25 @@ contrast_scale + 0 6 - 7 - GTK_FILL - GTK_FILL + 1 + 1 True True + True contrast_adjustment False 1 - 2 6 - 7 + 1 + 1 @@ -899,54 +1095,32 @@ quality_scale + 0 7 - 8 - GTK_FILL - GTK_FILL + 1 + 1 True True + True quality_adjustment False 1 - 2 7 - 8 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - True - - - False - False - 0 + 1 + 1 False - end - 0 + True + 1 @@ -957,120 +1131,52 @@ True + False True + False Single _Page True - + True + False All Pages From _Feeder True - + True + False True + False Text True True - + True + False Photo True True True text_toolbutton_menuitem - + - - - - - - - - - - - - - - - - - - True - gtk-help - - - True - mail-send - - - - - - - - - - - 3 - Front and Back - - - 1 - Front - - - 2 - Back - - - - - - - - - - - - - - - -100 - 100 - 1 - 10 - - - -100 - 100 - 1 - 10 - - - 0 - 100 - 1 - 10 - -- cgit v1.2.3