tdf#150466 notebookbar: hide PrintDefault on compact and standardize

As in the classic toolbars, do not promote direct printing
since it easily leads to mistakes and wasted paper.
Additionally, the printer settings is really never needed,
so it should not have a prominent place, especially on COMPACT.

At the same time, I standardized the File menu:
- always include print (especially useful for accessibility)
- always use the same order
- consistently provide access to print/web preview

Change-Id: I9ffbba179206274b5ed1788e496b7c5aa0503726
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157984
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>

4 files changed, 30 insertions, 9 deletions

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 54419a9c4385..714ad44e6e39 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -505,9 +505,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+      <object class="GtkMenuItem" id="MenuFile-Print">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Print</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+        <property name="visible">False</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 810d8e00ee05..7c64e36a4d3b 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -745,17 +745,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+      <object class="GtkMenuItem" id="MenuFile-Print">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:PrintDefault</property>
+        <property name="action_name">.uno:Print</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuFile-Print">
+      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
         <property name="visible">False</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Print</property>
+        <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
@@ -2865,7 +2865,7 @@
                             <property name="toolbar_style">both-horiz</property>
                             <child>
                               <object class="GtkToolButton" id="Files-PrintDefault">
-                                <property name="visible">True</property>
+                                <property name="visible">False</property>
                                 <property name="action_name">.uno:PrintDefault</property>
                               </object>
                               <packing>
@@ -2904,7 +2904,7 @@
                             <property name="show_arrow">False</property>
                             <child>
                               <object class="GtkToolButton" id="PrinterSetup">
-                                <property name="visible">True</property>
+                                <property name="visible">False</property>
                                 <property name="visible_horizontal">False</property>
                                 <property name="action_name">.uno:PrinterSetup</property>
                                 <property name="icon_name">sfx2/res/symphony/open_more.png</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 8547ef8f3aec..364ac8323397 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -730,9 +730,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+      <object class="GtkMenuItem" id="MenuFile-Print">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Print</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+        <property name="visible">False</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index e12befff2f1d..c6053993b96f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -1308,9 +1308,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+      <object class="GtkMenuItem" id="MenuFile-Print">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Print</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
+        <property name="visible">False</property>
+        <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>