sc/uiconfig/scalc/ui/notebookbar.ui | 1632 +++++++++++++++++++++++---------- sd/uiconfig/sdraw/ui/notebookbar.ui | 1000 +++++++++++--------- sd/uiconfig/simpress/ui/notebookbar.ui | 1155 ++++++++++++----------- sw/uiconfig/swriter/ui/notebookbar.ui | 85 - 4 files changed, 2385 insertions(+), 1487 deletions(-)
New commits: commit 51fd99367b517b9a7630f5c089d5fa22a7252472 Author: andreas kainz <kain...@gmail.com> AuthorDate: Wed May 29 01:01:19 2019 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Wed May 29 07:13:34 2019 +0200 NB tabbed layout update in all apps Change-Id: Ic291a6f9907e2449093469ae8a899093dc296e26 Reviewed-on: https://gerrit.libreoffice.org/73127 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 9ddbd5e79f33..9dde161a3c72 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1981,7 +1981,7 @@ </object> </child> </object> - <object class="GtkImage" id="RecentFilesImg"> + <object class="GtkImage" id="RecentFilesImg1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixbuf">cmd/sc_recentfilelist.png</property> @@ -2166,9 +2166,8 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -2191,20 +2190,33 @@ <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="File-Section-New1"> + <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="GroupB1"> + <object class="GtkBox" id="GroupB2"> <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="LineA1"> + <object class="sfxlo-NotebookbarToolBox" id="LineA3"> <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="File-NewDoc"> + <object class="GtkToolButton" id="File-NewDoc1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NewDoc</property> @@ -2223,13 +2235,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB1"> + <object class="sfxlo-NotebookbarToolBox" id="LineB2"> <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="File-SaveAsTemplate"> + <object class="GtkToolButton" id="File-SaveAsTemplate1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAsTemplate</property> @@ -2254,8 +2266,24 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-6"/> + </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="File-Section-Open"> + <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="separator9"> + <object class="GtkSeparator" id="separator92"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -2266,26 +2294,13 @@ <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="File-Section-Open"> - <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="SectionBottom59"> <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> @@ -2307,23 +2322,36 @@ <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="File-Section-Open1"> + <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="GroupB2"> + <object class="GtkBox" id="GroupB3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="File-RecentFileList"> + <object class="svtlo-ManagedMenuButton" id="File-RecentFileList1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="action_name">.uno:RecentFileList</property> - <property name="image">RecentFilesImg</property> + <property name="image">RecentFilesImg1</property> <property name="use_underline">True</property> </object> <packing> @@ -2333,13 +2361,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB2"> + <object class="sfxlo-NotebookbarToolBox" id="LineB3"> <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="File-OpenRemote"> + <object class="GtkToolButton" id="File-OpenRemote1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OpenRemote</property> @@ -2361,29 +2389,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator92"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> + <style> + <class name="priority-5"/> + </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> @@ -2393,9 +2409,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator13"> + <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="SectionBottom4"> <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> @@ -2417,23 +2448,36 @@ <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">4</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Save1"> + <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="GroupB3"> + <object class="GtkBox" id="GroupB4"> <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="LineA3"> + <object class="sfxlo-NotebookbarToolBox" id="LineA2"> <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="File-SaveAs"> + <object class="GtkToolButton" id="File-SaveAs1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAs</property> @@ -2452,13 +2496,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB3"> + <object class="sfxlo-NotebookbarToolBox" id="LineB4"> <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="File-SaveAsRemote"> + <object class="GtkToolButton" id="File-SaveAsRemote1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SaveAsRemote</property> @@ -2480,21 +2524,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2505,7 +2534,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> <child> @@ -2515,9 +2544,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator93"> + <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="SectionBottom66"> <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> @@ -2539,23 +2583,36 @@ <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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Export1"> + <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="GroupB4"> + <object class="GtkBox" id="GroupB5"> <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="LineA2"> + <object class="sfxlo-NotebookbarToolBox" id="LineA4"> <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="File-ExportDirectToPDF"> + <object class="GtkToolButton" id="File-ExportDirectToPDF1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportDirectToPDF</property> @@ -2574,13 +2631,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB4"> + <object class="sfxlo-NotebookbarToolBox" id="LineB5"> <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="File-ExportDirectToEPUB"> + <object class="GtkToolButton" id="File-ExportDirectToEPUB1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExportDirectToEPUB</property> @@ -2602,21 +2659,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator93"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2627,7 +2669,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -2637,9 +2679,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator9"> + <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="SectionBottom2"> <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> @@ -2661,23 +2718,36 @@ <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">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Print1"> + <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="GroupB5"> + <object class="GtkBox" id="GroupB6"> <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="LineA4"> + <object class="sfxlo-NotebookbarToolBox" id="LineA5"> <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="File-PrintDefault"> + <object class="GtkToolButton" id="File-PrintDefault1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintDefault</property> @@ -2696,13 +2766,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB5"> + <object class="sfxlo-NotebookbarToolBox" id="LineB6"> <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="File-PrintPreview"> + <object class="GtkToolButton" id="File-PrintPreview1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:PrintPreview</property> @@ -2724,21 +2794,6 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator35"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2749,7 +2804,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">9</property> </packing> </child> <child> @@ -2759,9 +2814,24 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator91"> + <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="SectionBottom6"> <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> @@ -2783,23 +2853,36 @@ <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">10</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="File-Section-Property1"> + <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="GroupB6"> + <object class="GtkBox" id="GroupB1"> <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="LineA5"> + <object class="sfxlo-NotebookbarToolBox" id="LineA1"> <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="File-Signature"> + <object class="GtkToolButton" id="File-Signature1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Signature</property> @@ -2818,13 +2901,13 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB6"> + <object class="sfxlo-NotebookbarToolBox" id="LineB1"> <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="File-SignPDF"> + <object class="GtkToolButton" id="File-SignPDF1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SignPDF</property> @@ -2846,7 +2929,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> @@ -2856,7 +2939,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">11</property> </packing> </child> </object> @@ -2918,7 +3001,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -4668,7 +4750,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -4692,48 +4773,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkToolButton" id="Insert-FunctionBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FunctionBox</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> - <child> - <object class="GtkSeparator" id="separator11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -4742,49 +4781,88 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Insert-Section-Chart"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Function1"> <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="SectionBottom12"> + <object class="GtkBox" id="GroupB77"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="Insert-InsertObjectChart"> + <object class="sfxlo-NotebookbarToolBox" id="LineA20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-Insert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Insert</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Insert-InsertObject1"> + <object class="sfxlo-NotebookbarToolBox" id="LineB21"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObject</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-InsertCell"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertCell</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Insert-Section-Chart"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator2"> <property name="visible">True</property> @@ -4797,24 +4875,11 @@ <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">1</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Insert-Section-Image"> - <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="SectionBottom65"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -4823,10 +4888,10 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Insert-InsertGraphic"> + <object class="GtkToolButton" id="Insert-InsertObjectChart"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:InsertObjectChart</property> </object> <packing> <property name="expand">False</property> @@ -4837,26 +4902,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">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Insert-Section-Chart1"> + <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="GroupB23"> + <object class="GtkBox" id="GroupB72"> <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="LineA11"> + <object class="sfxlo-NotebookbarToolBox" id="LineA8"> <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="Insert-Gallery"> + <object class="GtkToolButton" id="Insert-FunctionBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Gallery</property> + <property name="action_name">.uno:FunctionBox</property> </object> <packing> <property name="expand">False</property> @@ -4871,16 +4949,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB12"> + <object class="sfxlo-NotebookbarToolBox" id="LineB9"> <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="Insert-InsertAVMedia"> + <object class="GtkToolButton" id="Insert-InsertObject1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertAVMedia</property> + <property name="action_name">.uno:InsertObject</property> </object> <packing> <property name="expand">False</property> @@ -4898,9 +4976,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-6"/> + </style> + </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="Insert-Section-Image"> + <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="separator36"> <property name="visible">True</property> @@ -4913,24 +5007,11 @@ <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">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Insert-Section-Reference"> - <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="SectionBottom11"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -4939,10 +5020,10 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Insert-HyperlinkDialog"> + <object class="GtkToolButton" id="Insert-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:HyperlinkDialog</property> + <property name="action_name">.uno:InsertGraphic</property> </object> <packing> <property name="expand">False</property> @@ -4953,26 +5034,39 @@ <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="GroupB29"> - <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="LineA9"> - <property name="visible">True</property> - <property name="can_focus">True</property> + </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="Insert-Section-Image1"> + <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="GroupB23"> + <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="LineA11"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Insert-AddName"> + <object class="GtkToolButton" id="Insert-Gallery"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AddName</property> + <property name="action_name">.uno:Gallery</property> </object> <packing> <property name="expand">False</property> @@ -4987,16 +5081,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB10"> + <object class="sfxlo-NotebookbarToolBox" id="LineB12"> <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="Insert-DefineName"> + <object class="GtkToolButton" id="Insert-InsertAVMedia"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefineName</property> + <property name="action_name">.uno:InsertAVMedia</property> </object> <packing> <property name="expand">False</property> @@ -5014,9 +5108,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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Insert-Section-Reference"> + <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="separator4"> <property name="visible">True</property> @@ -5029,17 +5139,118 @@ <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="SectionBottom11"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> + <child> + <object class="GtkToolButton" id="Insert-HyperlinkDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HyperlinkDialog</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="Insert-Section-Reference1"> + <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="GroupB29"> + <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="LineA9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-AddName"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AddName</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="LineB10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Insert-DefineName"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefineName</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> <child> @@ -5047,6 +5258,21 @@ <property name="visible">True</property> <property name="can_focus">False</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="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> <property name="label" translatable="yes" context="CalcNotebookbar|FieldMenuButton">Fiel_d</property> <property name="width_request">70</property> @@ -5063,11 +5289,24 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <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="Insert-Section-DrawText"> + <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="separator33"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -5078,25 +5317,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> - <style> - <class name="priority-5"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Insert-Section-DrawText"> - <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="SectionBottom97"> <property name="visible">True</property> @@ -5132,17 +5355,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-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> @@ -5278,21 +5498,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator33"> - <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> @@ -5300,7 +5505,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">10</property> </packing> </child> <child> @@ -5310,6 +5515,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator95"> + <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="GroupB71"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5410,21 +5630,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator95"> - <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">4</property> - </packing> - </child> <style> <class name="priority-2"/> </style> @@ -5432,7 +5637,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">11</property> </packing> </child> <child> @@ -5442,6 +5647,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator35"> + <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="SectionBottom105"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5465,9 +5685,22 @@ <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">12</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Insert-Section-Symbol1"> + <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="GroupB27"> <property name="visible">True</property> @@ -5477,7 +5710,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineA13"> <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> @@ -5501,7 +5734,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineB14"> <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> @@ -5536,7 +5769,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">13</property> </packing> </child> </object> @@ -5585,10 +5818,21 @@ <property name="can_focus">True</property> <property name="halign">end</property> <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> + <object class="GtkToolButton" id="Insert-DataDataPilotRun1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DataDataPilotRun</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Insert-InsertDraw"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5596,7 +5840,18 @@ <property name="action_name">.uno:InsertDraw</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Insert-FunctionBox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FunctionBox</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -5793,12 +6048,24 @@ <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="Layout-Section-File1"> + <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="SectionBottom33"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <property name="vexpand">True</property> <property name="toolbar_style">both</property> <property name="show_arrow">False</property> @@ -5821,27 +6088,466 @@ <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="Layout-Section-File2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="GroupB30"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LineB15"> + <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="Layout-NormalViewMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="action_name">.uno:NormalViewMode</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="LineA12"> + <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="Layout-PagebreakMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PagebreakMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-10"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Layout-Section-Print"> + <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="separator111"> + <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> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits