Commit 7039a6ec authored by Aleksi Suomalainen's avatar Aleksi Suomalainen Committed by eekkelund

Fixed up pro file and add keyboard support

parent ceb879d0
...@@ -42,6 +42,8 @@ int main(int argc, char **argv) ...@@ -42,6 +42,8 @@ int main(int argc, char **argv)
if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 7) { if (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR > 7) {
app.setCompositorPath("/usr/share/lipstick-glacier-home-qt5/qml/compositor_new.qml"); app.setCompositorPath("/usr/share/lipstick-glacier-home-qt5/qml/compositor_new.qml");
} }
//app.setCompositorPath("/usr/share/lipstick-glacier-home-qt5/qml/GlacierCompositor.qml");
Qt::ScreenOrientation nativeOrientation = app.primaryScreen()->nativeOrientation(); Qt::ScreenOrientation nativeOrientation = app.primaryScreen()->nativeOrientation();
QByteArray v = qgetenv("GLACIER_NATIVEORIENTATION"); QByteArray v = qgetenv("GLACIER_NATIVEORIENTATION");
if (!v.isEmpty()) { if (!v.isEmpty()) {
...@@ -65,6 +67,7 @@ int main(int argc, char **argv) ...@@ -65,6 +67,7 @@ int main(int argc, char **argv)
if (nativeOrientation == Qt::PrimaryOrientation) if (nativeOrientation == Qt::PrimaryOrientation)
nativeOrientation = app.primaryScreen()->primaryOrientation(); nativeOrientation = app.primaryScreen()->primaryOrientation();
app.engine()->rootContext()->setContextProperty("nativeOrientation", nativeOrientation); app.engine()->rootContext()->setContextProperty("nativeOrientation", nativeOrientation);
app.engine()->addImportPath("/usr/lib/qml");
qmlRegisterType<GlacierWindowModel>("org.nemomobile.glacier", 1, 0 ,"GlacierWindowModel"); qmlRegisterType<GlacierWindowModel>("org.nemomobile.glacier", 1, 0 ,"GlacierWindowModel");
app.setQmlPath("/usr/share/lipstick-glacier-home-qt5/qml/MainScreen.qml"); app.setQmlPath("/usr/share/lipstick-glacier-home-qt5/qml/MainScreen.qml");
// Give these to the environment inside the lipstick homescreen // Give these to the environment inside the lipstick homescreen
...@@ -72,6 +75,7 @@ int main(int argc, char **argv) ...@@ -72,6 +75,7 @@ int main(int argc, char **argv)
setenv("EGL_PLATFORM", "wayland", 1); setenv("EGL_PLATFORM", "wayland", 1);
setenv("QT_QPA_PLATFORM", "wayland", 1); setenv("QT_QPA_PLATFORM", "wayland", 1);
setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1);
setenv("QT_IM_MODULE", "qtvirtualkeyboard", 1);
app.mainWindowInstance()->showFullScreen(); app.mainWindowInstance()->showFullScreen();
return app.exec(); return app.exec();
} }
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
import QtQuick 2.6 import QtQuick 2.6
import QtQuick.VirtualKeyboard 2.1
import org.nemomobile.lipstick 0.1 import org.nemomobile.lipstick 0.1
import org.nemomobile.configuration 1.0 import org.nemomobile.configuration 1.0
...@@ -141,6 +142,25 @@ Flickable{ ...@@ -141,6 +142,25 @@ Flickable{
timer.running = true; timer.running = true;
} }
}*/ }*/
InputPanel {
id: inputPanel
visible: Qt.inputMethod.visible
y: Qt.inputMethod.visible ? parent.height - inputPanel.height - statusBarHeight : parent.height
anchors.left: parent.left
anchors.right: parent.right
transitions: Transition {
from: ""; // default initial state
to: "visible";
reversible: true; // toggle visibility with reversible: true;
ParallelAnimation {
NumberAnimation {
properties: "y";
duration: 250;
easing.type: Easing.InOutQuad;
}
}
}
}
footer: Item { footer: Item {
height: Theme.itemHeightLarge*1.5 height: Theme.itemHeightLarge*1.5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment