diff options
| -rw-r--r-- | qml/ApplicationIcon.qml | 2 | ||||
| -rw-r--r-- | qml/LaunchScreen.qml | 8 | ||||
| -rw-r--r-- | qml/Main.qml | 28 | ||||
| -rw-r--r-- | qt_run.sh | 9 |
4 files changed, 36 insertions, 11 deletions
diff --git a/qml/ApplicationIcon.qml b/qml/ApplicationIcon.qml index 9fdcbdf..81298b7 100644 --- a/qml/ApplicationIcon.qml +++ b/qml/ApplicationIcon.qml @@ -83,7 +83,7 @@ Item { varying highp vec2 v_TexCoord; void main() { - gl_FragColor = texture2D(source, v_TexCoord) * qt_Opacity * selection; + gl_FragColor = vec4(texture2D(source, v_TexCoord).rgb * selection, 1.0) * qt_Opacity; } " } diff --git a/qml/LaunchScreen.qml b/qml/LaunchScreen.qml index ee518be..371c12e 100644 --- a/qml/LaunchScreen.qml +++ b/qml/LaunchScreen.qml @@ -92,6 +92,14 @@ Item { } onCountChanged: if (count > 0 && currentIndex < 0) currentIndex = 0 + + MouseArea { + anchors.fill: parent + onPressed: { + animateToCenter.stop() + mouse.accepted = false + } + } } Text { diff --git a/qml/Main.qml b/qml/Main.qml index 667053e..a56e851 100644 --- a/qml/Main.qml +++ b/qml/Main.qml @@ -16,7 +16,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 Item { id: root @@ -27,11 +27,14 @@ Item { property int stateDelay: 400; property int bootDelay: 1000; + property color qtpurple: '#ae32a0' + states: [ State { name: "booting" PropertyChanges { target: appGrid; opacity: 0 } PropertyChanges { target: splashScreen; opacity: 0 } + PropertyChanges { target: url; opacity: 0 } }, State { name: "running" @@ -49,6 +52,7 @@ Item { PropertyChanges { target: applicationLoader; opacity: 1 } PropertyChanges { target: appGrid; opacity: 0 } PropertyChanges { target: splashScreen; opacity: 0 } + PropertyChanges { target: url; opacity: 0 } }, State { name: "app-closing" @@ -293,4 +297,26 @@ Item { } } + Item { + id: url + anchors.bottom: parent.bottom; + anchors.horizontalCenter: parent.horizontalCenter; + anchors.margins: height/2 + width: urlLabel.width + height: urlLabel.height + + Rectangle { + color: "black" + opacity: 0.7 + anchors.fill: urlLabel + } + + Text { + id: urlLabel; + text: "qt.digia.com/QtEnterpriseEmbedded" + color: qtpurple + font.pixelSize: engine.sensibleButtonSize() * 0.2 + font.bold: true + } + } } diff --git a/qt_run.sh b/qt_run.sh deleted file mode 100644 index e65d94f..0000000 --- a/qt_run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/system/bin/sh - -export QT_QPA_EGLFS_NO_SURFACEFLINGER=1 -export QT_QPA_EGLFS_HIDECURSOR=1 - -export QMLSCENE_DEVICE=customcontext -export CUSTOMCONTEXT_NO_MULTISAMPLE=1 - -/system/bin/qtlauncher -plugin evdevtouch:/dev/input/event0 --logcat --single-process |