sd/inc/strings.hrc | 4 ++++ sd/source/core/sdpage.cxx | 33 +++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-)
New commits: commit c0a01ab89682d0e5d159e98af9543671123fec91 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Jan 29 10:51:49 2020 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Wed Jan 29 12:21:45 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/+/87677 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 58fdc3890b01..1869a8509e51 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -303,6 +303,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 6475a933cfb0..63c78998b3cd 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> @@ -36,6 +37,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svdopage.hxx> +#include <sfx2/lokhelper.hxx> #include <sfx2/printer.hxx> #include <basic/basmgr.hxx> #include <editeng/pbinitem.hxx> @@ -2619,36 +2621,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
