diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-06-27 00:27:30 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2019-06-27 07:17:35 +0200 |
| commit | db9965054d90c16f5c00a7726f2876301d4e3c2c (patch) | |
| tree | 0189ef1188be48d90ba5695244fb36cba3bfe0e9 /sw/uiconfig | |
| parent | 068f5f085cea4a8c87bfb6e15d3f2f74e0b0f219 (diff) | |
Review all NB's and compare each other
Change-Id: I1f6b18cb604059d890e9a3796b7b4dbca9d05134
Reviewed-on: https://gerrit.libreoffice.org/74769
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sw/uiconfig')
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 1381 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 10 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 493 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 764 |
4 files changed, 1579 insertions, 1069 deletions
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 67def7b463f1..bf25818e7795 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -3374,21 +3374,6 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkBox" id="GroupB10"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3752,6 +3737,21 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkSeparator" id="separator68"> + <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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3829,6 +3829,21 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkSeparator" id="separator8"> + <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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3871,21 +3886,6 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator68"> - <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">1</property> - </packing> - </child> - <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom81"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3972,22 +3972,6 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator72"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11412,6 +11396,220 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Image-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="GtkSeparator" id="separator55"> + <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">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third3"> + <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="Object-BorderDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third2"> + <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="Object-FormatArea1"> + <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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea1"> + <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="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first7"> + <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="Object-SetBorderStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</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="GtkToolButton" id="Object-LineStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</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="SectionBottom55"> + <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="Object-FrameLineColor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <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="Object-FillStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Image-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11468,7 +11666,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -11588,7 +11786,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -11664,7 +11862,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -11810,7 +12008,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">7</property> </packing> </child> <child> @@ -11944,221 +12142,10 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Image-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="GtkSeparator" id="separator55"> - <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">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third3"> - <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="Object-BorderDialog1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third2"> - <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="Object-FormatArea1"> - <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> - <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> - <property name="fill">True</property> <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea1"> - <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="box6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first7"> - <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="Object-SetBorderStyle2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</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="GtkToolButton" id="Object-LineStyle2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</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="SectionBottom55"> - <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="Object-FrameLineColor2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> - <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="Object-FillStyle2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="priority-3"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> - </packing> - </child> - <child> <object class="sfxlo-OptionalBox" id="Image-Section-FormatImageFilter"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12657,6 +12644,226 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator37"> + <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">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <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-FormatLine1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FormatLine</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">0</property> + </packing> + </child> + <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-FormatArea1"> + <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> + <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> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea3"> + <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="box15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first16"> + <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="Draw-XLineStyle1"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</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="SectionBottom61"> + <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="Draw-LineEndStyle1"> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-XLineColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FillStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">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">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Draw-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12713,7 +12920,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -12833,7 +13040,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -12909,7 +13116,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -13055,7 +13262,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> @@ -13189,226 +13396,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkSeparator" id="separator37"> - <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">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <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-FormatLine1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</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">0</property> - </packing> - </child> - <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-FormatArea1"> - <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> - <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> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea3"> - <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="box15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> - <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="Draw-XLineStyle1"> - <property name="width_request">100</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:XLineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-LineWidth"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineWidth</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</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="SectionBottom61"> - <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="Draw-LineEndStyle1"> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineEndStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-XLineColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Draw-FillStyle2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">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">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">7</property> </packing> </child> @@ -14098,6 +14085,214 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Object-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="GtkSeparator" id="separator32"> + <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">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-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> + <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> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea1"> + <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="box20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first23"> + <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="Object-SetBorderStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</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="GtkToolButton" id="Object-LineStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</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="SectionBottom120"> + <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="Object-FrameLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> + <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="Object-FillStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Object-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -14154,7 +14349,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -14274,7 +14469,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -14350,7 +14545,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -14496,7 +14691,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> @@ -14630,214 +14825,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Object-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="GtkSeparator" id="separator32"> - <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">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</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> - <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> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea1"> - <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="box20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first23"> - <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="Object-SetBorderStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</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="GtkToolButton" id="Object-LineStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</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="SectionBottom120"> - <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="Object-FrameLineColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> - <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="Object-FillStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">7</property> </packing> </child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 4f1e630ddbeb..69c8f74b1a20 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -3443,10 +3443,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Home-fontcolor"> + <object class="GtkMenuToolButton" id="Home-BackColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:BackColor</property> </object> <packing> <property name="expand">False</property> @@ -3454,10 +3454,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Home-BackColor"> + <object class="GtkMenuToolButton" id="Home-fontcolor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackColor</property> + <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> @@ -11143,7 +11143,7 @@ </child> <child> <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar_compact|ImageMenuButton">Image</property> + <property name="label" translatable="yes" context="notebookbar_compact|ImageMenuButton">Im_age</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index d61e090766ec..5ccbce93b833 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -7701,8 +7701,10 @@ <object class="sfxlo-OptionalBox" id="Image-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="GtkSeparator" id="separator109"> + <object class="GtkSeparator" id="separator55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -7713,7 +7715,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -7722,13 +7724,13 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third7"> + <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> - <property name="can_focus">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="Image-BorderDialog"> + <object class="GtkToolButton" id="Object-BorderDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BorderDialog</property> @@ -7746,20 +7748,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third8"> + <object class="sfxlo-NotebookbarToolBox" id="third4"> <property name="visible">True</property> - <property name="can_focus">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="Image-Section-FormatArea"> + <object class="GtkToolButton" id="Object-FormatArea1"> <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> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -7773,9 +7775,21 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</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="sfxlo-OptionalBox" id="Image-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> <object class="GtkBox" id="box56"> <property name="visible">True</property> @@ -7786,13 +7800,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> + <object class="sfxlo-NotebookbarToolBox" id="first7"> <property name="visible">True</property> - <property name="can_focus">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="Image-SetBorderStyle"> + <object class="GtkMenuToolButton" id="Object-SetBorderStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7804,7 +7818,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-LineStyle"> + <object class="GtkToolButton" id="Object-LineStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineStyle</property> @@ -7824,11 +7838,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> <property name="visible">True</property> - <property name="can_focus">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="Image-FrameLineColor"> + <object class="GtkToolButton" id="Object-FrameLineColor2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FrameLineColor</property> @@ -7854,19 +7868,18 @@ </child> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23"> - <property name="width_request">200</property> <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="Image-FillStyle"> + <object class="GtkToolButton" id="Object-FillStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -7891,7 +7904,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> @@ -8137,7 +8150,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -8271,7 +8284,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -8365,7 +8378,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -8445,7 +8458,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -8525,7 +8538,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -8641,7 +8654,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <style> @@ -8784,6 +8797,217 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Object-Section-BordersArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator69"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third10"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</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="third11"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="toolbar_style">text</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Object-FormatArea"> + <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> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box69"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box70"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first1"> + <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="Object-SetBorderStyle1"> + <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="GtkToolButton" id="Object-LineStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</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="first4"> + <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="GtkToolButton" id="Object-FrameLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <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="Object-FillStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Object-Section-BackFront"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8917,7 +9141,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -9075,7 +9299,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -9209,217 +9433,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Object-Section-BordersArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkSeparator" id="separator69"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box51"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third11"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-FormatArea"> - <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">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third10"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Object-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BorderDialog</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> - <style> - <class name="priority-8"/> - </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="Object-Section-FormatLineArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="box69"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> - <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="Object-FillStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</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="box70"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> - <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="Object-SetBorderStyle1"> - <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="GtkToolButton" id="Object-LineStyle1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</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="first4"> - <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="GtkToolButton" id="Object-FrameLineColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="priority-7"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">5</property> </packing> </child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 6f57c490a070..e63c383ba0db 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -1985,24 +1985,24 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuParagraph-CommonAlignTop"> + <object class="GtkMenuItem" id="MenuParagraph-CommonAlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignTop</property> + <property name="action_name">.uno:CommonAlignUp</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuParagraph-CommonAlignVerticalCenter"> + <object class="GtkMenuItem" id="MenuParagraph-CommonAlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignVerticalCenter</property> + <property name="action_name">.uno:CommonAlignMiddle</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuParagraph-CommonAlignBottom"> + <object class="GtkMenuItem" id="MenuParagraph-CommonAlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignBottom</property> + <property name="action_name">.uno:CommonAlignDown</property> </object> </child> <child> @@ -5632,7 +5632,7 @@ <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="SectionGraphic"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Image"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5691,9 +5691,22 @@ <object class="sfxlo-NotebookbarToolBox" id="CompressGraphicGroup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">text</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="ChangePicture"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="CompressGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5704,6 +5717,17 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -5755,10 +5779,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="RotateRight"> + <object class="GtkToolButton" id="RotateRight1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RotateRight</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> @@ -5766,10 +5790,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="FlipHorizontal"> + <object class="GtkToolButton" id="RotateRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:RotateRight</property> </object> <packing> <property name="expand">False</property> @@ -5777,10 +5801,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="SaveGraphic"> + <object class="GtkToolButton" id="FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -5878,11 +5902,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionArrange"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="horizontal6"> + <object class="GtkBox" id="horizontal52"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -5899,29 +5923,261 @@ </packing> </child> <child> - <object class="GtkBox" id="vertical6"> + <object class="GtkBox" id="box93"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third1"> + <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="Object-BorderDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BorderDialog</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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third25"> + <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="Object-FormatArea1"> + <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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box96"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first58"> + <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="Object-SetBorderStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</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="GtkToolButton" id="Object-LineStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</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="SectionBottom55"> + <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="Object-FrameLineColor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FrameLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <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="Object-FillStyle2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillStyle</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-8"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Arrange"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal50"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="vertical13"> <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="GtkBox" id="box22"> + <object class="GtkBox" id="box82"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="WrapGroup"> + <object class="GtkBox" id="WrapGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> <property name="visible">True</property> - <property name="can_focus">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="WrapOff"> + <object class="GtkToolButton" id="WrapOff3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> @@ -5932,7 +6188,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapOn"> + <object class="GtkToolButton" id="WrapOn3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> @@ -5943,7 +6199,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapIdeal"> + <object class="GtkToolButton" id="WrapIdeal3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> @@ -5961,13 +6217,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> <property name="visible">True</property> - <property name="can_focus">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="WrapLeft"> + <object class="GtkToolButton" id="WrapLeft3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> @@ -5978,7 +6234,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapThrough"> + <object class="GtkToolButton" id="WrapThrough3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> @@ -5989,7 +6245,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="WrapRight"> + <object class="GtkToolButton" id="WrapRight3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> @@ -6014,6 +6270,143 @@ </packing> </child> <child> + <object class="GtkBox" id="WrapGroup4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap1"> + <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="Object-ContourDialog1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ContourDialog</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">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap2"> + <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="Object-TextWrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TextWrap</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> + <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="GtkBox" id="box83"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</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> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </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="Graphic-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="vertical51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box84"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> <object class="GtkSeparator" id="separator19"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6027,21 +6420,21 @@ </packing> </child> <child> - <object class="GtkBox" id="AlignGroup"> + <object class="GtkBox" id="AlignGroup3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <object class="sfxlo-NotebookbarToolBox" id="Align1"> <property name="visible">True</property> - <property name="can_focus">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="AlignLeft"> + <object class="GtkToolButton" id="ObjectAlignLeft3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -6049,10 +6442,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignHorizontalCenter"> + <object class="GtkToolButton" id="AlignCenter3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -6060,10 +6453,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignRight"> + <object class="GtkToolButton" id="ObjectAlignRight3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -6080,14 +6473,14 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align2"> <property name="visible">True</property> - <property name="can_focus">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="AlignTop"> + <object class="GtkToolButton" id="AlignUp3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignTop</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -6095,10 +6488,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignVerticalCenter"> + <object class="GtkToolButton" id="AlignMiddle3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignVerticalCenter</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -6106,10 +6499,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignBottom"> + <object class="GtkToolButton" id="AlignDown5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBottom</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -6130,6 +6523,56 @@ <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-6"/> + </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="Graphic-Section-Arrange2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="vertical6"> + <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="GtkBox" id="box22"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> @@ -6155,7 +6598,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="AlignBottom1"> + <object class="GtkToolButton" id="AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -6237,23 +6680,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|ArrangeButton">_Arrange</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</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="thirdExt8"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -6302,17 +6728,17 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionColor"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Color"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -6367,7 +6793,7 @@ <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="GraphicFilterToolbox"> @@ -6380,28 +6806,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkMenuToolButton" id="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">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="BackgroundColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -6433,21 +6837,46 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Color1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal48"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="vertical13"> + <object class="GtkBox" id="vertical50"> <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-SidebarToolBox" id="colorbox1"> + <object class="sfxlo-SidebarToolBox" id="colorbox3"> <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="GrafLuminance1"> + <object class="GtkMenuToolButton" id="GrafLuminance2"> <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6459,13 +6888,26 @@ <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-SidebarToolBox" id="colorbox4"> + <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="GrafContrast1"> + <object class="GtkMenuToolButton" id="GrafTransparence2"> <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:GrafContrast</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> @@ -6476,30 +6918,98 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="third23"> + <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> + <property name="icon_size">1</property> + </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> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Color2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="horizontal49"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="vertical49"> + <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-SidebarToolBox" id="colorbox2"> + <object class="sfxlo-SidebarToolBox" id="colorbox5"> <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="GrafTransparence1"> + <object class="GtkMenuToolButton" id="GrafContrast3"> <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:GrafContrast</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-SidebarToolBox" id="colorbox6"> + <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="GrafGamma1"> + <object class="GtkMenuToolButton" id="GrafGamma3"> <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6519,16 +7029,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third1"> + <object class="sfxlo-NotebookbarToolBox" id="third24"> <property name="visible">True</property> - <property name="can_focus">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> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="ColorSettings1"> + <object class="GtkToolButton" id="ColorSettings3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ColorSettings</property> @@ -6566,11 +7076,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">9</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SectionGraphic1"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -6705,7 +7215,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">10</property> </packing> </child> <style> @@ -11821,10 +12331,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="CommonAlignTop"> + <object class="GtkToolButton" id="CommonAlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignTop</property> + <property name="action_name">.uno:CommonAlignUp</property> </object> <packing> <property name="expand">False</property> @@ -11832,10 +12342,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignVerticalCenter"> + <object class="GtkToolButton" id="CommonAlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignVerticalCenter</property> + <property name="action_name">.uno:CommonAlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -11843,10 +12353,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignBottom"> + <object class="GtkToolButton" id="CommonAlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignBottom</property> + <property name="action_name">.uno:CommonAlignDown</property> </object> <packing> <property name="expand">False</property> @@ -12569,10 +13079,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="AlignLeft1"> + <object class="GtkToolButton" id="ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -12580,10 +13090,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignHorizontalCenter1"> + <object class="GtkToolButton" id="AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -12591,10 +13101,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignRight1"> + <object class="GtkToolButton" id="ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -12602,10 +13112,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignTop1"> + <object class="GtkToolButton" id="AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignTop</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -12613,10 +13123,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignVerticalCenter1"> + <object class="GtkToolButton" id="AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignVerticalCenter</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -12624,10 +13134,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignBottom2"> + <object class="GtkToolButton" id="AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBottom</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -12661,7 +13171,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="AlignBottom3"> + <object class="GtkToolButton" id="AlignDown3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -13295,10 +13805,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectAlignLeft"> + <object class="GtkToolButton" id="Object-ObjectObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -13317,10 +13827,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight"> + <object class="GtkToolButton" id="Object-ObjectObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignRight</property> + <property name="action_name">.uno:ObjectObjectAlignRight</property> </object> <packing> <property name="expand">False</property> |