cui/uiconfig/ui/hyperlinkdialog.ui | 16 ++++++++++++---- cui/uiconfig/ui/hyperlinkinternetpage.ui | 2 +- sw/qa/uitest/writer_tests3/hyperlinkdialog.py | 8 ++++---- 3 files changed, 17 insertions(+), 9 deletions(-)
New commits: commit 8b5a89f6818dc77bd4d9808ad40e762674cdf5b7 Author: Gabor Kelemen <[email protected]> AuthorDate: Sat Dec 26 21:18:49 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Jan 4 11:50:10 2021 +0100 tdf#133718 Add accelerator keys to Hyperlink dialog tabs Also change an accelerator on the Internet tab to avoid clashing with the new one for Mail tab Change-Id: I24a03647ccba6901b1865f5ca4228e54d686d662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108358 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index a02e9f752943..34301fe97df3 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -180,7 +180,9 @@ <object class="GtkLabel" id="RID_SVXSTR_HYPERDLG_HLINETTP"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLINETTP">Internet</property> + <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLINETTP">_Internet</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">internet</property> </object> <packing> <property name="expand">False</property> @@ -253,7 +255,9 @@ <object class="GtkLabel" id="RID_SVXSTR_HYPERDLG_HLMAILTP"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLMAILTP">Mail</property> + <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLMAILTP">_Mail</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mail</property> </object> <packing> <property name="expand">False</property> @@ -327,7 +331,9 @@ <object class="GtkLabel" id="RID_SVXSTR_HYPERDLG_HLDOCTP"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLDOCTP">Document</property> + <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLDOCTP">_Document</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">document</property> </object> <packing> <property name="expand">False</property> @@ -401,7 +407,9 @@ <object class="GtkLabel" id="RID_SVXSTR_HYPERDLG_HLDOCNTP"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLDOCNTP">New Document</property> + <property name="label" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLDOCNTP">_New Document</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">newdocument</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui index c5bee8c85e64..e86627673709 100644 --- a/cui/uiconfig/ui/hyperlinkinternetpage.ui +++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui @@ -320,7 +320,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="hyperlinkinternetpage|name_label">Na_me:</property> + <property name="label" translatable="yes" context="hyperlinkinternetpage|name_label">N_ame:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">name</property> <property name="xalign">0</property> diff --git a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py index a8a42a02a3d1..e2b40f9e9005 100644 --- a/sw/qa/uitest/writer_tests3/hyperlinkdialog.py +++ b/sw/qa/uitest/writer_tests3/hyperlinkdialog.py @@ -29,19 +29,19 @@ class HyperlinkDialog(UITestCase): self.assertEqual(get_state_as_dict(xtab)["PageCount"], "4") xtab.executeAction("SELECT", mkPropertyValues({"POS": "0"})) - self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "Internet") + self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_Internet") self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "0") xtab.executeAction("SELECT", mkPropertyValues({"POS": "1"})) - self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "Mail") + self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_Mail") self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "1") xtab.executeAction("SELECT", mkPropertyValues({"POS": "2"})) - self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "Document") + self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_Document") self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "2") xtab.executeAction("SELECT", mkPropertyValues({"POS": "3"})) - self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "New Document") + self.assertEqual(get_state_as_dict(xtab)["CurrPageTitel"], "_New Document") self.assertEqual(get_state_as_dict(xtab)["CurrPagePos"], "3") xcancel = xDialog.getChild("cancel") _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
