|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2.changes
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/tohkbd2.git</param>
<param name="branch">master</param>
- <param name="revision">69101e01e019a178eeebc84e9161e662f8cfc03a</param>
+ <param name="revision">7793b40c3f9a073a96fea3a01917e87a36beea8f</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/src/userdaemon.cpp
^
|
| @@ -1,5 +1,8 @@
#include <stdio.h>
#include <sailfishapp.h>
+#include <QHostAddress>
+#include <QtSystemInfo/QDeviceInfo>
+
#include "userdaemon.h"
static const char *SERVICE = SERVICE_NAME;
@@ -15,6 +18,20 @@
physicalLayout = new MGConfItem("/desktop/lipstick-jolla-home/layout");
connect(physicalLayout, SIGNAL(valueChanged()), this, SLOT(handlePhysicalLayout()));
+
+ /* Remove tohkbd from enabled layouts if vkb is hidden by maliit.
+ * The related PR is merged in maliit-framework and should be in 2.0 */
+ if (checkSailfishVersion("2.0.0.0"))
+ {
+ QString tohlayout("harbour-tohkbd2.qml");
+ MGConfItem el("/sailfish/text_input/enabled_layouts");
+ QStringList list = el.value().toStringList();
+ if (list.contains(tohlayout))
+ {
+ list.removeAll(tohlayout);
+ el.set(list);
+ }
+ }
}
UserDaemon::~UserDaemon()
@@ -269,3 +286,15 @@
MGConfItem keymapVariant("/desktop/lipstick-jolla-home/variant");
keymapVariant.set(value);
}
+
+/*
+ * Check that Sailfish version is at least required version
+ */
+bool UserDaemon::checkSailfishVersion(QString versionToCompare)
+{
+ QDeviceInfo deviceInfo;
+ QString sailfishVersion = deviceInfo.version(QDeviceInfo::Os);
+
+ return (QHostAddress(sailfishVersion).toIPv4Address()
+ >= QHostAddress(versionToCompare).toIPv4Address());
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/src/userdaemon.h
^
|
| @@ -57,6 +57,7 @@
private:
void showNotification(const QString &text);
+ bool checkSailfishVersion(QString versionToCompare);
bool m_dbusRegistered;
bool m_launchPending;
MGConfItem *physicalLayout;
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.5.19.tar.bz2/user-daemon/user-daemon.pro
^
|
| @@ -2,8 +2,9 @@
CONFIG += sailfishapp link_pkgconfig
PKGCONFIG += sailfishapp mlite5 nemonotifications-qt5
+PKGCONFIG += Qt5SystemInfo
-QT += dbus gui-private
+QT += dbus network gui-private
system(lupdate src qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
system(lrelease -idbased $$PWD/i18n/*.ts)
|
