Merge lp:~mzanetti/unity8/desktop-stage into lp:unity8

[Michael Zanetti]

Add an initial, rudimentary DesktopStage to get started

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

yes

 * If you changed the UI, has there been a design review?

not yet, there's no design yet and this is really work in progress

[Gerry Boland (gerboland)]

I love it! Nice and simple. Plenty to do ofc, but great first go.

Only thing that is naughty is the window decoration clipping itself - breaks batching :) but no biggie

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1449
http://jenkins.qa.ubuntu.com/job/unity8-ci/4930/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/278/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/278/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4930/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/unity8-ci/4933/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/98
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/285
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/285/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16012

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4933/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/unity8-ci/4938/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/292
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16046

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4938/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/unity8-ci/4942/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/107
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/299
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16066

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4942/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Could it wait until shellRotation gets merged? It surely conflicts with it.

review: Needs Information

[Daniel d'Andrada (dandrader)]

> Could it wait until shellRotation gets merged? It surely conflicts with it.

More specifically, the approach used to select the "stage".

[Michael Zanetti (mzanetti)]

> > Could it wait until shellRotation gets merged? It surely conflicts with it.
>
> More specifically, the approach used to select the "stage".

It really depends on when Shell rotation lands. The fact that this is still waiting is blocking me already quite a bit...

Other than that, I don't think the conflict will be that big. In the end we just need to load the desktop stage if that gsettings option is set and do your stuff in the "else" case.

[Gerry Boland (gerboland)]

Blocking this work on shell rotation is unfair. Desktop support in its own QML files, changes of conflict are small. I'm approving

review: Approve

[Gerry Boland (gerboland)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Waiting for rebuild to complete
 * Did you make sure that the branch does not contain spurious tags?
Y

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/unity8-ci/5002/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/446/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/167
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/390/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/446
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16392

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5002/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in debian/unity8-common.install
1 conflicts encountered.

Note: Was top approved before

review: Needs Fixing

[lp:~mzanetti/unity8/desktop-stage]

1454. By Michael Zanetti on 2014-12-05

merge trunk

=== added file 'com.canonical.Unity8.gschema.xml'
--- com.canonical.Unity8.gschema.xml	1970-01-01 00:00:00 +0000
+++ com.canonical.Unity8.gschema.xml	2014-12-05 11:15:39 +0000
@@ -0,0 +1,14 @@
+<schemalist>
+  <enum id="usage-mode-enum">
+    <value nick="Staged" value="0" />
+    <value nick="Windowed" value="1" />
+  </enum>
+
+  <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">
+    <key enum="usage-mode-enum" name="usage-mode">
+      <default>"Staged"</default>
+      <summary>The usage mode.</summary>
+      <description>The usage mode chosen will affect the Window Management behaviour.</description>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'debian/unity8-common.install'
--- debian/unity8-common.install	2014-11-17 00:36:09 +0000
+++ debian/unity8-common.install	2014-12-05 11:15:39 +0000
@@ -3,4 +3,5 @@
 usr/share/unity8/Dash
 usr/share/unity8/Notifications
 usr/share/unity8/graphics
+com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/
 var/lib/polkit-1/localauthority/10-vendor.d

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-12-02 18:47:49 +0000
+++ qml/Shell.qml	2014-12-05 11:15:39 +0000
@@ -267,7 +267,13 @@
             // the screen larger (maybe connects to monitor) and tries to enter
             // tablet mode.
             property bool tabletMode: shell.sideStageEnabled && !greeter.hasLockedApp
-            source: tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
+            source: usageModeSettings.usageMode === "Windowed" ? "Stages/DesktopStage.qml"
+                        : tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
+
+            GSettings {
+                id: usageModeSettings
+                schema.id: "com.canonical.Unity8"
+            }
 
             Binding {
                 target: applicationsDisplayLoader.item

=== added file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/DesktopStage.qml	2014-12-05 11:15:39 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2014 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Unity.Application 0.1
+
+Item {
+    id: root
+
+    anchors.fill: parent
+
+    Connections {
+        target: ApplicationManager
+        onApplicationAdded: {
+            // Initial placement to avoid having the window decoration behind the panel
+            appRepeater.itemAt(ApplicationManager.count-1).y = units.gu(3)
+            ApplicationManager.requestFocusApplication(ApplicationManager.get(ApplicationManager.count-1).appId)
+        }
+
+        onFocusRequested: {
+            var appIndex = priv.indexOf(appId);
+            var appDelegate = appRepeater.itemAt(appIndex);
+            if (appDelegate.state === "minimized") {
+                appDelegate.state = "normal"
+            }
+            ApplicationManager.focusApplication(appId);
+        }
+    }
+
+    QtObject {
+        id: priv
+        function indexOf(appId) {
+            for (var i = 0; i < ApplicationManager.count; i++) {
+                if (ApplicationManager.get(i).appId == appId) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+    }
+
+    Repeater {
+        id: appRepeater
+        model: ApplicationManager
+
+        delegate: Item {
+            id: appDelegate
+            height: units.gu(30)
+            width: units.gu(30)
+            z: ApplicationManager.count - index
+
+            states: [
+                State {
+                    name: "normal"
+                },
+                State {
+                    name: "maximized"
+                    PropertyChanges { target: appDelegate; x: 0; y: 0; width: root.width; height: root.height }
+                },
+                State {
+                    name: "minimized"
+                    PropertyChanges { target: appDelegate; x: -appDelegate.width / 2; scale: units.gu(5) / appDelegate.width; opacity: 0 }
+                }
+            ]
+            transitions: [
+                Transition {
+                    PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
+                }
+            ]
+
+            BorderImage {
+                anchors {
+                    fill: appDelegate
+                    margins: -units.gu(2)
+                }
+                source: "graphics/dropshadow2gu.sci"
+                opacity: .3
+                Behavior on opacity { UbuntuNumberAnimation {} }
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                anchors.margins: -units.gu(0.5)
+
+                property bool resizeWidth: false
+                property bool resizeHeight: false
+
+                property int startX: 0
+                property int startWidth: 0
+                property int startY: 0
+                property int startHeight: 0
+
+                onPressed: {
+                    ApplicationManager.requestFocusApplication(model.appId)
+                    if (mouseX > width - units.gu(1)) {
+                        resizeWidth = true;
+                        startX = mouseX;
+                        startWidth = appDelegate.width;
+                    }
+                    if (mouseY > height - units.gu(1)) {
+                        resizeHeight = true;
+                        startY = mouseY;
+                        startHeight = appDelegate.height;
+                    }
+                    if (!resizeHeight && !resizeWidth) {
+                        drag.target = appDelegate;
+                    }
+                }
+
+                onMouseXChanged: {
+                    if (resizeWidth) {
+                        appDelegate.width = startWidth + (mouseX - startX)
+                    }
+                }
+                onMouseYChanged: {
+                    if (resizeHeight) {
+                        appDelegate.height = startHeight + (mouseY - startY)
+                    }
+                }
+
+                onReleased: {
+                    resizeWidth = false;
+                    resizeHeight = false;
+                    drag.target = undefined;
+                }
+            }
+
+            WindowDecoration {
+                anchors { left: parent.left; top: parent.top; right: parent.right }
+                height: units.gu(3)
+                title: model.name
+                onClose: ApplicationManager.stopApplication(model.appId)
+                onMaximize: appDelegate.state = (appDelegate.state == "maximized" ? "normal" : "maximized")
+                onMinimize: appDelegate.state = "minimized"
+                active: ApplicationManager.focusedApplicationId == model.appId
+            }
+
+            ApplicationWindow {
+                anchors.fill: parent
+                anchors.topMargin: units.gu(3)
+                application: ApplicationManager.get(index)
+                interactive: index == 0
+            }
+        }
+    }
+}

=== added file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/WindowDecoration.qml	2014-12-05 11:15:39 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2014 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+Item {
+    id: root
+    clip: true
+
+    property alias title: titleLabel.text
+    property bool active: false
+
+    signal close()
+    signal minimize()
+    signal maximize()
+
+    Rectangle {
+        anchors.fill: parent
+        anchors.bottomMargin: -radius
+        radius: units.gu(.5)
+        gradient: Gradient {
+            GradientStop { color: "#626055"; position: 0 }
+            GradientStop { color: "#3C3B37"; position: 1 }
+        }
+    }
+
+    Row {
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; margins: units.gu(0.7) }
+        spacing: units.gu(0.5)
+        opacity: root.active ? 1 : 0.5
+        Rectangle {
+            height: parent.height; width: height; radius: height / 2
+            gradient: Gradient {
+                GradientStop { color: "#F49073"; position: 0 }
+                GradientStop { color: "#DF4F1C"; position: 1 }
+            }
+            border.width: units.dp(.5)
+            border.color: "black"
+            MouseArea { anchors.fill: parent; onClicked: root.close() }
+        }
+        Rectangle {
+            height: parent.height; width: height; radius: height / 2
+            gradient: Gradient {
+                GradientStop { color: "#92918C"; position: 0 }
+                GradientStop { color: "#5E5D58"; position: 1 }
+            }
+            border.width: units.dp(.5)
+            border.color: "black"
+            MouseArea { anchors.fill: parent; onClicked: root.minimize() }
+        }
+        Rectangle {
+            height: parent.height; width: height; radius: height / 2
+            gradient: Gradient {
+                GradientStop { color: "#92918C"; position: 0 }
+                GradientStop { color: "#5E5D58"; position: 1 }
+            }
+            border.width: units.dp(.5)
+            border.color: "black"
+            MouseArea { anchors.fill: parent; onClicked: root.maximize() }
+        }
+
+        Label {
+            id: titleLabel
+            color: "#DFDBD2"
+            height: parent.height
+            verticalAlignment: Text.AlignVCenter
+            fontSize: "small"
+            font.bold: true
+        }
+    }
+}