cui/uiconfig/ui/hyperlinkdocpage.ui | 3 --- cui/uiconfig/ui/hyperlinkinternetpage.ui | 1 - cui/uiconfig/ui/hyperlinkmailpage.ui | 2 -- cui/uiconfig/ui/hyperlinknewdocpage.ui | 2 -- vcl/unx/gtk3/gtkinst.cxx | 6 ++++++ 5 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit ceb1d69eda4c7351e64cb92d40d7c48f3790f83b Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon May 31 16:16:08 2021 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon May 31 20:50:10 2021 +0200 no need for always-show-image if there is just an image and no text and reenable hyperlink dialog for gtk4 Change-Id: Id7e487dd64e102af80bb90279682a0636b887f85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116484 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui index a6a1ca03ee0a..b1a29b35b43c 100644 --- a/cui/uiconfig/ui/hyperlinkdocpage.ui +++ b/cui/uiconfig/ui/hyperlinkdocpage.ui @@ -59,7 +59,6 @@ <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> @@ -165,7 +164,6 @@ <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="browse-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|browse">Opens the Target in Document dialog.</property> @@ -370,7 +368,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="hyperlinkdocpage|script|tooltip_text">Events</property> - <property name="always_show_image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="script-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|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> diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui index 47b03a7c5d09..4b311bc078db 100644 --- a/cui/uiconfig/ui/hyperlinkinternetpage.ui +++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui @@ -381,7 +381,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="hyperlinkinternetpage|script|tooltip_text">Events</property> - <property name="always_show_image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="script-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkinternetpage|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> diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui index 9a691e2005b8..77568d69a9e9 100644 --- a/cui/uiconfig/ui/hyperlinkmailpage.ui +++ b/cui/uiconfig/ui/hyperlinkmailpage.ui @@ -54,7 +54,6 @@ <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|addressbook|tooltip_text">Data Sources...</property> <property name="image">image1</property> - <property name="always_show_image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="addressbook-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|addressbook">Hides or shows the data source browser.</property> @@ -295,7 +294,6 @@ <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> - <property name="always_show_image">True</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> diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui b/cui/uiconfig/ui/hyperlinknewdocpage.ui index 45e99dcb6bd2..bdb6a23c1b59 100644 --- a/cui/uiconfig/ui/hyperlinknewdocpage.ui +++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui @@ -118,7 +118,6 @@ <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="hyperlinknewdocpage|create|tooltip_text">Select Path</property> <property name="image">image1</property> - <property name="always_show_image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="create-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinknewdocpage|extended_tip|create">Opens the Select Path dialog, where you can select a path.</property> @@ -380,7 +379,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="hyperlinknewdocpage|script|tooltip_text">Events</property> - <property name="always_show_image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="script-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinknewdocpage|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> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 23416bd904c1..ed195f56a760 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -22311,10 +22311,16 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "cui/ui/acorreplacepage.ui" && rUIFile != "cui/ui/applylocalizedpage.ui" && rUIFile != "cui/ui/autocorrectdialog.ui" && + rUIFile != "cui/ui/hyperlinkdialog.ui" && + rUIFile != "cui/ui/hyperlinkdocpage.ui" && + rUIFile != "cui/ui/hyperlinkinternetpage.ui" && + rUIFile != "cui/ui/hyperlinkmailpage.ui" && + rUIFile != "cui/ui/hyperlinknewdocpage.ui" && rUIFile != "cui/ui/hyphenate.ui" && rUIFile != "cui/ui/insertfloatingframe.ui" && rUIFile != "cui/ui/objectnamedialog.ui" && rUIFile != "cui/ui/objecttitledescdialog.ui" && + rUIFile != "cui/ui/pastespecial.ui" && rUIFile != "cui/ui/percentdialog.ui" && rUIFile != "cui/ui/signatureline.ui" && rUIFile != "cui/ui/tipofthedaydialog.ui" && _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits