Imported Upstream version 3.13.4.2upstream/3.13.4.2

6 files changed, 269 insertions, 111 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index e737488..b436f12 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,6 @@ 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 b7b43b8..100a61c 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -278,6 +278,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -333,7 +335,6 @@ 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 659daaf..cc1b06b 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -183,6 +183,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/simple-scan-menu.ui b/data/simple-scan-menu.ui
deleted file mode 100644
index ee5e7ea..0000000
--- a/data/simple-scan-menu.ui
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 3.8 -->
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">New Document</attribute>
-        <attribute name="action">app.new_document</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>N]]></attribute>
-      </item>
-    </section>
-    <section>
-      <submenu>
-        <attribute name="label" translatable="yes">Document</attribute>
-        <section>
-          <item>
-            <attribute name="label" translatable="yes">Save</attribute>
-            <attribute name="action">app.save</attribute>
-            <attribute name="accel"><![CDATA[<Ctrl>S]]></attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Save As...</attribute>
-            <attribute name="action">app.save_as</attribute>
-            <attribute name="accel"><![CDATA[<Shift><Ctrl>S]]></attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Email...</attribute>
-            <attribute name="action">app.email</attribute>
-            <attribute name="accel"><![CDATA[<Ctrl>E]]></attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Print...</attribute>
-            <attribute name="action">app.print</attribute>
-            <attribute name="accel"><![CDATA[<Ctrl>P]]></attribute>
-          </item>
-        </section>
-      </submenu>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Preferences</attribute>
-        <attribute name="action">app.preferences</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">app.help</attribute>
-        <attribute name="accel"><![CDATA[F1]]></attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml
index 7aa3b12..b6fe6a6 100644
--- a/data/simple-scan.gresource.xml
+++ b/data/simple-scan.gresource.xml
@@ -2,6 +2,5 @@
 <gresources>
   <gresource prefix="/org/gnome/SimpleScan">
     <file preprocess="xml-stripblanks">simple-scan.ui</file>
-    <file preprocess="xml-stripblanks">simple-scan-menu.ui</file>
   </gresource>
 </gresources>
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index eba3c72..d610c2e 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Nov 19 13:50:35 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
+  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkDialog" id="authorize_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -9,7 +8,6 @@
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <property name="urgency_hint">True</property>
-    <property name="transient_for">simple_scan_window</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -159,7 +157,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="device_store">
+  <object class="GtkListStore" id="device_model">
     <columns>
       <!-- column-name device_name -->
       <column type="gchararray"/>
@@ -177,25 +175,7 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-help</property>
   </object>
-  <object class="GtkListStore" id="mode_store">
-    <columns>
-      <!-- column-name mode -->
-      <column type="gchararray"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">text</col>
-        <col id="1" translatable="yes" comments="Combo box label for text scan mode">Text</col>
-      </row>
-      <row>
-        <col id="0">photo</col>
-        <col id="1" translatable="yes" comments="Combo box label for photo scan mode">Photo</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="page_side_store">
+  <object class="GtkListStore" id="page_side_model">
     <columns>
       <!-- column-name side -->
       <column type="gint"/>
@@ -217,7 +197,7 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="paper_size_store">
+  <object class="GtkListStore" id="paper_size_model">
     <columns>
       <!-- column-name width -->
       <column type="gint"/>
@@ -227,7 +207,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="photo_dpi_store">
+  <object class="GtkListStore" id="photo_dpi_model">
     <columns>
       <!-- column-name dpi -->
       <column type="gint"/>
@@ -240,7 +220,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkApplicationWindow" id="simple_scan_window">
+  <template class="UserInterface" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
     <property name="icon_name">scanner</property>
@@ -254,7 +234,7 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="document_menuitem">
@@ -352,6 +332,15 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkMenuItem" id="reorder_menuitem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Menu item to reorder pages">Reorder Pages</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="reorder_menuitem_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="save_menuitem">
                         <property name="label">gtk-save</property>
                         <property name="visible">True</property>
