[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 30 08:13:59 UTC 2018
sd/uiconfig/sdraw/ui/notebookbar.ui | 359 +++++++++++++++++++++++++++++++++---
1 file changed, 334 insertions(+), 25 deletions(-)
New commits:
commit d2e5e266c15f72570708980dfbd0d3460996a01a
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Wed Nov 28 07:14:19 2018 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Nov 30 09:13:33 2018 +0100
tdf#121747 NB tabbed: add glue point group to view tab
Change-Id: Ia658f5c5ae6b0a6a82bf322d7fa22a1640d013ef
Reviewed-on: https://gerrit.libreoffice.org/64206
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 5f2e74b8a3fdf4b224520aa930273e2c6bd2cda9)
Reviewed-on: https://gerrit.libreoffice.org/64273
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index e2d7495e975c..7fe609087c5d 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -6616,7 +6616,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -6806,7 +6806,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -6816,13 +6816,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="View-Section-DisplayQuality">
+ <object class="sfxlo-OptionalBox" id="View-Section-New">
<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="SectionBottom86">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -6831,10 +6831,68 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="View-OutputQualityColor">
+ <object class="GtkToolButton" id="View-NewWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OutputQualityColor</property>
+ <property name="action_name">.uno:NewWindow</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</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="GtkSeparator" id="separator42">
+ <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>
+ <style>
+ <class name="priority-4"/>
+ </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-Gluepoint">
+ <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="SectionBottom92">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="View-GlueEditMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueEditMode</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6849,25 +6907,47 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB80">
+ <object class="GtkBox" id="GroupB50">
<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="LeftParaMargin12">
+ <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin1">
<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>
+ <property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-OutputQualityGrayscale">
+ <object class="GtkToolButton" id="View-GlueInsertPoint">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OutputQualityGrayscale</property>
+ <property name="action_name">.uno:GlueInsertPoint</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GluePercent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GluePercent</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueEscapeDirectionTop">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueEscapeDirectionTop</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6882,18 +6962,40 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="belowspacing13">
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing1">
<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>
+ <property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="View-OutputQualityBlackWhite">
+ <object class="GtkToolButton" id="View-GlueEscapeDirectionLeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OutputQualityBlackWhite</property>
+ <property name="action_name">.uno:GlueEscapeDirectionLeft</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueEscapeDirectionRight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueEscapeDirectionRight</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueEscapeDirectionBottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueEscapeDirectionBottom</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6915,7 +7017,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator30">
+ <object class="GtkSeparator" id="separator35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -6926,6 +7028,132 @@
<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-3"/>
+ </style>
+ </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-Gluepoint1">
+ <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="GroupB59">
+ <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="LeftParaMargin5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-GlueHorzAlignLeft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueHorzAlignLeft</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueHorzAlignCenter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueHorzAlignCenter</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueHorzAlignRight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueHorzAlignRight</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-GlueVertAlignTop">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueVertAlignTop</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueVertAlignCenter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueVertAlignCenter</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="View-GlueVertAlignBottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GlueVertAlignBottom</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">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -6936,17 +7164,17 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="View-Section-New">
+ <object class="sfxlo-OptionalBox" id="View-Section-DisplayQuality">
<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="SectionBottom88">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom86">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -6955,13 +7183,13 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="View-NewWindow">
+ <object class="GtkToolButton" id="View-OutputQualityColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:NewWindow</property>
+ <property name="action_name">.uno:OutputQualityColor</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -6972,6 +7200,87 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="GroupB80">
+ <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="LeftParaMargin12">
+ <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-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-OutputQualityGrayscale">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:OutputQualityGrayscale</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="belowspacing13">
+ <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-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="View-OutputQualityBlackWhite">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:OutputQualityBlackWhite</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">False</property>
+ <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="GtkSeparator" id="separator30">
+ <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>
<style>
<class name="priority-1"/>
</style>
@@ -6979,7 +7288,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">6</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list