Blame SOURCES/0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch

f325b2
From c33062fc07ac20b1ac28bd000fd3c57016d72e34 Mon Sep 17 00:00:00 2001
f325b2
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
f325b2
Date: Tue, 1 Sep 2015 11:59:32 +0100
f325b2
Subject: [PATCH] Resolves: rhbz#1256843 no obvious means to close template
f325b2
 dialog
f325b2
f325b2
under gnome-shell which doesn't put an "X" to close things in
f325b2
the wm decorations if the GDK DIALOG hint it set
f325b2
f325b2
prior to tdf#72587 this was a modeless dialog and in that case
f325b2
it doesn't have a parent, in which case the hint is NORMAL
f325b2
and it used to get close decorations.
f325b2
f325b2
easist thing to do is to remain modal so the crashes and
f325b2
confusion of tdf#72587 remain fixed but add a close to it to
f325b2
behave like all the other dialogs do
f325b2
f325b2
Change-Id: I64450be0ad1bc7b06196e1342679e15b60fc60d9
f325b2
---
f325b2
 sfx2/uiconfig/ui/templatedlg.ui | 653 +++++++++++++++++++++-------------------
f325b2
 1 file changed, 346 insertions(+), 307 deletions(-)
f325b2
f325b2
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
f325b2
index de8270c..6ed0172 100644
f325b2
--- a/sfx2/uiconfig/ui/templatedlg.ui
f325b2
+++ b/sfx2/uiconfig/ui/templatedlg.ui
f325b2
@@ -1,111 +1,327 @@
f325b2
 
f325b2
 
f325b2
 <interface>
f325b2
-  <requires lib="gtk+" version="3.0"/>
f325b2
+  <requires lib="gtk+" version="3.6"/>
f325b2
   <requires lib="LibreOffice" version="1.0"/>
f325b2
-  <object class="GtkWindow" id="TemplateDialog">
f325b2
+  <object class="GtkDialog" id="TemplateDialog">
f325b2
     <property name="width_request">800</property>
f325b2
-    <property name="height_request">560</property>
f325b2
+    <property name="height_request">600</property>
f325b2
     <property name="can_focus">False</property>
f325b2
-    <property name="modal">True</property>
f325b2
     <property name="border_width">6</property>
f325b2
     <property name="title" translatable="yes">Template Manager</property>
f325b2
-    <child>
f325b2
-      <object class="GtkBox" id="box1">
f325b2
-        <property name="visible">True</property>
f325b2
+    <property name="modal">True</property>
f325b2
+    <property name="type_hint">normal</property>
f325b2
+    <child internal-child="vbox">
f325b2
+      <object class="GtkBox" id="dialog-vbox1">
f325b2
         <property name="can_focus">False</property>
f325b2
-        <property name="border_width">6</property>
f325b2
         <property name="orientation">vertical</property>
f325b2
+        <property name="spacing">2</property>
f325b2
+        <child internal-child="action_area">
f325b2
+          <object class="GtkButtonBox" id="dialog-action_area1">
f325b2
+            <property name="can_focus">False</property>
f325b2
+            <property name="layout_style">end</property>
f325b2
+            <child>
f325b2
+              <object class="GtkButton" id="button1">
f325b2
+                <property name="label">gtk-close</property>
f325b2
+                <property name="visible">True</property>
f325b2
+                <property name="can_focus">True</property>
f325b2
+                <property name="can_default">True</property>
f325b2
+                <property name="has_default">True</property>
f325b2
+                <property name="receives_default">True</property>
f325b2
+                <property name="use_stock">True</property>
f325b2
+              </object>
f325b2
+              <packing>
f325b2
+                <property name="expand">True</property>
f325b2
+                <property name="fill">True</property>
f325b2
+                <property name="position">0</property>
f325b2
+              </packing>
f325b2
+            </child>
f325b2
+          </object>
f325b2
+          <packing>
f325b2
+            <property name="expand">False</property>
f325b2
+            <property name="fill">False</property>
f325b2
+            <property name="position">1</property>
f325b2
+          </packing>
f325b2
+        </child>
f325b2
         <child>
f325b2
-          <object class="GtkNotebook" id="tab_control">
f325b2
+          <object class="GtkBox" id="box1">
f325b2
             <property name="visible">True</property>
