[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/uiconfig
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 23 07:09:56 UTC 2020
sw/uiconfig/swriter/ui/notebookbar.ui | 179 +---------------------------------
1 file changed, 8 insertions(+), 171 deletions(-)
New commits:
commit 80b36ded609d77bc697644ce632be6c5fd4ec322
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 16 08:41:20 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jun 23 09:09:22 2020 +0200
notebookbar: insert styles preview widget
Change-Id: I9a9baed9bc6b769a83295f05fd17133b12965398
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96916
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 335a1b7fb5df..152d8d6aa074 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -4150,32 +4150,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom102">
- <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-StandardStyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles</property>
- <property name="icon_name">cmd/sc_defaultcharstyle.png</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>
@@ -4206,166 +4180,29 @@
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="GroupB85">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <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-StyleApply1">
- <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:StyleApply</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</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">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox" id="StyleParagraphSection2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkSeparator" id="separator69">
+ <object class="GtkToolButton" id="Home-StylesPreview">
<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="SectionBottom134">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="halign">center</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Home-TitleStyle1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles</property>
- <property name="icon_name">cmd/sc_titleparastyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-H1Style2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles</property>
- <property name="icon_name">cmd/sc_heading1parastyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-H2Style2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles</property>
- <property name="icon_name">cmd/sc_heading2parastyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-H3Style2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles</property>
- <property name="icon_name">cmd/sc_heading3parastyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Home-H4Style2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles</property>
- <property name="icon_name">cmd/sc_heading4parastyle.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator70">
- <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>
+ <property name="action_name">.uno:StylesPreview</property>
</object>
<packing>
<property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">5</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
- <style>
- <class name="priority-3"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list