diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-10-22 00:58:42 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-10-22 10:15:30 +0200 |
| commit | 0f262a4c8b2f72e35881bddc31a8899e2506eca7 (patch) | |
| tree | f9e79783ecc6a260dcccbdfc13192a0a025b8da9 /sd | |
| parent | 8acf598338f2255f13eb1182f9ecffc730584530 (diff) | |
NB tabbed draw and impress: finishing correct padding
and final tab review
Change-Id: Ia91398f65486f09fccce19b3b1a568f96844cd24
Reviewed-on: https://gerrit.libreoffice.org/62164
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 795 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 963 |
2 files changed, 895 insertions, 863 deletions
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 814c56c0fe26..23f5f5fc5a7b 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -3471,6 +3471,66 @@ </packing> </child> <child> + <object class="GtkBox" id="box23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatLine4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</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="third8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FormatArea4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</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">1</property> + </packing> + </child> + <child> <object class="GtkBox" id="box10"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3565,7 +3625,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -4086,6 +4146,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -4286,16 +4347,16 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA11"> + <object class="sfxlo-NotebookbarToolBox" id="LineB12"> <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="Insert-InsertAVMedia"> + <object class="GtkToolButton" id="Insert-Gallery"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAVMedia</property> + <property name="action_name">.uno:Gallery</property> </object> <packing> <property name="expand">False</property> @@ -4310,16 +4371,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB12"> + <object class="sfxlo-NotebookbarToolBox" id="LineA11"> <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="Insert-Gallery"> + <object class="GtkToolButton" id="Insert-InsertAVMedia"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Gallery</property> + <property name="action_name">.uno:InsertAVMedia</property> </object> <packing> <property name="expand">False</property> @@ -4915,7 +4976,7 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> @@ -4923,7 +4984,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:AssignLayout</property> + <property name="action_name">.uno:PageSetup</property> </object> <packing> <property name="expand">False</property> @@ -4985,7 +5046,9 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_left">5</property> + <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <property name="icon_size">3</property> @@ -5101,6 +5164,8 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42"> <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> @@ -5218,6 +5283,8 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> <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> @@ -5428,6 +5495,8 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> <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> @@ -5510,21 +5579,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator73"> - <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> <style> <class name="priority-2"/> </style> @@ -5599,7 +5653,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <style> @@ -5733,6 +5787,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -6175,6 +6230,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -7135,6 +7191,7 @@ <object class="sfxlo-NotebookbarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> <object class="GtkToolButton" id="Home-CharFontName"> <property name="visible">True</property> @@ -7157,6 +7214,7 @@ <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <child> <object class="GtkToolButton" id="Home-FontHeight"> <property name="visible">True</property> @@ -7175,6 +7233,41 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-Grow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Shrink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shrink</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">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -7333,93 +7426,6 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB30"> - <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="ExtTop6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-Grow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Grow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-Shrink"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Shrink</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="ExtTop5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-SubScript"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SubScript</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SuperScript"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SuperScript</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> - <child> <object class="GtkSeparator" id="separator8"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7830,19 +7836,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Text-EditStyle"> - <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:EditStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -7862,7 +7855,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> @@ -7913,6 +7906,47 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator23"> + <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="SectionBottom58"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Text-EditStyle"> + <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:EditStyle</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">4</property> </packing> </child> @@ -8123,7 +8157,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8133,47 +8167,67 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Table-TableDesign"> + <object class="GtkToolButton" id="Table-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="action_name">.uno:TableDesign</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <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> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB59"> + <object class="GtkBox" id="GroupB31"> <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="LineA29"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-FillStyle"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:InsertColumnsBefore</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertColumnsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteColumns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteColumns</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -8185,69 +8239,42 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB30"> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="Table-LineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB19"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Table-FrameLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:InsertRowsAfter</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteRows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteRows</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8261,11 +8288,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator119"> + <object class="GtkSeparator" id="separator2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8287,31 +8314,62 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="GtkBox" id="box19"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Table-MergeCells"> + <object class="sfxlo-NotebookbarToolBox" id="third5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:MergeCells</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</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> </object> @@ -8322,26 +8380,71 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB61"> + <object class="GtkBox" id="box20"> <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="LineA31"> + <object class="GtkBox" id="box21"> <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="Table-SplitCell"> + <object class="sfxlo-NotebookbarToolBox" id="first21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Table-LineStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Table-FrameLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -8352,27 +8455,40 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB32"> + <object class="GtkBox" id="box22"> <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="Table-OptimizeTable"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OptimizeTable</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</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> + <property name="position">2</property> </packing> </child> </object> @@ -8383,7 +8499,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator45"> + <object class="GtkSeparator" id="separator5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8394,12 +8510,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8408,118 +8521,53 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-ColumnRow"> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> <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="GroupB60"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="orientation">vertical</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="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="GtkToolButton" id="Table-MergeCells"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-InsertColumnsBefore"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsBefore</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-InsertColumnsAfter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsAfter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-DeleteColumns"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteColumns</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:MergeCells</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="GtkToolButton" id="Table-SplitCell"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-InsertRowsBefore"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsBefore</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsAfter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-DeleteRows"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:SplitCell</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</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> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator121"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8534,7 +8582,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -8583,7 +8631,7 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> @@ -8653,7 +8701,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -8669,7 +8717,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8678,21 +8726,10 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Table-Grow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Grow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Shrink"> + <object class="GtkToolButton" id="Table-OptimizeTable"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Shrink</property> + <property name="action_name">.uno:OptimizeTable</property> </object> <packing> <property name="expand">False</property> @@ -8836,8 +8873,23 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkSeparator" id="separator4"> + <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">2</property> + </packing> + </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> @@ -8846,6 +8898,51 @@ <property name="position">4</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-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="sfxlo-NotebookbarToolBox" id="SectionBottom62"> + <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="Table-TableDesign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:TableDesign</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-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> @@ -13040,66 +13137,22 @@ <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="GtkBox" id="GroupB52"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7"> - <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-horiz</property> - <property name="show_arrow">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing7"> + <object class="GtkToolButton" id="Tools-AVMediaPlayer"> <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-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Tools-AVMediaPlayer"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:AVMediaPlayer</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <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> + <property name="position">0</property> </packing> </child> <child> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 657df0ccddd0..0b6f89c072d6 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -3461,10 +3461,12 @@ <object class="sfxlo-NotebookbarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> <object class="GtkToolButton" id="Home-CharFontName"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="action_name">.uno:CharFontName</property> </object> <packing> @@ -3483,6 +3485,7 @@ <object class="sfxlo-NotebookbarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> <child> <object class="GtkToolButton" id="Home-FontHeight"> <property name="visible">True</property> @@ -3501,6 +3504,42 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-Grow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Grow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Shrink"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Shrink</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">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3553,10 +3592,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-Shadowed"> + <object class="GtkToolButton" id="Home-Strikeout"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Shadowed</property> + <property name="action_name">.uno:Strikeout</property> </object> <packing> <property name="expand">False</property> @@ -3564,10 +3603,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-Strikeout"> + <object class="GtkToolButton" id="Home-Shadowed"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Strikeout</property> + <property name="action_name">.uno:Shadowed</property> </object> <packing> <property name="expand">False</property> @@ -3595,7 +3634,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -3605,17 +3644,6 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Home-Spacing"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Spacing</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> <object class="GtkMenuToolButton" id="Home-CharBackColor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3641,7 +3669,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> @@ -3659,93 +3687,6 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB30"> - <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="ExtTop6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-Grow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Grow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-Shrink"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Shrink</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="ExtTop5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-SubScript"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SubScript</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SuperScript"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SuperScript</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> - <child> <object class="GtkSeparator" id="separator8"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4359,138 +4300,6 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Arrange"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-OptionalBox" id="FileSection1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> - <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="Home-ToggleObjectRotateMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</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="GtkBox" id="GroupB17"> - <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="LineA15"> - <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="Home-ObjectAlign"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlign</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="LineB16"> - <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="Home-ObjectPosition"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectPosition</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> - <child> - <object class="GtkSeparator" id="separator20"> - <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">2</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-2"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> <object class="sfxlo-OptionalBox" id="Home-Section-Slideshow"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4635,6 +4444,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -4846,16 +4656,16 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA11"> + <object class="sfxlo-NotebookbarToolBox" id="LineB12"> <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="Insert-InsertAVMedia"> + <object class="GtkToolButton" id="Insert-Gallery"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAVMedia</property> + <property name="action_name">.uno:Gallery</property> </object> <packing> <property name="expand">False</property> @@ -4870,16 +4680,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB12"> + <object class="sfxlo-NotebookbarToolBox" id="LineA11"> <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="Insert-Gallery"> + <object class="GtkToolButton" id="Insert-InsertAVMedia"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Gallery</property> + <property name="action_name">.uno:InsertAVMedia</property> </object> <packing> <property name="expand">False</property> @@ -4968,10 +4778,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-AnimationEffects"> + <object class="GtkToolButton" id="Insert-FontworkGalleryFloater"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AnimationEffects</property> + <property name="action_name">.uno:FontworkGalleryFloater</property> </object> <packing> <property name="expand">False</property> @@ -5694,7 +5504,7 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> @@ -5764,7 +5574,9 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_left">5</property> + <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <property name="icon_size">3</property> @@ -5880,6 +5692,8 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42"> <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> @@ -5977,9 +5791,6 @@ <property name="position">3</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -5997,6 +5808,8 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> <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> @@ -6095,7 +5908,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -6188,7 +6001,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -6207,6 +6020,8 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> <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> @@ -6289,6 +6104,83 @@ <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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Slide-Section-MasterSlide1"> + <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="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="LineA26"> + <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="Slide-DisplayMasterBackground"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DisplayMasterBackground</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="LineB28"> + <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="Slide-DisplayMasterObjects"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DisplayMasterObjects</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">0</property> + </packing> + </child> <child> <object class="GtkSeparator" id="separator73"> <property name="visible">True</property> @@ -6301,7 +6193,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> @@ -6311,32 +6203,35 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Slide-Section-MasterSlide1"> + <object class="sfxlo-OptionalBox" id="Slide-Section-Arrange"> <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="GroupB57"> + <object class="sfxlo-OptionalBox" id="SlideSection"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="orientation">vertical</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA26"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</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="Slide-DisplayMasterBackground"> + <object class="GtkToolButton" id="Slide-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -6351,20 +6246,57 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB28"> + <object class="GtkBox" id="GroupB17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Slide-DisplayMasterObjects"> + <object class="sfxlo-NotebookbarToolBox" id="LineA15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Slide-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlign</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LineB16"> + <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="Slide-ObjectPosition"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectPosition</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> @@ -6388,7 +6320,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> @@ -6511,6 +6443,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -6998,6 +6931,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -7438,6 +7372,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -8270,7 +8205,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8280,47 +8215,67 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Table-TableDesign"> + <object class="GtkToolButton" id="Table-AnimationEffects"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="action_name">.uno:TableDesign</property> + <property name="action_name">.uno:AnimationEffects</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <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> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB59"> + <object class="GtkBox" id="GroupB30"> <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="LineA29"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-FillStyle"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:InsertColumnsBefore</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertColumnsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteColumns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteColumns</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -8332,69 +8287,42 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB30"> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="Table-LineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB19"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Table-FrameLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="action_name">.uno:InsertRowsAfter</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteRows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteRows</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8408,11 +8336,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator119"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8434,31 +8362,62 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="GtkBox" id="box9"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Table-MergeCells"> + <object class="sfxlo-NotebookbarToolBox" id="third5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:MergeCells</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatArea</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> </object> @@ -8469,26 +8428,71 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB61"> + <object class="GtkBox" id="box10"> <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="LineA31"> + <object class="GtkBox" id="box11"> <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="Table-SplitCell"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Table-LineStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> + <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="GtkMenuToolButton" id="Table-FrameLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -8499,27 +8503,40 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB32"> + <object class="GtkBox" id="box19"> <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="Table-OptimizeTable"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OptimizeTable</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-FillStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</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> + <property name="position">2</property> </packing> </child> </object> @@ -8530,7 +8547,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator45"> + <object class="GtkSeparator" id="separator5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8541,12 +8558,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8555,118 +8569,53 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-ColumnRow"> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> <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="GroupB60"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="orientation">vertical</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="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="GtkToolButton" id="Table-MergeCells"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-InsertColumnsBefore"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsBefore</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-InsertColumnsAfter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsAfter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-DeleteColumns"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteColumns</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:MergeCells</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="GtkToolButton" id="Table-SplitCell"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-InsertRowsBefore"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsBefore</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsAfter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-DeleteRows"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:SplitCell</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</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> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator121"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -8681,7 +8630,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -8800,7 +8749,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -8825,21 +8774,10 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Table-Grow"> + <object class="GtkToolButton" id="Table-OptimizeTable"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Grow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Shrink"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Shrink</property> + <property name="action_name">.uno:OptimizeTable</property> </object> <packing> <property name="expand">False</property> @@ -8983,8 +8921,23 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkSeparator" id="separator2"> + <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">2</property> + </packing> + </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> @@ -8993,6 +8946,52 @@ <property name="position">4</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-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="sfxlo-NotebookbarToolBox" id="SectionBottom62"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_left">5</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="Table-TableDesign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:TableDesign</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-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> @@ -10222,7 +10221,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -10233,18 +10232,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-FlipVertical1"> + <object class="GtkToolButton" id="Draw-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> @@ -10255,10 +10243,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-Shear1"> + <object class="GtkToolButton" id="Draw-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Shear</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -10266,10 +10254,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CrookSlant"> + <object class="GtkToolButton" id="Draw-Shear"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CrookSlant</property> + <property name="action_name">.uno:Shear</property> </object> <packing> <property name="expand">False</property> @@ -10715,6 +10703,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <child> <object class="GtkGrid" id="grid2"> @@ -11527,17 +11516,6 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FlipHorizontal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Object-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11549,10 +11527,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-Shear"> + <object class="GtkToolButton" id="Object-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Shear</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -11560,10 +11538,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-CrookSlant"> + <object class="GtkToolButton" id="Object-Shear"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CrookSlant</property> + <property name="action_name">.uno:Shear</property> </object> <packing> <property name="expand">False</property> @@ -12009,6 +11987,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="margin_left">5</property> <property name="vexpand">True</property> <child> <object class="GtkGrid" id="grid3"> |