diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-01-13 23:00:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-14 16:55:44 +0100 |
| commit | 6a80183743d71b1a03a67e6dc4657dea6d56e6fe (patch) | |
| tree | 8de83cc95198cc4e39d28884767ed020bd2977b7 | |
| parent | a33469518f840ccf55913ab8c5c88e5e82fbf1bd (diff) | |
Asian phonetic guide dialog uses "close" widget
and not cancel one.
widget response = -7 corresponds to GTK_RESPONSE_CLOSE
See https://gtk.developpez.com/doc/en/gtk/GtkDialog.html
label is "gtk-close" and the variable name is "m_xClosePB"
Change-Id: I6ac8e1814ff3c594498d81e99e864939b6a2c23a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
| -rw-r--r-- | svx/uiconfig/ui/asianphoneticguidedialog.ui | 4 | ||||
| -rw-r--r-- | sw/qa/uitest/writer_tests2/asianPhoneticGuide.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 2c74895c0bb1..4302d4f6b41d 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -205,7 +205,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, weld::Wind , m_xCharStyleLB(m_xBuilder->weld_combo_box("stylelb")) , m_xStylistPB(m_xBuilder->weld_button("styles")) , m_xApplyPB(m_xBuilder->weld_button("ok")) - , m_xClosePB(m_xBuilder->weld_button("cancel")) + , m_xClosePB(m_xBuilder->weld_button("close")) , m_xContentArea(m_xDialog->weld_content_area()) , m_xGrid(m_xBuilder->weld_widget("grid")) , m_xPreviewWin(new RubyPreview) diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui b/svx/uiconfig/ui/asianphoneticguidedialog.ui index 8c4e4c9237bf..96d2dc04cb65 100644 --- a/svx/uiconfig/ui/asianphoneticguidedialog.ui +++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui @@ -35,7 +35,7 @@ </packing> </child> <child> - <object class="GtkButton" id="cancel"> + <object class="GtkButton" id="close"> <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -487,7 +487,7 @@ </child> <action-widgets> <action-widget response="-5">ok</action-widget> - <action-widget response="-7">cancel</action-widget> + <action-widget response="-7">close</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> <child type="titlebar"> diff --git a/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py b/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py index 4722541e6e66..1af2bfe94933 100644 --- a/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py +++ b/sw/qa/uitest/writer_tests2/asianPhoneticGuide.py @@ -42,7 +42,7 @@ class asianPhoneticGuide(UITestCase): xApplyBtn = xDialog.getChild("ok") xApplyBtn.executeAction("CLICK", tuple()) - xCloseBtn = xDialog.getChild("cancel") + xCloseBtn = xDialog.getChild("close") self.ui_test.close_dialog_through_button(xCloseBtn) self.assertEqual(document.Text.String[0:1], "a") |