sd/uiconfig/sdraw/ui/notebookbar.ui | 205 +++++++++++
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 146 +++++++-
sd/uiconfig/simpress/ui/notebookbar.ui | 205 +++++++++++
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 242 +++++++++++++-
4 files changed, 748 insertions(+), 50 deletions(-)
New commits:
commit 59b5eca7030a091b9f39257897e757a51f2345e1
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sat Jul 20 17:02:35 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Sun Jul 21 00:38:16 2019 +0200
tdf#124583 NB draw/impress sync -context-draw stuff
Change-Id: I5e214c6f78a4b2e8c17861d813efba2dff90be53
Reviewed-on: https://gerrit.libreoffice.org/76025
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 9213b216ef82..1c7145b3336a 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -12575,7 +12575,7 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
@@ -12697,7 +12697,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
@@ -12806,7 +12806,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
@@ -12940,7 +12940,7 @@
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -12998,7 +12998,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -13120,7 +13120,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -13220,7 +13220,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -13230,6 +13230,187 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Draw-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="GtkSeparator" id="separator41">
+ <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="SectionBottom91">
+ <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="Draw-GlueEditMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:GlueEditMode</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">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-7"/>
+ </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="Draw-Section-MergeCombine">
+ <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">
+ <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="SectionBottom137">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Combine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Combine</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Dismantle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Dismantle</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-DistributeSelection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:DistributeSelection</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="sfxlo-NotebookbarToolBox"
id="SectionBottom146">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Merge">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Merge</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Substract">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Substract</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Intersect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Intersect</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</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">11</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox"
id="Draw-Section-Group">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -13284,7 +13465,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -13365,7 +13546,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -13490,7 +13671,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -13548,7 +13729,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -13651,7 +13832,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">16</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 7338648f17f4..3a75276d1e85 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -7218,7 +7218,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
@@ -7369,7 +7369,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -7511,7 +7511,7 @@
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -7673,7 +7673,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -7837,7 +7837,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -8000,7 +8000,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -8114,7 +8114,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -8124,6 +8124,126 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Draw-Section-MergeCombine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="GroupB102">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom147">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Combine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Combine</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Dismantle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Dismantle</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-DistributeSelection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:DistributeSelection</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="sfxlo-NotebookbarToolBox"
id="SectionBottom148">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Merge">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Merge</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Substract">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Substract</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Intersect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Intersect</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>
+ </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">10</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox" id="Draw-Section-3d">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -8245,7 +8365,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>
@@ -8365,7 +8485,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -8479,7 +8599,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -8593,7 +8713,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">14</property>
</packing>
</child>
<style>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 7b73116b382b..7c6cf9a7f56d 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -12318,7 +12318,7 @@
</packing>
</child>
<style>
- <class name="priority-12"/>
+ <class name="priority-14"/>
</style>
</object>
<packing>
@@ -12456,7 +12456,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-13"/>
</style>
</object>
<packing>
@@ -12565,7 +12565,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
@@ -12699,7 +12699,7 @@
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -12757,7 +12757,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -12857,7 +12857,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -12979,7 +12979,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -12989,6 +12989,187 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Draw-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="GtkSeparator" id="separator67">
+ <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="SectionBottom137">
+ <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="Draw-GlueEditMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:GlueEditMode</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">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-7"/>
+ </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="Draw-Section-MergeCombine">
+ <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="GroupB102">
+ <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="SectionBottom147">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Combine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Combine</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Dismantle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Dismantle</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-DistributeSelection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:DistributeSelection</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="sfxlo-NotebookbarToolBox"
id="SectionBottom148">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Merge">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Merge</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Substract">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Substract</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Intersect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Intersect</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</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">11</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox"
id="Draw-Section-Group">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -13043,7 +13224,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">10</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -13124,7 +13305,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -13249,7 +13430,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -13307,7 +13488,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -13410,7 +13591,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">16</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 255fc0e4bc25..b91aa627f017 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -903,6 +903,17 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuFontwork">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="MenuFontwork-FontworkSameLetterHeights">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FontworkSameLetterHeights</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuForm">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1397,6 +1408,91 @@
</object>
</child>
</object>
+ <object class="GtkMenu" id="MenuGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-Ruler">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:Ruler</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-VRuler">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:VRuler</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuGrid-separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-ViewBounds">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ViewBounds</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-TableBoundaries">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:TableBoundaries</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-ShowGraphics">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ShowGraphics</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuGrid-separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-GridVisible">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GridVisible</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-GridUse">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GridUse</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-HelplinesMove">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HelplinesMove</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="MenuGrid-separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="MenuGrid-HideWhitespace">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:HideWhitespace</property>
+ </object>
+ </child>
+ </object>
<object class="GtkMenu" id="MenuGroup">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7178,7 +7274,7 @@
</packing>
</child>
<style>
- <class name="priority-11"/>
+ <class name="priority-12"/>
</style>
</object>
<packing>
@@ -7329,7 +7425,7 @@
</packing>
</child>
<style>
- <class name="priority-10"/>
+ <class name="priority-11"/>
</style>
</object>
<packing>
@@ -7471,7 +7567,7 @@
</packing>
</child>
<style>
- <class name="priority-9"/>
+ <class name="priority-10"/>
</style>
</object>
<packing>
@@ -7633,7 +7729,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -7797,7 +7893,7 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
@@ -7958,7 +8054,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -8072,7 +8168,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -8082,6 +8178,126 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox"
id="Draw-Section-MergeCombine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="GroupB102">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom147">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Combine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Combine</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Dismantle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Dismantle</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-DistributeSelection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:DistributeSelection</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="sfxlo-NotebookbarToolBox"
id="SectionBottom148">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Merge">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Merge</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Substract">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Substract</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Draw-Intersect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Intersect</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>
+ </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">10</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox" id="Draw-Section-3d">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -8203,7 +8419,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>
@@ -8323,7 +8539,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">11</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -8401,7 +8617,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="Draw-Fontwork:MenuFontwork">
+ <object class="svtlo-ManagedMenuButton"
id="Impress-Fontwork:MenuFontwork">
<property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|GridButton">_Fontwork</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8437,7 +8653,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -8515,7 +8731,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton"
id="Draw-Grid:MenuGrid">
+ <object class="svtlo-ManagedMenuButton"
id="Impress-Grid:MenuGrid">
<property name="label" translatable="yes"
context="notebookbar_groupedbar_compact|GridButton">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8551,7 +8767,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">14</property>
</packing>
</child>
<style>
commit 782b03828411a6f815fba3ea7b48c2939d052197
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sat Jul 20 16:13:19 2019 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Sun Jul 21 00:38:00 2019 +0200
NB GlueInsertPoint didn't work in NB added EditGluePoint
Change-Id: I1253fe7fe89ca1e247e8fafb348fbaa51a4e4f88
Reviewed-on: https://gerrit.libreoffice.org/76013
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index a136a1032064..7338648f17f4 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -2658,10 +2658,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuSnap-GlueInsertPoint">
+ <object class="GtkMenuItem" id="MenuSnap-GlueEditMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GlueInsertPoint</property>
+ <property name="action_name">.uno:GlueEditMode</property>
</object>
</child>
<child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
