[Libreoffice-commits] core.git: sc/uiconfig sw/uiconfig

andreas kainz (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 30 10:16:01 UTC 2020


 sc/uiconfig/scalc/ui/notebookbar.ui   |   15 +++++++------
 sw/uiconfig/swriter/ui/notebookbar.ui |   37 +++++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 18 deletions(-)

New commits:
commit 7eff29d772e12a19e198ea27b3f7e96fd447de27
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Oct 30 00:37:23 2020 +0100
Commit:     Andreas Kainz <kainz.a at gmail.com>
CommitDate: Fri Oct 30 11:15:17 2020 +0100

    NB tabbed update writer and calc arrangement
    
    Change-Id: Id9a0306a661dcc0dafd6b75776da775af9dc4565
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105032
    Tested-by: Jenkins
    Reviewed-by: Andreas Kainz <kainz.a at gmail.com>

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 42b3ca0d35f8..e43dda500640 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface domain="sc">
   <requires lib="gtk+" version="3.20"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -3473,18 +3473,21 @@
                                         <property name="hexpand">True</property>
                                         <property name="orientation">vertical</property>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="sfxlo-NotebookbarToolBox" id="ExtTop5">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="halign">end</property>
-                                        <property name="hexpand">True</property>
                                         <property name="toolbar_style">icons</property>
                                         <property name="show_arrow">False</property>
                                         <child>
                                           <object class="GtkToolButton" id="Home-SubScript">
-                                            <property name="visible">False</property>
+                                            <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:SubScript</property>
                                           </object>
@@ -3495,7 +3498,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkToolButton" id="Home-SuperScript">
-                                            <property name="visible">False</property>
+                                            <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:SuperScript</property>
                                           </object>
@@ -3515,10 +3518,8 @@
                                       <object class="GtkSeparator" id="separator78">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="halign">end</property>
                                         <property name="margin_top">5</property>
                                         <property name="margin_bottom">5</property>
-                                        <property name="hexpand">True</property>
                                         <property name="orientation">vertical</property>
                                       </object>
                                       <packing>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 9b5416eb805a..4833ecb1de94 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3647,17 +3647,6 @@
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-Spacing">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Spacing</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -3665,12 +3654,38 @@
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkSeparator" id="separator12">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
+                                    <property name="orientation">vertical</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <object class="sfxlo-NotebookbarToolBox" id="ExtTop2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
+                                    <child>
+                                      <object class="GtkMenuToolButton" id="Home-Spacing">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="action_name">.uno:Spacing</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="homogeneous">False</property>
+                                      </packing>
+                                    </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="Home-BackColor">
                                         <property name="visible">True</property>


More information about the Libreoffice-commits mailing list