summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am1
-rw-r--r--data/Makefile.in3
-rw-r--r--data/icons/Makefile.in2
-rw-r--r--data/org.gnome.SimpleScan.gschema.xml.in38
-rw-r--r--data/simple-scan-menu.ui62
-rw-r--r--data/simple-scan.gresource.xml1
-rw-r--r--data/simple-scan.ui776
7 files changed, 508 insertions, 375 deletions
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 @@
<schemalist>
- <enum id="org.gnome.SimpleScan.ScanDirection">
- <value value="0" nick="top-to-bottom"/>
- <value value="1" nick="left-to-right"/>
- <value value="2" nick="bottom-to-top"/>
- <value value="3" nick="right-to-left"/>
- </enum>
<enum id="org.gnome.SimpleScan.PageSide">
<value value="1" nick="front"/>
<value value="2" nick="back"/>
@@ -12,18 +6,6 @@
</enum>
<schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan">
- <key name="window-width" type="i">
- <default>600</default>
- <_summary>Window width in pixels</_summary>
- </key>
- <key name="window-height" type="i">
- <default>400</default>
- <_summary>Window height in pixels</_summary>
- </key>
- <key name="window-is-maximized" type="b">
- <default>false</default>
- <_summary>TRUE if the application window is maximized</_summary>
- </key>
<key name="selected-device" type="s">
<default>''</default>
<_summary>Device to scan from</_summary>
@@ -38,21 +20,6 @@
<_summary>Type of document being scanned</_summary>
<_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</_description>
</key>
- <key name="scan-direction" enum="org.gnome.SimpleScan.ScanDirection">
- <default>'top-to-bottom'</default>
- <_summary>Direction of scan</_summary>
- <_description>The direction of the scanner across the scanned page.</_description>
- </key>
- <key name="page-width" type="i">
- <default>595</default>
- <_summary>Width of scanned image in pixels</_summary>
- <_description>The width of scanned image in pixels. This value is updated to what the last scanned page was.</_description>
- </key>
- <key name="page-height" type="i">
- <default>842</default>
- <_summary>Height of scanned image in pixels</_summary>
- <_description>The height of scanned image in pixels. This value is updated to what the last scanned page was.</_description>
- </key>
<key name="paper-width" type="i">
<default>0</default>
<_summary>Width of paper in tenths of a mm</_summary>
@@ -73,11 +40,6 @@
<_summary>Contrast of scan</_summary>
<_description>The contrast adjustment from -100 to 100 (0 being none).</_description>
</key>
- <key name="page-dpi" type="i">
- <default>72</default>
- <_summary>Resolution of last scanned image</_summary>
- <_description>The resolution in dots-per-inch of the previously scanned image.</_description>
- </key>
<key name="text-dpi" type="i">
<default>150</default>
<_summary>Resolution for text scans</_summary>
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 @@
+<?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 b6fe6a6..7aa3b12 100644
--- a/data/simple-scan.gresource.xml
+++ b/data/simple-scan.gresource.xml
@@ -2,5 +2,6 @@
<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 eb4ae02..eba3c72 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -1,97 +1,350 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 13:50:35 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkWindow" id="simple_scan_window">
+ <!-- interface-requires gtk+ 3.8 -->
+ <object class="GtkDialog" id="authorize_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="resizable">False</property>
+ <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>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="authorize_button">
+ <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="authorize_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="username_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="username_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">username_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">authorize_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="brightness_adjustment">
+ <property name="lower">-100</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="contrast_adjustment">
+ <property name="lower">-100</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="device_store">
+ <columns>
+ <!-- column-name device_name -->
+ <column type="gchararray"/>
+ <!-- column-name label -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkImage" id="email_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">mail-send</property>
+ </object>
+ <object class="GtkImage" id="help_image">
+ <property name="visible">True</property>
+ <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">
+ <columns>
+ <!-- column-name side -->
+ <column type="gint"/>
+ <!-- column-name label -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">3</col>
+ <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
+ </row>
+ <row>
+ <col id="0">1</col>
+ <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
+ </row>
+ <row>
+ <col id="0">2</col>
+ <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="paper_size_store">
+ <columns>
+ <!-- column-name width -->
+ <column type="gint"/>
+ <!-- column-name height -->
+ <column type="gint"/>
+ <!-- column-name label -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="photo_dpi_store">
+ <columns>
+ <!-- column-name dpi -->
+ <column type="gint"/>
+ <!-- column-name label -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkAdjustment" id="quality_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkApplicationWindow" id="simple_scan_window">
+ <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>
- <signal name="configure_event" handler="simple_scan_window_configure_event_cb"/>
- <signal name="delete_event" handler="window_delete_event_cb"/>
- <signal name="window_state_event" handler="simple_scan_window_window_state_event_cb"/>
+ <signal name="configure-event" handler="simple_scan_window_configure_event_cb" swapped="no"/>
+ <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
+ <signal name="window-state-event" handler="simple_scan_window_window_state_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox" id="main_vbox">
+ <object class="GtkBox" id="main_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="document_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Label on document menu (contains actions for this document, e.g. save, print)">_Document</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="document_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="new_menuitem">
<property name="label">gtk-new</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="new_button_clicked_cb"/>
+ <signal name="activate" handler="new_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="scan_menuitem">
<property name="label" translatable="yes" comments="Scan menu item">Sc_an</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<child type="submenu">
<object class="GtkMenu" id="scan_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="scan_single_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Scan menu item to scan a single page from the scanner">Single _Page</property>
<property name="use_underline">True</property>
<accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="scan_button_clicked_cb"/>
+ <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="scan_all_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
<property name="use_underline">True</property>
<accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="continuous_scan_button_clicked_cb"/>
+ <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="stop_scan_menuitem">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Menu entry to stop current scan">_Stop Scan</property>
<property name="use_underline">True</property>
<accelerator key="Escape" signal="activate"/>
- <signal name="activate" handler="stop_scan_button_clicked_cb"/>
+ <signal name="activate" handler="stop_scan_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="text_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"/>
+ <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="photo_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_menuitem</property>
- <signal name="toggled" handler="photo_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
</object>
@@ -103,10 +356,11 @@
<property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="save_file_button_clicked_cb"/>
+ <signal name="activate" handler="save_file_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
@@ -114,61 +368,68 @@
<property name="label">gtk-save-as</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
- <signal name="activate" handler="save_as_file_button_clicked_cb"/>
+ <signal name="activate" handler="save_as_file_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="email_menuitem">
<property name="label" translatable="yes" comments="Label on email menu item">_Email</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">email_image</property>
<property name="use_stock">False</property>
<accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="email_button_clicked_cb"/>
+ <signal name="activate" handler="email_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="print_menuitem">
<property name="label">gtk-print</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="print_button_clicked_cb"/>
+ <signal name="activate" handler="print_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="document_sep_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="preferences_menuitem">
<property name="label">gtk-preferences</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="preferences_button_clicked_cb"/>
+ <signal name="activate" handler="preferences_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="quit_menuitem">
<property name="label">gtk-quit</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="quit_menuitem_activate_cb"/>
+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="quit_menuitem_activate_cb" swapped="no"/>
</object>
</child>
</object>
@@ -178,129 +439,145 @@
<child>
<object class="GtkMenuItem" id="page_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Page menu (contains action for each page, e.g. delete, crop)">_Page</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="page_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="rotate_left_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Menu item to rotate page to left (anti-clockwise)">Rotate _Left</property>
<property name="use_underline">True</property>
<accelerator key="bracketleft" signal="activate"/>
- <signal name="activate" handler="rotate_left_button_clicked_cb"/>
+ <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="rotate_right_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Menu item to rotate page to right (clockwise)">Rotate _Right</property>
<property name="use_underline">True</property>
<accelerator key="bracketright" signal="activate"/>
- <signal name="activate" handler="rotate_right_button_clicked_cb"/>
+ <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="crop_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Label for page crop submenu">_Crop</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="crop_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkRadioMenuItem" id="no_crop_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for no crop">_None</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_as_radio">True</property>
- <signal name="toggled" handler="no_crop_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="no_crop_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="a4_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for cropping page to A4 size">A_4</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="a4_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="a4_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="a5_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for cropping page to A5 size">A_5</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="a5_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="a5_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="a6_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for cropping page to A6 size">A_6</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="a6_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="a6_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="letter_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for cropping page to US letter size">_Letter</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="letter_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="letter_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="legal_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for cropping to page to US legal size">Le_gal</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="legal_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="legal_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="4x6_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4&#xD7;6</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="four_by_six_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="four_by_six_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="custom_crop_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Radio button for cropping to custom page size">_Custom</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">no_crop_menuitem</property>
- <signal name="toggled" handler="custom_crop_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="custom_crop_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="crop_sep_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="crop_rotate_menuitem">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Menu item to rotate the crop area">_Rotate Crop</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="crop_rotate_menuitem_activate_cb"/>
+ <signal name="activate" handler="crop_rotate_menuitem_activate_cb" swapped="no"/>
</object>
</child>
</object>
@@ -310,18 +587,20 @@
<child>
<object class="GtkMenuItem" id="page_move_left_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Menu item to move the selected page to the left">Move Left</property>
<accelerator key="less" signal="activate"/>
- <signal name="activate" handler="page_move_left_menuitem_activate_cb"/>
+ <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="page_move_right_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Menu item to move the selected page to the right">Move Right</property>
<property name="use_underline">True</property>
<accelerator key="greater" signal="activate"/>
- <signal name="activate" handler="page_move_right_menuitem_activate_cb"/>
+ <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
</object>
</child>
<child>
@@ -329,20 +608,22 @@
<property name="label">gtk-copy</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="copy_to_clipboard_button_clicked_cb"/>
+ <signal name="activate" handler="copy_to_clipboard_button_clicked_cb" swapped="no"/>
</object>
- </child>
+ </child>
<child>
<object class="GtkImageMenuItem" id="page_delete_menuitem">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="Delete" signal="activate"/>
- <signal name="activate" handler="page_delete_menuitem_activate_cb"/>
+ <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
</object>
</child>
</object>
@@ -352,29 +633,33 @@
<child>
<object class="GtkMenuItem" id="help_menuitem">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Label on help menu">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="help_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="help_contents_menuitem">
<property name="label" translatable="yes" comments="Help|Contents menu">_Contents</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">help_image</property>
<property name="use_stock">False</property>
<accelerator key="F1" signal="activate"/>
- <signal name="activate" handler="help_contents_menuitem_activate_cb"/>
+ <signal name="activate" handler="help_contents_menuitem_activate_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="about_menuitem">
<property name="label">gtk-about</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="about_menuitem_activate_cb"/>
+ <signal name="activate" handler="about_menuitem_activate_cb" swapped="no"/>
</object>
</child>
</object>
@@ -384,23 +669,26 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<style>
- <class name="primary-toolbar"/>
+ <class name="primary-toolbar"/>
</style>
<child>
<object class="GtkToolButton" id="new_toolbutton">
<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="label" translatable="yes">New</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-new</property>
- <signal name="clicked" handler="new_button_clicked_cb"/>
+ <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -410,28 +698,31 @@
<child>
<object class="GtkMenuToolButton" id="scan_toolbutton">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
<property name="is_important">True</property>
<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>
- <signal name="clicked" handler="scan_button_clicked_cb"/>
+ <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="save_toolbutton">
<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="is_important">True</property>
<property name="label" translatable="yes">Save</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-save</property>
- <signal name="clicked" handler="save_file_button_clicked_cb"/>
+ <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -442,11 +733,12 @@
<object class="GtkToolButton" id="stop_toolbutton">
<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 stop button">Stop the current scan</property>
<property name="label" translatable="yes">Stop</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-stop</property>
- <signal name="clicked" handler="stop_scan_button_clicked_cb"/>
+ <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -456,6 +748,7 @@
<child>
<object class="GtkSeparatorToolItem" id="toolbutton2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -465,11 +758,12 @@
<child>
<object class="GtkToolButton" id="rotate_left_toolbutton">
<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="label" translatable="yes" comments="Label on rotate page left (anti-clockwise) item">Rotate Left</property>
<property name="use_underline">True</property>
<property name="icon_name">object-rotate-left</property>
- <signal name="clicked" handler="rotate_left_button_clicked_cb"/>
+ <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -479,11 +773,12 @@
<child>
<object class="GtkToolButton" id="rotate_right_toolbutton">
<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="label" translatable="yes" comments="Label on rotate page right (clockwise) item">Rotate Right</property>
<property name="use_underline">True</property>
<property name="icon_name">object-rotate-right</property>
- <signal name="clicked" handler="rotate_right_button_clicked_cb"/>
+ <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -493,12 +788,13 @@
<child>
<object class="GtkToggleToolButton" id="crop_toolbutton">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Crop the selected page</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Crop</property>
<property name="use_underline">True</property>
<property name="icon_name">object-crop</property>
- <signal name="toggled" handler="crop_toolbutton_toggled_cb"/>
+ <signal name="toggled" handler="crop_toolbutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -508,6 +804,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -517,139 +814,42 @@
</object>
</child>
</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="device_store">
+ <object class="GtkListStore" id="text_dpi_store">
<columns>
- <!-- column-name device_name -->
- <column type="gchararray"/>
+ <!-- column-name dpi -->
+ <column type="gint"/>
<!-- column-name label -->
<column type="gchararray"/>
</columns>
</object>
- <object class="GtkDialog" id="authorize_dialog">
- <property name="border_width">12</property>
+ <object class="GtkDialog" id="preferences_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">7</property>
+ <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
<property name="resizable">False</property>
- <property name="modal">True</property>
+ <property name="icon_name">scanner</property>
<property name="type_hint">normal</property>
- <property name="urgency_hint">True</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">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="authorize_label">
- <property name="visible">True</property>
- <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkEntry" id="username_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">&#x25CF;</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">&#x25CF;</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="username_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">username_entry</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="password_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="authorize_button">
- <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
+ <object class="GtkButton" id="preferences_close_button">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -660,173 +860,168 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">authorize_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="preferences_dialog">
- <property name="border_width">7</property>
- <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
- <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="response" handler="preferences_dialog_response_cb"/>
- <signal name="delete_event" handler="preferences_dialog_delete_event_cb"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="spacing">2</property>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="n_rows">7</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="source_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="Label beside scan source combo box">Scan S_ource:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">device_combo</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="device_combo">
<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>
- <signal name="changed" handler="device_combo_changed_cb"/>
+ <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="text_dpi_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="Label beside scan source combo box">_Text Resolution:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">text_dpi_combo</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="photo_dpi_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="Label beside scan source combo box">_Photo Resolution:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">photo_dpi_combo</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="text_dpi_combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="model">text_dpi_store</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="photo_dpi_combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="model">photo_dpi_store</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="page_side_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="Label beside scan side combo box">Scan Side:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">photo_dpi_combo</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="page_side_combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="model">page_side_store</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="paper_size_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="Label beside page size combo box">Page Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">photo_dpi_combo</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="paper_size_combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="model">paper_size_store</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -836,27 +1031,27 @@
<property name="xalign">0</property>
<property name="label" translatable="yes" comments="Label beside brightness scale">Brightness:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">brightness_adjustment</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkScale" id="brightness_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="adjustment">brightness_adjustment</property>
<property name="draw_value">False</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -869,24 +1064,25 @@
<property name="mnemonic_widget">contrast_scale</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkScale" id="contrast_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="adjustment">contrast_adjustment</property>
<property name="draw_value">False</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -899,54 +1095,32 @@
<property name="mnemonic_widget">quality_scale</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkScale" id="quality_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="adjustment">quality_adjustment</property>
<property name="draw_value">False</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="preferences_close_button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -957,120 +1131,52 @@
</object>
<object class="GtkMenu" id="scan_toolbutton_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="scan_single_toolbutton_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"/>
+ <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="scan_all_toolbutton_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"/>
+ <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="text_toolbutton_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"/>
+ <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="photo_toolbutton_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>
- <signal name="toggled" handler="photo_menuitem_toggled_cb"/>
+ <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
</object>
</child>
</object>
- <object class="GtkListStore" id="photo_dpi_store">
- <columns>
- <!-- column-name dpi -->
- <column type="gint"/>
- <!-- column-name label -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="text_dpi_store">
- <columns>
- <!-- column-name dpi -->
- <column type="gint"/>
- <!-- column-name label -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkImage" id="help_image">
- <property name="visible">True</property>
- <property name="stock">gtk-help</property>
- </object>
- <object class="GtkImage" id="email_image">
- <property name="visible">True</property>
- <property name="icon_name">mail-send</property>
- </object>
- <object class="GtkListStore" id="page_side_store">
- <columns>
- <!-- column-name side -->
- <column type="gint"/>
- <!-- column-name label -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">3</col>
- <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
- </row>
- <row>
- <col id="0">1</col>
- <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
- </row>
- <row>
- <col id="0">2</col>
- <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="paper_size_store">
- <columns>
- <!-- column-name width -->
- <column type="gint"/>
- <!-- column-name height -->
- <column type="gint"/>
- <!-- column-name label -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkAdjustment" id="brightness_adjustment">
- <property name="lower">-100</property>
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="contrast_adjustment">
- <property name="lower">-100</property>
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="quality_adjustment">
- <property name="lower">0</property>
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>