Merge lp:~cimi/unity8/dash-filtergrid-renderers into lp:unity8

[Andrea Cimitan]

Make Tile themeable, add renderers for Dash Plugins and weather

Make Tile themeable, add renderers for Dash Plugins and weather

[lp:~cimi/unity8/dash-filtergrid-renderers]

377. By Andrea Cimitan on 2013-10-03

Add fixme

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:377
http://jenkins.qa.ubuntu.com/job/unity8-ci/1248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4475
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2246/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2060
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/271
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1247/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/350
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2248
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2248/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1917/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1934

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'Components/Tile.qml'
--- Components/Tile.qml	2013-08-05 15:02:05 +0000
+++ Components/Tile.qml	2013-10-03 16:28:24 +0000
@@ -18,70 +18,13 @@
 import Ubuntu.Components 0.1
 
 AbstractButton {
-    id: root
-    property alias source: image.source
-    property alias fillMode: image.fillMode
-    property alias horizontalAlignment: image.horizontalAlignment
-    property alias verticalAlignment: image.verticalAlignment
-    property alias text: label.text
+    property url source
+    property int fillMode
+    property int horizontalAlignment
+    property int verticalAlignment
+    property string text
     property int imageWidth
     property int imageHeight
 
-    UbuntuShape {
-        id: icon
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-        }
-        radius: "medium"
-        width: imageWidth
-        height: imageHeight
-        image: Image {
-            id: image
-            objectName: "image"
-            sourceSize { width: icon.width; height: icon.height }
-            asynchronous: true
-            cache: false
-        }
-    }
-
-    UbuntuShape {
-        id: borderPressed
-        objectName: "borderPressed"
-
-        anchors.fill: icon
-        radius: "medium"
-        borderSource: "radius_pressed.sci"
-        opacity: root.pressed ? 1.0 : 0.0
-        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
-    }
-
-    Item {
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: icon.bottom
-        }
-        height: units.gu(2)
-
-        Label {
-            id: label
-            objectName: "label"
-            anchors {
-                baseline: parent.bottom
-                left: parent.left
-                right: parent.right
-                leftMargin: units.gu(1)
-                rightMargin: units.gu(1)
-            }
-
-            color: Theme.palette.selected.backgroundText
-            opacity: 0.9
-            style: Text.Raised
-            styleColor: "black"
-            fontSize: "small"
-            elide: Text.ElideMiddle
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
+    style: TileStyle {}
 }

=== added file 'Components/TileStyle.qml'
--- Components/TileStyle.qml	1970-01-01 00:00:00 +0000
+++ Components/TileStyle.qml	2013-10-03 16:28:24 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: tile
+
+    anchors.fill: parent
+
+    UbuntuShape {
+        id: icon
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+        radius: "medium"
+        width: styledItem.imageWidth
+        height: styledItem.imageHeight
+        image: Image {
+            id: image
+            objectName: "image"
+            sourceSize { width: icon.width; height: icon.height }
+            asynchronous: true
+            cache: false
+            source: styledItem.source
+            fillMode: styledItem.fillMode
+            horizontalAlignment: styledItem.horizontalAlignment
+            verticalAlignment: styledItem.verticalAlignment
+        }
+    }
+
+    UbuntuShape {
+        id: borderPressed
+        objectName: "borderPressed"
+
+        anchors.fill: icon
+        radius: "medium"
+        borderSource: "radius_pressed.sci"
+        opacity: styledItem.pressed ? 1.0 : 0.0
+        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
+    }
+
+    Item {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: icon.bottom
+        }
+        height: units.gu(2)
+
+        Label {
+            id: label
+            objectName: "label"
+            anchors {
+                baseline: parent.bottom
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+
+            color: Theme.palette.selected.backgroundText
+            opacity: 0.9
+            style: Text.Raised
+            styleColor: "black"
+            fontSize: "small"
+            elide: Text.ElideMiddle
+            horizontalAlignment: Text.AlignHCenter
+            text: styledItem.text
+        }
+    }
+}

=== added file 'Dash/Apps/DashPluginFilterGrid.qml'
--- Dash/Apps/DashPluginFilterGrid.qml	1970-01-01 00:00:00 +0000
+++ Dash/Apps/DashPluginFilterGrid.qml	2013-10-03 16:28:24 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+import "../../Components"
+import "../Generic"
+
+GenericFilterGrid {
+    id: filtergrid
+
+    delegate: Tile {
+        id: tile
+        objectName: "delegate" + index
+        width: filtergrid.cellWidth
+        height: filtergrid.cellHeight
+        text: model.title
+        imageWidth: filtergrid.iconWidth
+        imageHeight: filtergrid.iconHeight
+        source: model.icon
+        fillMode: Image.PreserveAspectCrop
+
+        style: FlatTileStyle {
+            disabled: model.scopeDisabled
+        }
+
+        onClicked: {
+            var data = { model: model }
+            filtergrid.clicked(index, data, tile.y)
+        }
+
+        onPressAndHold: {
+            var data = { model: model }
+            filtergrid.pressAndHold(index, data, tile.y)
+        }
+    }
+}