f325b2
-            <property name="can_focus">True</property>
f325b2
-            <property name="hexpand">True</property>
f325b2
-            <property name="vexpand">True</property>
f325b2
+            <property name="can_focus">False</property>
f325b2
+            <property name="orientation">vertical</property>
f325b2
             <child>
f325b2
-              <object class="GtkBox" id="box2">
f325b2
+              <object class="GtkNotebook" id="tab_control">
f325b2
                 <property name="visible">True</property>
f325b2
-                <property name="can_focus">False</property>
f325b2
+                <property name="can_focus">True</property>
f325b2
                 <property name="hexpand">True</property>
f325b2
                 <property name="vexpand">True</property>
f325b2
-                <property name="orientation">vertical</property>
f325b2
-                <property name="spacing">6</property>
f325b2
                 <child>
f325b2
-                  <object class="GtkBox" id="box3">
f325b2
+                  <object class="GtkBox" id="box2">
f325b2
                     <property name="visible">True</property>
f325b2
                     <property name="can_focus">False</property>
f325b2
                     <property name="hexpand">True</property>
f325b2
+                    <property name="vexpand">True</property>
f325b2
+                    <property name="orientation">vertical</property>
f325b2
                     <property name="spacing">6</property>
f325b2
                     <child>
f325b2
-                      <object class="GtkToolbar" id="action_view">
f325b2
+                      <object class="GtkBox" id="box3">
f325b2
                         <property name="visible">True</property>
f325b2
                         <property name="can_focus">False</property>
f325b2
                         <property name="hexpand">True</property>
f325b2
+                        <property name="spacing">6</property>
f325b2
                         <child>
f325b2
-                          <object class="GtkToolButton" id="repository">
f325b2
+                          <object class="GtkToolbar" id="action_view">
f325b2
                             <property name="visible">True</property>
f325b2
                             <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">repository</property>
f325b2
-                            <property name="label" translatable="yes">Repository</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview026.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="import">
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">import</property>
f325b2
-                            <property name="label" translatable="yes">Import</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview010.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="delete">
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">delete</property>
f325b2
-                            <property name="label" translatable="yes">Delete</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview025.png</property>
f325b2
+                            <property name="hexpand">True</property>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="repository">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">repository</property>
f325b2
+                                <property name="label" translatable="yes">Repository</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview026.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="import">
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">import</property>
f325b2
+                                <property name="label" translatable="yes">Import</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview010.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="delete">
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">delete</property>
f325b2
+                                <property name="label" translatable="yes">Delete</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview025.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="save">
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">save</property>
f325b2
+                                <property name="label" translatable="yes">Save</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview028.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="new_folder">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">new_folder</property>
f325b2
+                                <property name="label" translatable="yes">New Folder</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview029.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
                           </object>
f325b2
                           <packing>
f325b2
                             <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
+                            <property name="fill">True</property>
f325b2
+                            <property name="position">0</property>
f325b2
                           </packing>
f325b2
                         </child>
f325b2
                         <child>
f325b2
-                          <object class="GtkToolButton" id="save">
f325b2
+                          <object class="GtkToolbar" id="action_templates">
f325b2
                             <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">save</property>
f325b2
-                            <property name="label" translatable="yes">Save</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview028.png</property>
f325b2
+                            <property name="hexpand">True</property>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="template_save">
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">template_save</property>
f325b2
+                                <property name="label" translatable="yes">Save</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview028.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="open">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">open</property>
f325b2
+                                <property name="label" translatable="yes">Open</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview030.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="edit">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">edit</property>
f325b2
+                                <property name="label" translatable="yes">Edit</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actiontemplates019.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="properties">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">properties</property>
f325b2
+                                <property name="label" translatable="yes">Properties</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actiontemplates016.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="default">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">default</property>
f325b2
+                                <property name="label" translatable="yes">Set as Default</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actiontemplates015.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="move">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">move</property>
f325b2
+                                <property name="label" translatable="yes">Move to Folder</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actiontemplates017.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="export">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">export</property>
f325b2
+                                <property name="label" translatable="yes">Export</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actiontemplates020.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="template_delete">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">template_delete</property>
f325b2
+                                <property name="label" translatable="yes">Delete</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actiontemplates018.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
                           </object>
f325b2
                           <packing>
f325b2
                             <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
+                            <property name="fill">True</property>
f325b2
+                            <property name="position">1</property>
f325b2
                           </packing>
f325b2
                         </child>
f325b2
                         <child>
