fpicker/uiconfig/ui/remotefilesdialog.ui | 2 ++ vcl/unx/gtk3/gtkinst.cxx | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
New commits: commit 2a5b91903a4a5572bfd7f6c53799d717838bf8a6 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 19 09:00:07 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Oct 19 11:18:36 2021 +0200 tdf#145216 remote open/save dialog: icon view shows nothing since... commit b004a1bd7bf3885613d52aba70dea79766eae639 Date: Sat Nov 23 19:14:45 2019 +0000 Resolves: tdf#128940 use a normal MenuButton Change-Id: I7ba6424a2a4892e2d6bc5552105a3b1e37d21a41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123777 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui index be7e83f43e03..0a87b3d403de 100644 --- a/fpicker/uiconfig/ui/remotefilesdialog.ui +++ b/fpicker/uiconfig/ui/remotefilesdialog.ui @@ -451,6 +451,8 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore2</property> + <property name="pixbuf_column">0</property> + <property name="text_column">1</property> </object> </child> </object> commit a928c968dc21d7e73172ebd6a55c4f4fae5a992d Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 19 08:44:43 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Oct 19 11:18:26 2021 +0200 Resolves: tdf#136498 %PRODUCTNAME shown in tool tips Change-Id: Id9640f9b5f85a98a510307bc7debf51448c716e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123776 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 727b6b547c36..6bfef76f9ed9 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -21633,9 +21633,18 @@ private: gtk_widget_hide(pWidget); } -#if !GTK_CHECK_VERSION(4, 0, 0) if (m_pStringReplace) { + // tdf#136498 %PRODUCTNAME shown in tool tips + const char* pTooltip = gtk_widget_get_tooltip_text(pWidget); + if (pTooltip && pTooltip[0]) + { + OUString aTooltip(pTooltip, strlen(pTooltip), RTL_TEXTENCODING_UTF8); + aTooltip = (*m_pStringReplace)(aTooltip); + gtk_widget_set_tooltip_text(pWidget, OUStringToOString(aTooltip, RTL_TEXTENCODING_UTF8).getStr()); + } + +#if !GTK_CHECK_VERSION(4, 0, 0) // tdf#142704 %PRODUCTNAME shown in extended tips AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget); const char* pDesc = pAtkObject ? atk_object_get_description(pAtkObject) : nullptr; @@ -21645,8 +21654,8 @@ private: aDesc = (*m_pStringReplace)(aDesc); atk_object_set_description(pAtkObject, OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr()); } - } #endif + } // expand placeholder and collect potentially missing mnemonics if (GTK_IS_BUTTON(pWidget))
