From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 8 Jun 2023 03:47:34 +0000 (-0400)
Subject: Move resources too
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~171^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a30e0fad1f9cdc953e21af350cd9134c6262bbf9;p=gtk4.git

Move resources too
---

diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py
index 66d2246343..6179fbf8e1 100644
--- a/gtk/gen-gtk-gresources-xml.py
+++ b/gtk/gen-gtk-gresources-xml.py
@@ -68,6 +68,9 @@ for f in get_files('theme/Default/assets-hc', '.svg'):
 for f in get_files('ui', '.ui'):
   xml += '    <file>ui/{0}</file>\n'.format(f)
 
+for f in get_files('print/ui', '.ui'):
+  xml += '    <file>print/ui/{0}</file>\n'.format(f)
+
 xml += '\n'
 
 xml += '''
diff --git a/gtk/print/gtkpagesetupunixdialog.c b/gtk/print/gtkpagesetupunixdialog.c
index ab4ee7f2a9..5879427d3a 100644
--- a/gtk/print/gtkpagesetupunixdialog.c
+++ b/gtk/print/gtkpagesetupunixdialog.c
@@ -146,7 +146,7 @@ gtk_page_setup_unix_dialog_class_init (GtkPageSetupUnixDialogClass *class)
   /* Bind class to template
    */
   gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/libgtk/ui/gtkpagesetupunixdialog.ui");
+                                               "/org/gtk/libgtk/print/ui/gtkpagesetupunixdialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtkPageSetupUnixDialog, printer_combo);
   gtk_widget_class_bind_template_child (widget_class, GtkPageSetupUnixDialog, paper_size_combo);
diff --git a/gtk/print/gtkprintunixdialog.c b/gtk/print/gtkprintunixdialog.c
index 28b9eb4811..5c1c587bb5 100644
--- a/gtk/print/gtkprintunixdialog.c
+++ b/gtk/print/gtkprintunixdialog.c
@@ -460,7 +460,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
   /* Bind class to template
    */
   gtk_widget_class_set_template_from_resource (widget_class,
-					       "/org/gtk/libgtk/ui/gtkprintunixdialog.ui");
+					       "/org/gtk/libgtk/print/ui/gtkprintunixdialog.ui");
 
   /* GtkTreeView / GtkTreeModel */
   gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_list);
diff --git a/gtk/print/ui/gtkpagesetupunixdialog.ui b/gtk/print/ui/gtkpagesetupunixdialog.ui
new file mode 100644
index 0000000000..21315e0d05
--- /dev/null
+++ b/gtk/print/ui/gtkpagesetupunixdialog.ui
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="gtk40">
+  <template class="GtkPageSetupUnixDialog" parent="GtkDialog">
+    <property name="resizable">0</property>
+    <property name="title" translatable="yes">Page Setup</property>
+    <style>
+      <class name="pagesetup"/>
+    </style>
+    <child internal-child="content_area">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="orientation">1</property>
+        <property name="spacing">2</property>
+        <property name="margin-start">5</property>
+        <property name="margin-end">5</property>
+        <property name="margin-top">5</property>
+        <property name="margin-bottom">5</property>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
+            <property name="vexpand">1</property>
+            <child>
+              <object class="GtkLabel" id="printer_combo_label">
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <property name="label" translatable="yes">_Format for:</property>
+                <property name="use-underline">1</property>
+                <property name="mnemonic-widget">printer_combo</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkDropDown" id="printer_combo">
+                <property name="hexpand">1</property>
+                <signal name="notify::selected" handler="printer_changed_callback"/>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                  <property name="column-span">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="paper_size_combo_label">
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <property name="label" translatable="yes">_Paper size:</property>
+                <property name="use-underline">1</property>
+                <property name="mnemonic-widget">paper_size_combo</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkDropDown" id="paper_size_combo">
+                <property name="hexpand">1</property>
+                <signal name="notify::selected" handler="paper_size_changed"/>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                  <property name="column-span">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="paper_size_label">
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                  <property name="column-span">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="orientation_label">
+                <property name="halign">1</property>
+                <property name="valign">3</property>
+                <property name="label" translatable="yes">_Orientation:</property>
+                <property name="use-underline">1</property>
+                <property name="mnemonic-widget">portrait_radio</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="portrait_radio">
+                <property name="active">1</property>
+                <property name="label" translatable="yes">Portrait</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="reverse_portrait_radio">
+                <property name="active">1</property>
+                <property name="group">portrait_radio</property>
+                <property name="label" translatable="yes">Reverse portrait</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="landscape_radio">
+                <property name="hexpand">1</property>
+                <property name="active">1</property>
+                <property name="group">portrait_radio</property>
+                <property name="label" translatable="yes">Landscape</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">4</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="reverse_landscape_radio">
+                <property name="hexpand">1</property>
+                <property name="group">portrait_radio</property>
+                <property name="label" translatable="yes">Reverse landscape</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">4</property>
+                </layout>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/gtk/print/ui/gtkprintunixdialog.ui b/gtk/print/ui/gtkprintunixdialog.ui
new file mode 100644
index 0000000000..d27c585ea2
--- /dev/null
+++ b/gtk/print/ui/gtkprintunixdialog.ui
@@ -0,0 +1,1097 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="gtk40">
+  <object class="GtkAdjustment" id="copies_spin_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">999</property>
+    <property name="value">1</property>
+    <property name="step-increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="scale_spin_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">1000</property>
+    <property name="value">100</property>
+    <property name="step-increment">1</property>
+  </object>
+  <template class="GtkPrintUnixDialog" parent="GtkDialog">
+    <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/>
+    <signal name="response" handler="error_dialogs" swapped="no"/>
+    <child internal-child="content_area">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="orientation">1</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="orientation">1</property>
+            <property name="vexpand">1</property>
+            <child>
+              <object class="GtkNotebook" id="notebook">
+                <property name="show-border">0</property>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="child">
+                      <object class="GtkBox" id="general_main_box">
+                        <property name="orientation">1</property>
+                        <property name="spacing">18</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                        <child>
+                          <object class="GtkBox" id="box2">
+                            <property name="orientation">1</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="printer_swin">
+                                <property name="has-frame">1</property>
+                                <property name="vexpand">1</property>
+                                <child>
+                                  <object class="GtkColumnView" id="printer_list">
+                                    <child>
+                                      <object class="GtkColumnViewColumn">
+                                        <property name="factory">
+                                          <object class="GtkBuilderListItemFactory">
+                                            <property name="bytes"><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkImage">
+        <binding name="icon-name">
+          <lookup name="icon-name" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+        <binding name="sensitive">
+          <lookup name="accepting-jobs" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
+                                            ]]></property>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkColumnViewColumn">
+                                        <property name="title" translatable="yes">Name</property>
+                                        <property name="factory">
+                                          <object class="GtkBuilderListItemFactory">
+                                            <property name="bytes"><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <property name="xalign">0</property>
+        <binding name="label">
+          <lookup name="name" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+        <binding name="sensitive">
+          <lookup name="accepting-jobs" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
+                                            ]]></property>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkColumnViewColumn">
+                                        <property name="title" translatable="yes" comments="this is the header for the location column in the print dialog">Location</property>
+                                        <property name="factory">
+                                          <object class="GtkBuilderListItemFactory">
+                                            <property name="bytes"><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <property name="xalign">0</property>
+        <binding name="label">
+          <lookup name="location" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+        <binding name="sensitive">
+          <lookup name="accepting-jobs" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
+                                            ]]></property>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkColumnViewColumn">
+                                        <property name="title" translatable="yes" comments="this is the header for the printer status column in the print dialog">Status</property>
+                                        <property name="expand">1</property>
+                                        <property name="factory">
+                                          <object class="GtkBuilderListItemFactory">
+                                            <property name="bytes"><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <property name="xalign">0</property>
+        <property name="ellipsize">end</property>
+        <binding name="label">
+          <lookup name="state-message" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+        <binding name="sensitive">
+          <lookup name="accepting-jobs" type="GtkPrinter">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
+                                            ]]></property>
+                                          </object>
+                                        </property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="extension_point">
+                                <property name="spacing">18</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box3">
+                            <property name="spacing">18</property>
+                            <child>
+                              <object class="GtkBox" id="frame_template1">
+                                <property name="orientation">1</property>
+                                <property name="spacing">6</property>
+                                <property name="hexpand">1</property>
+                                <child>
+                                  <object class="GtkLabel" id="label_widget1">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes">Range</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"></attribute>
+                                    </attributes>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="range_table">
+                                    <property name="margin-start">12</property>
+                                    <property name="row-spacing">6</property>
+                                    <property name="column-spacing">12</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="all_pages_radio">
+                                        <property name="label" translatable="yes">_All Pages</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="active">1</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="current_page_radio">
+                                        <property name="label" translatable="yes">C_urrent Page</property>
+                                        <property name="sensitive">0</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="selection_radio">
+                                        <property name="label" translatable="yes">Se_lection</property>
+                                        <property name="sensitive">0</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="page_range_radio">
+                                        <property name="label" translatable="yes">Pag_es:</property>
+                                        <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
+ e.g. 1–3, 7, 11</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="group">all_pages_radio</property>
+                                        <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="page_range_entry">
+                                        <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
+ e.g. 1–3, 7, 11</property>
+                                        <property name="activates-default">1</property>
+                                        <signal name="notify::has-focus" handler="page_range_entry_focus_changed" swapped="no"/>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="frame_template2">
+                                <property name="orientation">1</property>
+                                <property name="spacing">6</property>
+                                <property name="hexpand">1</property>
+                                <child>
+                                  <object class="GtkLabel" id="label_widget2">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes">Copies</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"></attribute>
+                                    </attributes>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="grid1">
+                                    <property name="margin-start">12</property>
+                                    <property name="row-spacing">6</property>
+                                    <property name="column-spacing">12</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label4">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Copie_s:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">copies_spin</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="copies_spin">
+                                        <property name="valign">4</property>
+                                        <property name="adjustment">copies_spin_adjustment</property>
+                                        <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="collate_check">
+                                        <property name="label" translatable="yes">C_ollate</property>
+                                        <property name="use-underline">1</property>
+                                        <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="reverse_check">
+                                        <property name="label" translatable="yes">_Reverse</property>
+                                        <property name="use-underline">1</property>
+                                        <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkDrawingArea" id="collate_image">
+                                        <property name="content-width">70</property>
+                                        <property name="content-height">50</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
+                                          <property name="row-span">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label1">
+                        <property name="label" translatable="yes">General</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="child">
+                      <object class="GtkBox" id="page_setup_main_box">
+                        <property name="orientation">1</property>
+                        <property name="spacing">18</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                        <child>
+                          <object class="GtkBox" id="box4">
+                            <property name="spacing">18</property>
+                            <child>
+                              <object class="GtkBox" id="frame_template3">
+                                <property name="orientation">1</property>
+                                <property name="spacing">6</property>
+                                <property name="hexpand">1</property>
+                                <child>
+                                  <object class="GtkLabel" id="label_widget3">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes">Layout</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"></attribute>
+                                    </attributes>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="grid2">
+                                    <property name="margin-start">12</property>
+                                    <property name="row-spacing">6</property>
+                                    <property name="column-spacing">12</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label5">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">T_wo-sided:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">duplex</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkPrinterOptionWidget" id="duplex">
+                                        <property name="valign">4</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label6">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Pages per _side:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">pages_per_sheet</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
+                                        <property name="valign">4</property>
+                                        <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label7">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Page or_dering:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">number_up_layout</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkPrinterOptionWidget" id="number_up_layout">
+                                        <property name="valign">4</property>
+                                        <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label8">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">_Only print:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">page_set_combo</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkDropDown" id="page_set_combo">
+                                        <property name="valign">4</property>
+                                        <property name="selected">0</property>
+                                        <property name="model">
+                                          <object class="GtkStringList">
+                                            <items>
+                                              <item translatable="yes">All sheets</item>
+                                              <item translatable="yes">Even sheets</item>
+                                              <item translatable="yes">Odd sheets</item>
+                                            </items>
+                                          </object>
+                                        </property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label9">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Sc_ale:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">scale_spin</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">4</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox" id="box5">
+                                        <property name="spacing">6</property>
+                                        <property name="valign">4</property>
+                                        <child>
+                                          <object class="GtkSpinButton" id="scale_spin">
+                                            <property name="valign">4</property>
+                                            <property name="adjustment">scale_spin_adjustment</property>
+                                            <property name="digits">1</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label10">
+                                            <property name="valign">4</property>
+                                            <property name="label">%</property>
+                                          </object>
+                                        </child>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">4</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="frame_template4">
+                                <property name="orientation">1</property>
+                                <property name="spacing">6</property>
+                                <property name="hexpand">1</property>
+                                <child>
+                                  <object class="GtkLabel" id="label_widget4">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes">Paper</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"></attribute>
+                                    </attributes>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="grid3">
+                                    <property name="margin-start">12</property>
+                                    <property name="row-spacing">6</property>
+                                    <property name="column-spacing">12</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label11">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Paper _type:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">paper_type</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkPrinterOptionWidget" id="paper_type">
+                                        <property name="valign">4</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label12">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Paper _source:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">paper_source</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkPrinterOptionWidget" id="paper_source">
+                                        <property name="valign">4</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label13">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Output t_ray:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">output_tray</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkPrinterOptionWidget" id="output_tray">
+                                        <property name="valign">4</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">2</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="paper_size_combo_label">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">_Paper size:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">paper_size_combo</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkDropDown" id="paper_size_combo">
+                                        <property name="sensitive">0</property>
+                                        <property name="valign">4</property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="orientation_combo_label">
+                                        <property name="halign">1</property>
+                                        <property name="valign">4</property>
+                                        <property name="label" translatable="yes">Or_ientation:</property>
+                                        <property name="use-underline">1</property>
+                                        <property name="mnemonic-widget">orientation_combo</property>
+                                        <layout>
+                                          <property name="column">0</property>
+                                          <property name="row">4</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkDropDown" id="orientation_combo">
+                                        <property name="sensitive">0</property>
+                                        <property name="selected">0</property>
+                                        <property name="valign">4</property>
+                                        <property name="model">
+                                          <object class="GtkStringList">
+                                            <items>
+                                              <item translatable="yes">Portrait</item>
+                                              <item translatable="yes">Landscape</item>
+                                              <item translatable="yes">Reverse portrait</item>
+                                              <item translatable="yes">Reverse landscape</item>
+                                            </items>
+                                          </object>
+                                        </property>
+                                        <layout>
+                                          <property name="column">1</property>
+                                          <property name="row">4</property>
+                                        </layout>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box6">
+                            <child>
+                              <object class="GtkDrawingArea" id="page_layout_preview">
+                                <property name="content-width">320</property>
+                                <property name="content-height">160</property>
+                                <property name="hexpand">1</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label2">
+                        <property name="label" translatable="yes">Page Setup</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="child">
+                      <object class="GtkGrid" id="job_page">
+                        <property name="row-spacing">18</property>
+                        <property name="column-spacing">18</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                        <child>
+                          <object class="GtkBox" id="frame_template5">
+                            <property name="orientation">1</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_widget5">
+                                <property name="halign">1</property>
+                                <property name="valign">3</property>
+                                <property name="label" translatable="yes">Job Details</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"></attribute>
+                                </attributes>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid5">
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="label16">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes">Pri_ority:</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">job_prio</property>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkPrinterOptionWidget" id="job_prio">
+                                    <layout>
+                                      <property name="column">1</property>
+                                      <property name="row">0</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label17">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes">_Billing info:</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">billing_info</property>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkPrinterOptionWidget" id="billing_info">
+                                    <layout>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="frame_template6">
+                            <property name="orientation">1</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_widget6">
+                                <property name="halign">1</property>
+                                <property name="valign">3</property>
+                                <property name="label" translatable="yes">Print Document</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"></attribute>
+                                </attributes>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid6">
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="print_now_radio">
+                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="active">1</property>
+                                    <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="print_at_radio">
+                                    <property name="sensitive">0</property>
+                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
+                                    <property name="has-tooltip">1</property>
+                                    <property name="tooltip-markup" translatable="yes">Specify the time of print,
+ e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
+                                    <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+ e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="group">print_now_radio</property>
+                                    <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
+                                    <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="print_at_entry">
+                                    <property name="sensitive">0</property>
+                                    <property name="has-tooltip">1</property>
+                                    <property name="tooltip-markup" translatable="yes">Specify the time of print,
+ e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
+                                    <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+ e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
+                                    <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="print_hold_radio">
+                                    <property name="sensitive">0</property>
+                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
+                                    <property name="has-tooltip">1</property>
+                                    <property name="tooltip-markup" translatable="yes">Hold the job until it is explicitly released</property>
+                                    <property name="tooltip-text" translatable="yes">Hold the job until it is explicitly released</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="group">print_now_radio</property>
+                                    <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="frame_template7">
+                            <property name="orientation">1</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_widget7">
+                                <property name="halign">1</property>
+                                <property name="valign">3</property>
+                                <property name="label" translatable="yes">Add Cover Page</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"></attribute>
+                                </attributes>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid7">
+                                <property name="margin-start">12</property>
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="label18">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">cover_before</property>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkPrinterOptionWidget" id="cover_before">
+                                    <layout>
+                                      <property name="column">1</property>
+                                      <property name="row">0</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label19">
+                                    <property name="halign">1</property>
+                                    <property name="valign">3</property>
+                                    <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
+                                    <property name="use-underline">1</property>
+                                    <property name="mnemonic-widget">cover_after</property>
+                                    <layout>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkPrinterOptionWidget" id="cover_after">
+                                    <layout>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
+                                    </layout>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label3">
+                        <property name="label" translatable="yes">Job</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="position">3</property>
+                    <property name="child">
+                      <object class="GtkScrolledWindow" id="image_quality_page">
+                        <property name="hscrollbar-policy">2</property>
+                        <property name="hexpand">1</property>
+                        <child>
+                          <object class="GtkViewport" id="viewport1">
+                            <child>
+                              <object class="GtkGrid" id="image_quality_table">
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label20">
+                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Image Quality</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="position">4</property>
+                    <property name="child">
+                      <object class="GtkScrolledWindow" id="color_page">
+                        <property name="hscrollbar-policy">2</property>
+                        <child>
+                          <object class="GtkViewport" id="viewport2">
+                            <child>
+                              <object class="GtkGrid" id="color_table">
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label21">
+                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Color</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="position">5</property>
+                    <property name="child">
+                      <object class="GtkScrolledWindow" id="finishing_page">
+                        <property name="hscrollbar-policy">2</property>
+                        <child>
+                          <object class="GtkViewport" id="viewport3">
+                            <child>
+                              <object class="GtkGrid" id="finishing_table">
+                                <property name="row-spacing">6</property>
+                                <property name="column-spacing">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label22">
+                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog. It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishing</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkNotebookPage">
+                    <property name="position">6</property>
+                    <property name="child">
+                      <object class="GtkScrolledWindow" id="advanced_page">
+                        <property name="hscrollbar-policy">2</property>
+                        <child>
+                          <object class="GtkViewport" id="viewport4">
+                            <child>
+                              <object class="GtkBox" id="advanced_vbox">
+                                <property name="orientation">1</property>
+                                <property name="spacing">18</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="tab">
+                      <object class="GtkLabel" id="label23">
+                        <property name="label" translatable="yes">Advanced</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkActionBar" id="conflicts_widget">
+                <child>
+                  <object class="GtkImage" id="image1">
+                    <property name="icon-name">dialog-warning-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label24">
+                    <property name="label" translatable="yes">Some of the settings in the dialog conflict</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
deleted file mode 100644
index 21315e0d05..0000000000
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk40">
-  <template class="GtkPageSetupUnixDialog" parent="GtkDialog">
-    <property name="resizable">0</property>
-    <property name="title" translatable="yes">Page Setup</property>
-    <style>
-      <class name="pagesetup"/>
-    </style>
-    <child internal-child="content_area">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">1</property>
-        <property name="spacing">2</property>
-        <property name="margin-start">5</property>
-        <property name="margin-end">5</property>
-        <property name="margin-top">5</property>
-        <property name="margin-bottom">5</property>
-        <child>
-          <object class="GtkGrid" id="grid1">
-            <property name="row-spacing">6</property>
-            <property name="column-spacing">12</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-top">5</property>
-            <property name="margin-bottom">5</property>
-            <property name="vexpand">1</property>
-            <child>
-              <object class="GtkLabel" id="printer_combo_label">
-                <property name="halign">1</property>
-                <property name="valign">3</property>
-                <property name="label" translatable="yes">_Format for:</property>
-                <property name="use-underline">1</property>
-                <property name="mnemonic-widget">printer_combo</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkDropDown" id="printer_combo">
-                <property name="hexpand">1</property>
-                <signal name="notify::selected" handler="printer_changed_callback"/>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">0</property>
-                  <property name="column-span">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="paper_size_combo_label">
-                <property name="halign">1</property>
-                <property name="valign">3</property>
-                <property name="label" translatable="yes">_Paper size:</property>
-                <property name="use-underline">1</property>
-                <property name="mnemonic-widget">paper_size_combo</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkDropDown" id="paper_size_combo">
-                <property name="hexpand">1</property>
-                <signal name="notify::selected" handler="paper_size_changed"/>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">1</property>
-                  <property name="column-span">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="paper_size_label">
-                <property name="halign">1</property>
-                <property name="valign">3</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">2</property>
-                  <property name="column-span">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="orientation_label">
-                <property name="halign">1</property>
-                <property name="valign">3</property>
-                <property name="label" translatable="yes">_Orientation:</property>
-                <property name="use-underline">1</property>
-                <property name="mnemonic-widget">portrait_radio</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="portrait_radio">
-                <property name="active">1</property>
-                <property name="label" translatable="yes">Portrait</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="reverse_portrait_radio">
-                <property name="active">1</property>
-                <property name="group">portrait_radio</property>
-                <property name="label" translatable="yes">Reverse portrait</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="landscape_radio">
-                <property name="hexpand">1</property>
-                <property name="active">1</property>
-                <property name="group">portrait_radio</property>
-                <property name="label" translatable="yes">Landscape</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">4</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="reverse_landscape_radio">
-                <property name="hexpand">1</property>
-                <property name="group">portrait_radio</property>
-                <property name="label" translatable="yes">Reverse landscape</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">4</property>
-                </layout>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
deleted file mode 100644
index d27c585ea2..0000000000
--- a/gtk/ui/gtkprintunixdialog.ui
+++ /dev/null
@@ -1,1097 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk40">
-  <object class="GtkAdjustment" id="copies_spin_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">999</property>
-    <property name="value">1</property>
-    <property name="step-increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="scale_spin_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">1000</property>
-    <property name="value">100</property>
-    <property name="step-increment">1</property>
-  </object>
-  <template class="GtkPrintUnixDialog" parent="GtkDialog">
-    <signal name="notify::page-setup" handler="redraw_page_layout_preview" swapped="no"/>
-    <signal name="response" handler="error_dialogs" swapped="no"/>
-    <child internal-child="content_area">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="orientation">1</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkBox" id="box1">
-            <property name="orientation">1</property>
-            <property name="vexpand">1</property>
-            <child>
-              <object class="GtkNotebook" id="notebook">
-                <property name="show-border">0</property>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="child">
-                      <object class="GtkBox" id="general_main_box">
-                        <property name="orientation">1</property>
-                        <property name="spacing">18</property>
-                        <property name="margin-start">12</property>
-                        <property name="margin-end">12</property>
-                        <property name="margin-top">12</property>
-                        <property name="margin-bottom">12</property>
-                        <child>
-                          <object class="GtkBox" id="box2">
-                            <property name="orientation">1</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="printer_swin">
-                                <property name="has-frame">1</property>
-                                <property name="vexpand">1</property>
-                                <child>
-                                  <object class="GtkColumnView" id="printer_list">
-                                    <child>
-                                      <object class="GtkColumnViewColumn">
-                                        <property name="factory">
-                                          <object class="GtkBuilderListItemFactory">
-                                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkImage">
-        <binding name="icon-name">
-          <lookup name="icon-name" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-        <binding name="sensitive">
-          <lookup name="accepting-jobs" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                                            ]]></property>
-                                          </object>
-                                        </property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkColumnViewColumn">
-                                        <property name="title" translatable="yes">Name</property>
-                                        <property name="factory">
-                                          <object class="GtkBuilderListItemFactory">
-                                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="name" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-        <binding name="sensitive">
-          <lookup name="accepting-jobs" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                                            ]]></property>
-                                          </object>
-                                        </property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkColumnViewColumn">
-                                        <property name="title" translatable="yes" comments="this is the header for the location column in the print dialog">Location</property>
-                                        <property name="factory">
-                                          <object class="GtkBuilderListItemFactory">
-                                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="location" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-        <binding name="sensitive">
-          <lookup name="accepting-jobs" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                                            ]]></property>
-                                          </object>
-                                        </property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkColumnViewColumn">
-                                        <property name="title" translatable="yes" comments="this is the header for the printer status column in the print dialog">Status</property>
-                                        <property name="expand">1</property>
-                                        <property name="factory">
-                                          <object class="GtkBuilderListItemFactory">
-                                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <property name="ellipsize">end</property>
-        <binding name="label">
-          <lookup name="state-message" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-        <binding name="sensitive">
-          <lookup name="accepting-jobs" type="GtkPrinter">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                                            ]]></property>
-                                          </object>
-                                        </property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="extension_point">
-                                <property name="spacing">18</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box3">
-                            <property name="spacing">18</property>
-                            <child>
-                              <object class="GtkBox" id="frame_template1">
-                                <property name="orientation">1</property>
-                                <property name="spacing">6</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkLabel" id="label_widget1">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes">Range</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"></attribute>
-                                    </attributes>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="range_table">
-                                    <property name="margin-start">12</property>
-                                    <property name="row-spacing">6</property>
-                                    <property name="column-spacing">12</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="all_pages_radio">
-                                        <property name="label" translatable="yes">_All Pages</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="active">1</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">0</property>
-                                          <property name="column-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="current_page_radio">
-                                        <property name="label" translatable="yes">C_urrent Page</property>
-                                        <property name="sensitive">0</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="group">all_pages_radio</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">1</property>
-                                          <property name="column-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="selection_radio">
-                                        <property name="label" translatable="yes">Se_lection</property>
-                                        <property name="sensitive">0</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="group">all_pages_radio</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">2</property>
-                                          <property name="column-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="page_range_radio">
-                                        <property name="label" translatable="yes">Pag_es:</property>
-                                        <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
- e.g. 1–3, 7, 11</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="group">all_pages_radio</property>
-                                        <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="page_range_entry">
-                                        <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
- e.g. 1–3, 7, 11</property>
-                                        <property name="activates-default">1</property>
-                                        <signal name="notify::has-focus" handler="page_range_entry_focus_changed" swapped="no"/>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="frame_template2">
-                                <property name="orientation">1</property>
-                                <property name="spacing">6</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkLabel" id="label_widget2">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes">Copies</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"></attribute>
-                                    </attributes>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid1">
-                                    <property name="margin-start">12</property>
-                                    <property name="row-spacing">6</property>
-                                    <property name="column-spacing">12</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label4">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Copie_s:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">copies_spin</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">0</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" id="copies_spin">
-                                        <property name="valign">4</property>
-                                        <property name="adjustment">copies_spin_adjustment</property>
-                                        <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
-                                        <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">0</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="collate_check">
-                                        <property name="label" translatable="yes">C_ollate</property>
-                                        <property name="use-underline">1</property>
-                                        <signal name="toggled" handler="update_collate_icon" swapped="no"/>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="reverse_check">
-                                        <property name="label" translatable="yes">_Reverse</property>
-                                        <property name="use-underline">1</property>
-                                        <signal name="toggled" handler="update_collate_icon" swapped="no"/>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDrawingArea" id="collate_image">
-                                        <property name="content-width">70</property>
-                                        <property name="content-height">50</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">1</property>
-                                          <property name="row-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label1">
-                        <property name="label" translatable="yes">General</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="child">
-                      <object class="GtkBox" id="page_setup_main_box">
-                        <property name="orientation">1</property>
-                        <property name="spacing">18</property>
-                        <property name="margin-start">12</property>
-                        <property name="margin-end">12</property>
-                        <property name="margin-top">12</property>
-                        <property name="margin-bottom">12</property>
-                        <child>
-                          <object class="GtkBox" id="box4">
-                            <property name="spacing">18</property>
-                            <child>
-                              <object class="GtkBox" id="frame_template3">
-                                <property name="orientation">1</property>
-                                <property name="spacing">6</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkLabel" id="label_widget3">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes">Layout</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"></attribute>
-                                    </attributes>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid2">
-                                    <property name="margin-start">12</property>
-                                    <property name="row-spacing">6</property>
-                                    <property name="column-spacing">12</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label5">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">T_wo-sided:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">duplex</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">0</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPrinterOptionWidget" id="duplex">
-                                        <property name="valign">4</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">0</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label6">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Pages per _side:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">pages_per_sheet</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
-                                        <property name="valign">4</property>
-                                        <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
-                                        <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label7">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Page or_dering:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">number_up_layout</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPrinterOptionWidget" id="number_up_layout">
-                                        <property name="valign">4</property>
-                                        <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label8">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">_Only print:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">page_set_combo</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropDown" id="page_set_combo">
-                                        <property name="valign">4</property>
-                                        <property name="selected">0</property>
-                                        <property name="model">
-                                          <object class="GtkStringList">
-                                            <items>
-                                              <item translatable="yes">All sheets</item>
-                                              <item translatable="yes">Even sheets</item>
-                                              <item translatable="yes">Odd sheets</item>
-                                            </items>
-                                          </object>
-                                        </property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label9">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Sc_ale:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">scale_spin</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">4</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkBox" id="box5">
-                                        <property name="spacing">6</property>
-                                        <property name="valign">4</property>
-                                        <child>
-                                          <object class="GtkSpinButton" id="scale_spin">
-                                            <property name="valign">4</property>
-                                            <property name="adjustment">scale_spin_adjustment</property>
-                                            <property name="digits">1</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label10">
-                                            <property name="valign">4</property>
-                                            <property name="label">%</property>
-                                          </object>
-                                        </child>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">4</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="frame_template4">
-                                <property name="orientation">1</property>
-                                <property name="spacing">6</property>
-                                <property name="hexpand">1</property>
-                                <child>
-                                  <object class="GtkLabel" id="label_widget4">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes">Paper</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"></attribute>
-                                    </attributes>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid3">
-                                    <property name="margin-start">12</property>
-                                    <property name="row-spacing">6</property>
-                                    <property name="column-spacing">12</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label11">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Paper _type:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">paper_type</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">0</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPrinterOptionWidget" id="paper_type">
-                                        <property name="valign">4</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">0</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label12">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Paper _source:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">paper_source</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPrinterOptionWidget" id="paper_source">
-                                        <property name="valign">4</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label13">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Output t_ray:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">output_tray</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPrinterOptionWidget" id="output_tray">
-                                        <property name="valign">4</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="paper_size_combo_label">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">_Paper size:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">paper_size_combo</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropDown" id="paper_size_combo">
-                                        <property name="sensitive">0</property>
-                                        <property name="valign">4</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="orientation_combo_label">
-                                        <property name="halign">1</property>
-                                        <property name="valign">4</property>
-                                        <property name="label" translatable="yes">Or_ientation:</property>
-                                        <property name="use-underline">1</property>
-                                        <property name="mnemonic-widget">orientation_combo</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">4</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropDown" id="orientation_combo">
-                                        <property name="sensitive">0</property>
-                                        <property name="selected">0</property>
-                                        <property name="valign">4</property>
-                                        <property name="model">
-                                          <object class="GtkStringList">
-                                            <items>
-                                              <item translatable="yes">Portrait</item>
-                                              <item translatable="yes">Landscape</item>
-                                              <item translatable="yes">Reverse portrait</item>
-                                              <item translatable="yes">Reverse landscape</item>
-                                            </items>
-                                          </object>
-                                        </property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">4</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box6">
-                            <child>
-                              <object class="GtkDrawingArea" id="page_layout_preview">
-                                <property name="content-width">320</property>
-                                <property name="content-height">160</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label2">
-                        <property name="label" translatable="yes">Page Setup</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="child">
-                      <object class="GtkGrid" id="job_page">
-                        <property name="row-spacing">18</property>
-                        <property name="column-spacing">18</property>
-                        <property name="margin-start">12</property>
-                        <property name="margin-end">12</property>
-                        <property name="margin-top">12</property>
-                        <property name="margin-bottom">12</property>
-                        <child>
-                          <object class="GtkBox" id="frame_template5">
-                            <property name="orientation">1</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label_widget5">
-                                <property name="halign">1</property>
-                                <property name="valign">3</property>
-                                <property name="label" translatable="yes">Job Details</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"></attribute>
-                                </attributes>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid5">
-                                <property name="margin-start">12</property>
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="label16">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes">Pri_ority:</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="mnemonic-widget">job_prio</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">0</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkPrinterOptionWidget" id="job_prio">
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">0</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label17">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes">_Billing info:</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="mnemonic-widget">billing_info</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkPrinterOptionWidget" id="billing_info">
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="frame_template6">
-                            <property name="orientation">1</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label_widget6">
-                                <property name="halign">1</property>
-                                <property name="valign">3</property>
-                                <property name="label" translatable="yes">Print Document</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"></attribute>
-                                </attributes>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid6">
-                                <property name="margin-start">12</property>
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="print_now_radio">
-                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="active">1</property>
-                                    <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">0</property>
-                                      <property name="column-span">2</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="print_at_radio">
-                                    <property name="sensitive">0</property>
-                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
-                                    <property name="has-tooltip">1</property>
-                                    <property name="tooltip-markup" translatable="yes">Specify the time of print,
- e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                    <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
- e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="group">print_now_radio</property>
-                                    <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
-                                    <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="print_at_entry">
-                                    <property name="sensitive">0</property>
-                                    <property name="has-tooltip">1</property>
-                                    <property name="tooltip-markup" translatable="yes">Specify the time of print,
- e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                    <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
- e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                    <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="print_hold_radio">
-                                    <property name="sensitive">0</property>
-                                    <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
-                                    <property name="has-tooltip">1</property>
-                                    <property name="tooltip-markup" translatable="yes">Hold the job until it is explicitly released</property>
-                                    <property name="tooltip-text" translatable="yes">Hold the job until it is explicitly released</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="group">print_now_radio</property>
-                                    <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">2</property>
-                                      <property name="column-span">2</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="frame_template7">
-                            <property name="orientation">1</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label_widget7">
-                                <property name="halign">1</property>
-                                <property name="valign">3</property>
-                                <property name="label" translatable="yes">Add Cover Page</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"></attribute>
-                                </attributes>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid7">
-                                <property name="margin-start">12</property>
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="label18">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="mnemonic-widget">cover_before</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">0</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_before">
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">0</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label19">
-                                    <property name="halign">1</property>
-                                    <property name="valign">3</property>
-                                    <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
-                                    <property name="use-underline">1</property>
-                                    <property name="mnemonic-widget">cover_after</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_after">
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label3">
-                        <property name="label" translatable="yes">Job</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="position">3</property>
-                    <property name="child">
-                      <object class="GtkScrolledWindow" id="image_quality_page">
-                        <property name="hscrollbar-policy">2</property>
-                        <property name="hexpand">1</property>
-                        <child>
-                          <object class="GtkViewport" id="viewport1">
-                            <child>
-                              <object class="GtkGrid" id="image_quality_table">
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">12</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label20">
-                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Image Quality</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="position">4</property>
-                    <property name="child">
-                      <object class="GtkScrolledWindow" id="color_page">
-                        <property name="hscrollbar-policy">2</property>
-                        <child>
-                          <object class="GtkViewport" id="viewport2">
-                            <child>
-                              <object class="GtkGrid" id="color_table">
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">12</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label21">
-                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Color</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="position">5</property>
-                    <property name="child">
-                      <object class="GtkScrolledWindow" id="finishing_page">
-                        <property name="hscrollbar-policy">2</property>
-                        <child>
-                          <object class="GtkViewport" id="viewport3">
-                            <child>
-                              <object class="GtkGrid" id="finishing_table">
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">12</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label22">
-                        <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog. It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishing</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkNotebookPage">
-                    <property name="position">6</property>
-                    <property name="child">
-                      <object class="GtkScrolledWindow" id="advanced_page">
-                        <property name="hscrollbar-policy">2</property>
-                        <child>
-                          <object class="GtkViewport" id="viewport4">
-                            <child>
-                              <object class="GtkBox" id="advanced_vbox">
-                                <property name="orientation">1</property>
-                                <property name="spacing">18</property>
-                                <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">12</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                    <property name="tab">
-                      <object class="GtkLabel" id="label23">
-                        <property name="label" translatable="yes">Advanced</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkActionBar" id="conflicts_widget">
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="icon-name">dialog-warning-symbolic</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label24">
-                    <property name="label" translatable="yes">Some of the settings in the dialog conflict</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4654345c53..a88114f290 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -401,10 +401,10 @@ gtk/ui/gtkfontchooserwidget.ui
 gtk/ui/gtklockbutton.ui
 gtk/ui/gtkmediacontrols.ui
 gtk/ui/gtkmessagedialog.ui
-gtk/ui/gtkpagesetupunixdialog.ui
+gtk/print/ui/gtkpagesetupunixdialog.ui
 gtk/ui/gtkplacesviewrow.ui
 gtk/ui/gtkplacesview.ui
-gtk/ui/gtkprintunixdialog.ui
+gtk/print/ui/gtkprintunixdialog.ui
 gtk/ui/gtkscalebutton.ui
 gtk/ui/gtksidebarrow.ui
 gtk/ui/gtkstatusbar.ui