@@ -543,7 +532,7 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="4x6_menuitem">
+                              <object class="GtkRadioMenuItem" id="four_by_six_menuitem">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
@@ -674,8 +663,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
+          <object class="GtkToolbar" id="toolbar">
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <style>
               <class name="primary-toolbar"/>
@@ -704,7 +693,7 @@
                 <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">scanner</property>
-                <property name="menu">scan_toolbutton_menu</property>
+                <property name="menu">scan_button_menu</property>
                 <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -813,8 +802,190 @@
         </child>
       </object>
     </child>
-  </object>
-  <object class="GtkListStore" id="text_dpi_store">
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="vexpand">True</property>
+        <property name="show_close_button">True</property>
+        <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
+        <style>
+          <class name="titlebar"/>
+        </style>
+        <child>
+          <object class="GtkBox" id="open_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="stop_button">
+                <property name="visible">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
+                <property name="label" translatable="yes">Stop</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="scan_button">
+                <property name="visible">True</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
+                <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="open_button">
+                <property name="visible">True</property>
+                <property name="popup">scan_button_hb_menu</property>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="save_button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="save_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-save-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="new_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="new_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-new-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="rotate_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="rotate_right_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="objectrotateright-button">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">object-rotate-right-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="rotate_left_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="objectrotateleft-button">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">object-rotate-left-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="crop_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Crop the selected page</property>
+            <property name="use_underline">True</property>
+            <signal name="toggled" handler="crop_button_toggled_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="objectcrop-button">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">edit-cut-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+      </packing>
+    </child>
+  </template>
+  <object class="GtkListStore" id="text_dpi_model">
     <columns>
       <!-- column-name dpi -->
       <column type="gint"/>
@@ -829,7 +1000,6 @@
     <property name="resizable">False</property>
     <property name="icon_name">scanner</property>
     <property name="type_hint">normal</property>
-    <property name="transient_for">simple_scan_window</property>
     <signal name="delete-event" handler="preferences_dialog_delete_event_cb" swapped="no"/>
     <signal name="response" handler="preferences_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
@@ -893,8 +1063,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">device_store</property>
-                <property name="button_sensitivity">on</property>
+                <property name="model">device_model</property>
                 <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
               </object>
               <packing>
@@ -941,7 +1110,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">text_dpi_store</property>
+                <property name="model">text_dpi_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -955,7 +1124,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">photo_dpi_store</property>
+                <property name="model">photo_dpi_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -985,7 +1154,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">page_side_store</property>
+                <property name="model">page_side_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -1015,7 +1184,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">paper_size_store</property>
+                <property name="model">paper_size_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -1129,11 +1298,11 @@
       <action-widget response="1">preferences_close_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkMenu" id="scan_toolbutton_menu">
+  <object class="GtkMenu" id="scan_button_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="scan_single_toolbutton_menuitem">
+      <object class="GtkMenuItem" id="scan_single_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
@@ -1142,7 +1311,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="scan_all_toolbutton_menuitem">
+      <object class="GtkMenuItem" id="scan_all_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
@@ -1157,7 +1326,57 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="text_toolbutton_menuitem">
+      <object class="GtkRadioMenuItem" id="text_button_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Text</property>
+        <property name="use_underline">True</property>
+        <property name="draw_as_radio">True</property>
+        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="photo_button_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Photo</property>
+        <property name="use_underline">True</property>
+        <property name="active">True</property>
+        <property name="draw_as_radio">True</property>
+        <property name="group">text_button_menuitem</property>
+        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="scan_button_hb_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="scan_single_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="scan_all_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="text_button_hb_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Text</property>
@@ -1167,14 +1386,14 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="photo_toolbutton_menuitem">
+      <object class="GtkRadioMenuItem" id="photo_button_hb_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Photo</property>
         <property name="use_underline">True</property>
         <property name="active">True</property>
         <property name="draw_as_radio">True</property>
-        <property name="group">text_toolbutton_menuitem</property>
+        <property name="group">text_button_hb_menuitem</property>
         <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
       </object>
     </child>