f325b2
-                          <object class="GtkToolButton" id="new_folder">
f325b2
+                          <object class="GtkToolbar" id="action_action">
f325b2
                             <property name="visible">True</property>
f325b2
                             <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">new_folder</property>
f325b2
-                            <property name="label" translatable="yes">New Folder</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview029.png</property>
f325b2
+                            <property name="halign">end</property>
f325b2
+                            <property name="hexpand">True</property>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="search">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">search</property>
f325b2
+                                <property name="label" translatable="yes">Search</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionaction012.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="action_menu">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">action_menu</property>
f325b2
+                                <property name="label" translatable="yes">Action Menu</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionaction013.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
+                            <child>
f325b2
+                              <object class="GtkToolButton" id="template_link">
f325b2
+                                <property name="visible">True</property>
f325b2
+                                <property name="can_focus">False</property>
f325b2
+                                <property name="action_name">template_link</property>
f325b2
+                                <property name="label" translatable="yes">Get more templates for %PRODUCTNAME</property>
f325b2
+                                <property name="use_underline">True</property>
f325b2
+                                <property name="icon_name">sfx2/imglst/actionview010.png</property>
f325b2
+                              </object>
f325b2
+                              <packing>
f325b2
+                                <property name="expand">False</property>
f325b2
+                                <property name="homogeneous">True</property>
f325b2
+                              </packing>
f325b2
+                            </child>
f325b2
                           </object>
f325b2
                           <packing>
f325b2
                             <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
+                            <property name="fill">True</property>
f325b2
+                            <property name="position">2</property>
f325b2
                           </packing>
f325b2
                         </child>
f325b2
                       </object>
f325b2
@@ -116,120 +332,10 @@
f325b2
                       </packing>
f325b2
                     </child>
f325b2
                     <child>
f325b2
-                      <object class="GtkToolbar" id="action_templates">
f325b2
-                        <property name="can_focus">False</property>
f325b2
+                      <object class="GtkEntry" id="search_edit">
f325b2
+                        <property name="can_focus">True</property>
f325b2
                         <property name="hexpand">True</property>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="template_save">
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">template_save</property>
f325b2
-                            <property name="label" translatable="yes">Save</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview028.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="open">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">open</property>
f325b2
-                            <property name="label" translatable="yes">Open</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview030.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="edit">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">edit</property>
f325b2
-                            <property name="label" translatable="yes">Edit</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actiontemplates019.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="properties">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">properties</property>
f325b2
-                            <property name="label" translatable="yes">Properties</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actiontemplates016.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="default">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">default</property>
f325b2
-                            <property name="label" translatable="yes">Set as Default</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actiontemplates015.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="move">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">move</property>
f325b2
-                            <property name="label" translatable="yes">Move to Folder</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actiontemplates017.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="export">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">export</property>
f325b2
-                            <property name="label" translatable="yes">Export</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actiontemplates020.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="template_delete">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">template_delete</property>
f325b2
-                            <property name="label" translatable="yes">Delete</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actiontemplates018.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
+                        <property name="invisible_char">●</property>
f325b2
                       </object>
f325b2
                       <packing>
f325b2
                         <property name="expand">False</property>
f325b2
@@ -238,53 +344,11 @@
f325b2
                       </packing>
f325b2
                     </child>
f325b2
                     <child>
f325b2
-                      <object class="GtkToolbar" id="action_action">
f325b2
+                      <object class="sfxlo-TemplateLocalView" id="template_view">
f325b2
                         <property name="visible">True</property>
f325b2
                         <property name="can_focus">False</property>
f325b2
-                        <property name="halign">end</property>
f325b2
                         <property name="hexpand">True</property>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="search">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">search</property>
f325b2
-                            <property name="label" translatable="yes">Search</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionaction012.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="action_menu">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">action_menu</property>
f325b2
-                            <property name="label" translatable="yes">Action Menu</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionaction013.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
-                        <child>
f325b2
-                          <object class="GtkToolButton" id="template_link">
f325b2
-                            <property name="visible">True</property>
f325b2
-                            <property name="can_focus">False</property>
f325b2
-                            <property name="action_name">template_link</property>
f325b2
-                            <property name="label" translatable="yes">Get more templates for %PRODUCTNAME</property>
f325b2
-                            <property name="use_underline">True</property>
f325b2
-                            <property name="icon_name">sfx2/imglst/actionview010.png</property>
f325b2
-                          </object>
f325b2
-                          <packing>
f325b2
-                            <property name="expand">False</property>
f325b2
-                            <property name="homogeneous">True</property>
f325b2
-                          </packing>
f325b2
-                        </child>
f325b2
+                        <property name="vexpand">True</property>
f325b2
                       </object>
