[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Sat Apr 17 16:44:27 UTC 2021
sc/uiconfig/scalc/ui/notebookbar.ui | 102 ++++++++++++++++++++++++++++--
sd/uiconfig/sdraw/ui/notebookbar.ui | 103 ++++++++++++++++++++++++++++--
sd/uiconfig/simpress/ui/notebookbar.ui | 102 ++++++++++++++++++++++++++++--
sw/uiconfig/swriter/ui/notebookbar.ui | 110 ++++++++++++++++++++++++++++++---
4 files changed, 388 insertions(+), 29 deletions(-)
New commits:
commit 440ae59f4e333cf5d1db88026b31b63cb037910a
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Sat Apr 17 16:18:27 2021 +0200
Commit: Andreas Kainz <kainz.a at gmail.com>
CommitDate: Sat Apr 17 18:43:45 2021 +0200
tdf#140764 add ImageMode to tabbed NB
Change-Id: I6d3e10fa945da303b1af69b1d631bd2dc8cdab43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114228
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a at gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 32d5e2149715..3626b2da0dc0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -11111,7 +11111,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -11171,7 +11171,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -11302,7 +11302,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -11437,7 +11437,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -11569,7 +11569,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -11650,7 +11650,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -11659,6 +11659,96 @@
<property name="position">10</property>
</packing>
</child>
+ <child>
+ <object class="VclOptionalBox" id="Graphic-Section-GrafMode">
+ <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="separator25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkBox" id="GroupB46">
+ <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="colorbox1">
+ <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="Graphic-GrafMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GrafMode</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
+ <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="Graphic-ColorSettings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ColorSettings</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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-1"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 421e936b5c4f..c65aced89a03 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -2262,7 +2262,6 @@
<property name="can_focus">False</property>
<property name="pixbuf">cmd/lc_insertfieldctrl.png</property>
</object>
- <!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="NotebookBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11294,7 +11293,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -11433,7 +11432,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -11543,7 +11542,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -11678,7 +11677,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -11809,7 +11808,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -11889,7 +11888,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -11898,6 +11897,96 @@
<property name="position">10</property>
</packing>
</child>
+ <child>
+ <object class="VclOptionalBox" id="Image-Section-GrafMode">
+ <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="separator61">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkBox" id="GroupB57">
+ <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="colorbox1">
+ <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="Graphic-GrafMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GrafMode</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
+ <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="Graphic-ColorSettings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ColorSettings</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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-1"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 23cfcd03f8ad..a4bbf78f302f 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -11149,7 +11149,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -11266,7 +11266,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -11398,7 +11398,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -11533,7 +11533,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -11665,7 +11665,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -11746,7 +11746,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -11755,6 +11755,96 @@
<property name="position">10</property>
</packing>
</child>
+ <child>
+ <object class="VclOptionalBox" id="Image-Section-GrafMode">
+ <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="separator97">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkBox" id="GroupB103">
+ <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="colorbox1">
+ <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="Graphic-GrafMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GrafMode</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
+ <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="Graphic-ColorSettings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ColorSettings</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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-1"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 9c33439d1aca..600b390a691d 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -11622,7 +11622,7 @@
</packing>
</child>
<style>
- <class name="priority-8"/>
+ <class name="priority-9"/>
</style>
</object>
<packing>
@@ -11742,13 +11742,13 @@
</packing>
</child>
<style>
- <class name="priority-7"/>
+ <class name="priority-8"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -11818,7 +11818,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-7"/>
</style>
</object>
<packing>
@@ -11964,13 +11964,13 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</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>
@@ -12099,7 +12099,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -12155,7 +12155,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">9</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -12230,14 +12230,14 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">10</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -12309,6 +12309,96 @@
<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">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="VclOptionalBox" id="Graphic-Section-GrafMode">
+ <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="separator69">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkBox" id="GroupB85">
+ <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="colorbox1">
+ <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="Graphic-GrafMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:GrafMode</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="colorbox2">
+ <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="Graphic-ColorSettings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ColorSettings</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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<style>
<class name="priority-1"/>
</style>
More information about the Libreoffice-commits
mailing list