Merge lp:~julia-segal/cdts/ui_work into lp:cdts

[Julia Segal]

Added the following views:
Suite Selection
Test Run Manager (skeleton only)
Test Selection - added Open/Close groups, Details

Fixed: png files are now added to project, paths using them will access them via the /artwork/. path. Note, png files have the @ for Resolution Independence:
http://askubuntu.com/questions/265473/what-is-the-sign-added-as-a-suffix-to-images-used-for-apps-based-in-the-ubuntu

The current arrow png files are a modification of the Ubuntu Components progress icon

[Daniel Manrique (roadmr)]

Hi!

When you update a branch, you don't necessarily need to submit another merge request. E.g. if you push rev 2231, you get a Needs Fixing comment, then you implement the fixes in rev 2232, you can simply bzr push your branch (updating the code on launchpad to rev 2232) and then add a comment to the existing merge proposal, changing the "Review" to "Resubmit" (a dropdown right below the comment box). That'll signal to reviewers that the branch was simply updated and needs reviewing again.

This looks good, I'll merge it, some tweaks may be needed but they can be done on top of this work. Thanks!

review: Approve

=== modified file 'plainbox-gui/gui-ihv/gui-ihv.pro'
--- plainbox-gui/gui-ihv/gui-ihv.pro	2013-07-15 09:47:30 +0000
+++ plainbox-gui/gui-ihv/gui-ihv.pro	2013-07-18 10:47:25 +0000
@@ -43,5 +43,10 @@
     qml/outline/TestSelectionButtons.qml \
     qml/outline/TestSelectionView.qml \
     qml/outline/OldMainButtons.qml \
-    qml/outline/TestSelectionListView.qml
+    qml/outline/TestSelectionListView.qml \
+    qml/outline/TestSelectionSuiteDelegate.qml \
+    qml/outline/TestSelectionTestDelegate.qml \
+    qml/outline/SuiteSelectionDelegate.qml \
+    qml/outline/SuiteSelectionView.qml \
+    qml/outline/RunManagerView.qml
 

=== modified file 'plainbox-gui/gui-ihv/listmodel.h'
--- plainbox-gui/gui-ihv/listmodel.h	2013-07-12 14:18:25 +0000
+++ plainbox-gui/gui-ihv/listmodel.h	2013-07-18 10:47:25 +0000
@@ -69,7 +69,7 @@
 private slots:
   void handleItemChange();
 
-private:
+protected:
   ListItem* m_prototype;
   QList<ListItem*> m_list;
   int count;

=== modified file 'plainbox-gui/gui-ihv/main.cpp'
--- plainbox-gui/gui-ihv/main.cpp	2013-07-12 14:18:25 +0000
+++ plainbox-gui/gui-ihv/main.cpp	2013-07-18 10:47:25 +0000
@@ -33,14 +33,14 @@
 ListModel* CreateTestSuiteModel(){
     //QList<QObject*> list;
     ListModel *model = new ListModel(new TestSuiteItem, qApp);
-    model->appendRow(new TestSuiteItem("Informational tests", "SATA/IDE devive information.", model));
-    model->appendRow(new TestSuiteItem("Hibernation tests", "power-management/hibernate_advanced", model));
-    model->appendRow(new TestSuiteItem("Wireless networking tests", "wireless/wireless_scanning", model));
-    model->appendRow(new TestSuiteItem("Wireless networking tests", "wireless/wireless_connection", model));
-    model->appendRow(new TestSuiteItem("LED tests", "led/wireless", model));
-    model->appendRow(new TestSuiteItem("Benchmarks tests", "benchmarks/network/network-loopback", model));
-    model->appendRow(new TestSuiteItem("Suspend tests", "suspend/led_after_suspend/wireless", model));
-    model->appendRow(new TestSuiteItem("Suspend tests", "suspend/wireless_after_suspenspeded", model));
+    model->appendRow(new TestSuiteItem("Informational tests", "SATA/IDE devive information.", 60, "Automatic", model));
+    model->appendRow(new TestSuiteItem("Hibernation tests", "power-management/hibernate_advanced", 22, "Manual", model));
+    model->appendRow(new TestSuiteItem("Wireless networking tests", "wireless/wireless_scanning", 360, "Automatic", model));
+    model->appendRow(new TestSuiteItem("Wireless networking tests", "wireless/wireless_connection", 600, "Automatic", model));
+    model->appendRow(new TestSuiteItem("LED tests", "led/wireless", 200, "Manual",model));
+    model->appendRow(new TestSuiteItem("Benchmarks tests", "benchmarks/network/network-loopback", 100, "Manual",model));
+    model->appendRow(new TestSuiteItem("Suspend tests", "suspend/led_after_suspend/wireless", 1, "Manual",model));
+    model->appendRow(new TestSuiteItem("Suspend tests", "suspend/wireless_after_suspenspeded", 2,  "Manual",model));
 
     return model;
 }

=== added file 'plainbox-gui/gui-ihv/qml/outline/RunManagerButtons.qml'
--- plainbox-gui/gui-ihv/qml/outline/RunManagerButtons.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/RunManagerButtons.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,56 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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
+
+
+
+Row {
+    id: bottombuttons
+    spacing: units.gu(12)
+
+    signal cancel
+    signal pauseTest
+
+
+    Button {
+         id:cancelButton
+         text: i18n.tr("Cancel")
+         color: UbuntuColors.warmGrey
+         width: units.gu(18)
+         onClicked: {
+             bottombuttons.cancel();
+         }
+    }
+
+    Button {
+        id: pauseButton
+        text: i18n.tr("Pause")
+        color: UbuntuColors.lightAubergine
+        width: units.gu(18)
+        onClicked:{
+            bottombuttons.pauseTest();
+        }
+    }
+
+
+}

