summaryrefslogtreecommitdiff
path: root/sw/uiconfig
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2023-10-14 16:49:56 -0400
committerJustin Luth <jluth@mail.com>2023-10-15 02:48:40 +0200
commit489da34e9bffb234fa27155cef1931bd6f21dc1d (patch)
tree9e1ca2043b685fadf2b4761459757d9bb7023969 /sw/uiconfig
parent2a3023bc91d6f16133b5c869a1159342f9223228 (diff)
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>
Diffstat (limited to 'sw/uiconfig')
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar.ui7
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_compact.ui13
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui9
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui9
4 files changed, 30 insertions, 8 deletions
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 4a65e014823f..bc79d1ba5b3a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -259,6 +259,13 @@
</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>
+ <child>
<object class="GtkMenuItem" id="MenuFile-PrinterSetup">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index a183fa3c703b..20a0270a1f39 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -382,16 +382,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>
@@ -3036,7 +3037,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>
@@ -3075,7 +3076,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/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index a1fdf88a7246..7b3d9a24417b 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1048,9 +1048,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/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 409e4b520aa6..430b016a4e5a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1038,9 +1038,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>