summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar.ui9
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_compact.ui12
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui9
-rw-r--r--sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui9
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar.ui9
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_compact.ui39
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui9
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar.ui9
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_compact.ui15
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui9
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui9
-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
15 files changed, 145 insertions, 31 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>
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,19 +597,26 @@
</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>
<property name="can_focus">False</property>
@@ -2752,6 +2759,28 @@
<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>
+ <child>
<object class="GtkToolButton" id="Files-Print">
<property name="visible">True</property>
<property name="action_name">.uno:Print</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
@@ -798,6 +798,13 @@
</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>
<property name="can_focus">False</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,19 +596,26 @@
</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>
<property name="can_focus">False</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
@@ -778,6 +778,13 @@
</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>
<property name="can_focus">False</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
@@ -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>