=== added file 'plainbox-gui/gui-ihv/qml/outline/RunManagerListView.qml'
--- plainbox-gui/gui-ihv/qml/outline/RunManagerListView.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/RunManagerListView.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,182 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 Ubuntu.Components.ListItems 0.1 as ListItem
+import "."
+
+
+
+Rectangle {
+    id: runmanagerrect
+    color: "white"
+    height: parent.height
+    width: parent.width
+
+
+    Flickable {
+        id: listflick
+        anchors.fill: parent
+        height: parent.height
+
+        clip: true
+        contentHeight: groupedList.height
+        boundsBehavior : Flickable.StopAtBounds
+
+        Component {
+            id: highlight
+            Rectangle {
+                width: groupedList.width
+                height: units.gu(7)
+                color: "lightsteelblue";
+                radius: 5
+            }
+        }
+
+
+
+        ListView {
+            id: groupedList
+            width: parent.width
+            height: units.gu(12) * groupedList.count + units.gu(1)
+            interactive: false
+            model: testSuiteModel
+
+            delegate: RunManagerTestDelegate {}
+
+            section {
+                property: "group"
+                criteria: ViewSection.FullString
+                delegate: TestSelectionSuiteDelegate{}
+            }
+
+            highlight: highlight
+            highlightFollowsCurrentItem: true
+
+
+
+
+            // when a group item is checked/unchecked the subitems are checked/unchecked
+            function selectGroup(groupName, sel){
+                for (var i = testSuiteModel.count - 1; i >=0; i--){
+                    var item = testSuiteModel.get(i);
+                    if (item.group === groupName)
+                        testSuiteModel.setProperty(i, "check", sel);
+                }
+
+                // this is to select the group items and to make sure data is updated
+                var oldCurrent = currentIndex
+                currentIndex = -1
+                for (var i = 0; i < groupedList.contentItem.children.length; i++)
+                {
+                    var curItem = groupedList.contentItem.children[i];
+                    //console.log(i,": ", curItem, "=", curItem.groupname);
+
+                    if (curItem.groupname === groupName)
+                        curItem.checked = sel;
+                }
+                currentIndex = oldCurrent
+            }
+
+            // determines if one or more subitems are checked
+            // if at least one subitem is checked, the group is checked
+            function setGroupCheck(groupName){
+                var oldCurrent = currentIndex
+                currentIndex = -1
+                var setCheck = false
+                var i = groupedList.contentItem.children.length - 1
+
+                for (;i >= 0 && setCheck === false; i--)
+                {
+                    var curItem = groupedList.contentItem.children[i];
+
+                    // determine if subitem is checked
+                    if (curItem.groupname === groupName && curItem.labelname !== groupName)
+                        if (curItem.checked === true)
+                            setCheck = true;
+
+                }
+
+                for (i = groupedList.contentItem.children.length - 1; i >= 0; i--)
+                {
+                    curItem = groupedList.contentItem.children[i];
+                    if (curItem.labelname === groupName)
+                        curItem.checked = setCheck
+                }
+
+                currentIndex = oldCurrent;
+            }
+
+            // If any subitems are selected, group should be selected.
+            function isGroupSelected(section){
+                var isSel = false;
+                for (var i = testSuiteModel.count - 1; i >=0 && isSel === false; i--)
+                {
+                    var curItem = testSuiteModel.get(i);
+                    //console.log("Section: ", section, " ", i,": ", curItem, "=", curItem.group, " check:", curItem.check);
+
+                    if (curItem.group === section && curItem.check === "true"){
+                        isSel = true;
+                    }
+                }
+                return isSel;
+            }
+
+            //  Open/Close gruops
+            function openShutSubgroup(groupName, sel){
+                var oldCurrent = currentIndex;
+                currentIndex = -1
+                for (var i = 0; i < groupedList.contentItem.children.length; i++)
+                {
+                    var curItem = groupedList.contentItem.children[i];
+                    //console.log(i,": ", curItem, "=", curItem.groupname);
+                    //console.log(i,": ", sel, "=", sel, " height = ", curItem.height);
+
+                    if (curItem.groupname === groupName && curItem.labelname !== groupName){
+                        curItem.height = sel? units.gu(7):units.gu(0);
+                        curItem.visible = sel;
+                        groupedList.height += sel?units.gu(7):-units.gu(7)
+                    }
+                }
+                currentIndex = oldCurrent;
+            }
+
+            // functions to do something across the whole list
+            function getEstimatedTime(section){
+                return "";
+            }
+        }
+
+
+
+
+    }
+
+    Scrollbar {
+        flickableItem: listflick
+        align: Qt.AlignTrailing
+    }
+}
+
+
+

=== added file 'plainbox-gui/gui-ihv/qml/outline/RunManagerTestDelegate.qml'
--- plainbox-gui/gui-ihv/qml/outline/RunManagerTestDelegate.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/RunManagerTestDelegate.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,117 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 Ubuntu.Components.ListItems 0.1 as ListItem
+import "./artwork"
+
+Component {
+    id: testDelegate
+
+    Item{
+        id: testitem
+        width: parent.width
+        height: units.gu(7)
+        property string groupname: group
+        property alias checked: itemcheckbox.checked
+        property string labelname: testname
+
+
+        MouseArea {
+            width: parent.width - itemcheckbox.width
+            height: parent.height
+            anchors.right: parent.right
+
+            onClicked: {
+                testdetails.testItem = testSuiteModel.get(index);
+                groupedList.currentIndex = index;
+            }
+        }
+
+        Item {
+            anchors.fill: parent
+
+            Item {
+                id: filler
+                width: itemcheckbox.width
+            }
+
+            CheckBox {
+                id: itemcheckbox
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: filler.right
+                anchors.leftMargin: units.gu(2)
+                checked: check
+                onClicked: {
+                    testSuiteModel.setProperty(index, "check", checked);
+                    groupedList.setGroupCheck(group)
+                }
+            }
+
+
+            Text {
+                id: nameLabel
+                text: testname
+                width: units.gu(40)
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: itemcheckbox.right
+                anchors.leftMargin: units.gu(1)
+            }
+
+            Item {
+                id: typefiller
+                width: units.gu(2)
+                anchors.left: nameLabel.right
+            }
+
+            Text {
+                id: typelabel
+                text: ""//type
+                width: units.gu(10)
+                anchors.left: typefiller.right
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignHCenter
+
+            }
+
+            Item {
+                id: descfiller
+                width: units.gu(20)
+                anchors.left: typelabel.right
+            }
+
+            Text {
+                id: descLabel
+                text: ""
+                width: units.gu(10)
+                anchors.left: descfiller.right
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignHCenter
+
+            }
+
+
+        }
+        ListItem.ThinDivider {}
+    }
+}

