[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/uiconfig
Rafael Lima (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 10 22:20:55 UTC 2021
sd/uiconfig/sdraw/ui/notebookbar.ui | 165 +++++++++++++++++++++++++++++++++++-
1 file changed, 163 insertions(+), 2 deletions(-)
New commits:
commit 3bec2da07a29029489257028adf77e52ad168906
Author: Rafael Lima <rafael.palma.lima at gmail.com>
AuthorDate: Mon Jul 19 23:58:35 2021 +0200
Commit: Andreas Kainz <kainz.a at gmail.com>
CommitDate: Wed Aug 11 00:20:15 2021 +0200
tdf#136610 Add Clone/Clear Direct Format buttons to LO Draw tabbed interface
Currently LO Draw only shows the "Clone" and "Clear Direct Format" buttons in the tabbed interface when a text object is selected (in the Text tab).
With this patch, LO Draw will now show these buttons in the "Draw" tab when shapes are selected, as well as in the Home tab (as it is shown in Impress).
Change-Id: I9acf577cc5322d43c18acc366788a5eadda67ff6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119183
Tested-by: Jenkins
Tested-by: Andreas Kainz <kainz.a at gmail.com>
Reviewed-by: Andreas Kainz <kainz.a at gmail.com>
(cherry picked from commit 73fc697d5aac06938cc78f51b4e0d6f3d615447c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120249
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index c65aced89a03..4c1b5ea4d0aa 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -3359,6 +3359,102 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="VclOptionalBox" id="Home-Section-Style">
+ <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="separator7">
+ <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="GtkBox" id="GroupB13">
+ <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="LineA7">
+ <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="Home-FormatPaintbrush">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FormatPaintbrush</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="LineB8">
+ <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="Home-SetDefault">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SetDefault</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-8"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
<object class="VclOptionalBox" id="Home-Section-DrawColor">
<property name="visible">True</property>
@@ -8437,7 +8533,7 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Home-FormatPaintbrush">
+ <object class="GtkToolButton" id="Text-FormatPaintbrush">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FormatPaintbrush</property>
@@ -8461,7 +8557,7 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Home-SetDefault">
+ <object class="GtkToolButton" id="Text-SetDefault">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SetDefault</property>
@@ -12289,6 +12385,71 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="GroupB99">
+ <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="SectionBottom124">
+ <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="Draw-FormatPaintbrush">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:FormatPaintbrush</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="SectionBottom148">
+ <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="Draw-SetDefault">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SetDefault</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">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list