cui/uiconfig/ui/hyperlinkdocpage.ui | 164 ++++++++++++------------- cui/uiconfig/ui/hyperlinkinternetpage.ui | 64 ++++----- cui/uiconfig/ui/hyperlinkmailpage.ui | 202 +++++++++++++++---------------- 3 files changed, 215 insertions(+), 215 deletions(-)
New commits: commit f5033992032719055efc5c7c5e04ef9455a960d8 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Feb 3 15:19:22 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Feb 3 18:28:49 2026 +0100 tdf#130857 Hyperlink dlg: Define widgets in "Document" page in order Switch the order in which the widgets in the .ui file are defined so that the order better matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. This is for the "Document" page of the "Insert" -> "Hyperlink" dialog. Change-Id: Ie56fbf9800d3732d534e5dd59b8e8d2456af84f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198604 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui index 3732eca134a2..a667d73e98ed 100644 --- a/cui/uiconfig/ui/hyperlinkdocpage.ui +++ b/cui/uiconfig/ui/hyperlinkdocpage.ui @@ -52,25 +52,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkButton" id="fileopen"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="hyperlinkdocpage|fileopen|tooltip_text">Open File</property> - <property name="image">image2</property> - <property name="always-show-image">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="fileopen-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|fileopen">Opens the Open dialog, where you can select a file.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> <child> <object class="GtkComboBoxText" id="path"> <property name="visible">True</property> @@ -95,6 +76,25 @@ <property name="top-attach">0</property> </packing> </child> + <child> + <object class="GtkButton" id="fileopen"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="hyperlinkdocpage|fileopen|tooltip_text">Open File</property> + <property name="image">image2</property> + <property name="always-show-image">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fileopen-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|fileopen">Opens the Open dialog, where you can select a file.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> </object> </child> <child type="label"> @@ -159,38 +159,38 @@ </packing> </child> <child> - <object class="GtkButton" id="browse"> + <object class="GtkEntry" id="target"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="hyperlinkdocpage|browse|tooltip_text">Target in Document</property> - <property name="image">image1</property> - <property name="always-show-image">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="browse-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|browse">Opens the Target in Document dialog.</property> + <object class="AtkObject" id="target-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|target">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</property> </object> </child> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="target"> + <object class="GtkButton" id="browse"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="hyperlinkdocpage|browse|tooltip_text">Target in Document</property> + <property name="image">image1</property> + <property name="always-show-image">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="target-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|target">Enter a URL for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</property> + <object class="AtkObject" id="browse-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|browse">Opens the Target in Document dialog.</property> </object> </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> @@ -292,40 +292,6 @@ <property name="top-attach">2</property> </packing> </child> - <child> - <object class="GtkEntry" id="indication"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="indication-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|indication">Specifies the visible text or button caption for the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="name"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="name-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|name">Enter a name for the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> <child> <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="grid4"> @@ -334,6 +300,22 @@ <property name="hexpand">True</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> + <child> + <object class="GtkComboBoxText" id="frame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="form_label"> <property name="visible">True</property> @@ -381,26 +363,44 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="frame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="frame-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="indication"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="indication-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|indication">Specifies the visible text or button caption for the hyperlink.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="name-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|name">Enter a name for the hyperlink.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> </object> commit 962241df84462a33de338e535a670db53545effc Author: Michael Weghorn <[email protected]> AuthorDate: Tue Feb 3 15:11:09 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Feb 3 18:28:42 2026 +0100 tdf#130857 Hyperlink dlg: Define widgets in "Mail" page in order Switch the order in which the widgets in the .ui file are defined so that the order better matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. This is for the "Mail" page of the "Insert" -> "Hyperlink" dialog. Change-Id: I662668b2e262628b59b7e57aca1472a63c0d7546 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198603 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui index 9e3db4622b08..ab3316e5aea2 100644 --- a/cui/uiconfig/ui/hyperlinkmailpage.ui +++ b/cui/uiconfig/ui/hyperlinkmailpage.ui @@ -47,6 +47,30 @@ <property name="top_attach">1</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="receiver"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can_focus">True</property> + <property name="truncate-multiline">True</property> + <property name="activates_default">True</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="receiver-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|receiver">Assigns the specified email address to the hyperlink.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> <child> <object class="GtkButton" id="addressbook"> <property name="visible">True</property> @@ -99,30 +123,6 @@ <property name="top_attach">2</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="receiver"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="can_focus">True</property> - <property name="truncate-multiline">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="receiver-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|receiver">Assigns the specified email address to the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> <child> <placeholder/> </child> @@ -187,6 +187,83 @@ <property name="top_attach">0</property> </packing> </child> + <child> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkComboBoxText" id="frame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="form_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="hyperlinkmailpage|form_label">F_orm:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">form</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="form"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="form-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|form">Specifies whether the hyperlink is inserted as text or as a button.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="script"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|script|tooltip_text">Events</property> + <child internal-child="accessible"> + <object class="AtkObject" id="script-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|script">Opens the Assign Macro dialog, in which you can give events such as "mouse over object" or "trigger hyperlink" their own program codes.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="indication_label"> <property name="visible">True</property> @@ -251,83 +328,6 @@ <property name="top_attach">2</property> </packing> </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="form_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="hyperlinkmailpage|form_label">F_orm:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">form</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="form"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="form-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|form">Specifies whether the hyperlink is inserted as text or as a button.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="script"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|script|tooltip_text">Events</property> - <child internal-child="accessible"> - <object class="AtkObject" id="script-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|script">Opens the Assign Macro dialog, in which you can give events such as "mouse over object" or "trigger hyperlink" their own program codes.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="frame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="frame-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> </object> </child> <child type="label"> commit 4760069cc9ac89f2d12363ceb5caabe15c7930c1 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Feb 3 14:25:53 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Feb 3 18:28:35 2026 +0100 tdf#130857 Hyperlink dlg: Define widgets in "Internet" page in order Switch the order in which the widgets in the .ui file are defined so that the order better matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. This is for the "Internet" page of the "Insert" -> "Hyperlink" dialog. Change-Id: I38cb42b98c4df703328e69147269a67cb545dfaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198602 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui index 961e933c2967..33d49943dd24 100644 --- a/cui/uiconfig/ui/hyperlinkinternetpage.ui +++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui @@ -162,23 +162,6 @@ <property name="top-attach">1</property> </packing> </child> - <child> - <object class="GtkEntry" id="name"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="name-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkinternetpage|extended_tip|name">Enter a name for the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> <child> <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="grid4"> @@ -187,6 +170,22 @@ <property name="hexpand">True</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> + <child> + <object class="GtkComboBoxText" id="frame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkinternetpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="form_label"> <property name="visible">True</property> @@ -234,26 +233,27 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="frame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="frame-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkinternetpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> - </object> - </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="name-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkinternetpage|extended_tip|name">Enter a name for the hyperlink.</property> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object>
