[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/uiconfig

Caolán McNamara caolanm at redhat.com
Wed Jun 21 20:54:17 UTC 2017 

 sw/uiconfig/swriter/menubar/menubar.xml |   40 ++++++++++++++++----------------
 sw/uiconfig/swriter/popupmenu/table.xml |   10 ++++----
 sw/uiconfig/swriter/popupmenu/text.xml  |   10 ++++----
 3 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit fb7f91acecb6a3fa7adbe59603cdfdbc36a6b891
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 20 10:44:13 2017 +0100

    these checkbox group entries are mutually exclusive
    
    so they're closer to radio buttons than checkboxes
    
    though this isn't great either as there are possibilites that are not listed,
    in which case all are unchecked, and when is selected like buletting it cannot
    be turned off from the menu
    
    (cherry picked from commit 4d7054947d87174decf12ad204c09532f33599f8)
    
    Change-Id: Ifa9650cdde5575807c0bd876e859c3ba3748e580
    Reviewed-on: https://gerrit.libreoffice.org/39008
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index f7ca5750f37e..5e7dbb6374a4 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -564,26 +564,26 @@
   </menu:menu>
   <menu:menu menu:id=".uno:FormatStylesMenu">
     <menu:menupopup>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Subtitle&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles"/>
-      <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&FamilyName:string=NumberingStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 1&FamilyName:string=NumberingStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 4&FamilyName:string=NumberingStyles"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Subtitle&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" menu:style="radio"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&FamilyName:string=NumberingStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 1&FamilyName:string=NumberingStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 4&FamilyName:string=NumberingStyles" menu:style="radio"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:EditStyle"/>
       <menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml
index a65f150522f5..5d6992de58b6 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -77,11 +77,11 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:EditStyle"/>
       <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml
index da39a8239b48..6f689036a5c6 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -48,11 +48,11 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:EditStyle"/>
       <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" menu:style="radio"/>
     </menu:menupopup>
   </menu:menu>
   <menu:menuseparator/>

More information about the Libreoffice-commits mailing list