summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail..com>2019-12-23 23:55:26 -0900
committerJim Raykowski <raykowj@gmail.com>2019-12-31 08:18:19 +0100
commit444f0d256957544d26b9af9a0898364e829df1b5 (patch)
treead61d45cf9aabb6b933cf5b83f48a2db2c400201
parent6fce7cd0b10ae83f973bb9897fc878da0b52a600 (diff)
tdf#108458 related: Make command tooltip show in tooltip
Make Customize > Keyboard > Function TreeView show command tooltip in the tooltip. Change-Id: I5d2ca7090e00d7c18d792da73c567cdfd6895da2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85776 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
-rw-r--r--cui/source/customize/cfgutil.cxx3
-rw-r--r--cui/uiconfig/ui/accelconfigpage.ui1
2 files changed, 4 insertions, 0 deletions
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index e52ed440d311..d181470df57f 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -599,11 +599,14 @@ void CuiConfigGroupListBox::FillFunctionsList(const css::uno::Sequence<DispatchI
m_pFunctionListBox->freeze();
for (const auto & rInfo : xCommands)
{
+ auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(rInfo.Command, m_sModuleLongName);
+
OUString sUIName = MapCommand2UIName(rInfo.Command);
aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) );
SfxGroupInfo_Impl* pGrpInfo = aArr.back().get();
pGrpInfo->sCommand = rInfo.Command;
pGrpInfo->sLabel = sUIName;
+ pGrpInfo->sTooltip = vcl::CommandInfoProvider::GetTooltipForCommand(rInfo.Command, aProperties, m_xFrame);
m_pFunctionListBox->append(OUString::number(reinterpret_cast<sal_Int64>(pGrpInfo)), sUIName);
}
m_pFunctionListBox->thaw();
diff --git a/cui/uiconfig/ui/accelconfigpage.ui b/cui/uiconfig/ui/accelconfigpage.ui
index 61f01d016892..83159c789fb5 100644
--- a/cui/uiconfig/ui/accelconfigpage.ui
+++ b/cui/uiconfig/ui/accelconfigpage.ui
@@ -433,6 +433,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>