Initial multi-monitor support

When an external screen appears, move the shell to it
ubports · Oct 2, 2015 · 391f833 · 391f833
1 parent 7d01e2f
commit 391f833
Show file tree

Hide file tree

Showing 13 changed files with 512 additions and 133 deletions.
diff --git a/qml/Components/BackgroundResolver.qml b/qml/Components/BackgroundResolver.qml
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import AccountsService 0.1
+import GSettings 1.0
+import Ubuntu.Components 1.3
+
+/*
+    Defines the background URL based on several factors, such as:
+        - default, fallback, background
+        - Background set in AccountSettings, if any
+        - Background set in GSettings, if any
+ */
+QtObject {
+    /*
+        Users should set their UI width here.
+     */
+    property real width
+
+    property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
+                                                                         : "../graphics/phone_background.jpg")
+
+    /*
+        That's the property users of this component are going to consume.
+     */
+    readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
+                                    : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
+
+    // This is a dummy image to detect if the custom AS set wallpaper loads successfully.
+    property var _asImageTester: Image {
+        id: asImageTester
+        source: "Adas"//AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
+        height: 0
+        width: 0
+        sourceSize.height: 0
+        sourceSize.width: 0
+    }
+
+    // This is a dummy image to detect if the custom GSettings set wallpaper loads successfully.
+    property var _gsImageTester: Image {
+        id: gsImageTester
+        source: backgroundSettings.pictureUri && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : ""
+        height: 0
+        width: 0
+        sourceSize.height: 0
+        sourceSize.width: 0
+    }
+
+    property var _gsettings: GSettings {
+        id: backgroundSettings
+        schema.id: "org.gnome.desktop.background"
+    }
+}
diff --git a/qml/SecondaryDisplay.qml b/qml/SecondaryDisplay.qml
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import "Components"
+
+Image {
+    id: root
+
+    BackgroundResolver {
+        width: root.width
+        id: bgResolver
+    }
+
+    source: bgResolver.background
+
+    UbuntuShape {
+        anchors.fill: text
+        anchors.margins: -units.gu(2)
+        backgroundColor: "black"
+        opacity: 0.4
+    }
+
+    Label {
+        id: text
+        anchors.centerIn: parent
+        width: parent.width / 2
+        text: i18n.tr("Your device is now connected to an external display.")
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        fontSize: "x-large"
+        wrapMode: Text.Wrap
+    }
+}
diff --git a/qml/Shell.qml b/qml/Shell.qml
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import QtQuick.Window 2.0
 import AccountsService 0.1
-import GSettings 1.0
 import Unity.Application 0.1
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 1.0
@@ -108,9 +107,11 @@ Item {
     enabled: greeter && !greeter.waiting
 
     property real edgeSize: units.gu(2)
-    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
-    property url background: asImageTester.status == Image.Ready ? asImageTester.source
-                             : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
+
+    BackgroundResolver {
+        id: bgResolver
+        width: shell.width
+    }
 
     readonly property alias greeter: greeterLoader.item
 
@@ -131,31 +132,6 @@ Item {
         shell.activateApplication(app);
     }
 
-    // This is a dummy image to detect if the custom AS set wallpaper loads successfully.
-    Image {
-        id: asImageTester
-        source: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
-        height: 0
-        width: 0
-        sourceSize.height: 0
-        sourceSize.width: 0
-    }
-
-    GSettings {
-        id: backgroundSettings
-        schema.id: "org.gnome.desktop.background"
-    }
-
-    // This is a dummy image to detect if the custom GSettings set wallpaper loads successfully.
-    Image {
-        id: gsImageTester
-        source: backgroundSettings.pictureUri && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : ""
-        height: 0
-        width: 0
-        sourceSize.height: 0
-        sourceSize.width: 0
-    }
-
     Binding {
         target: LauncherModel
         property: "applicationManager"
@@ -323,7 +299,7 @@ Item {
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "background"
-                value: shell.background
+                value: bgResolver.background
             }
             Binding {
                 target: applicationsDisplayLoader.item
@@ -428,7 +404,7 @@ Item {
             tabletMode: shell.usageScenario != "phone"
             launcherOffset: launcher.progress
             forcedUnlock: tutorial.running
-            background: shell.background
+            background: bgResolver.background
 
             // avoid overlapping with Launcher's edge drag area
             // FIXME: Fix TouchRegistry & friends and remove this workaround
@@ -603,7 +579,7 @@ Item {
             id: wizard
             objectName: "wizard"
             anchors.fill: parent
-            background: shell.background
+            background: bgResolver.background
 
             function unlockWhenDoneWithWizard() {
                 if (!active) {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,6 +21,9 @@ add_executable(${SHELL_APP}
     main.cpp
     MouseTouchAdaptor.cpp
     CachingNetworkManagerFactory.cpp
+    SecondaryWindow.cpp
+    ShellApplication.cpp
+    ShellView.cpp
     UnityCommandLineParser.cpp
     ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
 )

diff --git a/src/SecondaryWindow.cpp b/src/SecondaryWindow.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "SecondaryWindow.h"
+
+// local
+#include <paths.h>
+
+SecondaryWindow::SecondaryWindow(QQmlEngine *engine)
+    : QQuickView(engine, nullptr)
+{
+    setResizeMode(QQuickView::SizeRootObjectToView);
+    setColor("black");
+    setTitle(QStringLiteral("Unity8 Shell - Secundary Screen"));
+
+    QUrl source(::qmlDirectory() + "/SecondaryDisplay.qml");
+    setSource(source);
+}
diff --git a/src/SecondaryWindow.h b/src/SecondaryWindow.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SECONDARY_WINDOW_H
+#define UNITY_SECONDARY_WINDOW_H
+
+#include <QQuickView>
+
+class SecondaryWindow : public QQuickView
+{
+    Q_OBJECT
+
+public:
+    SecondaryWindow(QQmlEngine *engine);
+};
+
+#endif // UNITY_SECONDARY_WINDOW_H