update notebookbar_groupedbar writer with style menu

Change-Id: I408b9c8276afb38db464b3d2c0bdf4386ad75028
Reviewed-on: https://gerrit.libreoffice.org/42148
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>

2 files changed, 216 insertions, 24 deletions

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index d03f31bda2dd..4adf4b0339d8 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -3,7 +3,6 @@
 <interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
-  <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
   <object class="GtkMenu" id="AlignPara">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -3260,24 +3259,59 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="subtitle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="heading1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading%201&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="heading2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading%202&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="heading3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading%203&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="heading4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="textBody">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Quotations">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="preformattedText">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
@@ -3287,24 +3321,39 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="chardefault">
+      <object class="GtkMenuItem" id="defaultstyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Default%20Style&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="italic">
+      <object class="GtkMenuItem" id="Emphasis">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="bold">
+      <object class="GtkMenuItem" id="EmphasisStrong">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Quotation2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles</property>
+        <property name="label" translatable="yes">Quotation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="SourceCode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Strong%20Emphasis&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
@@ -3314,6 +3363,33 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="listStyle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="numbering1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="numbering4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator157">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="editstyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -3334,6 +3410,26 @@
         <property name="action_name">.uno:StyleNewByExample</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="styleload">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:LoadStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator152">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="designDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DesignerDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuTable">
     <property name="visible">True</property>
@@ -4127,7 +4223,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle">
-                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5181,7 +5277,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle">
-                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -7697,7 +7793,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="editdrawb:MenuDrawEdit">
-                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9207,7 +9303,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphstyles:MenuStyle">
-                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">St_yles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 16b7a6df4513..79e8f2d0e1aa 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -2,7 +2,6 @@
 <!-- Generated with glade 3.18.3 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
-  <requires lib="" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkMenu" id="Menu3D">
     <property name="visible">True</property>
@@ -3178,24 +3177,59 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="subtitle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="heading1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading%201&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="heading2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading%202&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="heading3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Heading%203&amp;FamilyName:string=ParagraphStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="heading4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="textBody">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Quotations">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="preformattedText">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles</property>
       </object>
     </child>
     <child>
@@ -3205,24 +3239,39 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="chardefault">
+      <object class="GtkMenuItem" id="defaultstyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Default%20Style&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="italic">
+      <object class="GtkMenuItem" id="Emphasis">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="bold">
+      <object class="GtkMenuItem" id="EmphasisStrong">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="Quotation2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles</property>
+        <property name="label" translatable="yes">Quotation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="SourceCode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:StyleApply?Style:string=Strong%20Emphasis&amp;FamilyName:string=CharacterStyles</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles</property>
       </object>
     </child>
     <child>
@@ -3232,6 +3281,33 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="listStyle">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="numbering1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="numbering4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator157">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="editstyle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -3252,6 +3328,26 @@
         <property name="action_name">.uno:StyleNewByExample</property>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="styleload">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:LoadStyles</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator152">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="designDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:DesignerDialog</property>
+      </object>
+    </child>
   </object>
   <object class="GtkMenu" id="MenuTable">
     <property name="visible">True</property>
@@ -4204,7 +4300,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle">
-                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">_Styles</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">St_yles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -6930,7 +7026,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle">
-                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">_Styles</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">St_yles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>