[Libreoffice-commits] core.git: extensions/uiconfig

[andreas kainz]

 extensions/uiconfig/sbibliography/menubar/menubar.xml |   22 +++++--------
 extensions/uiconfig/sbibliography/ui/toolbar.ui       |   30 +++++++++---------
 2 files changed, 24 insertions(+), 28 deletions(-)

New commits:
commit 7ad1c45c3ef07147681c9f084ae2d0936a2438fe
Author: andreas kainz <kainz.a at gmail.com>
Date:   Thu Jun 14 23:12:32 2018 +0200

    menubar sbibliography: finish menubar and fix a bug in the toolbar
    
    Change-Id: I08a6e29aeac8c16bbb987c5513cbf3d0777d4b3a
    Reviewed-on: https://gerrit.libreoffice.org/55835
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml
index 9402451d0f35..b2bf69fd927f 100644
--- a/extensions/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml
@@ -14,27 +14,23 @@
             <menu:menuitem menu:id=".uno:Cut"/>
             <menu:menuitem menu:id=".uno:Copy"/>
             <menu:menuitem menu:id=".uno:Paste"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Bib/Mapping"/>
-            <menu:menuitem menu:id=".uno:Bib/sdbsource"/>
-            <menu:menuitem menu:id=".uno:Bib/DeleteRecord"/>
         </menu:menupopup>
     </menu:menu>
-    <menu:menu menu:id=".uno:ViewMenu">
-        <menu:menupopup>
-            <menu:menuitem menu:id=".uno:AvailableToolbars"/>
-            <menu:menuitem menu:id=".uno:StatusBarVisible"/>
-        </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:InsertMenu">
+    <menu:menu menu:id=".uno:DataMenu">
         <menu:menupopup>
             <menu:menuitem menu:id=".uno:Bib/InsertRecord"/>
+            <menu:menuitem menu:id=".uno:Bib/DeleteRecord"/>
+            <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:Bib/autoFilter"/>
+            <menu:menuitem menu:id=".uno:Bib/standardFilter"/>
+            <menu:menuitem menu:id=".uno:Bib/removeFilter"/>
+            <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:Bib/sdbsource"/>
+            <menu:menuitem menu:id=".uno:Bib/Mapping"/>
         </menu:menupopup>
     </menu:menu>
     <menu:menu menu:id=".uno:ToolsMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:Bib/standardFilter"/>
-            <menu:menuseparator/>
             <menu:menu menu:id=".uno:MacrosMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:MacroRecorder"/>
diff --git a/extensions/uiconfig/sbibliography/ui/toolbar.ui b/extensions/uiconfig/sbibliography/ui/toolbar.ui
index 2eea93f31f57..87eed09f0a8a 100644
--- a/extensions/uiconfig/sbibliography/ui/toolbar.ui
+++ b/extensions/uiconfig/sbibliography/ui/toolbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
+<!-- Generated with glade 3.18.3 -->
 <interface domain="pcr">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkToolbar" id="toolbar">
@@ -32,6 +32,19 @@
       </packing>
     </child>
     <child>
+      <object class="GtkToolButton" id="TBC_BT_CHANGESOURCE">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Bib/sdbsource</property>
+        <property name="label" translatable="yes" context="toolbar|TBC_BT_CHANGESOURCE">Data Source</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkSeparatorToolItem" id="toolbutton1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -119,7 +132,7 @@
       <object class="GtkToolButton" id="TBC_BT_COL_ASSIGN">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">TBC_BT_COL_ASSIGN</property>
+        <property name="action_name">.uno:Bib/Mapping</property>
         <property name="label" translatable="yes" context="toolbar|TBC_BT_COL_ASSIGN">Column Arrangement</property>
         <property name="use_underline">True</property>
       </object>
@@ -128,18 +141,5 @@
         <property name="homogeneous">True</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkToolButton" id="TBC_BT_CHANGESOURCE">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Bib/sdbsource</property>
-        <property name="label" translatable="yes" context="toolbar|TBC_BT_CHANGESOURCE">Data Source</property>
-        <property name="use_underline">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">True</property>
-      </packing>
-    </child>
   </object>
 </interface>