sw/uiconfig/swriter/ui/notebookbar_single.ui | 2483 +++++++++++++++------------ 1 file changed, 1455 insertions(+), 1028 deletions(-)
New commits: commit 0ea9fd65847dd2f4e435c6c8e5325d306256560d Author: andreas kainz <kain...@gmail.com> AuthorDate: Thu May 23 00:30:42 2019 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Thu May 23 10:02:13 2019 +0200 NB single update Change-Id: I67b76b65105e5020ea396ab68d41999c80368c41 Reviewed-on: https://gerrit.libreoffice.org/72812 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 5ae78000ef19..b9b0d1d679a5 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -168,6 +168,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-20"/> + </style> </object> <packing> <property name="expand">False</property> @@ -176,13 +179,27 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-FontName"> + <object class="sfxlo-OptionalBox" id="Default-Section-CharFontName"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom5"> + <object class="GtkSeparator" id="separator63"> + <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="SectionBottom53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -201,11 +218,11 @@ <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-18"/> + <class name="priority-19"/> </style> </object> <packing> @@ -219,9 +236,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom6"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -240,11 +256,11 @@ <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-17"/> + <class name="priority-18"/> </style> </object> <packing> @@ -293,7 +309,7 @@ </packing> </child> <style> - <class name="priority-16"/> + <class name="priority-17"/> </style> </object> <packing> @@ -316,6 +332,7 @@ <object class="GtkToolButton" id="Default-Bold"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="is_important">True</property> <property name="action_name">.uno:Bold</property> </object> <packing> @@ -327,6 +344,7 @@ <object class="GtkToolButton" id="Default-Italic"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="is_important">True</property> <property name="action_name">.uno:Italic</property> </object> <packing> @@ -338,6 +356,7 @@ <object class="GtkToolButton" id="Default-Underline"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="is_important">True</property> <property name="action_name">.uno:Underline</property> </object> <packing> @@ -349,6 +368,7 @@ <object class="GtkToolButton" id="Default-Strikeout"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="is_important">True</property> <property name="action_name">.uno:Strikeout</property> </object> <packing> @@ -363,9 +383,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-15"/> - </style> </object> <packing> <property name="expand">False</property> @@ -413,7 +430,7 @@ </packing> </child> <style> - <class name="priority-14"/> + <class name="priority-15"/> </style> </object> <packing> @@ -428,6 +445,22 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> + <object class="GtkSeparator" id="separator26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_top">8</property> + <property name="margin_bottom">8</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="SectionBottom64"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -459,12 +492,9 @@ <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-13"/> - </style> </object> <packing> <property name="expand">False</property> @@ -502,9 +532,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-12"/> - </style> </object> <packing> <property name="expand">False</property> @@ -577,7 +604,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-12"/> </style> </object> <packing> @@ -626,7 +653,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-11"/> </style> </object> <packing> @@ -636,7 +663,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Para"> + <object class="sfxlo-OptionalBox" id="Default-Section-Para1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -712,7 +739,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-10"/> </style> </object> <packing> @@ -722,6 +749,80 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Default-Section-Para2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</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="SectionBottom59"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Default-CommonAlignTop"> + <property name="can_focus">False</property> + <property name="action_name">.uno:CommonAlignTop</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-CommonAlignVerticalCenter"> + <property name="can_focus">False</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-CommonAlignBottom"> + <property name="can_focus">False</property> + <property name="action_name">.uno:CommonAlignBottom</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-9"/> + </style> + </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="Default-Section-LTR"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -768,7 +869,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -778,9 +879,7 @@ <property name="valign">center</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom126"> - <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -817,7 +916,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> @@ -867,7 +966,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -907,7 +1006,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -993,7 +1092,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -1079,7 +1178,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -1153,7 +1252,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> <child> @@ -1228,7 +1327,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">20</property> </packing> </child> <style> @@ -1338,6 +1437,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-27"/> + </style> </object> <packing> <property name="expand">False</property> @@ -1346,18 +1448,32 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FontName"> + <object class="sfxlo-OptionalBox" id="Table-Section-CharFontName"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom7"> + <object class="GtkSeparator" id="separator64"> + <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="SectionBottom55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-CharFontName1"> + <object class="GtkToolButton" id="Table-CharFontName"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CharFontName</property> @@ -1371,11 +1487,11 @@ <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-25"/> + <class name="priority-26"/> </style> </object> <packing> @@ -1389,14 +1505,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom9"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-FontHeight1"> + <object class="GtkToolButton" id="Default-FontHeight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontHeight</property> @@ -1410,11 +1525,11 @@ <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-24"/> + <class name="priority-25"/> </style> </object> <packing> @@ -1463,7 +1578,7 @@ </packing> </child> <style> - <class name="priority-23"/> + <class name="priority-24"/> </style> </object> <packing> @@ -1533,9 +1648,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-22"/> - </style> </object> <packing> <property name="expand">False</property> @@ -1583,7 +1695,7 @@ </packing> </child> <style> - <class name="priority-21"/> + <class name="priority-22"/> </style> </object> <packing> @@ -1598,6 +1710,22 @@ <property name="can_focus">False</property> <property name="valign">center</property> <child> + <object class="GtkSeparator" id="separator61"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_top">8</property> + <property name="margin_bottom">8</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="SectionBottom60"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1629,11 +1757,11 @@ <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-20"/> + <class name="priority-21"/> </style> </object> <packing> @@ -1673,7 +1801,7 @@ </packing> </child> <style> - <class name="priority-19"/> + <class name="priority-20"/> </style> </object> <packing> @@ -1747,7 +1875,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-19"/> </style> </object> <packing> @@ -1796,7 +1924,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-18"/> </style> </object> <packing> @@ -1806,7 +1934,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Para"> + <object class="sfxlo-OptionalBox" id="Table-Section-Para1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -1882,7 +2010,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-17"/> </style> </object> <packing> @@ -1892,21 +2020,39 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-LTR"> + <object class="sfxlo-OptionalBox" id="Table-Section-Para2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-ParaLeftToRight"> + <object class="GtkToolButton" id="Table-CommonAlignTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaLeftToRight</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CommonAlignTop</property> </object> <packing> <property name="expand">False</property> @@ -1914,10 +2060,23 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-ParaRightToLeft"> + <object class="GtkToolButton" id="Table-CommonAlignVerticalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaRightToLeft</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-CommonAlignBottom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CommonAlignBottom</property> </object> <packing> <property name="expand">False</property> @@ -1928,11 +2087,11 @@ <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-8"/> + <class name="priority-16"/> </style> </object> <packing> @@ -1942,35 +2101,36 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Spacing"> + <object class="sfxlo-OptionalBox" id="Table-Section-LTR"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">5</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-ParaspaceIncrease"> + <object class="GtkToolButton" id="Table-ParaLeftToRight"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaspaceIncrease</property> + <property name="action_name">.uno:ParaLeftToRight</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="Table-ParaspaceDecrease"> + <object class="GtkToolButton" id="Table-ParaRightToLeft"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ParaspaceDecrease</property> + <property name="action_name">.uno:ParaRightToLeft</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -1981,7 +2141,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-15"/> </style> </object> <packing> @@ -1991,6 +2151,54 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Table-Section-Spacing"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-ParaspaceIncrease"> + <property name="can_focus">False</property> + <property name="action_name">.uno:ParaspaceIncrease</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-ParaspaceDecrease"> + <property name="can_focus">False</property> + <property name="action_name">.uno:ParaspaceDecrease</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-14"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">14</property> + </packing> + </child> + <child> <object class="sfxlo-OptionalBox" id="Table-Section-ParagraphColor"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2002,8 +2210,7 @@ <property name="margin_left">5</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Home-LineSpacing1"> - <property name="visible">True</property> + <object class="GtkMenuToolButton" id="Table-LineSpacing"> <property name="can_focus">False</property> <property name="action_name">.uno:LineSpacing</property> </object> @@ -2013,7 +2220,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Table-BackgroundColor1"> + <object class="GtkMenuToolButton" id="Table-BackgroundColor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BackgroundColor</property> @@ -2030,14 +2237,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -2071,13 +2275,13 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-12"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -2157,13 +2361,13 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-11"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -2197,13 +2401,13 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-10"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -2272,13 +2476,13 @@ </packing> </child> <style> - <class name="priority-16"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> <child> @@ -2312,13 +2516,13 @@ </packing> </child> <style> - <class name="priority-15"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">20</property> </packing> </child> <child> @@ -2398,14 +2602,11 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-14"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">21</property> </packing> </child> <child> @@ -2470,14 +2671,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-13"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">22</property> </packing> </child> <child> @@ -2510,14 +2708,11 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-12"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">22</property> + <property name="position">23</property> </packing> </child> <child> @@ -2603,7 +2798,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">23</property> + <property name="position">24</property> </packing> </child> <child> @@ -2689,7 +2884,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">24</property> + <property name="position">25</property> </packing> </child> <child> @@ -2763,7 +2958,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">25</property> + <property name="position">26</property> </packing> </child> <child> @@ -2838,7 +3033,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">26</property> + <property name="position">27</property> </packing> </child> <style> @@ -2929,7 +3124,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-StyleApply2"> + <object class="GtkToolButton" id="Graphic-StyleApply"> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply</property> </object> @@ -2946,7 +3141,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-10"/> </style> </object> <packing> @@ -2999,7 +3194,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-9"/> </style> </object> <packing> @@ -3059,7 +3254,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-8"/> </style> </object> <packing> @@ -3120,7 +3315,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-7"/> </style> </object> <packing> @@ -3160,7 +3355,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-6"/> </style> </object> <packing> @@ -3170,14 +3365,15 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Align1"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator4"> + <object class="GtkSeparator" id="separator59"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> <property name="orientation">vertical</property> @@ -3190,21 +3386,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <object class="sfxlo-NotebookbarToolBox" id="Align11"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ObjectAlignLeft"> + <object class="GtkMenuToolButton" id="MultiObject-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">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="Graphic-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Graphic-AlignCenter"> <property name="visible">True</property> @@ -3235,13 +3456,13 @@ </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">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -3295,13 +3516,13 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -3358,13 +3579,13 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -3406,22 +3627,22 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Crop"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Rotate"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator42"> + <object class="GtkSeparator" id="separator43"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3436,16 +3657,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom12"> <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="Graphic-Crop"> + <object class="GtkToolButton" id="Graphic-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-RotateRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RotateRight</property> </object> <packing> <property name="expand">False</property> @@ -3463,35 +3694,24 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-SaveReplace"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Flip"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom17"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ChangePicture"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Graphic-CompressGraphic"> + <object class="GtkToolButton" id="Graphic-FlipVertical"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="action_name">.uno:FlipVertical</property> </object> <packing> <property name="expand">False</property> @@ -3499,10 +3719,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Graphic-SaveGraphic"> + <object class="GtkToolButton" id="Graphic-FlipHorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> + <property name="action_name">.uno:FlipHorizontal</property> </object> <packing> <property name="expand">False</property> @@ -3520,21 +3740,21 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicDialog"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Graphic"> + <object class="sfxlo-NotebookbarToolBox" id="Graphic1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-GraphicDialog"> + <object class="GtkToolButton" id="Graphic-GraphicDialog1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="visible_horizontal">False</property> @@ -3557,16 +3777,16 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicFilterToolbox"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-Crop"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator13"> + <object class="GtkSeparator" id="separator42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3581,16 +3801,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> <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="Graphic-GraphicFilterToolbox"> + <object class="GtkToolButton" id="Graphic-Crop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> + <property name="action_name">.uno:Crop</property> </object> <packing> <property name="expand">False</property> @@ -3604,32 +3824,50 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-16"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-ColorSettings"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-SaveReplace"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom17"> <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="Graphic-ColorSettings"> + <object class="GtkToolButton" id="Graphic-ChangePicture"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ColorSettings</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Graphic-SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SaveGraphic</property> </object> <packing> <property name="expand">False</property> @@ -3640,34 +3878,33 @@ <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-15"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafMode"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> + <object class="sfxlo-NotebookbarToolBox" id="Graphic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-GrafMode"> + <object class="GtkToolButton" id="Graphic-GraphicDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</property> + <property name="visible_horizontal">False</property> + <property name="action_name">.uno:GraphicDialog</property> + <property name="icon_name">sfx2/res/symphony/open_more.png</property> </object> <packing> <property name="expand">False</property> @@ -3678,34 +3915,47 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> - <style> - <class name="priority-14"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafTransparence"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GraphicFilterToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <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="SectionBottom32"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Graphic-GrafTransparence"> + <object class="GtkToolButton" id="Graphic-GraphicFilterToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:GraphicFilterToolbox</property> </object> <packing> <property name="expand">False</property> @@ -3716,60 +3966,73 @@ <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-13"/> + <class name="priority-14"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Rotate"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-ColorSettings"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator43"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48"> <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="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Graphic-ColorSettings"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ColorSettings</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="padding">5</property> <property name="position">0</property> </packing> </child> + <style> + <class name="priority-13"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafMode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom12"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-ToggleObjectRotateMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Graphic-RotateRight"> + <object class="GtkToolButton" id="Graphic-GrafMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RotateRight</property> + <property name="action_name">.uno:GrafMode</property> </object> <packing> <property name="expand">False</property> @@ -3783,39 +4046,31 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-12"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">19</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Graphic-Section-Flip"> + <object class="sfxlo-OptionalBox" id="Graphic-Section-GrafTransparence"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom4"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Graphic-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="Graphic-FlipHorizontal"> + <object class="GtkMenuToolButton" id="Graphic-GrafTransparence"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> @@ -3826,14 +4081,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">20</property> </packing> </child> <style> @@ -3924,7 +4182,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-StyleApply3"> + <object class="GtkToolButton" id="Draw-StyleApply"> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply</property> </object> @@ -3941,7 +4199,7 @@ </packing> </child> <style> - <class name="priority-11"/> + <class name="priority-12"/> </style> </object> <packing> @@ -3994,7 +4252,7 @@ </packing> </child> <style> - <class name="priority-10"/> + <class name="priority-11"/> </style> </object> <packing> @@ -4054,7 +4312,7 @@ </packing> </child> <style> - <class name="priority-9"/> + <class name="priority-10"/> </style> </object> <packing> @@ -4115,7 +4373,7 @@ </packing> </child> <style> - <class name="priority-8"/> + <class name="priority-9"/> </style> </object> <packing> @@ -4155,7 +4413,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> @@ -4165,14 +4423,15 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Align1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator14"> + <object class="GtkSeparator" id="separator4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> <property name="orientation">vertical</property> @@ -4185,21 +4444,46 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <object class="sfxlo-NotebookbarToolBox" id="Align12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignLeft2"> + <object class="GtkMenuToolButton" id="Draw-ObjectAlign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> + <property name="action_name">.uno:ObjectAlign</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">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="Draw-Section-Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Draw-AlignCenter2"> <property name="visible">True</property> @@ -4236,7 +4520,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> @@ -4296,7 +4580,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> @@ -4359,7 +4643,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> @@ -4407,16 +4691,16 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Draw-Section-Area1"> + <object class="sfxlo-OptionalBox" id="Draw-Section-Rotate"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator48"> + <object class="GtkSeparator" id="separator17"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4431,16 +4715,26 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FormatArea"> + <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode1"> <property name="visible">True</property> <property name="can_focus">False</property> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits