diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-01-29 10:51:49 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-05-27 22:11:48 +0100 |
| commit | aa8c235386dd4075cd25ec38f7a09eb1e7877b32 (patch) | |
| tree | bdd10177b9d2525b7369cbf2df80e31904ccfcca | |
| parent | 84a6fb2367ac2bf3d2d1763cf7c1a246c11870b7 (diff) | |
android lok: Correct the hint in the slides from click to double-tap.
Change-Id: I71744dc48f50115c9b4245ac2c81a6431ecbdce6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87678
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | sd/inc/strings.hrc | 4 | ||||
| -rw-r--r-- | sd/source/core/sdpage.cxx | 33 |
2 files changed, 21 insertions, 16 deletions
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 1eeb0c178976..9d7bdfd5b58f 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -306,6 +306,10 @@ #define STR_PRESOBJ_OUTLINE NC_("STR_PRESOBJ_OUTLINE", "Click to add Text" ) #define STR_PRESOBJ_TEXT NC_("STR_PRESOBJ_TEXT", "Click to add Text" ) #define STR_PRESOBJ_NOTESTEXT NC_("STR_PRESOBJ_NOTESTEXT", "Click to add Notes" ) +#define STR_PRESOBJ_TITLE_MOBILE NC_("STR_PRESOBJ_TITLE_MOBILE", "Double-tap to add Title" ) +#define STR_PRESOBJ_OUTLINE_MOBILE NC_("STR_PRESOBJ_OUTLINE_MOBILE", "Double-tap to add Text" ) +#define STR_PRESOBJ_TEXT_MOBILE NC_("STR_PRESOBJ_TEXT_MOBILE", "Double-tap to add Text" ) +#define STR_PRESOBJ_NOTESTEXT_MOBILE NC_("STR_PRESOBJ_NOTESTEXT_MOBILE", "Double-tap to add Notes" ) #define STR_PRESOBJ_GRAPHIC NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" ) #define STR_PRESOBJ_OBJECT NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" ) #define STR_PRESOBJ_CHART NC_("STR_PRESOBJ_CHART", "Double-click to add a Chart" ) diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index ffbd3ff1041f..622a21949f4c 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -21,6 +21,7 @@ #include <comphelper/classids.hxx> #include <comphelper/embeddedobjectcontainer.hxx> +#include <comphelper/lok.hxx> #include <vcl/svapp.hxx> #include <editeng/outliner.hxx> @@ -35,6 +36,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svdopage.hxx> +#include <sfx2/lokhelper.hxx> #include <editeng/pbinitem.hxx> #include <svx/svdundo.hxx> #include <svl/hint.hxx> @@ -2602,36 +2604,35 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) const aString = SdResId( STR_PRESOBJ_MPNOTESTITLE ); } } + else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())) + aString = SdResId(STR_PRESOBJ_TITLE_MOBILE); else - { - aString = SdResId( STR_PRESOBJ_TITLE ); - } + aString = SdResId(STR_PRESOBJ_TITLE); } else if (eObjKind == PRESOBJ_OUTLINE) { if (mbMaster) - { - aString = SdResId( STR_PRESOBJ_MPOUTLINE ); - } + aString = SdResId(STR_PRESOBJ_MPOUTLINE); + else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())) + aString = SdResId(STR_PRESOBJ_OUTLINE_MOBILE); else - { - aString = SdResId( STR_PRESOBJ_OUTLINE ); - } + aString = SdResId(STR_PRESOBJ_OUTLINE); } else if (eObjKind == PRESOBJ_NOTES) { if (mbMaster) - { - aString = SdResId( STR_PRESOBJ_MPNOTESTEXT ); - } + aString = SdResId(STR_PRESOBJ_MPNOTESTEXT); + else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())) + aString = SdResId(STR_PRESOBJ_NOTESTEXT_MOBILE); else - { - aString = SdResId( STR_PRESOBJ_NOTESTEXT ); - } + aString = SdResId(STR_PRESOBJ_NOTESTEXT); } else if (eObjKind == PRESOBJ_TEXT) { - aString = SdResId( STR_PRESOBJ_TEXT ); + if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())) + aString = SdResId(STR_PRESOBJ_TEXT_MOBILE); + else + aString = SdResId(STR_PRESOBJ_TEXT); } else if (eObjKind == PRESOBJ_GRAPHIC) { |