general: Use GtkStackPage in GtkStack

4 files changed, 379 insertions, 356 deletions

diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui b/src/resources/ui/nautilus-batch-rename-dialog.ui
index 850458266..2c246038c 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -88,110 +88,116 @@
                 <property name="transition_type">crossfade</property>
                 <property name="transition_duration">100</property>
                 <child>
-                  <object class="GtkGrid" id="format_stack_child">
-                    <property name="visible">True</property>
-                    <property name="margin-start">40</property>
-                    <property name="margin-end">40</property>
-                    <property name="margin-top">0</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="row-spacing">15</property>
-                    <property name="column-spacing">6</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">horizontal</property>
-                        <property name="spacing">0</property>
-                        <property name="visible">True</property>
-                        <property name="halign">center</property>
-                        <child>
-                          <object class="GtkEntry" id="name_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="has_focus">True</property>
-                            <property name="width_request">400</property>
-                            <property name="hexpand">True</property>
-                            <property name="activates-default">True</property>
-                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
-                            <signal name="insert-text" handler="on_insert_text" swapped="no" />
-                            <signal name="delete-text" handler="on_delete_text" swapped="no" />
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="add_button">
-                            <property name="visible">True</property>
-                            <signal name="toggled" handler="add_button_clicked" swapped="yes" />
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <property name="spacing">0</property>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="visible">True</property>
-                                    <property name="icon-name">list-add-symbolic</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Add</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                            <style>
-                              <class name="linked"/>
-                            </style>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                        <property name="width">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRevealer" id="numbering_revealer">
+                  <object class="GtkStackPage">
+                    <property name="name">format</property>
+                    <property name="title" translatable="yes" comments="Translators: This is a noun, not a verb">Format</property>
+                    <property name="child">
+                      <object class="GtkGrid" id="format_stack_child">
                         <property name="visible">True</property>
-                        <property name="halign">center</property>
+                        <property name="margin-start">40</property>
+                        <property name="margin-end">40</property>
+                        <property name="margin-top">0</property>
+                        <property name="margin-bottom">10</property>
+                        <property name="row-spacing">15</property>
+                        <property name="column-spacing">6</property>
                         <child>
-                          <object class="GtkBox" id="numbering_box">
-                            <property name="visible">True</property>
+                          <object class="GtkBox">
                             <property name="orientation">horizontal</property>
-                            <property name="spacing">10</property>
+                            <property name="spacing">0</property>
+                            <property name="visible">True</property>
+                            <property name="halign">center</property>
                             <child>
-                              <object class="GtkLabel" id="numbering_label">
+                              <object class="GtkEntry" id="name_entry">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Automatic Numbering Order</property>
-                                <property name="can_focus">False</property>
+                                <property name="can_focus">True</property>
+                                <property name="has_focus">True</property>
+                                <property name="width_request">400</property>
+                                <property name="hexpand">True</property>
+                                <property name="activates-default">True</property>
+                                <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
+                                <signal name="insert-text" handler="on_insert_text" swapped="no" />
+                                <signal name="delete-text" handler="on_delete_text" swapped="no" />
                               </object>
                             </child>
                             <child>
-                              <object class="GtkToggleButton" id="numbering_order_button">
+                              <object class="GtkToggleButton" id="add_button">
                                 <property name="visible">True</property>
-                                <signal name="toggled" handler="numbering_order_button_clicked" swapped="yes" />
+                                <signal name="toggled" handler="add_button_clicked" swapped="yes" />
                                 <child>
                                   <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="orientation">horizontal</property>
-                                    <property name="spacing">15</property>
+                                    <property name="spacing">0</property>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="visible">True</property>
+                                        <property name="icon-name">list-add-symbolic</property>
+                                        <property name="icon-size">1</property>
+                                      </object>
+                                    </child>
                                     <child>
-                                      <object class="GtkLabel" id="numbering_order_label">
+                                      <object class="GtkLabel">
                                         <property name="visible">True</property>
-                                        <property name="width-request">180</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Original Name (Ascending)</property>
+                                        <property name="label" translatable="yes">Add</property>
                                         <property name="can_focus">False</property>
                                       </object>
                                     </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="width">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRevealer" id="numbering_revealer">
+                            <property name="visible">True</property>
+                            <property name="halign">center</property>
+                            <child>
+                              <object class="GtkBox" id="numbering_box">
+                                <property name="visible">True</property>
+                                <property name="orientation">horizontal</property>
+                                <property name="spacing">10</property>
+                                <child>
+                                  <object class="GtkLabel" id="numbering_label">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Automatic Numbering Order</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkToggleButton" id="numbering_order_button">
+                                    <property name="visible">True</property>
+                                    <signal name="toggled" handler="numbering_order_button_clicked" swapped="yes" />
                                     <child>