=== added file 'plainbox-gui/gui-ihv/qml/outline/RunManagerView.qml'
--- plainbox-gui/gui-ihv/qml/outline/RunManagerView.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/RunManagerView.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,73 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 "."
+
+
+
+
+
+Page {
+    title: i18n.tr("Run Manager")
+
+    Item {
+        id: filler
+        height: units.gu(0)
+    }
+
+
+
+    RunManagerListView {
+        id: testsuitelist
+
+        width: parent.width - units.gu(4)
+
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top: filler.bottom
+            bottom: runbuttons.top
+            margins: units.gu(2)
+        }
+    }
+
+
+    RunManagerButtons {
+        id: runbuttons
+
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+
+        onCancel:{
+            console.log("On Cancel")
+        }
+
+        onPauseTest: {
+            console.log("Pause")
+        }
+    }
+
+}

=== added file 'plainbox-gui/gui-ihv/qml/outline/SuiteSelectionDelegate.qml'
--- plainbox-gui/gui-ihv/qml/outline/SuiteSelectionDelegate.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/SuiteSelectionDelegate.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,60 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 Ubuntu.Components.ListItems 0.1 as ListItem
+import "./artwork"
+
+
+    Item {
+        id: itemdelegate
+        width: parent.width
+        height: units.gu(7)
+
+        signal selectSuite(string suite, bool sel)
+
+        Item {
+            id: suitefiller
+            width: units.gu(1)
+        }
+
+        CheckBox {
+            id: suitecheckbox
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: suitefiller.right
+            checked: true
+            onClicked: {
+                itemdelegate.selectSuite(section, checked);
+            }
+        }
+
+
+        Text {
+            id: suitetext
+            text: section
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: suitecheckbox.right
+            anchors.leftMargin: units.gu(1)
+        }
+        ListItem.ThinDivider {}
+    }

=== added file 'plainbox-gui/gui-ihv/qml/outline/SuiteSelectionView.qml'
--- plainbox-gui/gui-ihv/qml/outline/SuiteSelectionView.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/SuiteSelectionView.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,102 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 Ubuntu.Components.ListItems 0.1 as ListItem
+import "."
+
+
+
+
+Page {
+    title: i18n.tr("Suite Selection")
+
+    Item {
+        id: filler
+        height: units.gu(4)
+    }
+
+    Rectangle {
+        id: suitelist
+        width: parent.width - units.gu(4)
+        color: "white"
+        height: parent.height - filler.height - okbutton.height - units.gu(6)
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top: filler.bottom
+        }
+
+        ListView {
+            id: testselection
+            height: parent.height
+            width: parent.width
+            anchors.fill: parent
+            contentHeight: units.gu(12) * testSuiteModel.count
+            interactive: true
+            clip: true
+            boundsBehavior : Flickable.StopAtBounds
+            model: testSuiteModel
+
+            delegate: Item {}
+
+            section {
+                property: "group"
+                criteria: ViewSection.FullString
+                delegate: SuiteSelectionDelegate{
+
+                    onSelectSuite: {
+                        // This is using the prototype list,
+                        // In the model, select all tests in the suite
+                        for (var i = testSuiteModel.count - 1; i >= 0; i--){
+                            var item = testSuiteModel.get(i);
+                            if (item.group === suite)
+                                testSuiteModel.setProperty(i, "check", sel);
+                        }
+                    }
+                }
+            }
+        }
+        Scrollbar {
+            flickableItem: testselection
+            align: Qt.AlignTrailing
+        }
+    }
+
+
+    Button {
+        id: okbutton
+        width: units.gu(20)
+        anchors {
+            horizontalCenter:parent.horizontalCenter
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+        text: i18n.tr("OK")
+        color: UbuntuColors.lightAubergine
+        onClicked: {
+            // NOTE: When the user is done, this is where to load up the TestSelection list
+            mainView.state = "TESTSELECTION"
+        }
+    }
+
+}

=== modified file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionButtons.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionButtons.qml	2013-07-12 14:18:25 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionButtons.qml	2013-07-18 10:47:25 +0000
@@ -31,9 +31,7 @@
     signal deselectAll
     signal startTesting
 
