[Libreoffice-commits] core.git: sc/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 26 21:58:51 UTC 2021
sc/uiconfig/scalc/ui/notebookbar.ui | 196 ++++++++++++------------------------
1 file changed, 68 insertions(+), 128 deletions(-)
New commits:
commit c5b911b23f45ba86100c2eadc747b27c8744a96d
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Sat Feb 20 09:16:23 2021 +0100
Commit: Andreas Kainz <kainz.a at gmail.com>
CommitDate: Fri Feb 26 22:58:08 2021 +0100
Update Calc home tab
Change-Id: Iecdfe016878673d22d5afca3b9ef70fcbe2b35ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111257
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 fc3a387012b9..e26a7aabb45e 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -2106,7 +2106,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>
@@ -3352,8 +3351,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
- <property name="margin-start">5</property>
- <property name="margin-end">5</property>
+ <property name="margin_start">5</property>
+ <property name="margin_end">5</property>
<child>
<object class="GtkToolButton" id="Home-FontHeight">
<property name="visible">True</property>
@@ -4358,13 +4357,14 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Home-Section-Style2">
+ <object class="VclOptionalBox" id="Home-Section-Condition">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="margin_end">5</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkSeparator" id="separator25">
+ <object class="GtkSeparator" id="separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -4378,6 +4378,49 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37">
+ <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</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
+ <child>
+ <object class="GtkMenuToolButton" id="Home-ConditionalFormatMenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:ConditionalFormatMenu</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">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">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="VclOptionalBox" id="Home-Section-Style2">
+ <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="GroupB17">
<property name="visible">True</property>
@@ -4390,32 +4433,6 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Home-DesignerDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="action_name">.uno:DesignerDialog</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="SectionBottom101">
<property name="visible">True</property>
@@ -4480,21 +4497,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator" id="separator106">
- <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>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom93">
<property name="visible">True</property>
@@ -4617,64 +4619,6 @@
<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">8</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Home-Section-Condition">
- <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="separator1">
- <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="SectionBottom37">
- <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</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">3</property>
- <child>
- <object class="GtkMenuToolButton" id="Home-ConditionalFormatMenu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ConditionalFormatMenu</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">1</property>
- </packing>
- </child>
<style>
<class name="priority-3"/>
</style>
@@ -4997,7 +4941,7 @@
<object class="GtkToolButton" id="Insert-DataDataPilotRun">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin-start">5</property>
+ <property name="margin_start">5</property>
<property name="action_name">.uno:DataDataPilotRun</property>
</object>
<packing>
@@ -9232,7 +9176,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -9633,7 +9577,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -10625,7 +10569,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -11379,7 +11323,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="margin-start">5</property>
+ <property name="margin_start">5</property>
<property name="vexpand">True</property>
<child>
<object class="GtkSeparator" id="separator123">
@@ -11397,7 +11341,6 @@
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11610,7 +11553,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="margin-end">5</property>
+ <property name="margin_end">5</property>
<property name="action_name">.uno:GrafContrast</property>
</object>
<packing>
@@ -11691,7 +11634,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="margin-end">5</property>
+ <property name="margin_end">5</property>
<property name="action_name">.uno:GrafGamma</property>
</object>
<packing>
@@ -12530,7 +12473,6 @@
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -13838,7 +13780,6 @@
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14113,7 +14054,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -14148,7 +14089,7 @@
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">both-horiz</property>
@@ -14437,7 +14378,6 @@
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14676,7 +14616,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -16098,7 +16038,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -16240,7 +16180,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -16321,7 +16261,7 @@
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -16454,7 +16394,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -16662,7 +16602,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
@@ -17028,7 +16968,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -17119,7 +17059,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -17256,7 +17196,7 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -17302,7 +17242,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
@@ -17542,7 +17482,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom81">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
More information about the Libreoffice-commits
mailing list