[Libreoffice-commits] core.git: sw/source sw/uiconfig

[Muhammet Kara]

 sw/source/uibase/sidebar/WrapPropertyPanel.cxx |    7 -----
 sw/uiconfig/swriter/ui/sidebarwrap.ui          |   32 ++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit c6db7f77386e4e3a8c3ec97be4eb42c74556141f
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date:   Thu Jun 16 22:09:45 2016 +0300

    Move AccessibleNames to .ui file for WrapPropertyPanel tdf#87026
    
    GetQuickHelpText() returns the value of the tooltip text.
    So moving them into .ui file as tooltips.
    
    Change-Id: If7f8f5a585f5a765b0c41374beec2843c0335e75
    Reviewed-on: https://gerrit.libreoffice.org/26389
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index be381bf..63517d7 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -180,13 +180,6 @@ void WrapPropertyPanel::Initialize()
 
     aCustomEntry = mpCustomEntry->GetText();
 
-    mpRBNoWrap->SetAccessibleName(mpRBNoWrap->GetQuickHelpText());
-    mpRBWrapLeft->SetAccessibleName(mpRBWrapLeft->GetQuickHelpText());
-    mpRBWrapRight->SetAccessibleName(mpRBWrapRight->GetQuickHelpText());
-    mpRBWrapParallel->SetAccessibleName(mpRBWrapParallel->GetQuickHelpText());
-    mpRBWrapThrough->SetAccessibleName(mpRBWrapThrough->GetQuickHelpText());
-    mpRBIdealWrap->SetAccessibleName(mpRBIdealWrap->GetQuickHelpText());
-
     mpBindings->Update( FN_FRAME_NOWRAP );
     mpBindings->Update( FN_FRAME_WRAP );
     mpBindings->Update( FN_FRAME_WRAP_RIGHT );
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index 9e3708a..0b9b2df 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="spacinglist">
@@ -74,6 +74,11 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="buttonnone-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">None</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -93,6 +98,11 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="buttonparallel-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Parallel</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -112,6 +122,11 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="buttonoptimal-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Optimal</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -131,6 +146,11 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="buttonbefore-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Before</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -150,6 +170,11 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="buttonafter-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">After</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -169,6 +194,11 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="buttonthrough-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Through</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>