diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-05-31 16:38:17 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2019-06-01 00:02:46 +0200 |
| commit | 9613e026d52d7475c3dcd92feadb35caa4aff356 (patch) | |
| tree | 2e922496c033bcc2c8d97ddc0afce96989f26b7b /sd/uiconfig/sdraw | |
| parent | de4d296619b978ec303f1d7b1e2c78e13fa7a512 (diff) | |
NB tabbed big sync between different apps
Change-Id: I1616bcdd6e88615423e033f4ef276700fb3ba3ba
Reviewed-on: https://gerrit.libreoffice.org/73277
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'sd/uiconfig/sdraw')
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 2020 |
1 files changed, 1383 insertions, 637 deletions
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 55abaa92fb1e..1f5fc7dea160 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -5666,6 +5666,17 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Slide-HeaderAndFooter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HeaderAndFooter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -5755,7 +5766,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -5810,7 +5821,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -5887,7 +5898,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -5942,7 +5953,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> @@ -6019,7 +6030,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> @@ -6112,7 +6123,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -6167,7 +6178,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -6244,7 +6255,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -6609,7 +6620,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -6757,7 +6768,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -6839,7 +6850,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> @@ -6849,6 +6860,64 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Review-Section-RedactDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkSeparator" id="separator55"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119"> + <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-RedactDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RedactDoc</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-1"/> + </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-EditDoc"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6900,7 +6969,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> @@ -10396,7 +10465,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Big"> <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> @@ -10422,6 +10491,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="Image-Section-Edit1"> + <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="SecondGroup"> <property name="visible">True</property> @@ -10436,7 +10518,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first11"> <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> @@ -10460,7 +10542,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first"> <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> @@ -10491,7 +10573,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="second3"> <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> @@ -10543,8 +10625,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="Image-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator1"> + <object class="GtkSeparator" id="separator60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10555,22 +10650,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> @@ -10579,7 +10661,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third1"> <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> @@ -10603,7 +10685,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> @@ -10628,11 +10710,24 @@ <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> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box6"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -10641,9 +10736,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first41"> + <object class="sfxlo-NotebookbarToolBox" id="first1"> <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> @@ -10659,20 +10754,41 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</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-LineEndStyle4"> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Draw-XLineColor1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10698,26 +10814,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle1"> + <object class="GtkToolButton" id="Draw-FillStyle4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -10726,22 +10842,35 @@ <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">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box9"> + <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first5"> + <object class="sfxlo-NotebookbarToolBox" id="first27"> <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="Draw-LineEndStyle1"> + <object class="GtkToolButton" id="Image-LineEndStyle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> @@ -10759,13 +10888,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom134"> <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="Draw-FillShadow1"> + <object class="GtkToolButton" id="Image-FillShadow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> @@ -10786,29 +10915,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator60"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">3</property> </packing> </child> + <style> + <class name="priority-5"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <child> @@ -10818,6 +10935,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator80"> + <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="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert"> <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> @@ -10834,24 +10966,23 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="margin_right">5</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">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -10897,7 +11028,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align6"> <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> @@ -10912,10 +11043,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignDown"> + <object class="GtkToolButton" id="Image-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> @@ -10923,10 +11054,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignMiddle"> + <object class="GtkToolButton" id="Image-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> @@ -10951,17 +11082,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-4"/> </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> @@ -10971,13 +11102,28 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator123"> + <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="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first2"> + <object class="sfxlo-NotebookbarToolBox" id="first5"> <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> @@ -11000,7 +11146,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="second2"> <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> @@ -11023,7 +11169,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first7"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -11046,7 +11192,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Second7"> <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> @@ -11070,32 +11216,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator123"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-3"/> </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> @@ -11105,9 +11236,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator79"> + <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="GraphicFilterToolboxGroup"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> <child> @@ -11125,17 +11271,14 @@ <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">4</property> + <property name="position">8</property> </packing> </child> <child> @@ -11153,7 +11296,7 @@ <child> <object class="sfxlo-SidebarToolBox" id="colorbox3"> <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> @@ -11179,7 +11322,7 @@ <child> <object class="sfxlo-SidebarToolBox" id="colorbox4"> <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> @@ -11217,7 +11360,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">5</property> + <property name="position">9</property> </packing> </child> <child> @@ -11235,7 +11378,7 @@ <child> <object class="sfxlo-SidebarToolBox" id="colorbox5"> <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> @@ -11261,7 +11404,7 @@ <child> <object class="sfxlo-SidebarToolBox" id="colorbox6"> <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> @@ -11298,7 +11441,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">10</property> </packing> </child> </object> @@ -11481,7 +11624,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Big1"> <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> @@ -11496,8 +11639,8 @@ <property name="action_name">.uno:NameGroup</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> @@ -11516,7 +11659,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60"> <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-horiz</property> @@ -11542,7 +11685,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61"> <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">icons</property> @@ -11559,10 +11702,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal1"> + <object class="GtkToolButton" id="Draw-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> @@ -11570,10 +11713,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipVertical1"> + <object class="GtkToolButton" id="Draw-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> @@ -11581,7 +11724,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-Shear1"> + <object class="GtkToolButton" id="Draw-Shear"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Shear</property> @@ -11616,8 +11759,21 @@ <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator63"> + <object class="GtkSeparator" id="separator68"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -11628,22 +11784,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Draw-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="box59"> <property name="visible">True</property> @@ -11652,7 +11795,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third10"> <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> @@ -11676,7 +11819,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third13"> <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> @@ -11701,26 +11844,39 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea4"> + <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="box56"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box29"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first3"> + <object class="sfxlo-NotebookbarToolBox" id="first4"> <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="Draw-XLineStyle"> + <object class="GtkMenuToolButton" id="Draw-XLineStyle4"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11732,20 +11888,41 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first4"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="Draw-LineEndStyle1"> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Draw-XLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11771,26 +11948,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom102"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -11799,9 +11976,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="Draw-Section-FormatLineArea5"> + <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="box8"> <property name="visible">True</property> @@ -11810,7 +12000,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first13"> <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> @@ -11834,7 +12024,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <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> @@ -11859,29 +12049,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator68"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">3</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -11889,9 +12067,23 @@ <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="separator81"> + <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="svtlo-ManagedMenuButton" id="Draw-ConvertButton:MenuConvert"> <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> @@ -11908,7 +12100,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -11923,11 +12115,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ObjectAlignLeft1"> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -11938,7 +12130,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter1"> + <object class="GtkToolButton" id="Draw-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -11949,7 +12141,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-ObjectAlignRight1"> + <object class="GtkToolButton" id="Draw-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -11969,7 +12161,7 @@ <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> @@ -11984,10 +12176,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignDown1"> + <object class="GtkToolButton" id="Image-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> @@ -11995,10 +12187,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignMiddle1"> + <object class="GtkToolButton" id="Image-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> @@ -12023,17 +12215,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -12043,13 +12235,28 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator67"> + <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="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="sfxlo-NotebookbarToolBox" id="first8"> <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> @@ -12072,7 +12279,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="second1"> <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> @@ -12095,14 +12302,14 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first9"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-Forward"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Forward</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -12118,14 +12325,14 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Second1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-Backward"> + <object class="GtkToolButton" id="Draw-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Backward</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -12142,32 +12349,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator67"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">1</property> </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -12177,9 +12369,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator66"> + <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="SectionBottom56"> <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> @@ -12200,9 +12407,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Bezier1"> + <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> @@ -12350,32 +12573,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator83"> - <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">4</property> + <property name="position">7</property> </packing> </child> <child> @@ -12385,6 +12593,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator132"> + <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="SectionBottom51"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12408,9 +12631,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Group1"> + <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="GroupB70"> <property name="visible">True</property> @@ -12476,29 +12715,14 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator132"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">9</property> </packing> </child> <child> @@ -12508,6 +12732,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator54"> + <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="GroupB73"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -12598,17 +12837,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">10</property> </packing> </child> <child> @@ -12618,7 +12857,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator54"> + <object class="GtkSeparator" id="separator63"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -12633,7 +12872,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12659,8 +12898,24 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork1"> + <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="GroupB64"> + <object class="GtkBox" id="GroupB60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12703,7 +12958,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom102"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12753,7 +13008,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">12</property> </packing> </child> </object> @@ -13055,21 +13310,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -13084,6 +13324,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -13140,26 +13395,39 @@ <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Object-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box15"> + <object class="GtkBox" id="box30"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box16"> + <object class="GtkBox" id="box31"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first16"> + <object class="sfxlo-NotebookbarToolBox" id="first2"> <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="Object-XLineStyle"> + <object class="GtkMenuToolButton" id="Object-XLineStyle5"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -13171,21 +13439,42 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="ObjectLineWidth2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first19"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom128"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</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-XLineColor"> + <object class="GtkToolButton" id="Object-LineEndStyle5"> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Object-XLineColor4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:XLineColor</property> @@ -13210,26 +13499,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom133"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Object-FillStyle"> + <object class="GtkToolButton" id="Object-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -13238,22 +13527,35 @@ <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="Object-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="box18"> + <object class="GtkBox" id="box16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first20"> + <object class="sfxlo-NotebookbarToolBox" id="first3"> <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-LineEndStyle"> + <object class="GtkToolButton" id="Object-LineEndStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> @@ -13271,13 +13573,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46"> <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-FillShadow"> + <object class="GtkToolButton" id="Object-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> @@ -13298,29 +13600,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator32"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">3</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -13331,6 +13621,21 @@ <property name="margin_right">5</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:MenuConvert"> <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> <property name="width_request">70</property> @@ -13347,7 +13652,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -13462,17 +13767,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -13482,6 +13787,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator70"> + <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="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -13581,17 +13901,17 @@ <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"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> </object> @@ -13758,7 +14078,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27"> <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> @@ -13793,9 +14113,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -13819,10 +14137,8 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">icons</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="Media-ToggleObjectRotateMode"> @@ -13835,28 +14151,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Media-FlipVertical"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Media-FlipHorizontal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -13871,21 +14165,6 @@ <property name="position">2</property> </packing> </child> - <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">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -13894,56 +14173,57 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolbox"> + <object class="sfxlo-OptionalBox" id="Media-Section-Anchor"> <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="first12"> - <property name="width_request">1000</property> + <object class="GtkSeparator" id="separator31"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:AVMediaToolBox</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <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="GtkSeparator" id="separator31"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom137"> <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> + <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="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -13959,22 +14239,17 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-ConvertButton:MenuConvert2"> - <property name="label" translatable="yes" context="drawnotebookbar|ConvertMenuButton">Convert</property> - <property name="width_request">70</property> + <object class="GtkSeparator" id="separator41"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ChangeBezier</property> - <property name="image">changebezierImg</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - <property name="image_position">top</property> - <property name="always_show_image">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> @@ -13990,11 +14265,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align3"> <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-ObjectAlignLeft2"> + <object class="GtkToolButton" id="Object-ObjectAlignLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -14005,7 +14280,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter2"> + <object class="GtkToolButton" id="Object-AlignCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -14016,7 +14291,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-ObjectAlignRight2"> + <object class="GtkToolButton" id="Object-ObjectAlignRight2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -14036,11 +14311,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Align4"> <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-AlignUp2"> + <object class="GtkToolButton" id="Object-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -14051,10 +14326,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignDown2"> + <object class="GtkToolButton" id="Object-AlignMiddle2"> <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> @@ -14062,10 +14337,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignMiddle2"> + <object class="GtkToolButton" id="Object-AlignDown2"> <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> @@ -14100,7 +14375,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> <child> @@ -14110,17 +14385,32 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator85"> + <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="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first14"> + <object class="sfxlo-NotebookbarToolBox" id="first12"> <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="Media-BringToFront"> + <object class="GtkToolButton" id="Object-BringToFront2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -14137,13 +14427,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second5"> + <object class="sfxlo-NotebookbarToolBox" id="second7"> <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="Media-SendToBack"> + <object class="GtkToolButton" id="Object-SendToBack2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -14160,16 +14450,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first15"> + <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">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-Forward"> + <object class="GtkToolButton" id="Object-ObjectForwardOne2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Forward</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> @@ -14185,14 +14475,14 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="Second3"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-Backward"> + <object class="GtkToolButton" id="Object-ObjectBackOne2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Backward</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> @@ -14209,7 +14499,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -14219,7 +14509,94 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator86"> + <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="box15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom138"> + <property name="width_request">148</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Media-AVMediaToolBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaToolBox</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="SectionBottom139"> + <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="Media-AVMediaPlayer1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> </object> @@ -14359,7 +14736,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Form-FormButton:MenuForm"> - <property name="label" translatable="yes" context="DrawNotebookbar|FormMenuButton">Fo_rm</property> + <property name="label" translatable="yes" context="drawnotebookbar|FormMenuButton">Fo_rm</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -14377,9 +14754,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> <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">both-horiz</property> @@ -14419,7 +14796,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> + <object class="GtkSeparator" id="separator11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -14442,22 +14819,22 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form1"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form"> <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="SectionBottom109"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63"> <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> <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Form-SwitchControlDesignMode"> + <object class="GtkToolButton" id="Form-SwitchControlDesignMode1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SwitchControlDesignMode</property> @@ -14474,8 +14851,21 @@ <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="Form-Section-Form1"> + <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="GroupB52"> + <object class="GtkBox" id="GroupB34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14484,7 +14874,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2"> <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-horiz</property> @@ -14508,9 +14898,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing2"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing10"> <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-horiz</property> @@ -14540,8 +14930,24 @@ <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="Form-Section-Form2"> + <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="separator11"> + <object class="GtkSeparator" id="separator24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -14552,24 +14958,11 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form"> - <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="GroupB34"> + <object class="GtkBox" id="GroupB52"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -14578,7 +14971,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114"> <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> @@ -14602,7 +14995,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115"> <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> @@ -14627,24 +15020,37 @@ <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> + <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> + <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="GroupB72"> + <object class="GtkBox" id="GroupB54"> <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="SectionBottom116"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-TabDialog"> + <object class="GtkToolButton" id="Form-TabDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:TabDialog</property> @@ -14662,13 +15068,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom109"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-OpenReadOnly"> + <object class="GtkToolButton" id="Form-OpenReadOnly1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OpenReadOnly</property> @@ -14692,21 +15098,49 @@ <property name="position">1</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="Form-Section-Form4"> + <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="separator25"> + <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="GroupB68"> + <object class="GtkBox" id="GroupB56"> <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="SectionBottom120"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom110"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-ControlProperties"> + <object class="GtkToolButton" id="Form-ControlProperties2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ControlProperties</property> @@ -14724,13 +15158,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom123"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom111"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Form-AutoControlFocus"> + <object class="GtkToolButton" id="Form-AutoControlFocus2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AutoControlFocus</property> @@ -14751,55 +15185,55 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator24"> - <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">1</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">1</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form2"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form5"> <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="GroupB54"> + <object class="GtkSeparator" id="separator40"> + <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="GroupB64"> <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="SectionBottom110"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112"> <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="Form-Label"> + <object class="GtkToolButton" id="Tools-Label1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Label</property> @@ -14810,7 +15244,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-Edit"> + <object class="GtkToolButton" id="Tools-Edit1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Edit</property> @@ -14821,7 +15255,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-CheckBox"> + <object class="GtkToolButton" id="Tools-CheckBox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CheckBox</property> @@ -14831,8 +15265,21 @@ <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="SectionBottom113"> + <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="Form-RadioButton"> + <object class="GtkToolButton" id="Tools-RadioButton2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:RadioButton</property> @@ -14843,7 +15290,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-ListBox"> + <object class="GtkToolButton" id="Tools-ListBox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ListBox</property> @@ -14854,7 +15301,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-ComboBox"> + <object class="GtkToolButton" id="Tools-ComboBox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ComboBox</property> @@ -14868,20 +15315,65 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <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="Tools-Section-Form6"> + <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="separator72"> + <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="GroupB96"> + <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="SectionBottom111"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116"> <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="Form-FormattedField"> + <object class="GtkToolButton" id="Tools-NumericField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormattedField</property> + <property name="action_name">.uno:NumericField</property> </object> <packing> <property name="expand">False</property> @@ -14889,10 +15381,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-DateField"> + <object class="GtkToolButton" id="Tools-CurrencyField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DateField</property> + <property name="action_name">.uno:CurrencyField</property> </object> <packing> <property name="expand">False</property> @@ -14900,21 +15392,34 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-TimeField"> + <object class="GtkToolButton" id="Tools-PatternField2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TimeField</property> + <property name="action_name">.uno:PatternField</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="SectionBottom120"> + <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="Form-NumericField"> + <object class="GtkToolButton" id="Tools-FormattedField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumericField</property> + <property name="action_name">.uno:FormattedField</property> </object> <packing> <property name="expand">False</property> @@ -14922,10 +15427,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-CurrencyField"> + <object class="GtkToolButton" id="Tools-DateField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CurrencyField</property> + <property name="action_name">.uno:DateField</property> </object> <packing> <property name="expand">False</property> @@ -14933,10 +15438,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Form-PatternField"> + <object class="GtkToolButton" id="Tools-TimeField1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:PatternField</property> + <property name="action_name">.uno:TimeField</property> </object> <packing> <property name="expand">False</property> @@ -14954,21 +15459,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator40"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">1</property> </packing> </child> @@ -14979,26 +15469,41 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Form-Section-Form3"> + <object class="sfxlo-OptionalBox" id="Form-Section-Form7"> <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="GroupB56"> + <object class="GtkSeparator" id="separator73"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="GroupB61"> <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="SectionBottom112"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom123"> <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> @@ -15042,9 +15547,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom135"> <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> @@ -15091,7 +15596,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <style> @@ -15101,7 +15606,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> </object> @@ -15113,7 +15618,7 @@ </child> </object> <packing> - <property name="position">12</property> + <property name="position">10</property> </packing> </child> <child type="tab"> @@ -15253,13 +15758,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="Draw-Container1"> + <object class="sfxlo-PriorityMergedHBox" id="3dObject-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Edit1"> + <object class="sfxlo-OptionalBox" id="3dObject-Section-Edit"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15274,7 +15779,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Draw-NameGroup1"> + <object class="GtkToolButton" id="3dObject-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15308,7 +15813,7 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode2"> + <object class="GtkToolButton" id="3dObject-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AdvancedMode</property> @@ -15334,7 +15839,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> + <object class="GtkToolButton" id="3dObject-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ToggleObjectRotateMode</property> @@ -15345,7 +15850,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipHorizontal2"> + <object class="GtkToolButton" id="3dObject-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipHorizontal</property> @@ -15356,7 +15861,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlipVertical2"> + <object class="GtkToolButton" id="3dObject-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlipVertical</property> @@ -15367,7 +15872,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-Shear2"> + <object class="GtkToolButton" id="3dObject-Shear"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Shear</property> @@ -15378,7 +15883,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CrookSlant1"> + <object class="GtkToolButton" id="3dObject-CrookSlant"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CrookSlant</property> @@ -15410,13 +15915,13 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea1"> + <object class="sfxlo-OptionalBox" id="3dObject-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="separator47"> + <object class="GtkSeparator" id="separator46"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -15431,7 +15936,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box24"> + <object class="GtkBox" id="box18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -15490,23 +15995,36 @@ <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="3dObject-Section-FormatLineArea1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box26"> + <object class="GtkBox" id="box25"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first22"> + <object class="sfxlo-NotebookbarToolBox" id="first15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Draw-XLineStyle3"> + <object class="GtkMenuToolButton" id="3dObject-XLineStyle5"> <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15518,21 +16036,42 @@ <property name="homogeneous">False</property> </packing> </child> + <child> + <object class="GtkToolButton" id="ObjectLineWidth1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first23"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-XLineColor3"> + <object class="GtkToolButton" id="3dObject-LineEndStyle5"> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="3dObject-XLineColor4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:XLineColor</property> @@ -15557,26 +16096,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> - <property name="width_request">200</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle3"> + <object class="GtkToolButton" id="3dObject-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -15588,19 +16127,32 @@ <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="3dObject-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="box27"> + <object class="GtkBox" id="box26"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first24"> + <object class="sfxlo-NotebookbarToolBox" id="first16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-LineEndStyle3"> + <object class="GtkToolButton" id="3dObject-LineEndStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineEndStyle</property> @@ -15618,13 +16170,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom142"> <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-FillShadow2"> + <object class="GtkToolButton" id="3dObject-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillShadow</property> @@ -15648,22 +16200,24 @@ <property name="position">3</property> </packing> </child> + <style> + <class name="priority-3"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-ObjectAlign1"> + <object class="sfxlo-OptionalBox" id="3dObject-Section-Windows3D"> <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="separator46"> + <object class="GtkSeparator" id="separator74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -15678,7 +16232,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Big4"> + <object class="sfxlo-NotebookbarToolBox" id="Big5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15687,7 +16241,7 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Draw-Window3D"> + <object class="GtkToolButton" id="Draw-Window3D1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -15706,8 +16260,21 @@ <property name="position">1</property> </packing> </child> + </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="3dObject-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="GtkBox" id="box28"> + <object class="GtkBox" id="box27"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -15722,7 +16289,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ObjectAlignLeft3"> + <object class="GtkToolButton" id="3dObject-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -15733,7 +16300,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignCenter3"> + <object class="GtkToolButton" id="3dObject-AlignCenter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -15744,7 +16311,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-ObjectAlignRight3"> + <object class="GtkToolButton" id="3dObject-ObjectAlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -15768,7 +16335,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-AlignUp3"> + <object class="GtkToolButton" id="3dObject-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -15779,7 +16346,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignDown3"> + <object class="GtkToolButton" id="3dObject-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -15790,7 +16357,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-AlignMiddle3"> + <object class="GtkToolButton" id="3dObject-AlignMiddle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -15822,33 +16389,48 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-2"/> </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> - <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange1"> + <object class="sfxlo-OptionalBox" id="3dObject-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator90"> + <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="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first25"> + <object class="sfxlo-NotebookbarToolBox" id="first19"> <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-BringToFront1"> + <object class="GtkToolButton" id="3dObject-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -15865,13 +16447,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second6"> + <object class="sfxlo-NotebookbarToolBox" id="second5"> <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-SendToBack1"> + <object class="GtkToolButton" id="3dObject-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -15888,13 +16470,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first26"> + <object class="sfxlo-NotebookbarToolBox" id="first20"> <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="Draw-Forward1"> + <object class="GtkToolButton" id="3dObject-Forward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Forward</property> @@ -15917,7 +16499,7 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-Backward1"> + <object class="GtkToolButton" id="3dObject-Backward"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Backward</property> @@ -15941,13 +16523,13 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">6</property> </packing> </child> </object> @@ -15959,7 +16541,7 @@ </child> </object> <packing> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child type="tab"> @@ -16080,7 +16662,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="MasterPage-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Master-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16095,6 +16677,101 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> + <object class="GtkToolButton" id="View-PageMode1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageMode</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> + </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="Master-Section-View1"> + <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="SectionBottom117"> + <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="View-MasterPage1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MasterPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="MasterPage-Section-Insert"> + <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="separator57"> + <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="SectionBottom122"> + <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="MasterPage-InsertMasterPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -16112,15 +16789,28 @@ <property name="position">1</property> </packing> </child> + </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="MasterPage-Section-Insert1"> + <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="GroupB75"> + <object class="GtkBox" id="GroupB63"> <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="LeftParaMargin6"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16146,7 +16836,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing6"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16178,21 +16868,24 @@ <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">0</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterPage-Section-Background"> + <object class="sfxlo-OptionalBox" id="Master-Section-MasterLayouts"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator55"> + <object class="GtkSeparator" id="separator61"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -16207,14 +16900,54 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB76"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom124"> + <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="MasterPage-MasterLayouts1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:MasterLayouts</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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Master-Section-ShowHide"> + <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="GroupB69"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16222,10 +16955,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MasterPage-SelectBackground"> + <object class="GtkToolButton" id="Master-HideSlide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SelectBackground</property> + <property name="action_name">.uno:HideSlide</property> </object> <packing> <property name="expand">False</property> @@ -16240,7 +16973,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing7"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16248,10 +16981,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MasterPage-SaveBackground"> + <object class="GtkToolButton" id="Master-ShowSlide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveBackground</property> + <property name="action_name">.uno:ShowSlide</property> </object> <packing> <property name="expand">False</property> @@ -16279,17 +17012,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">7</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MasterPage-Section-View"> + <object class="sfxlo-OptionalBox" id="MasterPage-Section-Property"> <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="separator57"> + <object class="GtkSeparator" id="separator64"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -16304,7 +17037,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom117"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom125"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16313,10 +17046,10 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="MasterPage-MasterLayouts"> + <object class="GtkToolButton" id="MasterPageMenu-PageSetup1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:MasterLayouts</property> + <property name="action_name">.uno:PageSetup</property> </object> <packing> <property name="expand">False</property> @@ -16330,15 +17063,28 @@ <property name="position">1</property> </packing> </child> + </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="MasterPage-Section-Background"> + <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="GroupB77"> + <object class="GtkBox" id="GroupB75"> <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="LeftParaMargin11"> + <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16346,10 +17092,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MasterPage-DisplayMasterBackground"> + <object class="GtkToolButton" id="MasterPage-SelectBackground"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterBackground</property> + <property name="action_name">.uno:SelectBackground</property> </object> <packing> <property name="expand">False</property> @@ -16364,7 +17110,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="belowspacing10"> + <object class="sfxlo-NotebookbarToolBox" id="belowspacing12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16372,10 +17118,10 @@ <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="MasterPage-DisplayMasterObjects"> + <object class="GtkToolButton" id="MasterPage-SaveBackground"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DisplayMasterObjects</property> + <property name="action_name">.uno:SaveBackground</property> </object> <packing> <property name="expand">False</property> @@ -16403,7 +17149,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">9</property> </packing> </child> <child> @@ -16428,7 +17174,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom126"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -16458,7 +17204,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">10</property> </packing> </child> </object> @@ -16470,14 +17216,14 @@ </child> </object> <packing> - <property name="position">12</property> + <property name="position">14</property> </packing> </child> <child type="tab"> <object class="GtkLabel" id="MasterLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="DrawNotebookbar|FormLabel">~Master</property> + <property name="label" translatable="yes" context="DrawNotebookbar|MasterLabel">~Master</property> <property name="use_underline">True</property> <style> <class name="context-MasterPage"/> @@ -17502,7 +18248,7 @@ </child> </object> <packing> - <property name="position">13</property> + <property name="position">15</property> </packing> </child> <child type="tab"> @@ -17513,7 +18259,7 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">13</property> + <property name="position">15</property> <property name="tab_fill">False</property> </packing> </child> |