Merge lp:~unity-team/unity8/new-scopes-vj-integration into lp:~unity-team/unity8/new-scopes

[Michał Karnicki]

Add VerticalJournal integration.

Add VerticalJournal integration.

[Michał Karnicki (karni)]

PS the abstractjournal.cpp and verticaljournal.cpp changes come from Albert, and have been merged in a different branch already. I added them to avoid crashers.

[Michał Sawicz (saviq)]

Number of columns should be dynamic based on delegate width.

review: Needs Fixing

[lp:~unity-team/unity8/new-scopes-vj-integration]

583. By Michał Karnicki on 2014-01-16

Don't try to fix the header title positioning with hardcorded value.

584. By Michał Karnicki on 2014-01-16

Fix copyright headers.

585. By Michał Karnicki on 2014-01-17

Make column count dynamic.

586. By Michał Karnicki on 2014-01-17

Update CardVerticalJournal defaults.

[Michał Karnicki (karni)]

Should I add this? http://paste.ubuntu.com/6767766/

[Michał Karnicki (karni)]

unity-scope-tool shows nothing, when JSON updated to: 'category-layout': 'vertical-journal' :(

[lp:~unity-team/unity8/new-scopes-vj-integration]

587. By Michał Karnicki on 2014-01-17

Bind ResponsiveVJ model and height.

588. By Michał Karnicki on 2014-01-17

Fetch template and components from DashRenderer. Set RVJ columnWidth cased on card size from template.

[Albert Astals Cid (aacid)]

Why left, right and top margin but no bottom margin?

review: Needs Information

[lp:~unity-team/unity8/new-scopes-vj-integration]

589. By Michał Karnicki on 2014-01-20

Add bottom margin.

[Michał Karnicki (karni)]

I followed ResponsiveGridView implementation as reference. Added bottom margin.

[lp:~unity-team/unity8/new-scopes-vj-integration]

590. By Michał Karnicki on 2014-01-20

Expand CardVerticalJournal to fill its parent.

[Michał Karnicki (karni)]

Getting seg fault'ed when I add the filtering capability. Will have to leave this to Saviq.

[Albert Astals Cid (aacid)]

I'm sure we can debug that crash without Saviq, which stacktrace are you getting? How easy is it to reproduce?

[Michał Karnicki (karni)]

lp:~unity-team/unity8/new-scopes-vj-integration-filter
$ ./build -c
$ ./builddir/tools/unity-scope-tool
Override category -> set category-layout to "vertical-journal", apply.
Notice seg fault.

[Albert Astals Cid (aacid)]

Does not segfault here :S

Are you doing any other change? Or do you have uncommited changes?

[Michał Sawicz (saviq)]

Can you rebase (except for CardVerticalJournal) onto lp:unity8 at some point please?

Unmerged revisions

590. By Michał Karnicki on 2014-01-20

Expand CardVerticalJournal to fill its parent.

589. By Michał Karnicki on 2014-01-20

Add bottom margin.

588. By Michał Karnicki on 2014-01-17

Fetch template and components from DashRenderer. Set RVJ columnWidth cased on card size from template.

587. By Michał Karnicki on 2014-01-17

Bind ResponsiveVJ model and height.

586. By Michał Karnicki on 2014-01-17

Update CardVerticalJournal defaults.

585. By Michał Karnicki on 2014-01-17

Make column count dynamic.

584. By Michał Karnicki on 2014-01-16

Fix copyright headers.

583. By Michał Karnicki on 2014-01-16

Don't try to fix the header title positioning with hardcorded value.

582. By Michał Karnicki on 2014-01-16

Fix column and row spacing tests.

581. By Michał Karnicki on 2014-01-16

Add ResponsiveVerticalJournal tests. column and row spacing still not passing.

=== modified file 'plugins/DashViews/abstractjournal.cpp'
--- plugins/DashViews/abstractjournal.cpp	2014-01-07 14:51:15 +0000
+++ plugins/DashViews/abstractjournal.cpp	2014-01-20 23:24:53 +0000
@@ -194,7 +194,7 @@
 
 void AbstractJournal::refill()
 {
-    if (!isComponentComplete()) {
+    if (!isComponentComplete() || height() < 0) {
         return;
     }
 

=== modified file 'plugins/DashViews/verticaljournal.cpp'
--- plugins/DashViews/verticaljournal.cpp	2014-01-03 09:18:24 +0000
+++ plugins/DashViews/verticaljournal.cpp	2014-01-20 23:24:53 +0000
@@ -79,7 +79,7 @@
 
 void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)
 {
-    *modelIndex = INT_MAX;
+    *modelIndex = 0;
     *yPos = std::numeric_limits<qreal>::lowest();
     int columnToAddTo = -1;
 

=== added file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2014-01-20 23:24:53 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013-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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "../Components"
+import DashViews 0.1
+
+// A VerticalJournal, which allows setting max number of columns. Based on
+// defined column width, delegates are spread in the horizontal space.
+Item {
+    property int minimumColumnSpacing: units.gu(0.5)
+    property int maximumNumberOfColumns: 2
+
+    property alias columnWidth: verticalJournalView.columnWidth
+    property alias rowSpacing: verticalJournalView.rowSpacing
+    property alias model: verticalJournalView.model
+    property alias delegate: verticalJournalView.delegate
+    property alias delegateCreationBegin: verticalJournalView.delegateCreationBegin
+    property alias delegateCreationEnd: verticalJournalView.delegateCreationEnd
+
+    //readonly property alias currentItem // TODO bug #1269024
+
+    VerticalJournal {
+        id: verticalJournalView
+        objectName: "responsiveVerticalJournalView"
+        anchors {
+            fill: parent
+            leftMargin: columnSpacing/2
+            rightMargin: columnSpacing/2
+            topMargin: rowSpacing/2
+            bottomMargin: rowSpacing/2
+        }
+        clip: parent.height != implicitHeight
+
+        function px2gu(pixels) {
+            return Math.floor(pixels / units.gu(1))
+        }
+
+        function columnsForSpacing(spacing) {
+            // parent.width = columns * columnWidth +
+            //       (columns-1) * spacing + spacing(margins)
+            return Math.max(1, Math.floor(parent.width / (columnWidth + spacing)))
+        }
+
+        function spacingForColumns(columns) {
+            var spacingGU = px2gu((parent.width - columns * columnWidth) / columns)
+            return units.gu(spacingGU)
+        }
+
+        property int expectedColumns: Math.min(
+                columnsForSpacing(minimumColumnSpacing), maximumNumberOfColumns)
+        columnSpacing: spacingForColumns(expectedColumns)
+    }
+}

=== added file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/CardVerticalJournal.qml	2014-01-20 23:24:53 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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"
+
+DashRenderer {
+    id: genericVerticalJournal
+
+    property alias minimumColumnSpacing: cardVerticalJournal.minimumColumnSpacing
+    property alias maximumNumberOfColumns: cardVerticalJournal.maximumNumberOfColumns
+    property alias columnWidth: cardVerticalJournal.columnWidth
+    property alias rowSpacing: cardVerticalJournal.rowSpacing
+
+    anchors.fill: parent
+
+    ResponsiveVerticalJournal {
+        id: cardVerticalJournal
+        anchors.fill: parent
+        maximumNumberOfColumns: 2
+        minimumColumnSpacing: units.gu(1)
+        rowSpacing: units.gu(1)
+        model: genericVerticalJournal.model
+
+        columnWidth: {
+            if (genericVerticalJournal.template !== undefined) {
+                switch (genericVerticalJournal.template['card-size']) {
+                    case "small": return units.gu(12);
+                    case "large": return units.gu(38);
+                }
+            }
+            return units.gu(18.5);
+        }
+
+        delegate: Card {
+            id: card
+            objectName: "delegate" + index
+            cardData: model
+            template: genericVerticalJournal.template
+            components: genericVerticalJournal.components
+
+            //onClicked: cardVerticalJournal.clicked(index, tile.y)
+            //onPressAndHold: cardVerticalJournal.pressAndHold(index, tile.y)
+        }
+    }
+}

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-01-09 09:05:57 +0000
+++ qml/Dash/GenericScopeView.qml	2014-01-20 23:24:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-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
@@ -326,6 +326,7 @@
         }
         switch (layout) {
             case "carousel": return "CardCarousel.qml";
+            case "vertical-journal": return "CardVerticalJournal.qml";
             case "grid":
             default: return "CardFilterGrid.qml";
         }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-01-16 14:12:43 +0000
+++ tests/qmltests/CMakeLists.txt	2014-01-20 23:24:53 +0000
@@ -31,6 +31,7 @@
 add_qml_test(Components LazyImage)
 add_qml_test(Components ResponsiveFlowView)
 add_qml_test(Components ResponsiveGridView)
+add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Components Revealer)
 add_qml_test(Components Showable)
 add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}