f325b2
                       <packing>
f325b2
                         <property name="expand">False</property>
f325b2
@@ -292,123 +356,98 @@
f325b2
                         <property name="position">2</property>
f325b2
                       </packing>
f325b2
                     </child>
f325b2
+                    <child>
f325b2
+                      <object class="sfxlo-TemplateSearchView" id="search_view">
f325b2
+                        <property name="can_focus">True</property>
f325b2
+                        <property name="no_show_all">True</property>
f325b2
+                        <property name="margin">0</property>
f325b2
+                        <property name="hexpand">True</property>
f325b2
+                        <property name="vexpand">True</property>
f325b2
+                      </object>
f325b2
+                      <packing>
f325b2
+                        <property name="expand">False</property>
f325b2
+                        <property name="fill">True</property>
f325b2
+                        <property name="position">3</property>
f325b2
+                      </packing>
f325b2
+                    </child>
f325b2
+                    <child>
f325b2
+                      <object class="sfxlo-TemplateRemoteView" id="remote_view">
f325b2
+                        <property name="can_focus">True</property>
f325b2
+                        <property name="no_show_all">True</property>
f325b2
+                        <property name="margin">0</property>
f325b2
+                        <property name="hexpand">True</property>
f325b2
+                        <property name="vexpand">True</property>
f325b2
+                      </object>
f325b2
+                      <packing>
f325b2
+                        <property name="expand">False</property>
f325b2
+                        <property name="fill">True</property>
f325b2
+                        <property name="position">4</property>
f325b2
+                      </packing>
f325b2
+                    </child>
f325b2
+                  </object>
f325b2
+                </child>
f325b2
+                <child type="tab">
f325b2
+                  <object class="GtkLabel" id="filter_docs">
f325b2
+                    <property name="visible">True</property>
f325b2
+                    <property name="can_focus">False</property>
f325b2
+                    <property name="label" translatable="yes">Documents</property>
f325b2
                   </object>
f325b2
                   <packing>
f325b2
-                    <property name="expand">False</property>
f325b2
-                    <property name="fill">True</property>
f325b2
-                    <property name="position">0</property>
f325b2
+                    <property name="tab_fill">False</property>
f325b2
                   </packing>
f325b2
                 </child>
f325b2
                 <child>
f325b2
-                  <object class="GtkEntry" id="search_edit">
f325b2
-                    <property name="can_focus">True</property>
f325b2
-                    <property name="hexpand">True</property>
f325b2
-                    <property name="invisible_char">●</property>
f325b2
+                  <placeholder/>
f325b2
+                </child>
f325b2
+                <child type="tab">
f325b2
+                  <object class="GtkLabel" id="filter_sheets">
f325b2
+                    <property name="visible">True</property>
f325b2
+                    <property name="can_focus">False</property>
f325b2
+                    <property name="label" translatable="yes">Spreadsheets</property>
f325b2
                   </object>
f325b2
                   <packing>
f325b2
-                    <property name="expand">False</property>
f325b2
-                    <property name="fill">True</property>
f325b2
                     <property name="position">1</property>
f325b2
+                    <property name="tab_fill">False</property>
f325b2
                   </packing>
f325b2
                 </child>
f325b2
                 <child>
f325b2
-                  <object class="sfxlo-TemplateLocalView" id="template_view">
f325b2
+                  <placeholder/>
f325b2
+                </child>
f325b2
+                <child type="tab">
f325b2
+                  <object class="GtkLabel" id="filter_presentations">
f325b2
                     <property name="visible">True</property>
f325b2
-                    <property name="can_focus">True</property>
f325b2
-                    <property name="hexpand">True</property>
f325b2
-                    <property name="vexpand">True</property>
f325b2
+                    <property name="can_focus">False</property>
f325b2
+                    <property name="label" translatable="yes">Presentations</property>
f325b2
                   </object>
f325b2
                   <packing>
f325b2
-                    <property name="expand">False</property>
f325b2
-                    <property name="fill">True</property>
f325b2
                     <property name="position">2</property>
f325b2
+                    <property name="tab_fill">False</property>
f325b2
                   </packing>
f325b2
                 </child>
f325b2
                 <child>
