diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-06-28 01:56:03 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2019-06-28 08:35:43 +0200 |
| commit | ebc86c79ec65ea1422fd79c55804b7515c82ed0b (patch) | |
| tree | 3848920d31e1220ad2a45c7d4c6ed6a12e9743a8 | |
| parent | 20b1e6440aacab043753e93be4499e939a80b05b (diff) | |
NB tabbed sd reviewed
Change-Id: I078187f37251ebd153565e41d5e08ea64253099b
Reviewed-on: https://gerrit.libreoffice.org/74829
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 1107 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 48 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 1162 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar_compact.ui | 48 |
4 files changed, 1531 insertions, 834 deletions
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 0ab18c1d67bf..96192cf34f69 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -3575,6 +3575,9 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-9"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6794,7 +6797,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> @@ -6844,17 +6847,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Review-ShowAnnotations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -6942,7 +6934,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -7024,7 +7016,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -7034,6 +7026,49 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Review-ShowAnnotations"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowAnnotations</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> + <style> + <class name="priority-3"/> + </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="Review-Section-RedactDoc"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7082,13 +7117,13 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -7139,11 +7174,14 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> </object> @@ -7348,9 +7386,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-10"/> - </style> </object> <packing> <property name="expand">False</property> @@ -7631,14 +7666,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB49"> + <object class="GtkBox" id="GroupB47"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7646,14 +7681,14 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-Menubar"> + <object class="GtkToolButton" id="View-ShowRuler"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Menubar</property> + <property name="action_name">.uno:ShowRuler</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -7664,7 +7699,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing11"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7672,10 +7707,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-LeftPaneDraw"> + <object class="GtkToolButton" id="View-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPaneDraw</property> + <property name="action_name">.uno:GridVisible</property> </object> <packing> <property name="expand">False</property> @@ -7693,7 +7728,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> @@ -7713,14 +7748,14 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB47"> + <object class="GtkBox" id="GroupB49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7728,14 +7763,14 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-ShowRuler"> + <object class="GtkToolButton" id="View-Menubar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ShowRuler</property> + <property name="action_name">.uno:Menubar</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -7746,7 +7781,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing9"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7754,10 +7789,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="View-GridVisible"> + <object class="GtkToolButton" id="View-LeftPaneDraw"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GridVisible</property> + <property name="action_name">.uno:LeftPaneDraw</property> </object> <packing> <property name="expand">False</property> @@ -7775,7 +7810,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <style> @@ -9871,6 +9906,19 @@ <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> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Layout1"> + <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="GroupB31"> <property name="visible">True</property> @@ -9880,7 +9928,7 @@ <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">icons</property> <property name="show_arrow">False</property> <child> @@ -9926,7 +9974,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <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> @@ -9976,8 +10024,21 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator2"> + <object class="GtkSeparator" id="separator5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9988,22 +10049,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="GtkBox" id="box19"> <property name="visible">True</property> @@ -10012,7 +10060,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third5"> <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> @@ -10036,7 +10084,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third6"> <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> @@ -10061,9 +10109,22 @@ <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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-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="GtkBox" id="box20"> <property name="visible">True</property> @@ -10074,15 +10135,16 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first21"> + <object class="sfxlo-NotebookbarToolBox" id="first14"> <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="Table-SetBorderStyle"> <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> @@ -10091,14 +10153,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Table-LineStyle"> + <object class="GtkToolButton" id="Table-LineStyle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10109,20 +10171,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> <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="GtkMenuToolButton" id="Table-FrameLineColor"> + <object class="GtkToolButton" id="Table-FrameLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FrameLineColor</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10140,40 +10202,27 @@ </packing> </child> <child> - <object class="GtkBox" id="box22"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom79"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Table-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -10183,8 +10232,21 @@ <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator5"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10195,22 +10257,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</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> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom90"> <property name="visible">True</property> @@ -10237,13 +10286,29 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</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="Table-Section-Merge1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> @@ -10264,32 +10329,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator45"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -10299,6 +10349,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom43"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -10322,9 +10387,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </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="Table-Section-Select1"> + <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="GroupB62"> <property name="visible">True</property> @@ -10332,9 +10413,9 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <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> @@ -10356,9 +10437,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <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> @@ -10383,32 +10464,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator51"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -10418,6 +10484,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -10441,9 +10522,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Optimize1"> + <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="GroupB66"> <property name="visible">True</property> @@ -10453,7 +10550,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom84"> <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> @@ -10516,7 +10613,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> <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> @@ -10582,21 +10679,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -10607,7 +10689,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> @@ -10617,6 +10699,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -10652,7 +10749,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">10</property> </packing> </child> </object> @@ -10941,6 +11038,32 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Image-ChangePicture"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -11249,7 +11372,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -11300,33 +11423,126 @@ </packing> </child> <child> - <object class="GtkBox" id="box9"> + <object class="sfxlo-OptionalBox" id="Image-Section-ObjectAlign2"> <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="AlignGroup3"> + <object class="GtkBox" id="box32"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="GtkBox" id="AlignGroup8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <object class="sfxlo-NotebookbarToolBox" id="Align15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> + <object class="sfxlo-NotebookbarToolBox" id="Align16"> + <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="Image-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</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">2</property> + </packing> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </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="Image-Section-ObjectAlign1"> + <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="box9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <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="Image-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11362,17 +11578,6 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-AlignUp"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Image-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11422,7 +11627,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -11823,19 +12028,6 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Image-SaveGraphic1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Image-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12383,7 +12575,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-12"/> </style> </object> <packing> @@ -12434,16 +12626,16 @@ </packing> </child> <child> - <object class="GtkBox" id="box4"> + <object class="GtkBox" id="box28"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="AlignGroup1"> + <object class="GtkBox" id="AlignGroup7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="sfxlo-NotebookbarToolBox" id="Align13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> @@ -12459,6 +12651,82 @@ <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="Align14"> + <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="Image-AlignUp1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</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">2</property> + </packing> + </child> + <style> + <class name="priority-11"/> + </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="Draw-Section-ObjectAlign1"> + <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="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup1"> + <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">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-AlignCenter"> <property name="visible">True</property> @@ -12495,17 +12763,6 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-AlignUp1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Image-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12549,13 +12806,13 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-10"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -12565,7 +12822,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator67"> + <object class="GtkSeparator" id="separator7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12636,10 +12893,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -12659,10 +12916,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -12683,13 +12940,13 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -12741,13 +12998,13 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -12802,11 +13059,35 @@ <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="BackgroundFront2"> + <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-BezierCutLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BezierCutLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> <child> - <object class="GtkToolButton" id="Draw-BezierConvert"> + <object class="GtkToolButton" id="Draw-BezierEdge"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierConvert</property> + <property name="action_name">.uno:BezierEdge</property> </object> <packing> <property name="expand">False</property> @@ -12814,10 +13095,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierClose"> + <object class="GtkToolButton" id="Draw-BezierSmooth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierClose</property> + <property name="action_name">.uno:BezierSmooth</property> </object> <packing> <property name="expand">False</property> @@ -12828,31 +13109,50 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Bezier2"> + <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="BezierGroup1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BezierCutLine"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierCutLine</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BezierEdge"> + <object class="GtkToolButton" id="Draw-BezierConvert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierEdge</property> + <property name="action_name">.uno:BezierConvert</property> </object> <packing> <property name="expand">False</property> @@ -12860,16 +13160,29 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierSmooth"> + <object class="GtkToolButton" id="Draw-BezierClose"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierSmooth</property> + <property name="action_name">.uno:BezierClose</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront1"> + <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-BezierSymmetric"> <property name="visible">True</property> @@ -12913,7 +13226,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> @@ -12971,7 +13284,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">10</property> </packing> </child> <child> @@ -13052,7 +13365,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">11</property> </packing> </child> <child> @@ -13177,7 +13490,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">12</property> </packing> </child> <child> @@ -13235,7 +13548,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> <child> @@ -13338,7 +13651,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">14</property> </packing> </child> </object> @@ -13583,10 +13896,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FlipHorizontal"> + <object class="GtkToolButton" id="Object-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -13594,10 +13907,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FlipVertical"> + <object class="GtkToolButton" id="Object-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -13934,7 +14247,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -13948,7 +14261,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator37"> @@ -13986,18 +14298,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box22"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="AlignGroup4"> + <object class="GtkBox" id="AlignGroup6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <object class="sfxlo-NotebookbarToolBox" id="Align11"> <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> @@ -14011,6 +14323,82 @@ <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="Align12"> + <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="Object-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</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">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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign1"> + <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="box17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <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="Object-AlignCenter"> <property name="visible">True</property> @@ -14043,14 +14431,14 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align8"> <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="Object-AlignUp"> + <object class="GtkToolButton" id="Object-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -14068,17 +14456,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -14107,7 +14484,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> @@ -14241,7 +14618,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> @@ -14503,7 +14880,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Anchor"> + <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14524,82 +14901,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom137"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkMenuToolButton" id="Object-Anchor2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:AnchorMenu</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-5"/> - </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="Media-Section-ObjectAlign"> - <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="separator41"> - <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="box12"> + <object class="GtkBox" id="box33"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="AlignGroup2"> + <object class="GtkBox" id="AlignGroup9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align3"> + <object class="sfxlo-NotebookbarToolBox" id="Align17"> <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="Object-ObjectAlignLeft2"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -14610,7 +14927,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignCenter2"> + <object class="GtkToolButton" id="Object-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -14621,7 +14938,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight2"> + <object class="GtkToolButton" id="Object-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -14639,13 +14956,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="sfxlo-NotebookbarToolBox" id="Align18"> <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="Object-AlignUp2"> + <object class="GtkToolButton" id="Object-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -14656,10 +14973,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignMiddle2"> + <object class="GtkToolButton" id="Object-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -14667,10 +14984,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignDown2"> + <object class="GtkToolButton" id="Object-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -14695,7 +15012,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> @@ -14705,7 +15022,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> @@ -14715,7 +15032,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator85"> + <object class="GtkSeparator" id="separator8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -14734,13 +15051,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first12"> + <object class="sfxlo-NotebookbarToolBox" id="first10"> <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="Object-BringToFront2"> + <object class="GtkToolButton" id="Media-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -14757,13 +15074,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second7"> + <object class="sfxlo-NotebookbarToolBox" id="second6"> <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="Object-SendToBack2"> + <object class="GtkToolButton" id="Media-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -14780,16 +15097,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first14"> + <object class="sfxlo-NotebookbarToolBox" id="first12"> <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-ObjectForwardOne2"> + <object class="GtkToolButton" id="Media-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -14809,10 +15126,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne2"> + <object class="GtkToolButton" id="Media-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -14839,7 +15156,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -14926,7 +15243,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> </object> @@ -14970,20 +15287,44 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25"> <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="Media-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Media-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TransformDialog</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -16025,11 +16366,11 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-TransformDialog1"> + <object class="GtkToolButton" id="Draw-FormatLine5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:TransformDialog</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> <property name="expand">False</property> @@ -16037,11 +16378,11 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FormatLine5"> + <object class="GtkToolButton" id="Draw-TransformDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:TransformDialog</property> </object> <packing> <property name="expand">False</property> @@ -16180,10 +16521,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-FlipHorizontal"> + <object class="GtkToolButton" id="3dObject-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -16191,10 +16532,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-FlipVertical"> + <object class="GtkToolButton" id="3dObject-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -16676,10 +17017,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-AlignDown"> + <object class="GtkToolButton" id="3dObject-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -16687,10 +17028,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-AlignMiddle"> + <object class="GtkToolButton" id="3dObject-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index 6736cede5f38..a74119658bde 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -11833,10 +11833,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ObjectForwardOne2"> + <object class="GtkToolButton" id="Graphic-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -11872,10 +11872,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ObjectBackOne2"> + <object class="GtkToolButton" id="Graphic-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -13210,10 +13210,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MultiObject-ObjectForwardOne2"> + <object class="GtkToolButton" id="MultiObject-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -13249,10 +13249,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MultiObject-ObjectBackOne2"> + <object class="GtkToolButton" id="MultiObject-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -14455,10 +14455,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne"> + <object class="GtkToolButton" id="Object-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -14494,10 +14494,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne"> + <object class="GtkToolButton" id="Object-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -15539,10 +15539,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectForwardOne2"> + <object class="GtkToolButton" id="Media-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -15578,10 +15578,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectBackOne2"> + <object class="GtkToolButton" id="Media-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -16784,10 +16784,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne3"> + <object class="GtkToolButton" id="Object-Forward3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -16795,10 +16795,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne3"> + <object class="GtkToolButton" id="Object-Backward3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -18683,10 +18683,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="3dObject-ObjectForwardOne2"> + <object class="GtkToolButton" id="3dObject-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -18722,10 +18722,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="3dObject-ObjectBackOne2"> + <object class="GtkToolButton" id="3dObject-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 100e40b70805..7b73116b382b 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -7843,7 +7843,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> @@ -7893,17 +7893,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Review-ShowAnnotations"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ShowAnnotations</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -7991,7 +7980,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -8073,7 +8062,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -8083,6 +8072,49 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom94"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Review-ShowAnnotations"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowAnnotations</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> + <style> + <class name="priority-3"/> + </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="Review-Section-RedactDoc"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8131,13 +8163,13 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -8188,11 +8220,14 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> </object> @@ -8396,7 +8431,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-13"/> </style> </object> <packing> @@ -8478,7 +8513,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-12"/> </style> </object> <packing> @@ -8615,7 +8650,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-11"/> </style> </object> <packing> @@ -8748,7 +8783,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-10"/> </style> </object> <packing> @@ -8826,7 +8861,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> @@ -8963,7 +8998,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> @@ -9045,7 +9080,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-7"/> </style> </object> <packing> @@ -9103,7 +9138,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -9225,7 +9260,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -9325,7 +9360,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -9618,6 +9653,19 @@ <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> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Layout1"> + <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="GroupB30"> <property name="visible">True</property> @@ -9627,7 +9675,7 @@ <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">icons</property> <property name="show_arrow">False</property> <child> @@ -9673,7 +9721,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> <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> @@ -9723,8 +9771,21 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator1"> + <object class="GtkSeparator" id="separator5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9735,31 +9796,18 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box9"> + <object class="GtkBox" id="box19"> <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="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> @@ -9783,7 +9831,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third6"> <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> @@ -9808,28 +9856,42 @@ <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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-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="GtkBox" id="box10"> + <object class="GtkBox" id="box9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box11"> + <object class="GtkBox" id="box10"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="first10"> <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="Table-SetBorderStyle"> <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> @@ -9838,14 +9900,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Table-LineStyle"> + <object class="GtkToolButton" id="Table-LineStyle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineStyle</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9856,20 +9918,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <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="GtkMenuToolButton" id="Table-FrameLineColor"> + <object class="GtkToolButton" id="Table-FrameLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FrameLineColor</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9887,40 +9949,27 @@ </packing> </child> <child> - <object class="GtkBox" id="box19"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom79"> - <property name="width_request">200</property> + <object class="GtkToolButton" id="Table-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Table-FillStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:FillStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -9930,8 +9979,21 @@ <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator5"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9942,26 +10004,13 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</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> - <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Merge"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> @@ -9984,13 +10033,29 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</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="Table-Section-Merge1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> @@ -10011,32 +10076,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator45"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -10046,9 +10096,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom43"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> @@ -10069,9 +10134,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> + </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="Table-Section-Select1"> + <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="GroupB62"> <property name="visible">True</property> @@ -10079,9 +10160,9 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> <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> @@ -10103,9 +10184,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> <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> @@ -10130,32 +10211,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator51"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -10165,9 +10231,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> @@ -10188,9 +10269,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Optimize1"> + <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="GroupB66"> <property name="visible">True</property> @@ -10200,7 +10297,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom84"> <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> @@ -10263,7 +10360,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85"> <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> @@ -10329,21 +10426,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -10354,7 +10436,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> @@ -10364,11 +10446,25 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> + <object class="GtkSeparator" id="separator2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -10400,7 +10496,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">10</property> </packing> </child> </object> @@ -10687,6 +10783,32 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Image-ChangePicture"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -10709,7 +10831,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -10995,7 +11117,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -11046,33 +11168,126 @@ </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="sfxlo-OptionalBox" id="Image-Section-ObjectAlign2"> <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="AlignGroup3"> + <object class="GtkBox" id="box11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="GtkBox" id="AlignGroup6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <object class="sfxlo-NotebookbarToolBox" id="Align11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> + <object class="sfxlo-NotebookbarToolBox" id="Align12"> + <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="Image-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</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">2</property> + </packing> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </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="Image-Section-ObjectAlign1"> + <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="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <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="Image-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11108,17 +11323,6 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-AlignUp"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Image-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11168,7 +11372,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -11569,19 +11773,6 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Image-SaveGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Image-FormatArea"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12127,7 +12318,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-12"/> </style> </object> <packing> @@ -12178,32 +12369,123 @@ </packing> </child> <child> - <object class="GtkBox" id="box4"> + <object class="sfxlo-OptionalBox" id="Draw-Section-ObjectAlign2"> <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="AlignGroup1"> + <object class="GtkBox" id="box25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="GtkBox" id="AlignGroup7"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> + <object class="sfxlo-NotebookbarToolBox" id="Align13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align14"> + <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="Image-AlignUp1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</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">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">2</property> + </packing> + </child> + <style> + <class name="priority-11"/> + </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="Draw-Section-ObjectAlign1"> + <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="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup1"> + <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">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-AlignCenter"> <property name="visible">True</property> @@ -12236,21 +12518,10 @@ <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="Image-AlignUp1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Image-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12294,13 +12565,13 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-10"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -12310,7 +12581,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator67"> + <object class="GtkSeparator" id="separator58"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12381,10 +12652,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -12404,10 +12675,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -12428,13 +12699,13 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -12486,13 +12757,13 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -12502,12 +12773,12 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="BezierGroup"> + <object class="GtkBox" id="BezierGroup1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12515,21 +12786,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BezierMove"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierMove</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-BezierInsert"> + <object class="GtkToolButton" id="Draw-BezierConvert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierInsert</property> + <property name="action_name">.uno:BezierConvert</property> </object> <packing> <property name="expand">False</property> @@ -12537,21 +12797,34 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierDelete"> + <object class="GtkToolButton" id="Draw-BezierClose"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierDelete</property> + <property name="action_name">.uno:BezierClose</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront1"> + <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-BezierConvert"> + <object class="GtkToolButton" id="Draw-BezierSymmetric"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierConvert</property> + <property name="action_name">.uno:BezierSymmetric</property> </object> <packing> <property name="expand">False</property> @@ -12559,10 +12832,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierClose"> + <object class="GtkToolButton" id="Draw-BezierEliminatePoints"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierClose</property> + <property name="action_name">.uno:BezierEliminatePoints</property> </object> <packing> <property name="expand">False</property> @@ -12573,20 +12846,50 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Bezier2"> + <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="BezierGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BezierCutLine"> + <object class="GtkToolButton" id="Draw-BezierMove"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierCutLine</property> + <property name="action_name">.uno:BezierMove</property> </object> <packing> <property name="expand">False</property> @@ -12594,10 +12897,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierEdge"> + <object class="GtkToolButton" id="Draw-BezierInsert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierEdge</property> + <property name="action_name">.uno:BezierInsert</property> </object> <packing> <property name="expand">False</property> @@ -12605,10 +12908,34 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierSmooth"> + <object class="GtkToolButton" id="Draw-BezierDelete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierSmooth</property> + <property name="action_name">.uno:BezierDelete</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2"> + <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-BezierCutLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BezierCutLine</property> </object> <packing> <property name="expand">False</property> @@ -12616,10 +12943,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierSymmetric"> + <object class="GtkToolButton" id="Draw-BezierEdge"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierSymmetric</property> + <property name="action_name">.uno:BezierEdge</property> </object> <packing> <property name="expand">False</property> @@ -12627,10 +12954,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-BezierEliminatePoints"> + <object class="GtkToolButton" id="Draw-BezierSmooth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BezierEliminatePoints</property> + <property name="action_name">.uno:BezierSmooth</property> </object> <packing> <property name="expand">False</property> @@ -12658,7 +12985,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">9</property> </packing> </child> <child> @@ -12716,7 +13043,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">10</property> </packing> </child> <child> @@ -12797,7 +13124,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">11</property> </packing> </child> <child> @@ -12922,7 +13249,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">12</property> </packing> </child> <child> @@ -12980,7 +13307,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> <child> @@ -13083,7 +13410,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">14</property> </packing> </child> </object> @@ -13330,10 +13657,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FlipHorizontal"> + <object class="GtkToolButton" id="Object-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -13341,10 +13668,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-FlipVertical"> + <object class="GtkToolButton" id="Object-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -13681,7 +14008,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -13757,6 +14084,82 @@ <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="Align8"> + <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="Object-AlignUp"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignUp</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">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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-ObjectAlign1"> + <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="box26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="AlignGroup8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align15"> + <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="Object-AlignCenter"> <property name="visible">True</property> @@ -13787,16 +14190,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align8"> + <object class="sfxlo-NotebookbarToolBox" id="Align16"> <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="Object-AlignUp"> + <object class="GtkToolButton" id="Object-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -13814,17 +14217,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Object-AlignMiddle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -13853,7 +14245,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> @@ -13987,7 +14379,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> @@ -14161,12 +14553,12 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Media-AnimationEffects"> + <object class="GtkToolButton" id="Media-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="action_name">.uno:AnimationEffects</property> + <property name="action_name">.uno:NameGroup</property> </object> <packing> <property name="expand">True</property> @@ -14249,7 +14641,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Anchor"> + <object class="sfxlo-OptionalBox" id="Media-Section-ObjectAlign1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14270,82 +14662,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom137"> + <object class="GtkBox" id="box33"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="Object-Anchor2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:AnchorMenu</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-5"/> - </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="Media-Section-ObjectAlign"> - <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="separator41"> - <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="box12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="AlignGroup2"> + <object class="GtkBox" id="AlignGroup9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align3"> + <object class="sfxlo-NotebookbarToolBox" id="Align17"> <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="Object-ObjectAlignLeft2"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -14356,7 +14688,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignCenter2"> + <object class="GtkToolButton" id="Object-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -14367,7 +14699,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectAlignRight2"> + <object class="GtkToolButton" id="Object-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -14385,13 +14717,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <object class="sfxlo-NotebookbarToolBox" id="Align18"> <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="Object-AlignUp2"> + <object class="GtkToolButton" id="Object-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -14402,10 +14734,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignMiddle2"> + <object class="GtkToolButton" id="Object-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -14413,10 +14745,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-AlignDown2"> + <object class="GtkToolButton" id="Object-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -14441,7 +14773,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> @@ -14451,7 +14783,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> @@ -14461,7 +14793,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator85"> + <object class="GtkSeparator" id="separator41"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -14486,7 +14818,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-BringToFront2"> + <object class="GtkToolButton" id="Media-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -14503,13 +14835,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second7"> + <object class="sfxlo-NotebookbarToolBox" id="second6"> <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="Object-SendToBack2"> + <object class="GtkToolButton" id="Media-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -14532,10 +14864,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne2"> + <object class="GtkToolButton" id="Media-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -14555,10 +14887,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne2"> + <object class="GtkToolButton" id="Media-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -14585,7 +14917,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -14672,7 +15004,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> </object> @@ -14723,13 +15055,37 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> + <object class="GtkToolButton" id="Media-FormatArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatArea</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Media-FormatLine"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:FormatLine</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Media-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TransformDialog</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -16919,7 +17275,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-6"/> </style> </object> <packing> @@ -17001,7 +17357,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-5"/> </style> </object> <packing> @@ -17264,7 +17620,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-4"/> </style> </object> <packing> @@ -17346,7 +17702,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-3"/> </style> </object> <packing> @@ -17428,7 +17784,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-2"/> </style> </object> <packing> @@ -17581,11 +17937,11 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-TransformDialog1"> + <object class="GtkToolButton" id="Draw-FormatLine5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:TransformDialog</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> <property name="expand">False</property> @@ -17593,11 +17949,11 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FormatLine5"> + <object class="GtkToolButton" id="Draw-TransformDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:TransformDialog</property> </object> <packing> <property name="expand">False</property> @@ -17736,10 +18092,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-FlipHorizontal"> + <object class="GtkToolButton" id="3dObject-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -17747,10 +18103,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-FlipVertical"> + <object class="GtkToolButton" id="3dObject-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -18232,10 +18588,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-AlignDown"> + <object class="GtkToolButton" id="3dObject-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -18243,10 +18599,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="3dObject-AlignMiddle"> + <object class="GtkToolButton" id="3dObject-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui index 4ed789796eff..7270e061f260 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui @@ -11311,10 +11311,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ObjectForwardOne2"> + <object class="GtkToolButton" id="Graphic-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -11350,10 +11350,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ObjectBackOne2"> + <object class="GtkToolButton" id="Graphic-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -12686,10 +12686,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MultiObject-ObjectForwardOne2"> + <object class="GtkToolButton" id="MultiObject-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -12725,10 +12725,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MultiObject-ObjectBackOne2"> + <object class="GtkToolButton" id="MultiObject-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -14242,10 +14242,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne"> + <object class="GtkToolButton" id="Object-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -14281,10 +14281,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne"> + <object class="GtkToolButton" id="Object-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -15324,10 +15324,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectForwardOne2"> + <object class="GtkToolButton" id="Media-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -15363,10 +15363,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-ObjectBackOne2"> + <object class="GtkToolButton" id="Media-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -16567,10 +16567,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-ObjectForwardOne3"> + <object class="GtkToolButton" id="Object-Forward3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -16578,10 +16578,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Object-ObjectBackOne3"> + <object class="GtkToolButton" id="Object-Backward3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> @@ -18466,10 +18466,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="3dObject-ObjectForwardOne2"> + <object class="GtkToolButton" id="3dObject-Forward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> + <property name="action_name">.uno:Forward</property> </object> <packing> <property name="expand">False</property> @@ -18505,10 +18505,10 @@ <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="3dObject-ObjectBackOne2"> + <object class="GtkToolButton" id="3dObject-Backward2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> + <property name="action_name">.uno:Backward</property> </object> <packing> <property name="expand">False</property> |