writer: sync global and print toolbars between dif UI layouts

Change-Id: I226db3f1a9cd6bed12db8edcb37ae6a6dcc999bc
Reviewed-on: https://gerrit.libreoffice.org/71656
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

sw/uiconfig/sglobal/toolbar/previewobjectbar.xml

@@ -34,8 +34,8 @@
  <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>

sw/uiconfig/sweb/toolbar/previewobjectbar.xml

@@ -34,8 +34,8 @@
  <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>

sw/uiconfig/swform/toolbar/previewobjectbar.xml

@@ -34,8 +34,8 @@
  <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>

sw/uiconfig/swreport/toolbar/previewobjectbar.xml

@@ -18,23 +18,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
- <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
- <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
- <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:JumpToSpecificPage"/>
+ <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
  <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ClosePreview"/>
+ <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>

sw/uiconfig/swriter/toolbar/previewobjectbar.xml

@@ -34,8 +34,8 @@
  <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>

sw/uiconfig/swriter/ui/notebookbar_compact.ui

@@ -3690,8 +3690,6 @@
                               <object class="GtkToolButton" id="Home-BackgroundColor">
                                 <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:BackgroundColor</property>
                               </object>
                               <packing>
@@ -10599,29 +10597,24 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-OptionalBox" id="MediaSection1">
+                      <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox">
+                        <property name="width_request">148</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="vexpand">True</property>
                         <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="first1">
-                            <property name="width_request">800</property>
+                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
+                            <property name="can_focus">False</property>
                             <property name="show_arrow">False</property>
                             <child>
                               <object class="GtkToolButton" id="Media-AVMediaToolBox">
-                                <property name="width_request">600</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
                                 <property name="action_name">.uno:AVMediaToolBox</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="homogeneous">True</property>
                               </packing>
                             </child>
@@ -10632,24 +10625,6 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator32">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10952,7 +10927,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-DropdownBox" id="ObjectSection1">
+                  <object class="sfxlo-DropdownBox" id="MediaSectio">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>

sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui

@@ -2161,6 +2161,19 @@
         <property name="can_focus">False</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuPrint-FullScreen">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FullScreen</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuPrint-separator3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
     <child>
       <object class="GtkMenuItem" id="MenuPrint-Print">
         <property name="visible">True</property>
@@ -10203,6 +10216,7 @@
                                   <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="halign">center</property>
                                     <property name="hexpand">True</property>
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>

sw/uiconfig/swriter/ui/notebookbar_single.ui

@@ -6254,6 +6254,9 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <style>
+                          <class name="priority-12"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6291,7 +6294,7 @@
                           </packing>
                         </child>
                         <style>
-                          <class name="priority-12"/>
+                          <class name="priority-11"/>
                         </style>
                       </object>
                       <packing>
@@ -6330,7 +6333,7 @@
                           </packing>
                         </child>
                         <style>
-                          <class name="priority-11"/>
+                          <class name="priority-10"/>
                         </style>
                       </object>
                       <packing>
@@ -6368,9 +6371,6 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
-                        <style>
-                          <class name="priority-10"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -6383,6 +6383,21 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
+                        <child>
+                          <object class="GtkSeparator" id="separator53">
+                            <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="ExtTop14">
                             <property name="visible">True</property>
@@ -6414,7 +6429,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <style>
@@ -6519,6 +6534,21 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
+                        <child>
+                          <object class="GtkSeparator" id="separator56">
+                            <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="ExtTop13">
                             <property name="visible">True</property>
@@ -6561,7 +6591,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <style>
@@ -6658,6 +6688,21 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
+                        <child>
+                          <object class="GtkSeparator" id="separator57">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="padding">5</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
                             <property name="visible">True</property>
@@ -6679,7 +6724,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>

sw/uiconfig/swxform/toolbar/previewobjectbar.xml

@@ -34,8 +34,8 @@
  <toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Print"/>
  <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:style="image text"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:style="image text"/>
 </toolbar:toolbar>