From a29b1018972d4052f361553b40cb4da2d2a5d318 Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Tue, 26 Jun 2018 00:04:09 +0200
Subject: tdf#114425 add Page Settings to writer and calc NB

add to NB grouped (full and compact) in Edit group
cause Format is only Format selected text but not Format page.
Edit group is most generic group that fit's for page selection

Change-Id: I49af8ff5b560655d43c55818da391a768d26ef04
Reviewed-on: https://gerrit.libreoffice.org/56430
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
---
 .../swriter/ui/notebookbar_groupedbar_compact.ui   | 26 +++++++++++++++--
 .../swriter/ui/notebookbar_groupedbar_full.ui      | 34 +++++++++++++++++-----
 2 files changed, 50 insertions(+), 10 deletions(-)

(limited to 'sw')

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 606b33ad0933..ac0e455c2ae6 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -917,6 +917,26 @@
         <property name="action_name">.uno:GotoPage</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator68">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Watermark">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Watermark</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="PageDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:PageDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuFile">
     <property name="visible">True</property>
@@ -1278,7 +1298,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertRLMD1">
+      <object class="GtkMenuItem" id="FontDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FontDialog</property>
@@ -2513,7 +2533,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" context="notebookbar_groupedbar_compact|Menu"  translatable="yes">_Check for Updates...</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Menu">_Check for Updates...</property>
       </object>
     </child>
     <child>
@@ -2942,7 +2962,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" context="notebookbar_groupedbar_compact|Tools"  translatable="yes">_Check for Updates...</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Tools">_Check for Updates...</property>
       </object>
     </child>
     <child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index c35d4ce43d9d..6274110e81fc 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -864,6 +864,26 @@
         <property name="action_name">.uno:GotoPage</property>
       </object>
     </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator68">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Watermark">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Watermark</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="PageDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:PageDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuFile">
     <property name="visible">True</property>
@@ -1110,7 +1130,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator40">
+      <object class="GtkSeparatorMenuItem" id="separator21">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1164,7 +1184,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator155">
+      <object class="GtkSeparatorMenuItem" id="separator40">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1219,13 +1239,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator156">
+      <object class="GtkSeparatorMenuItem" id="separator22">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="InsertRLMD1">
+      <object class="GtkMenuItem" id="FontDialog3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:FontDialog</property>
@@ -1483,7 +1503,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" context="notebookbar_groupedbar_full|Help"  translatable="yes">_Check for Updates...</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Help">_Check for Updates...</property>
       </object>
     </child>
     <child>
@@ -2552,7 +2572,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" context="notebookbar_groupedbar_full|Menu" translatable="yes">_Check for Updates...</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Menu">_Check for Updates...</property>
       </object>
     </child>
     <child>
@@ -2981,7 +3001,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" context="notebookbar_groupedbar_full|Tools" translatable="yes">_Check for Updates...</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Tools">_Check for Updates...</property>
       </object>
     </child>
     <child>
-- 
cgit