[Libreoffice-commits] core.git: sc/uiconfig sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jun 29 05:42:59 UTC 2019
sc/uiconfig/scalc/ui/notebookbar.ui | 359 ++++++++++++++++++++++------------
sw/uiconfig/swriter/ui/notebookbar.ui | 34 ++-
2 files changed, 265 insertions(+), 128 deletions(-)
New commits:
commit 086798f6791891540833564c4ec4f136f02c0043
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Jun 28 22:40:52 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Sat Jun 29 07:42:06 2019 +0200
NB tabbed writer and calc update
Change-Id: Ia2822b62df9f467db424bb9741b0081dc0d7bbf4
Reviewed-on: https://gerrit.libreoffice.org/74862
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 048336b1e21e..e4b8c1950d76 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -9511,10 +9511,23 @@
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-View1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom78">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -9538,10 +9551,23 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-View2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom81">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom103">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both</property>
@@ -9565,6 +9591,22 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-View3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB61">
<property name="visible">True</property>
@@ -9575,7 +9617,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA22">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -9599,7 +9641,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB23">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -9627,8 +9669,24 @@
<property name="position">3</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator20">
+ <object class="GtkSeparator" id="separator120">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -9639,22 +9697,9 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="View-Section-Zoom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom24">
<property name="visible">True</property>
@@ -9679,9 +9724,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB51">
<property name="visible">True</property>
@@ -9692,7 +9750,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA28">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -9716,7 +9774,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB29">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -9741,9 +9799,25 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-6"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Zoom2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB50">
<property name="visible">True</property>
@@ -9754,7 +9828,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineA26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -9778,7 +9852,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LineB27">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
@@ -9803,32 +9877,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator120">
- <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">4</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -9838,6 +9897,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator22">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom23">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9861,9 +9935,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Split1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB36">
<property name="visible">True</property>
@@ -9874,7 +9961,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -9906,7 +9993,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">icons</property>
@@ -9932,7 +10019,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -9966,32 +10053,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator22">
- <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>
+ <property name="position">2</property>
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -10001,6 +10073,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator21">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom22">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10024,9 +10111,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Visible1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="GroupB48">
<property name="visible">True</property>
@@ -10037,7 +10137,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10063,7 +10163,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="belowspacing4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10090,20 +10190,36 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox" id="View-Section-Visible2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB46">
+ <object class="GtkBox" id="GroupB55">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin6">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10127,9 +10243,9 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing6">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -10159,21 +10275,6 @@
<property name="position">3</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator21">
- <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">4</property>
- </packing>
- </child>
<style>
<class name="priority-2"/>
</style>
@@ -10181,7 +10282,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -10191,6 +10292,21 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
+ <object class="GtkSeparator" id="separator40">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom38">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10214,7 +10330,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -10224,7 +10340,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">12</property>
</packing>
</child>
</object>
@@ -12918,10 +13034,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Object-ToggleObjectBezierMode">
+ <object class="GtkToolButton" id="Object-OriginalSize">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:AdvancedMode</property>
+ <property name="action_name">.uno:OriginalSize</property>
</object>
<packing>
<property name="expand">False</property>
@@ -12955,17 +13071,6 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Object-FlipHorizontal">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:FlipHorizontal</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<object class="GtkToolButton" id="Object-FlipVertical">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12977,21 +13082,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Object-Shear">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Shear</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Object-CrookSlant">
+ <object class="GtkToolButton" id="Object-FlipHorizontal">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CrookSlant</property>
+ <property name="action_name">.uno:FlipHorizontal</property>
</object>
<packing>
<property name="expand">False</property>
@@ -14348,13 +14442,38 @@
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
+ <object class="GtkToolButton" id="Media-FormatArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="action_name">.uno:FormatArea</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Media-FormatLine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="action_name">.uno:FormatLine</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolButton" id="Media-TransformDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="action_name">.uno:TransformDialog</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index bf25818e7795..f6935d190cab 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -11476,9 +11476,6 @@
<property name="position">2</property>
</packing>
</child>
- <style>
- <class name="priority-10"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -11599,9 +11596,6 @@
<property name="position">2</property>
</packing>
</child>
- <style>
- <class name="priority-9"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -13874,7 +13868,7 @@
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkToolButton" id="DrawFormatArea">
+ <object class="GtkToolButton" id="Draw-FormatArea">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -13886,7 +13880,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="FormatLine">
+ <object class="GtkToolButton" id="Draw-FormatLine">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -15767,6 +15761,30 @@
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
+ <object class="GtkToolButton" id="Media-FormatArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="action_name">.uno:FormatArea</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Media-FormatLine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="action_name">.uno:FormatLine</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolButton" id="Media-TransformDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
More information about the Libreoffice-commits
mailing list