Merge branch 'feature/upstream' into develop

1 files changed, 98 insertions, 8 deletions

diff --git a/data/ui/preferences-dialog.ui b/data/ui/preferences-dialog.ui
index a54709c..fe63150 100644
--- a/data/ui/preferences-dialog.ui
+++ b/data/ui/preferences-dialog.ui
@@ -41,7 +41,6 @@
     </columns>
   </object>
   <template class="PreferencesDialog" parent="HdyPreferencesWindow">
-    <property name="can_focus">False</property>
     <property name="icon_name">org.gnome.SimpleScan</property>
     <property name="search_enabled">False</property>
     <child>
@@ -60,7 +59,6 @@
                 <child>
                   <object class="GtkBox" id="scan_side_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -109,7 +107,6 @@
                 <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="valign">center</property>
                     <property name="model">paper_size_model</property>
@@ -127,7 +124,6 @@
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="homogeneous">True</property>
                     <child>
@@ -206,7 +202,6 @@
                 <child>
                   <object class="GtkComboBox" id="text_dpi_combo">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="model">text_dpi_model</property>
                   </object>
@@ -222,7 +217,6 @@
                 <child>
                   <object class="GtkComboBox" id="photo_dpi_combo">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="model">photo_dpi_model</property>
                   </object>
@@ -232,7 +226,6 @@
             <child>
               <object class="HdyActionRow">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="title" translatable="yes" comments="Label beside brightness scale">_Brightness</property>
                 <property name="use_underline">True</property>
                 <property name="activatable_widget">brightness_scale</property>
@@ -251,7 +244,6 @@
             <child>
               <object class="HdyActionRow">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="title" translatable="yes" comments="Label beside contrast scale">_Contrast</property>
                 <property name="use_underline">True</property>
                 <property name="activatable_widget">contrast_scale</property>
@@ -269,6 +261,104 @@
             </child>
           </object>
         </child>
+        <child>
+          <object class="HdyPreferencesGroup">
+            <property name="visible">True</property>
+            <property name="title" translatable="yes" comments="Preferences Dialog: Section label for postprocessing settings">Postprocessing</property>
+            <child>
+              <object class="HdyActionRow">
+                <property name="visible">True</property>
+                <property name="title" translatable="yes" comments="Switch to enable postprocessing">_Enable Postprocessing</property>
+                <property name="use_underline">True</property>
+                <property name="activatable_widget">postproc_enable_box</property>
+                <child>
+                  <object class="GtkBox" id="postproc_enable_box">
+                    <property name="visible">True</property>
+                    <property name="valign">center</property>
+                    <property name="homogeneous">True</property>
+                    <child>
+                      <object class="GtkSwitch" id="postproc_enable_switch">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">False</property>
+                        <property name="active">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="HdyActionRow">
+                <property name="visible">True</property>
+                <property name="title" translatable="yes" comments="Label beside postprocesing script name entry">_Script</property>
+                <property name="use_underline">True</property>
+                <property name="activatable_widget">postproc_script_entry</property>
+                <child>
+                  <object class="GtkBox" id="postproc_script_box">
+                    <property name="visible">True</property>
+                    <property name="valign">center</property>
+                    <property name="homogeneous">True</property>
+
+                    <child>
+                      <object class="GtkEntry" id="postproc_script_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="HdyActionRow">
+                <property name="visible">True</property>
+                <property name="title" translatable="yes" comments="Label beside postprocesing arguments entry">_Script arguments</property>
+                <property name="use_underline">True</property>
+                <property name="activatable_widget">postproc_args_entry</property>
+                <child>
+                  <object class="GtkBox" id="postproc_args_box">
+                    <property name="visible">True</property>
+                    <property name="valign">center</property>
+                    <property name="homogeneous">True</property>
+
+                    <child>
+                      <object class="GtkEntry" id="postproc_args_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="HdyActionRow">
+                <property name="visible">True</property>
+                <property name="title" translatable="yes" comments="Label beside keep keep original file radio">_Keep original file</property>
+                <property name="use_underline">True</property>
+                <property name="activatable_widget">postproc_keep_original_box</property>
+                <child>
+                  <object class="GtkBox" id="postproc_keep_original_box">
+                    <property name="visible">True</property>
+                    <property name="valign">center</property>
+                    <property name="homogeneous">True</property>
+                      <child>
+                        <object class="GtkSwitch" id="postproc_keep_original_switch">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">False</property>
+                        <property name="active">True</property>
+                        </object>
+                      </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
     </child>
   </template>