sd/inc/strings.hrc | 4 ++++
sd/source/core/sdpage.cxx | 33 +++++++++++++++++----------------
2 files changed, 21 insertions(+), 16 deletions(-)
New commits:
commit 74e46a9f2e55a1e918e03efe269abcb93cc1a10d
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Wed Jan 29 10:51:49 2020 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Sat Feb 1 09:25:40 2020 +0100
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 <ke...@collabora.com>
Tested-by: Jenkins
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 3d1d90273395..0f188c5b1227 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -304,6 +304,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 5ce948618f18..ab91aec1d9d2 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>
@@ -2611,36 +2613,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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