=== added file 'Dash/Generic/FlatTileStyle.qml'
--- Dash/Generic/FlatTileStyle.qml	1970-01-01 00:00:00 +0000
+++ Dash/Generic/FlatTileStyle.qml	2013-10-03 16:28:24 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: tile
+
+    property bool disabled: false
+
+    anchors.fill: parent
+
+    Item {
+        id: icon
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: styledItem.imageWidth
+        height: styledItem.imageHeight
+
+        Image {
+            id: image
+            objectName: "image"
+            sourceSize { width: icon.width; height: icon.height }
+            asynchronous: true
+            cache: false
+            source: styledItem.source
+            fillMode: styledItem.fillMode
+            opacity: tile.disabled ? 0.5 : 1.0
+            horizontalAlignment: styledItem.horizontalAlignment
+            verticalAlignment: styledItem.verticalAlignment
+        }
+    }
+
+    UbuntuShape {
+        id: borderPressed
+        objectName: "borderPressed"
+
+        anchors.fill: icon
+        radius: "medium"
+        borderSource: "radius_pressed.sci"
+        opacity: styledItem.pressed ? 1.0 : 0.0
+        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
+    }
+
+    Item {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: icon.bottom
+        }
+        height: units.gu(2)
+
+        Label {
+            id: label
+            objectName: "label"
+            anchors {
+                baseline: parent.bottom
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+
+            color: Theme.palette.selected.backgroundText
+            opacity: 0.9
+            style: Text.Raised
+            styleColor: "black"
+            fontSize: "small"
+            elide: Text.ElideMiddle
+            horizontalAlignment: Text.AlignHCenter
+            text: styledItem.text
+        }
+    }
+}

=== modified file 'Dash/Generic/GenericFilterGrid.qml'
--- Dash/Generic/GenericFilterGrid.qml	2013-09-05 10:02:00 +0000
+++ Dash/Generic/GenericFilterGrid.qml	2013-10-03 16:28:24 +0000
@@ -39,9 +39,7 @@
         text: model.title
         imageWidth: filtergrid.iconWidth
         imageHeight: filtergrid.iconHeight
-
         source: model.icon
-
         fillMode: Image.PreserveAspectCrop
 
         onClicked: {

=== added file 'Dash/Generic/WeatherFilterGrid.qml'
--- Dash/Generic/WeatherFilterGrid.qml	1970-01-01 00:00:00 +0000
+++ Dash/Generic/WeatherFilterGrid.qml	2013-10-03 16:28:24 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+import "../../Components"
+
+GenericFilterGrid {
+    id: filtergrid
+
+    delegate: Tile {
+        id: tile
+        objectName: "delegate" + index
+        width: filtergrid.cellWidth
+        height: filtergrid.cellHeight
+        text: model.title
+        imageWidth: filtergrid.iconWidth
+        imageHeight: filtergrid.iconHeight
+        source: model.icon
+        fillMode: Image.PreserveAspectCrop
+
+        style: FlatTileStyle {}
+
+        onClicked: {
+            var data = { model: model }
+            filtergrid.clicked(index, data, tile.y)
+        }
+
+        onPressAndHold: {
+            var data = { model: model }
+            filtergrid.pressAndHold(index, data, tile.y)
+        }
+    }
+}

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-10-03 16:28:24 +0000
+++ Dash/GenericScopeView.qml	2013-10-03 16:28:24 +0000
@@ -209,6 +209,13 @@
                 switch (contentType) {
                     case "video": return "Generic/GenericFilterGridPotrait.qml";
                     case "music": return "Music/MusicFilterGrid.qml";
+                    case "apps": {
+                        if (rendererHint == "toggled")
+                            return "Apps/DashPluginFilterGrid.qml";
+                        else
+                            return "Generic/GenericFilterGrid.qml";
+                    }
+                    case "weather": return "Generic/WeatherFilterGrid.qml";
                     default: return "Generic/GenericFilterGrid.qml";
                 }
             }

=== modified file 'plugins/Unity/categoryresults.cpp'
--- plugins/Unity/categoryresults.cpp	2013-10-01 15:46:09 +0000
+++ plugins/Unity/categoryresults.cpp	2013-10-03 16:28:24 +0000
@@ -46,6 +46,7 @@
     m_roles[CategoryResults::RoleComment] = "comment";
     m_roles[CategoryResults::RoleDndUri] = "dndUri";
     m_roles[CategoryResults::RoleMetadata] = "metadata";
+    m_roles[CategoryResults::RoleMetadataScopeDisabled] = "scopeDisabled";
 }
 
 int CategoryResults::categoryIndex() const
@@ -100,6 +101,17 @@
             return DeeListModel::data(index, ResultsColumn::DND_URI);
         case RoleMetadata:
             return DeeListModel::data(index, ResultsColumn::METADATA);
+        // FIXME nasty hack while we don't support annotated icons
+        case RoleMetadataScopeDisabled: {
+            QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());
+            if (hash.contains("content")) {
+                QVariantHash innerHash(hash["content"].toHash());
+                if (innerHash.contains("scope_disabled")) {
+                    return innerHash["scope_disabled"];
+                }
+            }
+            return QVariant();
+        }
         default:
             return QVariant();
     }

=== modified file 'plugins/Unity/categoryresults.h'
--- plugins/Unity/categoryresults.h	2013-09-05 11:48:57 +0000
+++ plugins/Unity/categoryresults.h	2013-10-03 16:28:24 +0000
@@ -43,7 +43,8 @@
         RoleTitle,
         RoleComment,
         RoleDndUri,
-        RoleMetadata
+        RoleMetadata,
+        RoleMetadataScopeDisabled
     };
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;