-                                      <object class="GtkImage" id="action_icon">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
-                                        <property name="icon-name">pan-down-symbolic</property>
-                                        <property name="icon-size">1</property>
+                                        <property name="orientation">horizontal</property>
+                                        <property name="spacing">15</property>
+                                        <child>
+                                          <object class="GtkLabel" id="numbering_order_label">
+                                            <property name="visible">True</property>
+                                            <property name="width-request">180</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Original Name (Ascending)</property>
+                                            <property name="can_focus">False</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkImage" id="action_icon">
+                                            <property name="visible">True</property>
+                                            <property name="icon-name">pan-down-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                          </object>
+                                        </child>
                                       </object>
                                     </child>
                                   </object>
@@ -199,92 +205,90 @@
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                            <property name="width">5</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                        <property name="width">5</property>
-                      </packing>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
-                    <property name="name">format</property>
-                    <property name="title" translatable="yes" comments="Translators: This is a noun, not a verb">Format</property>
-                  </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="replace_stack_child">
-                    <property name="visible">True</property>
-                    <property name="margin-start">40</property>
-                    <property name="margin-end">40</property>
-                    <property name="margin-top">0</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="hexpand">True</property>
-                    <property name="halign">center</property>
-                    <property name="row-spacing">15</property>
-                    <property name="column-spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="existing_text_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Existing Text</property>
-                        <property name="can_focus">False</property>
-                        <property name="sensitive">False</property>
-                      </object>
-                        <packing>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                          <property name="width">1</property>
-                        </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="find_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_request">375</property>
-                        <property name="hexpand">False</property>
-                        <property name="activates-default">True</property>
-                        <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
-                        <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
-                      </object>
-                        <packing>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                          <property name="width">3</property>
-                        </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="replace_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Replace With</property>
-                        <property name="can_focus">False</property>
-                        <property name="sensitive">False</property>
-                      </object>
-                        <packing>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                          <property name="width">1</property>
-                        </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="replace_entry">
+                  <object class+"GtkStackPage">
+                    <property name="name">replace</property>
+                    <property name="title" translatable="yes" context="title">Replace</property>
+                    <property name="child">
+                      <object class="GtkGrid" id="replace_stack_child">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="width_request">375</property>
-                        <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
-                        <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
+                        <property name="margin-start">40</property>
+                        <property name="margin-end">40</property>
+                        <property name="margin-top">0</property>
+                        <property name="margin-bottom">10</property>
+                        <property name="hexpand">True</property>
+                        <property name="halign">center</property>
+                        <property name="row-spacing">15</property>
+                        <property name="column-spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="existing_text_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Existing Text</property>
+                            <property name="can_focus">False</property>
+                            <property name="sensitive">False</property>
+                          </object>
+                            <packing>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">0</property>
+                              <property name="width">1</property>
+                            </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="find_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="width_request">375</property>
+                            <property name="hexpand">False</property>
+                            <property name="activates-default">True</property>
+                            <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
+                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
+                          </object>
+                            <packing>
+                              <property name="left-attach">1</property>
+                              <property name="top-attach">0</property>
+                              <property name="width">3</property>
+                            </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="replace_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Replace With</property>
+                            <property name="can_focus">False</property>
+                            <property name="sensitive">False</property>
+                          </object>
+                            <packing>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">1</property>
+                              <property name="width">1</property>
+                            </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="replace_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="width_request">375</property>
+                            <signal name="changed" handler="file_names_widget_entry_on_changed" swapped="yes" />
+                            <signal name="activate" handler="file_names_widget_on_activate" swapped="yes" />
+                          </object>
+                            <packing>
+                              <property name="left-attach">1</property>
+                              <property name="top-attach">1</property>
+                              <property name="width">3</property>
+                            </packing>
+                        </child>
                       </object>
-                        <packing>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                          <property name="width">3</property>
-                        </packing>
-                    </child>
+                    </property>
                   </object>
-                  <packing>
-                    <property name="name">replace</property>
-                    <property name="title" translatable="yes" context="title">Replace</property>
-                  </packing>
                 </child>
               </object>
               <packing>
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
index b9f4487d2..cc522242e 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -81,43 +81,49 @@
             <property name="can_focus">False</property>
             <property name="homogeneous">True</property>
             <child>