-
-    width: parent.width - units.gu(20)
-    spacing: (parent.width - (units.gu(18)*3))/3
+    spacing: units.gu(12)
 
     Button {
          id:selectButton

=== modified file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionDetails.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionDetails.qml	2013-07-15 09:54:32 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionDetails.qml	2013-07-18 10:47:25 +0000
@@ -25,6 +25,8 @@
 Item {
     id: testseldetails
     property var testItem;
+    property bool showDetails;
+    property int openHeight: units.gu(18)
 
 
     onTestItemChanged: {
@@ -32,102 +34,226 @@
         nameText.text = testItem.testname;
     }
 
-    Rectangle {
-        anchors.fill: parent
-        color: Theme.palette.normal.overlay
-        border.color: "black"
-        border.width: 1
-
-        Text {
-            anchors.centerIn: parent
-            text: i18n.tr("Test details")
-        }
-
-        // Left side of the details
-        Rectangle {
-            id: leftRect
-            height: parent.height
-            width: parent.width - rightRect.width
+    onShowDetailsChanged:{
+        if (showDetails){
+            progressIcon.source = "artwork/DownArrow.png";
+            detailsFlick.height = openHeight
+            testsuitelist.height -= openHeight
+        }
+        else{
+            progressIcon.source = "artwork/RightArrow.png";
+            detailsFlick.height = 0
+            testsuitelist.height += openHeight
+        }
+    }
+
+    // Open/Shut label + icon
+    Item {
+        id: detailsItem
+        height: parent.height
+        width: detailsLabel.width + progressIcon.width + units.gu(2)
+
+        Label {
+            id: detailsLabel
+            text: i18n.tr("Test Details")
             anchors {
                 left: parent.left
                 top: parent.top
-                bottom: parent.bottom
-            }
-            color: Theme.palette.normal.overlay
-
-            Column {
-                anchors.horizontalCenter: leftRect.horizontalCenter
-
-                spacing: units.gu(1)
-
-                Text {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    text: i18n.tr("Test Details: ")
-                }
-                Text {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    text: i18n.tr("Test Run Time")
-                }
-                Text {
-                    id: testTimeRunText
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "green"
-                    text: i18n.tr("< 1 min")
-                }
-                Text {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    text: i18n.tr("Suite Time Run")
-                }
-                Text {
-                    id: suiteTimeRunText
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "green"
-                    text: i18n.tr("90 minutes")
-                }
-            }
-        }
-
-
-
-        // Right side of the details
+                margins: units.gu(1)
+            }
+        }
+
+        Image {
+            id: progressIcon
+            source: "artwork/RightArrow.png"
+            anchors {
+                left: detailsLabel.right
+                top: parent.top
+                margins: units.gu(1)
+            }
+
+            opacity: enabled ? 1.0 : 0.5
+
+        }
+        MouseArea {
+            anchors.fill: detailsItem
+            onClicked: {showDetails = !showDetails}
+        }
+    }
+
+
+
+    // Right side of the details
+    Flickable {
+        id: detailsFlick
+        anchors.left: detailsItem.right
+        anchors.top: parent.top
+        anchors.leftMargin: units.gu(2)
+        width: parent.width - detailsItem.width - units.gu(2)
+        height: 0  // initialize to closed
+        contentHeight: detailsblock.height
+        clip: true
+        boundsBehavior : Flickable.StopAtBounds
 
         Rectangle {
             id: rightRect
             anchors.right: parent.right
             anchors.top: parent.top
 
-            height: parent.height
-            width: parent.width - units.gu(20)
-            color: Theme.palette.normal.overlay
-            border.color: "black"
-            border.width: 1
-
-            Label {
-                id: nameLabel
-                text: i18n.tr("name: ")
-                anchors.left: parent.left
-                anchors.top: parent.top
-                anchors.margins: units.gu(2)
-            }
-
-            Rectangle {
-                id: nameRect
-                height: units.gu(4)
-                border.color: UbuntuColors.warmGrey
-                border.width: 1
-                anchors.left: nameLabel.right
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.margins: units.gu(1)
-            }
-            Text {
-                id: nameText
-                anchors.fill: nameRect
-                anchors.margins: units.gu(1)
-                text:""
-            }
+            height: detailsblock.height
+            width: parent.width
+            border{
+                color: "black"
+                width: 1
+            }
+
+            Item{
+                id: detailsblock
+                anchors.fill: parent
+                height: units.gu(24)
+
+                Label {
+                    id: nameLabel
+                    text: i18n.tr("     name:  ")
+                    anchors {
+                        left: parent.left
+                        top: parent.top
+                        margins: units.gu(2)
+                    }
+                }
+
+                Rectangle {
+                    id: nameRect
+                    height: units.gu(4)
+                    border{
+                        color: UbuntuColors.warmGrey
+                        width: 1
+                    }
+                    anchors {
+                        left: nameLabel.right
+                        right: parent.right
+                        top: parent.top
+                        margins: units.gu(1)
+                    }
+                }
+                Text {
+                    id: nameText
+
+                    anchors{
+                        fill: nameRect
+                        margins: units.gu(1)
+                    }
+                    text:""
+                }
+
+                Label {
+                    id: dependsLabel
+                    text: i18n.tr("depends: ")
+                    anchors{
+                        left: parent.left
+                        top: nameRect.bottom
+                        margins: units.gu(2)
+                    }
+                }
+
+                Rectangle {
+                    id: dependsRect
+                    height: units.gu(4)
+                    border{
+                        color: UbuntuColors.warmGrey
+                        width: 1
+                    }
+                    anchors{
+                        left: dependsLabel.right
+                        right: parent.right
+                        top: nameRect.bottom
+                        margins: units.gu(1)
+                    }
+                }
+                Text {
+                    id: dependsText
+                    anchors{
+                        fill: dependsRect
+                        margins: units.gu(1)
+                        top: nameRect.bottom
+                    }
+                    text:""
+                }
+                Label {
+                    id: requiresLabel
+                    text: i18n.tr(" requires: ")
+                    anchors{
+                        left: parent.left
+                        top: dependsRect.bottom
+                        margins: units.gu(2)
+                    }
+                }
+
+                Rectangle {
+                    id: requiresRect
+                    height: units.gu(4)
+                    border{
+                        color: UbuntuColors.warmGrey
+                        width: 1
+                    }
+                    anchors {
+                        left: requiresLabel.right
+                        right: parent.right
+                        top: dependsRect.bottom
+                        margins: units.gu(1)
+                    }
+                }
+                Text {
+                    id: requiresText
+                    anchors{
+                        fill: requiresRect
+                        margins: units.gu(1)
+                        top: dependsRect.bottom
+                    }
+                    text:""
+                }
+
+                Label {
+                    id: otherLabel
+                    text: i18n.tr("     other: ")
+                    anchors{
+                        left: parent.left
+                        top: requiresRect.bottom
+                        margins: units.gu(2)
+                    }
+                }
+
+                Rectangle {
+                    id: otherRect
+                    height: units.gu(4)
+                    border{
+                        color: UbuntuColors.warmGrey
+                        width: 1
+                    }
+                    anchors{
+                        left: requiresLabel.right
+                        right: parent.right
+                        top: requiresRect.bottom
+                        margins: units.gu(1)
+                    }
+                }
+                Text {
+                    id: otherText
+                    anchors{
+                        fill: requiresRect
+                        margins: units.gu(1)
+                        top: requiresRect.bottom
+                    }
+                    text:""
+                }
+            }
+
         }
 
     }
+    Scrollbar {
+        flickableItem: detailsFlick
+        align: Qt.AlignTrailing
+    }
 }
 

=== modified file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionListView.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionListView.qml	2013-07-15 09:47:30 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionListView.qml	2013-07-18 10:47:25 +0000
@@ -28,8 +28,10 @@
 
 
 Rectangle {
+    id: suitetestlist
     color: "white"
     height: parent.height
+    width: parent.width
 
 
     function selectAll(sel) {
@@ -40,180 +42,71 @@
         id: listflick
         anchors.fill: parent
         height: parent.height
-        width: parent.width
+
         clip: true
         contentHeight: groupedList.height
         boundsBehavior : Flickable.StopAtBounds
 
+        Component {
+            id: highlight
+            Rectangle {
+                width: groupedList.width
+                height: units.gu(7)
+                color: "lightsteelblue";
+                radius: 5
+            }
+        }
+
+
 
         ListView {
             id: groupedList
             width: parent.width
-            height: units.gu(12) * groupedList.count
+            height: units.gu(12) * groupedList.count + units.gu(1)
             interactive: false
             model: testSuiteModel
 
-
-            delegate: Item{
-                width: parent.width
-                height: units.gu(7)
-                property string groupname: group
-                property alias checked: itemcheckbox.checked
-                property string labelname: testname
-
-
-                MouseArea {
-                    width: parent.width - itemcheckbox.width
-                    height: parent.height
-                    anchors.right: parent.right
-
-                    onClicked: {
-                        testdetails.testItem = testSuiteModel.get(index);
-                    }
-                }
-
-                Item {
-                    anchors.fill: parent
-
-                    Item {
-                        id: filler
-                        width: units.gu(4)
-                    }
-
-                    CheckBox {
-                        id: itemcheckbox
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.left: filler.right
-                        anchors.leftMargin: units.gu(2)
-                        checked: check
-                        onClicked: {
-                            testSuiteModel.setProperty(index, "check", checked);
-                            // only do this if we have a tri-state checkbox
-                            //if (checked == false)
-                            //    groupedList.turnGroupOff(group)
-                        }
-                    }
-
-
-                    Text {
-                        id: nameLabel
-                        text: testname
-                        width: units.gu(40)
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.left: itemcheckbox.right
-                        anchors.leftMargin: units.gu(1)
-
-                    }
-
-                    Item {
-                        id: typefiller
-                        width: units.gu(2)
-                        anchors.left: nameLabel.right
-                    }
-
-                    Text {
-                        id: typelabel
-                        text: "Automated" //type
-                        width: units.gu(30)
-                        anchors.left: typefiller.right
-                        anchors.verticalCenter: parent.verticalCenter
-
-                    }
-
-                    Item {
-                        id: descfiller
-                        width: units.gu(6)
-                        anchors.left: typelabel.right
-
-
-                    }
-
-                    Text {
-                        id: descLabel
-                        text: "" //description
-                        width: units.gu(8)
-                        anchors.left: descfiller.right
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-
-                    Image {
-                        id: progressIcon
-                        source: "ListItemProgressionArrow.png"
-                        anchors {
-                            verticalCenter: parent.verticalCenter
-                            right: parent.right
-                        }
-
-                        opacity: enabled ? 1.0 : 0.5
-                    }
-                }
-                ListItem.ThinDivider {}
-            }
-
-            section.property: "group"
-            section.criteria: ViewSection.FullString
-            section.delegate: Item {
-                id: itemdelegate
-                width: parent.width
-                height: units.gu(7)
-                property string groupname: section
-                property alias checked: groupcheckbox.checked
-                property string labelname: section
-                property bool open: true
-
-                MouseArea {
-                    width: parent.width - groupcheckbox.width
-                    height: parent.height
-                    anchors.right: parent.right
-
-                    onClicked: {
-                        itemdelegate.open = !itemdelegate.open
-                        groupedList.openShutSubgroup(section, itemdelegate.open)
-                        console.log("Open/Shut items below")
-                    }
-                }
-
-                Label {
-                    id: groupfiller
-                    text: " "
-                }
-
-                CheckBox {
-                    id: groupcheckbox
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.left: groupfiller.right
-                    anchors.leftMargin: units.gu(1)
-                    checked: true
-                    onClicked: {
-                        groupedList.selectGroup(section, checked)
-                    }
-                }
-
-
-                Text {
-                    id: grouptext
-                    text: section
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.left: groupcheckbox.right
-                    anchors.leftMargin: units.gu(1)
-                }
-                ListItem.ThinDivider {}
-            }
-
+            delegate: TestSelectionTestDelegate {}
+
+            section {
+                property: "group"
+                criteria: ViewSection.FullString
+                delegate: TestSelectionSuiteDelegate{}
+            }
+
+            highlight: highlight
+            highlightFollowsCurrentItem: true
+
+            Component.onCompleted: testdetails.testItem = testSuiteModel.get(currentItem);
 
             // functions to do something across the whole list
+
+            // select/deselect all items in the list
             function selectAll(sel){
+                for (var i = testSuiteModel.count - 1; i >=0; i--)
+                    testSuiteModel.setProperty(i, "check", sel);
+
+                // this is to select the group items and to make sure data is updated
+                var oldCurrent = currentIndex
                 currentIndex = -1
-                for (var i = 0; i < groupedList.contentItem.children.length; i++)
-                {
-                    var curItem = groupedList.contentItem.children[i];
-                    //console.log(i,": ", curItem, "=", curItem.text);
+                for (var j = 0; j < groupedList.contentItem.children.length; j++){
+                    var curItem = groupedList.contentItem.children[j];
                     curItem.checked = sel;
                 }
+                currentIndex = oldCurrent
             }
 
+
+            // when a group item is checked/unchecked the subitems are checked/unchecked
             function selectGroup(groupName, sel){
+                for (var i = testSuiteModel.count - 1; i >=0; i--){
+                    var item = testSuiteModel.get(i);
+                    if (item.group === groupName)
+                        testSuiteModel.setProperty(i, "check", sel);
+                }
+
+                // this is to select the group items and to make sure data is updated
+                var oldCurrent = currentIndex
                 currentIndex = -1
                 for (var i = 0; i < groupedList.contentItem.children.length; i++)
                 {
@@ -223,21 +116,84 @@
                     if (curItem.groupname === groupName)
                         curItem.checked = sel;
                 }
+                currentIndex = oldCurrent
             }
 
-            function turnGroupOff(groupName){
+            // determines if one or more subitems are checked
+            // if at least one subitem is checked, the group is checked
+            function setGroupCheck(groupName){
+                var oldCurrent = currentIndex
                 currentIndex = -1
-                for (var i = 0; i < groupedList.contentItem.children.length; i++)
+                var setCheck = false
+                var i = groupedList.contentItem.children.length - 1
+
+                for (;i >= 0 && setCheck === false; i--)
                 {
                     var curItem = groupedList.contentItem.children[i];
-                    //console.log(i,": ", curItem, "=", curItem.text);
-
+
+                    // determine if subitem is checked
+                    if (curItem.groupname === groupName && curItem.labelname !== groupName)
+                        if (curItem.checked === true)
+                            setCheck = true;
+
+                }
+
+                for (i = groupedList.contentItem.children.length - 1; i >= 0; i--)
+                {
+                    curItem = groupedList.contentItem.children[i];
                     if (curItem.labelname === groupName)
-                        curItem.checked = false;
-                }
-            }
-
+                        curItem.checked = setCheck
+
+                }
+
+                currentIndex = oldCurrent;
+            }
+
+            // If any subitems are selected, group should be selected.
+            function isGroupSelected(section){
+                var isSel = false;
+                for (var i = testSuiteModel.count - 1; i >=0 && isSel === false; i--)
+                {
+                    var curItem = testSuiteModel.get(i);
+                    //console.log("Section: ", section, " ", i,": ", curItem, "=", curItem.group, " check:", curItem.check);
+
+                    if (curItem.group === section && curItem.check === "true"){
+                        isSel = true;
+                    }
+                }
+                return isSel;
+            }
+
+            // Add up all the selected tests in a group
+            function getEstimatedTime(section){
+                var estTimeStr = "";
+                var estTimeInt=0;
+
+                for (var i = testSuiteModel.count - 1; i >=0; i--)
+                {
+                    var curItem = testSuiteModel.get(i);
+
+                    //console.log("curItem.group:", curItem.group, "check", curItem.check)
+                    if (curItem.group === section && curItem.check === "true")
+                        estTimeInt = parseInt(curItem.duration) + parseInt(estTimeInt);
+
+                }
+                if (estTimeInt == 0)
+                    estTimeStr = "";
+                else if (estTimeInt/60 < 1)
+                    estTimeStr = i18n.tr("< 1 minute");
+                else {
+                    var durMinutes = Math.round(estTimeInt/60);
+                    estTimeStr = durMinutes.toString() + i18n.tr(" minute");
+                    if (durMinutes > 1)
+                        estTimeStr += 's';
+                }
+                return  estTimeStr;
+            }
+
+            //  Open/Close gruops
             function openShutSubgroup(groupName, sel){
+                var oldCurrent = currentIndex;
                 currentIndex = -1
                 for (var i = 0; i < groupedList.contentItem.children.length; i++)
                 {
@@ -248,8 +204,10 @@
                     if (curItem.groupname === groupName && curItem.labelname !== groupName){
                         curItem.height = sel? units.gu(7):units.gu(0);
                         curItem.visible = sel;
+                        groupedList.height += sel?units.gu(7):-units.gu(7)
                     }
                 }
+                currentIndex = oldCurrent;
             }
 
         }

=== added file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionSuiteDelegate.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionSuiteDelegate.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionSuiteDelegate.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,114 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 Ubuntu.Components.ListItems 0.1 as ListItem
+import "."
+
+Component {
+    id: groupDelegate
+
+
+    Item {
+        id: itemdelegate
+        width: parent.width
+        height: units.gu(7)
+
+        property string groupname: section
+        property alias checked: groupcheckbox.checked
+        property string labelname: section
+        property bool open: true
+
+        onOpenChanged: {
+            open?progressIcon.source = "artwork/DownArrow.png":progressIcon.source = "artwork/RightArrow.png"
+        }
+
+        MouseArea {
+            width: parent.width - groupcheckbox.width
+            height: parent.height
+            anchors.right: parent.right
+
+            onClicked: {
+                itemdelegate.open = !itemdelegate.open
+                groupedList.openShutSubgroup(section, itemdelegate.open)
+                //console.log("Open/Shut items below")
+            }
+        }
+
+        Item {
+            id: groupfiller
+            width: units.gu(1)
+        }
+
+        CheckBox {
+            id: groupcheckbox
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: groupfiller.right
+            anchors.leftMargin: units.gu(1)
+            checked: groupedList.isGroupSelected(section)
+            onClicked: groupedList.selectGroup(section, checked)
+        }
+
+
+        Text {
+            id: grouptext
+            text: section
+            width: units.gu(20)
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: groupcheckbox.right
+            anchors.leftMargin: units.gu(1)
+        }
+
+        Item {
+            id: estfiller
+            width: units.gu(55)
+            anchors.left: grouptext.right
+        }
+
+        Text {
+            id: estimatedTimeText
+            text: groupedList.getEstimatedTime(section)
+            width: units.gu(12)
+            anchors.left:  estfiller.right
+            anchors.verticalCenter: parent.verticalCenter
+            horizontalAlignment: Text.AlignHCenter
+            color: "green"
+            font.bold : true
+        }
+
+        Image {
+            id: progressIcon
+            source: "artwork/DownArrow.png"
+            anchors {
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+                rightMargin: units.gu(1)
+            }
+
+            opacity: enabled ? 1.0 : 0.5
+        }
+
+        ListItem.ThinDivider {}
+    }
+}
+

=== added file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionSummary.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionSummary.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionSummary.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,72 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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
+
+Rectangle {
+    id: summary
+
+    property string totalTimeStr: "26 minutes"
+    property int totalTests: 6
+    property int totalManualTests: 2
+
+    height: units.gu(3)
+    color: "lightsteelblue"
+    border {
+        color: UbuntuColors.warmGrey
+        width: 1
+    }
+
+    Text {
+        id: estimatedTimeText
+        text: i18n.tr("Total time: [~" + summary.totalTimeStr + "]")
+        color: "darkslateblue"
+        anchors{
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: units.gu(1)
+        }
+    }
+
+    Text {
+        id: totalTestsText
+        text: i18n.tr("Tests: [" + summary.totalTests + "]")
+        color:"darkslateblue"
+        anchors{
+            verticalCenter: parent.verticalCenter
+            left: estimatedTimeText.right
+            leftMargin: units.gu(10)
+        }
+    }
+
+    Text {
+        id: manualTestsText
+        text: i18n.tr("Manual tests: [" + summary.totalManualTests + "]")
+        color: "darkslateblue"
+        anchors{
+            verticalCenter: parent.verticalCenter
+            left: totalTestsText.right
+            leftMargin: units.gu(10)
+        }
+    }
+}

=== added file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionTestDelegate.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionTestDelegate.qml	1970-01-01 00:00:00 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionTestDelegate.qml	2013-07-18 10:47:25 +0000
@@ -0,0 +1,129 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ *
+ * 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 Ubuntu.Components.ListItems 0.1 as ListItem
+import "./artwork"
+
+Component {
+    id: testDelegate
+
+    Item{
+        id: testitem
+        width: parent.width
+        height: units.gu(7)
+        property string groupname: group
+        property alias checked: itemcheckbox.checked
+        property string labelname: testname
+
+
+        MouseArea {
+            width: parent.width - itemcheckbox.width
+            height: parent.height
+            anchors.right: parent.right
+
+            onClicked: {
+                testdetails.testItem = testSuiteModel.get(index);
+                groupedList.currentIndex = index;  // sets selection
+            }
+        }
+
+        Item {
+            anchors.fill: parent
+
+            Item {
+                id: filler
+                width: itemcheckbox.width
+            }
+
+            CheckBox {
+                id: itemcheckbox
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: filler.right
+                anchors.leftMargin: units.gu(2)
+                checked: check
+                onClicked: {
+                    testSuiteModel.setProperty(index, "check", checked);
+                    groupedList.setGroupCheck(group)
+                }
+            }
+
+
+            Text {
+                id: nameLabel
+                text: testname
+                width: units.gu(40)
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: itemcheckbox.right
+                anchors.leftMargin: units.gu(1)
+            }
+
+            Item {
+                id: typefiller
+                width: units.gu(2)
+                anchors.left: nameLabel.right
+            }
+
+            Text {
+                id: typelabel
+                text: type
+                width: units.gu(10)
+                anchors.left: typefiller.right
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignHCenter
+
+            }
+
+            Item {
+                id: descfiller
+                width: units.gu(20)
+                anchors.left: typelabel.right
+            }
+
+            Text {
+                id: descLabel
+                text: convertToText(duration)
+                width: units.gu(10)
+                anchors.left: descfiller.right
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignHCenter
+
+                function convertToText(durationTime){
+                    var timeStr = "";
+                    if (durationTime/60 < 1)
+                        timeStr = i18n.tr("< 1 minute");
+                    else {
+                        var durMinutes = Math.round(duration/60);
+                        timeStr = durMinutes.toString() + i18n.tr(" minute");
+                        if (durMinutes > 1)
+                            timeStr += 's';
+                    }
+                    return timeStr;
+                }
+            }
+
+
+        }
+        ListItem.ThinDivider {}
+    }
+}

=== modified file 'plainbox-gui/gui-ihv/qml/outline/TestSelectionView.qml'
--- plainbox-gui/gui-ihv/qml/outline/TestSelectionView.qml	2013-07-15 09:47:30 +0000
+++ plainbox-gui/gui-ihv/qml/outline/TestSelectionView.qml	2013-07-18 10:47:25 +0000
@@ -31,65 +31,100 @@
 Page {
     title: i18n.tr("Choose tests to run on your system:")
 
-    Label {
-        id: testselectionlabel
-        width: parent.width
-        anchors.left: parent.left
-        anchors.leftMargin: units.gu(2)
-        anchors.topMargin: units.gu(4)
+
+    Item { // puts a space at the top
+        id: filler
+        height: units.gu(0)
+        anchors {
+            left: parent.left
+            top: parent.top
+        }
     }
 
     Item {
         id: testlistheaders
         width: parent.width - units.gu(4)
         height: units.gu(3)
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: testselectionlabel.bottom
-        anchors.margins: units.gu(2)
-
+
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: filler.bottom
+            margins: units.gu(2)
+        }
+
+        Item {
+            id: compfiller
+            width: units.gu(6)
+            anchors.left: parent.left
+        }
         Text  {
             id: complabel
-            anchors.left: parent.left
-            anchors.leftMargin: units.gu(6)
+            width: units.gu(12)
             text: i18n.tr("Components")
-        }
+            anchors.left: compfiller.right
+        }
+        Item {
+            id: typefiller
+            width: units.gu(28)
+            anchors.left: complabel.right
+        }
+
         Text  {
             id: typelabel
-            anchors.left: complabel.right
-            anchors.leftMargin: units.gu(40)
             text: i18n.tr("Type")
+            anchors.left: typefiller.right
+            anchors.leftMargin: units.gu(10)
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Item {
+            id: descfiller
+            width: units.gu(24)
+            anchors.left: typelabel.right
         }
         Text  {
             id: descriptionlabel
-            anchors.left: typelabel.right
-            anchors.leftMargin: units.gu(30)
+            width: units.gu(10)
             text: i18n.tr("Description")
+            horizontalAlignment: Text.AlignHCenter
+            anchors.left: descfiller.right
         }
     }
 
     TestSelectionListView {
         id: testsuitelist
-        height: units.gu(56)
-        width: parent.width - units.gu(4)
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: testlistheaders.bottom
+        height: parent.height - filler.height - testlistheaders.height - summary.height - testbuttons.height - units.gu(12)
+
+        width: testlistheaders.width
+
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top: testlistheaders.bottom
+        }
     }
 
+
+
     TestSelectionDetails {
         id: testdetails
-        height: units.gu(20)
-        width: parent.width - units.gu(4)
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: testsuitelist.bottom
-        anchors.topMargin: units.gu(2)
+        height: units.gu(4)
+        width: testlistheaders.width
+
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top: testsuitelist.bottom
+            topMargin: units.gu(1)
+        }
     }
 
 
     TestSelectionButtons {
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: testdetails.bottom
-        anchors.topMargin: units.gu(5)
+        id: testbuttons
+        anchors{
+             horizontalCenter: parent.horizontalCenter
+             bottom: parent.bottom
+             bottomMargin: units.gu(4)
+        }
 
         onSelectAll:{
             testsuitelist.selectAll(true);
@@ -101,10 +136,19 @@
 
         onStartTesting: {
             // CHANGE THIS TO NEXT PAGE TO BRING UP
-            mainView.state = "DEMOWARNINGS"
+            mainView.state = "RUNMANAGER"
             console.log("Start Testing")
         }
     }
+
+    TestSelectionSummary{
+        id: summary
+        width: parent.width
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+        }
+    }
 }
 
 

=== modified file 'plainbox-gui/gui-ihv/qml/outline/WelcomeView.qml'
--- plainbox-gui/gui-ihv/qml/outline/WelcomeView.qml	2013-07-12 14:18:25 +0000
+++ plainbox-gui/gui-ihv/qml/outline/WelcomeView.qml	2013-07-18 10:47:25 +0000
@@ -22,13 +22,10 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-    import Ubuntu.Components.ListItems 0.1 as ListItem
-
-
 
 
 Page {
-    title: "Welcome!"
+    title: i18n.tr("Welcome!")
 
 
 
@@ -37,8 +34,8 @@
          anchors.right: parent.right
          anchors.bottom: parent.bottom
          anchors.margins: units.gu(2)
-         text: i18n.tr("Move on to Test Selection")
+         text: i18n.tr("OK")
          color: UbuntuColors.lightAubergine
-         onClicked: {mainView.state = "TESTSELECTION"}
+         onClicked: {mainView.state = "SUITESELECTION"}
     }
 }

=== added directory 'plainbox-gui/gui-ihv/qml/outline/artwork'
=== added file 'plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]'
Binary files plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	2013-07-18 10:47:25 +0000 differ
=== added file 'plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]'
Binary files plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	2013-07-18 10:47:25 +0000 differ
=== added file 'plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]'
Binary files plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	2013-07-18 10:47:25 +0000 differ
=== added file 'plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]'
Binary files plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	2013-07-18 10:47:25 +0000 differ
=== added file 'plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]'
Binary files plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and plainbox-gui/gui-ihv/qml/outline/artwork/[e-mail]	2013-07-18 10:47:25 +0000 differ
=== modified file 'plainbox-gui/gui-ihv/qml/outline/gui-ihv.qml'
--- plainbox-gui/gui-ihv/qml/outline/gui-ihv.qml	2013-07-15 09:47:30 +0000
+++ plainbox-gui/gui-ihv/qml/outline/gui-ihv.qml	2013-07-18 10:47:25 +0000
@@ -20,7 +20,7 @@
  */
 
 import QtQuick 2.0
-import GuiEngine 1.0
+//import GuiEngine 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import "."
@@ -29,13 +29,13 @@
 MainView {
     id: mainView
     width: units.gu(120)
-    height: units.gu(110)
+    height: units.gu(100)
 
 
     PageStack {
         id: pageStack
         state: "WELCOME"
-        property string pageName: "DemoWarnings.qml"
+        property string pageName: "DemoWarnings.qml"  // initial state
 
         Component.onCompleted: {
             push(Qt.resolvedUrl(pageName))
@@ -48,7 +48,7 @@
     }
 
     // Fill in states for all the pages.
-    // The pages/views will set the state to the next one when it is dones
+    // The pages/views will set the state to the next one when it is done
     // like this: onClicked: {mainView.state = "TESTSELECTION"}
     states: [
         State {
@@ -56,12 +56,20 @@
             PropertyChanges { target: pageStack; pageName: "WelcomeView.qml"}
         },
         State {
+            name: "SUITESELECTION"
+            PropertyChanges { target: pageStack; pageName: "SuiteSelectionView.qml"}
+        },
+        State {
             name: "DEMOWARNINGS"
             PropertyChanges { target: pageStack; pageName: "DemoWarnings.qml"}
         },
         State {
             name: "TESTSELECTION"
             PropertyChanges { target: pageStack; pageName: "TestSelectionView.qml"}
+        },
+        State {
+            name: "RUNMANAGER"
+            PropertyChanges {target: pageStack; pageName: "RunManagerView.qml"}
         }
 
     ]

=== modified file 'plainbox-gui/gui-ihv/testsuiteitem.cpp'
--- plainbox-gui/gui-ihv/testsuiteitem.cpp	2013-07-12 14:18:25 +0000
+++ plainbox-gui/gui-ihv/testsuiteitem.cpp	2013-07-18 10:47:25 +0000
@@ -22,11 +22,14 @@
 #include <qdebug.h>
 #include "testsuiteitem.h"
 
-TestSuiteItem::TestSuiteItem(const QString &groupName, const QString &testName, QObject * parent  ) :
+
+TestSuiteItem::TestSuiteItem(const QString &groupName, const QString &testName, int duration, const QString &type, QObject * parent  ) :
     ListItem( parent ),
     m_group(groupName),
     m_testName(testName),
-    m_check(true)
+    m_check(true),
+    m_duration(duration),
+    m_type(type)
 {
 }
 
@@ -37,6 +40,8 @@
   names[GroupRole] = "group";
   names[TestNameRole] = "testname";
   names[CheckRole] = "check";
+  names[DurationRole] = "duration";
+  names[TypeRole] = "type";
   return names;
 }
 
@@ -49,6 +54,10 @@
     return testname();
   case CheckRole:
       return check();
+  case DurationRole:
+      return duration();
+  case TypeRole:
+      return type();
   default:
     return QVariant();
   }
@@ -65,6 +74,9 @@
     case CheckRole:
         setCheck(value.toBool());
         break;
+    case DurationRole:
+        setDuration(value.toInt());
+        break;
     }
 
 }
