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

[Muhammet Kara]

 cui/source/customize/cfg.cxx      |    2 +-
 cui/uiconfig/ui/menuassignpage.ui |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit d4daf634cd9ce8d422d49669c324a2220eba54a9
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date:   Sun Oct 15 15:23:35 2017 +0000

    tdf#112136: Resolve confusion of two 'Reset' buttons
    
    in the Customize dialog.
    
    Change-Id: I0703fccb45a3bac17890e481d6635872df7becd2
    Reviewed-on: https://gerrit.libreoffice.org/43406
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Muhammet Kara <muhammet.kara at pardus.org.tr>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 51bab76a9843..736b228e86c5 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1163,7 +1163,7 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
     get(m_pSaveInListBox, "savein");
     get(m_pInsertBtn, "insert");
     get(m_pModifyBtn, "modify");
-    get(m_pResetBtn, "resetbtn");
+    get(m_pResetBtn, "defaultsbtn");
     get(m_pDescriptionFieldLb, "descriptionlabel");
     get(m_pDescriptionField, "desc");
     m_pDescriptionField->set_height_request(m_pDescriptionField->GetTextHeight()*2.9);
diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui
index 44b85edc2b86..0059d725de31 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -410,8 +410,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="resetbtn">
-                <property name="label" translatable="yes" context="menuassignpage|resetbtn">Rese_t</property>
+              <object class="GtkButton" id="defaultsbtn">
+                <property name="label" translatable="yes" context="menuassignpage|defaultsbtn">_Defaults</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -420,6 +420,11 @@
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="use_underline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="defaultsbtn-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="menuassignpage|defaultsbtn-atkobject">Resets the selected toolbar, menu, or context menu to its default state.</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">True</property>