-              <object class="GtkLabel" id="zip_description_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Compatible with all operating systems.</property>
-                <property name="xalign">0</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">zip-description-label</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkLabel" id="zip_description_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Compatible with all operating systems.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkLabel" id="tar_xz_description_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Smaller archives but Linux and Mac only.</property>
-                <property name="xalign">0</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">tar-xz-description-label</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkLabel" id="tar_xz_description_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Smaller archives but Linux and Mac only.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkLabel" id="seven_zip_description_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Smaller archives but must be installed on Windows and Mac.</property>
-                <property name="xalign">0</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">seven-zip-description-label</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkLabel" id="seven_zip_description_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Smaller archives but must be installed on Windows and Mac.</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </property>
+              </object>
             </child>
           </object>
         </child>
diff --git a/src/resources/ui/nautilus-search-popover.ui b/src/resources/ui/nautilus-search-popover.ui
index 751367777..4ec43e7bd 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -34,63 +34,66 @@
             <property name="transition_type">crossfade</property>
             <property name="transition_duration">250</property>
             <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="select_date_button">
+              <object class="GtkStackPage">
+                <property name="name">date-button</property>
+                <property name="child">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Select a date</property>
-                    <property name="hexpand">True</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkLabel" id="select_date_button_label">
+                      <object class="GtkButton" id="select_date_button">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Select Dates…</property>
-                        <property name="xalign">0</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a date</property>
+                        <property name="hexpand">True</property>
+                        <child>
+                          <object class="GtkLabel" id="select_date_button_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Select Dates…</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
+                        <signal name="clicked" handler="select_date_button_clicked" object="NautilusSearchPopover" swapped="no" />
                       </object>
                     </child>
-                    <signal name="clicked" handler="select_date_button_clicked" object="NautilusSearchPopover" swapped="no" />
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="clear_date_button">
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Clear the currently selected date</property>
-                    <signal name="clicked" handler="clear_date_button_clicked" object="NautilusSearchPopover" swapped="no" />
                     <child>
-                      <object class="GtkImage" id="clear_date_button_image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">edit-clear-symbolic</property>
+                      <object class="GtkButton" id="clear_date_button">
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Clear the currently selected date</property>
+                        <signal name="clicked" handler="clear_date_button_clicked" object="NautilusSearchPopover" swapped="no" />
+                        <child>
+                          <object class="GtkImage" id="clear_date_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">edit-clear-symbolic</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
+                    <style>
+                      <class name="linked"/>
+                    </style>
                   </object>
-                </child>
-                <style>
-                  <class name="linked"/>
-                </style>
+                </property>
               </object>
-              <packing>
-                <property name="name">date-button</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="date_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="secondary_icon_name">x-office-calendar-symbolic</property>
-                <property name="secondary_icon_tooltip_text" translatable="yes">Show a calendar to select the date</property>
-                <signal name="icon-release" handler="toggle_calendar_icon_clicked" object="NautilusSearchPopover" swapped="no" />
-                <signal name="activate" handler="date_entry_activate" object="NautilusSearchPopover" swapped="no" />
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">date-entry</property>
-                <property name="position">1</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkEntry" id="date_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="secondary_icon_name">x-office-calendar-symbolic</property>
+                    <property name="secondary_icon_tooltip_text" translatable="yes">Show a calendar to select the date</property>
+                    <signal name="icon-release" handler="toggle_calendar_icon_clicked" object="NautilusSearchPopover" swapped="no" />
+                    <signal name="activate" handler="date_entry_activate" object="NautilusSearchPopover" swapped="no" />
+                  </object>
+                </property>
+              </object>
             </child>
           </object>
           <packing>
@@ -134,43 +137,46 @@
                     <property name="transition_type">crossfade</property>
                     <property name="transition_duration">250</property>
                     <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="height_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkViewport">
+                      <object class="GtkStackPage">
+                        <property name="name">date-list</property>
+                        <property name="child">
+                          <object class="GtkScrolledWindow">
+                            <property name="height_request">200</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkListBox" id="dates_listbox">
+                              <object class="GtkViewport">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="selection_mode">none</property>
-                                <signal name="row-activated" handler="dates_listbox_row_activated" object="NautilusSearchPopover" swapped="no" />
+                                <child>
+                                  <object class="GtkListBox" id="dates_listbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="selection_mode">none</property>
+                                    <signal name="row-activated" handler="dates_listbox_row_activated" object="NautilusSearchPopover" swapped="no" />
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
-                        </child>
+                        </property>
                       </object>