@@ -93,8 +105,15 @@
         m_check = check;
         emit checkChanged();
         emit dataChanged();
-        //qDebug() << "Check changed to" << check;
+        //qDebug() << m_testName << "check changed to" << check;
     }
 }
 
+void TestSuiteItem::setDuration(int duration){
+    if (duration != m_duration){
+        m_duration = duration;
+        emit durationChanged();
+        emit dataChanged();
+    }
+}
 

=== modified file 'plainbox-gui/gui-ihv/testsuiteitem.h'
--- plainbox-gui/gui-ihv/testsuiteitem.h	2013-07-12 14:18:25 +0000
+++ plainbox-gui/gui-ihv/testsuiteitem.h	2013-07-18 10:47:25 +0000
@@ -29,23 +29,30 @@
     Q_PROPERTY(QString group READ group WRITE setGroup NOTIFY groupChanged)
     Q_PROPERTY(QString testname READ testname WRITE setTestname NOTIFY testnameChanged)
     Q_PROPERTY(bool check READ check WRITE setCheck NOTIFY checkChanged)
+    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+    Q_PROPERTY(QString type READ type)
+
+
 
 signals:
     void groupChanged();
     void testnameChanged();
     void checkChanged();
+    void durationChanged();
 
 public:
       enum Roles {
         GroupRole = Qt::UserRole+1,
         TestNameRole,
-        CheckRole
+        CheckRole,
+        DurationRole,
+        TypeRole
       };
 
 
 public:
     TestSuiteItem(QObject * parent = 0 ) : ListItem(parent), m_check(true){}
-    TestSuiteItem(const QString &groupName, const QString &testname, QObject * parent = 0 );
+    TestSuiteItem(const QString &groupName, const QString &testname, int durationInSeconds, const QString &type, QObject * parent = 0 );
 
     QVariant data(int role) const;
     void setData(const QVariant & value, int role);
@@ -62,12 +69,18 @@
     inline bool check() const { return m_check; }
     void setCheck(bool check);
 
+    inline int duration() const { return m_duration; }
+    void setDuration(int duration);
+
+    inline QString type() const {return m_type; }
+
 
 private:
     QString m_group;
     QString m_testName;
     bool m_check;
-
+    int m_duration;
+    QString m_type;
 };