Kaydet (Commit) 0310815d authored tarafından Vasily Melenchuk's avatar Vasily Melenchuk Kaydeden (comit) Samuel Mehrbrodt

sd: update tooltips on hyperlink hover

Show "Ctrl-click to open..." or "Click to open..." depending on
security options.

Change-Id: I93024a894967ddd378cc436efffb22302f6034d7
Reviewed-on: https://gerrit.libreoffice.org/52672Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 46f9fb52
......@@ -469,6 +469,9 @@
#define STR_SD_NONE NC_("STR_SD_NONE", "- None -")
#define STR_CTRLCLICKHYPERLINK NC_("STR_CTRLCLICKHYPERLINK", "%s-click to follow hyperlink: ")
#define STR_CLICKHYPERLINK NC_("STR_CLICKHYPERLINK", "Click to open hyperlink: ")
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -61,6 +61,7 @@
#include <vcl/weld.hxx>
#include <slideshow.hxx>
#include <svx/sdrhittesthelper.hxx>
#include <unotools/securityoptions.hxx>
using namespace ::com::sun::star;
......@@ -902,7 +903,30 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
/**************************************************************
* URL-Field
**************************************************************/
aHelpText = INetURLObject::decode( rVEvt.pURLField->GetURL(), INetURLObject::DecodeMechanism::WithCharset );
OUString aURL = INetURLObject::decode( rVEvt.pURLField->GetURL(), INetURLObject::DecodeMechanism::WithCharset );
SvtSecurityOptions aSecOpt;
if (aSecOpt.IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink))
{
// Hint about Ctrl-click to open hyperlink
// But need to detect "Ctrl" key for MacOs
vcl::KeyCode aCode(KEY_SPACE);
vcl::KeyCode aModifiedCode(KEY_SPACE, KEY_MOD1);
OUString aModStr(aModifiedCode.GetName());
aModStr = aModStr.replaceFirst(aCode.GetName(), "");
aModStr = aModStr.replaceAll("+", "");
OUString aCtrlClickHlinkStr = SdResId(STR_CTRLCLICKHYPERLINK);
aCtrlClickHlinkStr = aCtrlClickHlinkStr.replaceAll("%s", aModStr);
aHelpText = aCtrlClickHlinkStr + aURL;
}
else
{
// Hint about just clicking hyperlink
aHelpText = SdResId(STR_CLICKHYPERLINK) + aURL;
}
}
if (!aHelpText.isEmpty())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment