[Libreoffice-commits] core.git: sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 29 09:15:39 UTC 2020
sw/uiconfig/swriter/ui/notebookbar.ui | 425 ++++++++++++++++++----------------
1 file changed, 226 insertions(+), 199 deletions(-)
New commits:
commit 08c5891bfcd67a6e0b7768a17afc3153668300df
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Thu Oct 29 00:29:23 2020 +0100
Commit: Andreas Kainz <kainz.a at gmail.com>
CommitDate: Thu Oct 29 10:15:07 2020 +0100
Writer Notebookbar update
Change-Id: I33cbda2a3afefef5f50ae86b935c857a044ce2eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104984
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index b1a0f4800436..d3fb69d3be4c 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/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="sw">
<requires lib="gtk+" version="3.20"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -2704,7 +2704,6 @@
</child>
<child>
<object class="GtkToolButton" id="File-ExportToPDF">
- <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ExportToPDF</property>
<property name="use_underline">True</property>
@@ -2741,7 +2740,6 @@
</child>
<child>
<object class="GtkToolButton" id="File-ExportToEPUB">
- <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:ExportToEPUB</property>
<property name="use_underline">True</property>
@@ -3587,6 +3585,16 @@
<property name="homogeneous">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton" id="Home-Shadowed">
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Shadowed</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3598,8 +3606,10 @@
<object class="GtkSeparator" id="separator5">
<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>
@@ -3613,8 +3623,6 @@
<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>
@@ -3639,6 +3647,17 @@
<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>
@@ -3646,23 +3665,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <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>
- <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>
@@ -3797,21 +3799,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator68">
- <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">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3889,21 +3876,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator8">
- <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">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3944,7 +3916,24 @@
<object class="GtkBox" id="GroupB93">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkSeparator" id="separator68">
+ <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">1</property>
+ </packing>
+ </child>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom81">
<property name="visible">True</property>
@@ -3977,6 +3966,19 @@
<property name="homogeneous">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton" id="Home-HangingIndent">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:HangingIndent</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
<child>
<object class="GtkToolButton" id="Home-ControlCodes1">
<property name="visible">True</property>
@@ -4030,13 +4032,56 @@
<object class="GtkBox" id="GroupB94">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkSeparator" id="separator8">
+ <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="SectionBottom125">
<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="GtkToolButton" id="Home-ParaspaceIncrease">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:ParaspaceIncrease</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Home-ParaspaceDecrease">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:ParaspaceDecrease</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
<child>
<object class="GtkMenuToolButton" id="Home-LineSpacing1">
<property name="visible">True</property>
@@ -4104,25 +4149,9 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- <style>
- <class name="priority-6"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Home-Section-Style2">
- <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="separator10">
<property name="visible">True</property>
@@ -4135,7 +4164,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -4145,37 +4174,39 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Home-Section-Style3">
+ <object class="VclOptionalBox" id="Home-Section-Style4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB80">
+ <object class="GtkBox" id="GroupB86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138">
<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="GtkToolButton" id="Home-StylesPreview">
+ <object class="GtkToolButton" id="Home-EditStyle2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="action_name">.uno:StylesPreview</property>
+ <property name="action_name">.uno:EditStyle</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -4186,6 +4217,33 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom141">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">center</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Home-StyleUpdateByExample2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:StyleUpdateByExample</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -4194,53 +4252,38 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Home-Section-Style4">
+ <object class="VclOptionalBox" id="Home-Section-Style3">
<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="GroupB86">
+ <object class="GtkBox" id="GroupB80">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127">
<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="GtkToolButton" id="Home-StyleUpdateByExample2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="action_name">.uno:StyleUpdateByExample</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-EditStyle2">
+ <object class="GtkToolButton" id="Home-StylesPreview">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="action_name">.uno:EditStyle</property>
+ <property name="action_name">.uno:StylesPreview</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4254,44 +4297,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom141">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Home-EmphasisCharStyle2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles</property>
- <property name="icon_name">cmd/sc_emphasischarstyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-StrongEmphasisCharStyle2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles</property>
- <property name="icon_name">cmd/sc_strongemphasischarstyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -4300,13 +4305,13 @@
</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">7</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -4784,7 +4789,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -4916,7 +4921,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -5048,7 +5053,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -5180,7 +5185,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -5310,6 +5315,83 @@
<property name="position">9</property>
</packing>
</child>
+ <child>
+ <object class="VclOptionalBox" id="Insert-Section-DrawText1">
+ <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="GroupB17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="LineA30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Insert-FontworkGalleryFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FontworkGalleryFloater</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</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-NotebookbarToolBox" id="LineB30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Insert-EditGlossary">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:EditGlossary</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-4"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
<child>
<object class="VclOptionalBox" id="Insert-Section-Draw">
<property name="visible">True</property>
@@ -5465,7 +5547,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -5594,61 +5676,6 @@
<class name="priority-2"/>
</style>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Insert-Section-AutoText">
- <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="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">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom78">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="toolbar_style">both</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">3</property>
- <child>
- <object class="GtkToolButton" id="Insert-EditGlossary">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:EditGlossary</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
More information about the Libreoffice-commits
mailing list