=== added file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2014-01-20 23:24:53 +0000
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2013-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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import ".."
+import "../../../qml/Components"
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 0.1
+import Utils 0.1
+import Unity.Test 0.1 as UT
+
+Item {
+    width: journalRect.width + controls.width
+    height: units.gu(80)
+
+    Column {
+        id: controls
+        width: units.gu(40)
+        height: parent.height
+        anchors.top: parent.top
+        anchors.right: parent.right
+        ListItem.ValueSelector {
+            id: cardSizeSelector
+            text: "card-size"
+            // small, medium, large card sizes
+            values: [units.gu(12), units.gu(18.5), units.gu(38)]
+            selectedIndex: 0
+        }
+        ListItem.ValueSelector {
+            id: minColumnSpacingSelector
+            text: "minColumnSpacing"
+            values: [0, units.gu(2), units.gu(8), units.gu(25)]
+            selectedIndex: 0
+        }
+        ListItem.ValueSelector {
+            id: maxColumnsSelector
+            text: "maxColumns"
+            values: [1, 2, 3, 8, 15, fakeModel.count]
+            selectedIndex: 1
+        }
+        ListItem.ValueSelector {
+            id: rowSpacingSelector
+            text: "rowSpacing"
+            values: [units.gu(1), units.gu(2), units.gu(4), units.gu(8)]
+            selectedIndex: 1
+        }
+    }
+
+    ListModel {
+        id: fakeModel
+        ListElement { name: "A" }
+        ListElement { name: "B" }
+        ListElement { name: "C" }
+        ListElement { name: "D" }
+        ListElement { name: "E" }
+        ListElement { name: "F" }
+        ListElement { name: "G" }
+        ListElement { name: "H" }
+        ListElement { name: "I" }
+        ListElement { name: "J" }
+        ListElement { name: "K" }
+        ListElement { name: "L" }
+        ListElement { name: "M" }
+        ListElement { name: "N" }
+        ListElement { name: "O" }
+        ListElement { name: "P" }
+        ListElement { name: "Q" }
+        ListElement { name: "R" }
+        ListElement { name: "S" }
+        ListElement { name: "T" }
+        ListElement { name: "U" }
+    }
+
+    SortFilterProxyModel {
+        id: wrappedFakeModel
+        model: fakeModel
+    }
+
+    Rectangle {
+        id: journalRect
+        width: units.gu(80)
+        height: parent.height
+        color: "grey"
+        anchors.top: parent.top
+        anchors.left: parent.left
+
+        ResponsiveVerticalJournal {
+            id: journal
+            anchors.fill: parent
+            model: wrappedFakeModel
+            minimumColumnSpacing: minColumnSpacingSelector.
+                      values[minColumnSpacingSelector.selectedIndex]
+            maximumNumberOfColumns:
+                      maxColumnsSelector.values[maxColumnsSelector.selectedIndex]
+            rowSpacing:
+                    rowSpacingSelector.values[rowSpacingSelector.selectedIndex]
+            columnWidth: // XXX karni: How do I get that from the delegate?
+                    cardSizeSelector.values[cardSizeSelector.selectedIndex]
+
+            delegate: Rectangle {
+                id: delegateItem
+                // So that it can be identified by test code
+                property bool isJournalDelegate: true
+                objectName: "delegate" + index
+                color: "grey"
+                border.color: "red"
+                border.width: 1
+
+                // width derived from Card's template['card-size']
+                width: cardSizeSelector.values[cardSizeSelector.selectedIndex]
+                height: Math.max(units.gu(8), Math.floor(Math.random() * 300))
+
+                Rectangle {
+                    color: "green"
+                    anchors.centerIn: parent
+                    width: units.gu(6)
+                    height: units.gu(6)
+                    Text {
+                        anchors.centerIn: parent
+                        text: name
+                    }
+                }
+
+                Text { x:0; y:0; text:"(" + parent.x + ", " + parent.y + ")"}
+            }
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "ResponsiveVerticalJournal"
+        when: windowShown
+
+        function test_minimumColumnSpacing_data() {
+            var data = new Array()
+            data.push({minColumnSpacingIndex: 0, expectedColumns: 2})
+            data.push({minColumnSpacingIndex: 1, expectedColumns: 2})
+            data.push({minColumnSpacingIndex: 2, expectedColumns: 1})
+            return data
+        }
+
+        // Test how minimumColumnSpacing affects column count.
+        function test_minimumColumnSpacing(data) {
+            cardSizeSelector.selectedIndex = 2 // large card
+            maxColumnsSelector.selectedIndex = 1 // two columns
+
+            minColumnSpacingSelector.selectedIndex = data.minColumnSpacingIndex
+
+            tryCompareFunction(countJournalDelegatesOnFirstRow, data.expectedColumns)
+        }
+
+        function test_maximumNumberOfColumns_data() {
+            var data = new Array()
+            // Change maxColumns
+            data.push({maxColumnsIndex: 0, cardSizeIndex: 0, expectedColumns: 1})
+            data.push({maxColumnsIndex: 1, cardSizeIndex: 0, expectedColumns: 2})
+            data.push({maxColumnsIndex: 2, cardSizeIndex: 0, expectedColumns: 3})
+            data.push({maxColumnsIndex: 3, cardSizeIndex: 0, expectedColumns: 6})
+            data.push({maxColumnsIndex: 4, cardSizeIndex: 0, expectedColumns: 6})
+            // Change card size
+            data.push({maxColumnsIndex: 3, cardSizeIndex: 1, expectedColumns: 4})
+            data.push({maxColumnsIndex: 3, cardSizeIndex: 2, expectedColumns: 2})
+            return data
+        }
+
+        // Test how maximumNumberOfColumns and columnWidth affect column count.
+        function test_maximumNumberOfColumns(data) {
+            minColumnSpacingSelector.selectedIndex = 0 // no spacing
+
+            cardSizeSelector.selectedIndex = data.cardSizeIndex // columnWidth
+            maxColumnsSelector.selectedIndex = data.maxColumnsIndex
+
+            tryCompareFunction(countJournalDelegatesOnFirstRow, data.expectedColumns)
+        }
+
+        function countJournalDelegatesOnFirstRow() {
+            return __countJournalDelegatesOnFirstRow(journal.visibleChildren, 0)
+        }
+
+        function __countJournalDelegatesOnFirstRow(objList, total) {
+            for (var i = 0; i < objList.length; ++i) {
+                var child = objList[i];
+                if (child.isJournalDelegate !== undefined && child.y === 0) {
+                    ++total;
+                } else {
+                    total = __countJournalDelegatesOnFirstRow(
+                            child.visibleChildren, total)
+                }
+            }
+            return total
+        }
+    }
+}