commit d4daf634cd9ce8d422d49669c324a2220eba54a9
author Muhammet Kara <muhammet.kara@pardus.org.tr> Sun Oct 15 15:23:35 2017 +0000
committer Katarina Behrens <Katarina.Behrens@cib.de> Sun Oct 15 23:26:18 2017 +0200
tree 9d13771b9a932aa07b307b17244b95a00d1f410d
parent 1ad5bc0374b32cc0bbee554a2e95d0e1855c394b

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@libreoffice.org>
Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

cui/source/customize/cfg.cxx

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 51bab76..736b228 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);

cui/uiconfig/ui/menuassignpage.ui

diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui
index 44b85ed..0059d72 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>