-                      <packing>
-                        <property name="name">date-list</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkCalendar" id="calendar">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="valign">start</property>
-                        <property name="show_week_numbers">True</property>
-                        <signal name="day_selected" handler="calendar_day_selected" object="NautilusSearchPopover" swapped="no" />
-                      </object>
-                      <packing>
+                      <object class="GtkStackPage">
                         <property name="name">date-calendar</property>
-                        <property name="position">1</property>
-                      </packing>
+                        <property name="child">
+                          <object class="GtkCalendar" id="calendar">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="valign">start</property>
+                            <property name="show_week_numbers">True</property>
+                            <signal name="day_selected" handler="calendar_day_selected" object="NautilusSearchPopover" swapped="no" />
+                          </object>
+                        </property>
+                      </object>
                     </child>
                   </object>
                   <packing>
@@ -245,65 +251,68 @@
             <property name="transition_type">crossfade</property>
             <property name="transition_duration">250</property>
             <child>
-              <object class="GtkButton" id="select_type_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Which file types will be searched</property>
-                <signal name="clicked" handler="select_type_button_clicked" object="NautilusSearchPopover" swapped="no" />
-                <child>
-                  <object class="GtkBox">
+              <object class="GtkStackPage">
+                <property name="name">type-button</property>
+                <property name="child">
+                  <object class="GtkButton" id="select_type_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="type_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Anything</property>
-                        <property name="width_chars">30</property>
-                        <property name="xalign">0</property>
-                      </object>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Which file types will be searched</property>
+                    <signal name="clicked" handler="select_type_button_clicked" object="NautilusSearchPopover" swapped="no" />
                     <child>
-                      <object class="GtkImage">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">pan-down-symbolic</property>
+                        <child>
+                          <object class="GtkLabel" id="type_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Anything</property>
+                            <property name="width_chars">30</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">pan-down-symbolic</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">type-button</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="height_request">250</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkViewport">
+              <object class="GtkStackPage">
+                <property name="name">type-list</property>
+                <property name="child">
+                  <object class="GtkScrolledWindow">
+                    <property name="height_request">250</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkListBox" id="type_listbox">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="selection_mode">single</property>
-                        <signal name="row-activated" handler="types_listbox_row_activated" object="NautilusSearchPopover" swapped="no" />
+                        <child>
+                          <object class="GtkListBox" id="type_listbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="selection_mode">single</property>
+                            <signal name="row-activated" handler="types_listbox_row_activated" object="NautilusSearchPopover" swapped="no" />
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">type-list</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
           <packing>
diff --git a/src/resources/ui/nautilus-toolbar-switcher.ui b/src/resources/ui/nautilus-toolbar-switcher.ui
index 3b13c9214..0de02af69 100644
--- a/src/resources/ui/nautilus-toolbar-switcher.ui
+++ b/src/resources/ui/nautilus-toolbar-switcher.ui
@@ -8,66 +8,70 @@
     <property name="hexpand">False</property>
     <property name="transition_type">crossfade</property>
     <child>
-      <object class="GtkBox" id="path_bar_container">
-        <property name="can_focus">False</property>
-        <property name="valign">center</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <style>
-          <class name="path-bar-box"/>
-        </style>
-      </object>
-      <packing>
+      <object class="GtkStackPage">
         <property name="name">pathbar</property>
-      </packing>
+        <property name="child">
+          <object class="GtkBox" id="path_bar_container">
+            <property name="can_focus">False</property>
+            <property name="valign">center</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <style>
+              <class name="path-bar-box"/>
+            </style>
+          </object>
+        </property>
+      </object>
     </child>
     <child>
-      <object class="GtkBox" id="location_entry_container">
-        <property name="can_focus">False</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <style>
-          <class name="linked"/>
-        </style>
-      </object>
-      <packing>
+      <object class="GtkStackPage">
         <property name="name">location</property>
-        <property name="position">1</property>
-      </packing>
+        <property name="child">
+          <object class="GtkBox" id="location_entry_container">
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <style>
+              <class name="linked"/>
+            </style>
+          </object>
+        </property>
+      </object>
     </child>
     <child>
-      <object class="GtkBox" id="search_container">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
+      <object class="GtkStackPage">
         <property name="name">search</property>
-        <property name="position">2</property>
-      </packing>
+        <property name="child">
+          <object class="GtkBox" id="search_container">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </property>
+      </object>
     </child>
   </object>
-</interface>
\ No newline at end of file
+</interface>