added logo

sailfish-containers · Jul 15, 2020 · b5ad542 · b5ad542
1 parent bec807c
commit b5ad542
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/qml/images/sailfishcontainers.png b/qml/images/sailfishcontainers.png
diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
@@ -46,17 +46,23 @@ Page {
     id: root
     objectName: "firstPage"
 
+    Image {
+        id: hintLogo
+        anchors.centerIn: parent
+        source: "../images/sailfishcontainers.png"
+    }
+
     Label {
         id: hintLabel
-        anchors.centerIn: parent
-        text: "No Xwayland window"
+        anchors.bottom: hintLogo.bottom
+        text: "Waiting Xwayland window..."
+        anchors.horizontalCenter: parent.horizontalCenter
         font.pixelSize: Theme.fontSizeLarge
     }
 
     property variant selectedWindow: null
     property bool hasFullscreenWindow: typeof compositor != "undefined" && compositor.fullscreenSurface !== null
 
-
     function windowAdded(window) {
         var windowContainerComponent = Qt.createComponent("../compositor/XWaylandContainer.qml");
         if (windowContainerComponent.status !== Component.Ready) {
@@ -73,6 +79,7 @@ Page {
         windowContainer.child.touchEventsEnabled = true;
 
         hintLabel.visible = false
+        hintLogo.visible = false
 
         root.selectedWindow = windowContainer.child
         windowContainer.child.takeFocus()

diff --git a/qxdisplay.pro b/qxdisplay.pro
@@ -35,10 +35,11 @@ SOURCES += \
 
 OTHER_FILES += \
     qml/cover/CoverPage.qml \
-    qml/pages/FirstPage.qml \
+    qml/pages/FirstPage.qml
 
 DISTFILES += \
     qml/compositor/XWaylandContainer.qml \
+    qml/images/sailfishcontainers.png \
     qml/qxcompositor.qml \
     rpm/qxdisplay.changes.in \
     rpm/qxdisplay.spec

diff --git a/rpm/qxdisplay.spec b/rpm/qxdisplay.spec
@@ -6,7 +6,7 @@ Name:       qxdisplay
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    My Sailfish OS Application
 Version:    0.1
-Release:    1
+Release:    2
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/

diff --git a/src/qmlcompositor.h b/src/qmlcompositor.h
@@ -11,7 +11,7 @@ class QmlCompositor : public QObject, public QWaylandQuickCompositor
     Q_PROPERTY(QWaylandQuickSurface* fullscreenSurface READ fullscreenSurface WRITE setFullscreenSurface NOTIFY fullscreenSurfaceChanged)
 
 public:
-    QmlCompositor(QQuickView *quickView, const char *socketName = 0, const char *screenOrientationOption="landscape");
+    QmlCompositor(QQuickView *quickView, const char *socketName = 0, const char *screenOrientationOption=qPrintable("landscape"));
 
     QWaylandQuickSurface *fullscreenSurface() const;