f325b2
-                  <object class="sfxlo-TemplateSearchView" id="search_view">
f325b2
-                    <property name="can_focus">True</property>
f325b2
-                    <property name="no_show_all">True</property>
f325b2
-                    <property name="margin">0</property>
f325b2
-                    <property name="hexpand">True</property>
f325b2
-                    <property name="vexpand">True</property>
f325b2
-                  </object>
f325b2
-                  <packing>
f325b2
-                    <property name="expand">False</property>
f325b2
-                    <property name="fill">True</property>
f325b2
-                    <property name="position">3</property>
f325b2
-                  </packing>
f325b2
+                  <placeholder/>
f325b2
                 </child>
f325b2
-                <child>
f325b2
-                  <object class="sfxlo-TemplateRemoteView" id="remote_view">
f325b2
-                    <property name="can_focus">True</property>
f325b2
-                    <property name="no_show_all">True</property>
f325b2
-                    <property name="margin">0</property>
f325b2
-                    <property name="hexpand">True</property>
f325b2
-                    <property name="vexpand">True</property>
f325b2
+                <child type="tab">
f325b2
+                  <object class="GtkLabel" id="filter_draws">
f325b2
+                    <property name="visible">True</property>
f325b2
+                    <property name="can_focus">False</property>
f325b2
+                    <property name="label" translatable="yes">Drawings</property>
f325b2
                   </object>
f325b2
                   <packing>
f325b2
-                    <property name="expand">False</property>
f325b2
-                    <property name="fill">True</property>
f325b2
-                    <property name="position">4</property>
f325b2
+                    <property name="position">3</property>
f325b2
+                    <property name="tab_fill">False</property>
f325b2
                   </packing>
f325b2
                 </child>
f325b2
               </object>
f325b2
-            </child>
f325b2
-            <child type="tab">
f325b2
-              <object class="GtkLabel" id="filter_docs">
f325b2
-                <property name="visible">True</property>
f325b2
-                <property name="can_focus">False</property>
f325b2
-                <property name="label" translatable="yes">Documents</property>
f325b2
-              </object>
f325b2
               <packing>
f325b2
-                <property name="tab_fill">False</property>
f325b2
-              </packing>
f325b2
-            </child>
f325b2
-            <child>
f325b2
-              <placeholder/>
f325b2
-            </child>
f325b2
-            <child type="tab">
f325b2
-              <object class="GtkLabel" id="filter_sheets">
f325b2
-                <property name="visible">True</property>
f325b2
-                <property name="can_focus">False</property>
f325b2
-                <property name="label" translatable="yes">Spreadsheets</property>
f325b2
-              </object>
f325b2
-              <packing>
f325b2
-                <property name="position">1</property>
f325b2
-                <property name="tab_fill">False</property>
f325b2
-              </packing>
f325b2
-            </child>
f325b2
-            <child>
f325b2
-              <placeholder/>
f325b2
-            </child>
f325b2
-            <child type="tab">
f325b2
-              <object class="GtkLabel" id="filter_presentations">
f325b2
-                <property name="visible">True</property>
f325b2
-                <property name="can_focus">False</property>
f325b2
-                <property name="label" translatable="yes">Presentations</property>
f325b2
-              </object>
f325b2
-              <packing>
f325b2
-                <property name="position">2</property>
f325b2
-                <property name="tab_fill">False</property>
f325b2
-              </packing>
f325b2
-            </child>
f325b2
-            <child>
f325b2
-              <placeholder/>
f325b2
-            </child>
f325b2
-            <child type="tab">
f325b2
-              <object class="GtkLabel" id="filter_draws">
f325b2
-                <property name="visible">True</property>
f325b2
-                <property name="can_focus">False</property>
f325b2
-                <property name="label" translatable="yes">Drawings</property>
f325b2
-              </object>
f325b2
-              <packing>
f325b2
-                <property name="position">3</property>
f325b2
-                <property name="tab_fill">False</property>
f325b2
+                <property name="expand">False</property>
f325b2
+                <property name="fill">True</property>
f325b2
+                <property name="position">0</property>
f325b2
               </packing>
f325b2
             </child>
f325b2
           </object>
f325b2
           <packing>
f325b2
-            <property name="expand">False</property>
f325b2
+            <property name="expand">True</property>
f325b2
             <property name="fill">True</property>
f325b2
             <property name="position">0</property>
f325b2
           </packing>
f325b2
-- 
f325b2
2.4.0
f325b2