sc/uiconfig/scalc/ui/notebookbar.ui | 9 ++-
sc/uiconfig/scalc/ui/notebookbar_compact.ui | 12 ++--
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 9 ++-
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 9 ++-
sd/uiconfig/sdraw/ui/notebookbar.ui | 9 ++-
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 39 ++++++++++++--
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 9 ++-
sd/uiconfig/simpress/ui/notebookbar.ui | 9 ++-
sd/uiconfig/simpress/ui/notebookbar_compact.ui | 15 +++--
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 9 ++-
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 9 ++-
sw/uiconfig/swriter/ui/notebookbar.ui | 7 ++
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 13 ++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 9 ++-
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 9 ++-
15 files changed, 145 insertions(+), 31 deletions(-)
New commits:
commit 489da34e9bffb234fa27155cef1931bd6f21dc1d
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Sat Oct 14 16:49:56 2023 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Sun Oct 15 02:48:40 2023 +0200
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 <jl...@mail.com>
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>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 4f91cd52e122..eb3f977a15a5 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -561,9 +561,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/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index dc9ecbe73439..3aa52a0ccf82 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -597,18 +597,25 @@
</child>
<child>
<object class="GtkMenuItem" id="MenuFile-WebHtml">
- <property name="visible">False</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:WebHtml</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuFile-Print">
- <property name="visible">False</property>
+ <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>
<child>
<object class="GtkMenuItem" id="MenuFile-PrinterSetup">
<property name="visible">True</property>
@@ -2748,6 +2755,28 @@
</child>
<child>
<object class="sfxlo-NotebookbarToolBox"
id="SectionBottom105">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="toolbar_style">both-horiz</property>
+ <child>
+ <object class="GtkToolButton" id="Files-WebHtml">
+ <property name="visible">True</property>
+ <property
name="action_name">.uno:WebHtml</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom105b">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
@@ -2765,7 +2794,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -2788,7 +2817,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>
@@ -2827,7 +2856,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/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index d306a82252a9..b1f8e937ca7f 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -797,6 +797,13 @@
<property name="can_focus">False</property>
</object>
</child>
+ <child>
+ <object class="GtkMenuItem" id="MenuFile-WebHtml">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:WebHtml</property>
+ </object>
+ </child>
<child>
<object class="GtkMenuItem" id="PrintD">
<property name="visible">True</property>
@@ -806,7 +813,7 @@
</child>
<child>
<object class="GtkMenuItem" id="PrintDefaultD">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:PrintDefault</property>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 47b3109dd899..cff0d3c1e5bd 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -483,9 +483,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/sd/uiconfig/simpress/ui/notebookbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 0d3a9cca0a74..f7d65027ae5b 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -596,18 +596,25 @@
</child>
<child>
<object class="GtkMenuItem" id="MenuFile-WebHtml">
- <property name="visible">False</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:WebHtml</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuFile-Print">
- <property name="visible">False</property>
+ <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>
<child>
<object class="GtkMenuItem" id="MenuFile-PrinterSetup">
<property name="visible">True</property>
@@ -3095,7 +3102,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>
@@ -3134,7 +3141,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/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index f2248d0fd14a..2075f8208d29 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -777,6 +777,13 @@
<property name="can_focus">False</property>
</object>
</child>
+ <child>
+ <object class="GtkMenuItem" id="MenuFile-WebHtml">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:WebHtml</property>
+ </object>
+ </child>
<child>
<object class="GtkMenuItem" id="PrintD">
<property name="visible">True</property>
@@ -786,7 +793,7 @@
</child>
<child>
<object class="GtkMenuItem" id="PrintDefaultD">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:PrintDefault</property>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index 1c7cbb0ed2ef..a39708e4aac7 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -842,9 +842,16 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="PrintDefaultD">
+ <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="PrintDefaultD">
+ <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.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
@@ -258,6 +258,13 @@
<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>
<child>
<object class="GtkMenuItem" id="MenuFile-PrinterSetup">
<property name="visible">True</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>
