From e746cf656d71b78216b65c3352a8441829bbf6db Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Fri, 13 Nov 2015 09:11:34 +0100 Subject: Vcl: Add TooltipLabel to vcl buttons also Change-Id: I332041e2d1d53f56cd38c1cd1ca325252535a53c --- vcl/source/window/builder.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'vcl/source/window/builder.cxx') diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index e39eb6f8435f..626327f90868 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -892,10 +892,14 @@ namespace uno::Reference xModuleManager(frame::ModuleManager::create(xContext)); OUString aModuleId(xModuleManager->identify(rFrame)); - OUString aLabel(VclBuilder::getCommandLabel(aCommand, xContext, aModuleId)); + OUString aLabel(VclBuilder::getCommandProperty("Label", aCommand, xContext, aModuleId)); if (!aLabel.isEmpty()) pButton->SetText(aLabel); + OUString aTooltip(VclBuilder::getCommandProperty("Tooltip", aCommand, xContext, aModuleId)); + if (!aTooltip.isEmpty()) + pButton->SetQuickHelpText(aTooltip); + Image aImage(VclBuilder::getCommandImage(aCommand, /* bLarge = */ false, xContext, rFrame, aModuleId)); pButton->SetModeImage(aImage); @@ -2164,7 +2168,8 @@ void VclBuilder::reorderWithinParent(std::vector& rChilds, bool bI } } -OUString VclBuilder::getCommandLabel(const OUString& rCommand, const uno::Reference& rContext, const OUString& rModuleId) +OUString VclBuilder::getCommandProperty(const OUString aProperty, const OUString& rCommand, + const uno::Reference& rContext, const OUString& rModuleId) { if (rCommand.isEmpty()) return OUString(); @@ -2181,7 +2186,7 @@ OUString VclBuilder::getCommandLabel(const OUString& rCommand, const uno::Refere { for ( sal_Int32 i = 0; i < aProperties.getLength(); i++ ) { - if (aProperties[i].Name == "Label") + if (aProperties[i].Name == aProperty) { OUString aLabel; if (aProperties[i].Value >>= aLabel) -- cgit v1.2.3