diff options
| author | Vasily Melenchuk <Vasily.Melenchuk@cib.de> | 2018-04-10 15:18:59 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-04-11 15:01:02 +0200 |
| commit | 2a34a745d776bc762de365342f13271ede29a65d (patch) | |
| tree | cc9e31d88b84b68f27d761c604a711dc971a8c62 /sd | |
| parent | e401663fa338c04aa3c3422a8f268c732816f5bc (diff) | |
sd: update tooltips on hyperlink hover
Show "Ctrl-click to open..." or "Click to open..." depending on
security options.
Reviewed-on: https://gerrit.libreoffice.org/52672
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Conflicts:
sd/inc/strings.hrc
sd/source/ui/func/fudraw.cxx
Change-Id: I93024a894967ddd378cc436efffb22302f6034d7
Reviewed-on: https://gerrit.libreoffice.org/52723
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/glob.hrc | 3 | ||||
| -rw-r--r-- | sd/source/core/glob.src | 10 | ||||
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 26 |
3 files changed, 38 insertions, 1 deletions
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 0ec289c7ab0e..ec27eba3b4ec 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -140,6 +140,9 @@ #define STR_SHRINK_FONT_SIZE RID_GLOB_START+232 #define STR_GROW_FONT_SIZE RID_GLOB_START+233 +#define STR_CTRLCLICKHYPERLINK RID_GLOB_START+234 +#define STR_CLICKHYPERLINK RID_GLOB_START+235 + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index d158cccf0414..1f45382f0ec6 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -400,4 +400,14 @@ String STR_GROW_FONT_SIZE Text [ en-US ] = "Grow font size"; }; + +String STR_CTRLCLICKHYPERLINK +{ + Text [ en-US ] = "%s-click to follow hyperlink: "; +}; +String STR_CLICKHYPERLINK +{ + Text [ en-US ] = "Click to open hyperlink: "; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 4e684288558e..c51d78edd5e9 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -62,6 +62,7 @@ #include <vcl/msgbox.hxx> #include "slideshow.hxx" #include <svx/sdrhittesthelper.hxx> +#include <unotools/securityoptions.hxx> using namespace ::com::sun::star; @@ -914,7 +915,30 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE /************************************************************** * URL-Field **************************************************************/ - aHelpText = INetURLObject::decode( rVEvt.pURLField->GetURL(), INetURLObject::DECODE_WITH_CHARSET ); + OUString aURL = INetURLObject::decode( rVEvt.pURLField->GetURL(), INetURLObject::DECODE_WITH_CHARSET ); + + SvtSecurityOptions aSecOpt; + if (aSecOpt.IsOptionSet(SvtSecurityOptions::E_CTRLCLICK_HYPERLINK)) + { + // 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 = SD_RESSTR(STR_CTRLCLICKHYPERLINK); + + aCtrlClickHlinkStr = aCtrlClickHlinkStr.replaceAll("%s", aModStr); + + aHelpText = aCtrlClickHlinkStr + aURL; + } + else + { + // Hint about just clicking hyperlink + aHelpText = SD_RESSTR(STR_CLICKHYPERLINK) + aURL; + } } if (!aHelpText.isEmpty()) |