sd/uiconfig/simpress/ui/notebookbar_compact.ui | 369 ++++++++++++++++++++++---
1 file changed, 339 insertions(+), 30 deletions(-)
New commits:
commit 3eccfd7fda3050018e79fb6d38be4937af7272ee
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Wed Jun 26 00:56:44 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Wed Jun 26 13:04:19 2019 +0200
NB impress tabbed compact add context-multi and 3d stuff
Change-Id: I4356863ea9b0fff4187e8234fdadb980d416bc71
Reviewed-on: https://gerrit.libreoffice.org/74722
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
(cherry picked from commit 719f4a93e46a6b397356dbb605d2867639ca3942)
Reviewed-on: https://gerrit.libreoffice.org/74724
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index e2756899baec..b000cf7b7850 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -10068,7 +10068,6 @@
<property name="valign">center</property>
<child>
<object class="GtkSeparator" id="separator54">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
@@ -11500,7 +11499,6 @@
<property name="valign">center</property>
<child>
<object class="GtkSeparator" id="separator68">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
@@ -12147,7 +12145,7 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-18"/>
</style>
</object>
<packing>
@@ -12186,7 +12184,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-17"/>
</style>
</object>
<packing>
@@ -12336,7 +12334,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-16"/>
</style>
</object>
<packing>
@@ -12375,7 +12373,7 @@
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-15"/>
</style>
</object>
<packing>
@@ -12414,7 +12412,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
@@ -12510,7 +12508,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -12554,13 +12552,13 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -12615,13 +12613,13 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -12673,7 +12671,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -12706,13 +12704,13 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">18</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -12756,13 +12754,13 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">19</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -12821,13 +12819,13 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">20</property>
+ <property name="position">17</property>
</packing>
</child>
<child>
@@ -12860,13 +12858,13 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">21</property>
+ <property name="position">18</property>
</packing>
</child>
<child>
@@ -12876,7 +12874,6 @@
<property name="valign">center</property>
<child>
<object class="GtkSeparator" id="separator80">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
@@ -12914,13 +12911,13 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">22</property>
+ <property name="position">19</property>
</packing>
</child>
<child>
@@ -12985,7 +12982,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">23</property>
+ <property name="position">20</property>
</packing>
</child>
<child>
@@ -13046,7 +13043,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">24</property>
+ <property name="position">21</property>
</packing>
</child>
<child>
@@ -13082,9 +13079,321 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">22</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="MultiObject-Section-3D">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="GtkSeparator" id="separator10">
+ <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="SectionBottom9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="margin_top">4</property>
+ <property name="margin_bottom">4</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-ExtrusionToggle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ExtrusionToggle</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">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-6"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">23</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="MultiObject-Section-3D1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-ExtrusionDepthFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ExtrusionDepthFloater</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-ExtrusionDirectionFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ExtrusionDirectionFloater</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>
+ <style>
+ <class name="priority-5"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">24</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="MultiObject-Section-3D2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkMenuToolButton"
id="Draw-Extrusion3DColor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Extrusion3DColor</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton"
id="Draw-ExtrusionSurfaceFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:ExtrusionSurfaceFloater</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>
+ <style>
+ <class name="priority-4"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">25</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="MultiObject-Section-Fontwork">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="margin_top">4</property>
+ <property name="margin_bottom">4</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FontworkGalleryFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FontworkGalleryFloater</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">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-3"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">26</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="MultiObject-Section-Fontwork1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FontworkShapeType">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FontworkShapeType</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FontworkSameLetterHeights">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FontworkSameLetterHeights</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>
+ <style>
+ <class name="priority-2"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">27</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="MultiObject-Section-Fontwork2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FontworkAlignmentFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FontworkAlignmentFloater</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FontworkCharacterSpacingFloater">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FontworkCharacterSpacingFloater</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>
+ <style>
+ <class name="priority-1"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">28</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -13180,13 +13489,16 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="ShapeLabel">
+ <object class="GtkLabel" id="DrawLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="notebookbar_impress_compact|ShapeLabel">~Draw</property>
<property name="use_underline">True</property>
<style>
<class name="context-Draw"/>
+ <class name="context-DrawLine"/>
+ <class name="context-3DObject"/>
+ <class name="context-MultiObject"/>
</style>
</object>
<packing>
@@ -14119,7 +14431,6 @@
<property name="valign">center</property>
<child>
<object class="GtkSeparator" id="separator94">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
@@ -15202,7 +15513,6 @@
<property name="valign">center</property>
<child>
<object class="GtkSeparator" id="separator90">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
@@ -18345,7 +18655,6 @@
<property name="valign">center</property>
<child>
<object class="GtkSeparator" id="separator122">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_top">5</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
