Merge lp:~zyga/checkbox/drop-legacy into lp:~checkbox-dev/checkbox/checkbox-packaging

[Zygmunt Krynicki]

This branch drops all checkbox-old related packages from trunk packaging.

[lp:~zyga/checkbox/drop-legacy]

2826. By Zygmunt Krynicki on 2014-03-21

plainbox:test-data: update integration tests to use stubbox

Now that checkbox-old is gone and we don't assume to use any particular
provider. All integration tests should use stubbox.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2827. By Zygmunt Krynicki on 2014-03-21

plainbox: drop PLAINBOX_USE_TRUSTED_LAUNCHER

This patch drops the special PLAINBOX_USE_TRUSTED_LAUNCHER environment variable
that allowed to force-use plainbox-trusted-launcher-1 with a special insecure,
hidden argument --development, to use checkbox-from-source provider. With the
removal of checkbox-old, that option makes no sense anymore.

Signed-off-by: Zygmunt Krynicki <email address hidden>

Unmerged revisions

2827. By Zygmunt Krynicki on 2014-03-21

plainbox: drop PLAINBOX_USE_TRUSTED_LAUNCHER

This patch drops the special PLAINBOX_USE_TRUSTED_LAUNCHER environment variable
that allowed to force-use plainbox-trusted-launcher-1 with a special insecure,
hidden argument --development, to use checkbox-from-source provider. With the
removal of checkbox-old, that option makes no sense anymore.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2826. By Zygmunt Krynicki on 2014-03-21

plainbox:test-data: update integration tests to use stubbox

Now that checkbox-old is gone and we don't assume to use any particular
provider. All integration tests should use stubbox.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2825. By Zygmunt Krynicki on 2014-03-20

Replace whitelist symlinks with copies from checkbox-old

2824. By Zygmunt Krynicki on 2014-03-20

support:releasectl: drop support for checkbox-old

2823. By Zygmunt Krynicki on 2014-03-20

plainbox,checkbox-ng: drop all references to checkbox-src provider

2822. By Zygmunt Krynicki on 2014-03-20

support: don't multiplex to checkbox-old

2821. By Zygmunt Krynicki on 2014-03-20

support: don't develop checkbox-old

2820. By Zygmunt Krynicki on 2014-03-20

Remove checkbox-old references from ignore files

2819. By Zygmunt Krynicki on 2014-03-20

Replace whitelist symlinks with copies from checkbox-old

2818. By Zygmunt Krynicki on 2014-03-20

Replace data symlinks with copies from checkbox-old (actual data)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-03-20 14:51:45 +0000
@@ -0,0 +1,24 @@
+# Ignore all python3 bytecode data
+__pycache__
+# Ignore setuptools artifacts
+build
+dist
+*.egg-info
+# Ignore coverage artifacts
+.coverage
+htmlcov
+# Ignore logs created by test-in-vagrant.sh
+vagrant-logs
+# Ignore vagrant state file
+.vagrant
+# The list below is riddled with junk created by running the test suite of checkbox
+# It should be really cleaned up as tests should _not_ do that but right now it's more
+# annoying than dangerous so I'll get rid of the noise first
+*.o
+# Attic where zygmunt puts random stuff
+_attic
+# Orig files from diffs and patches
+*.orig
+# Ignore stuff we get from somewhere else
+support/external-tarballs
+support/checkbox-packaging

=== added file '.coveragerc'
--- .coveragerc	1970-01-01 00:00:00 +0000
+++ .coveragerc	2014-03-20 14:51:45 +0000
@@ -0,0 +1,25 @@
+[run]
+branch = True
+source = plainbox
+omit =
+    plainbox/impl/commands/test_*
+    plainbox/impl/exporter/test_*
+    plainbox/impl/integration_tests.py
+    plainbox/impl/secure/test_*
+    plainbox/impl/test_*
+    plainbox/impl/transport/test_*
+    plainbox/setup.py
+    plainbox/test_*
+    plainbox/testing_utils/test_*
+    plainbox/tests.py
+    plainbox/vendor/*
+
+[report]
+exclude_lines =
+    @abc.abstractmethod
+    @abc.abstractproperty
+    @abstractmethod
+    @abstractproperty
+    @public
+    pragma: no cover
+    raise NotImplementedError

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2014-03-20 14:51:45 +0000
@@ -0,0 +1,24 @@
+# Ignore all python3 bytecode data
+__pycache__
+# Ignore setuptools artifacts
+build
+dist
+*.egg-info
+# Ignore coverage artifacts
+.coverage
+htmlcov
+# Ignore logs created by test-in-vagrant.sh
+vagrant-logs
+# Ignore vagrant state file
+.vagrant
+# The list below is riddled with junk created by running the test suite of checkbox
+# It should be really cleaned up as tests should _not_ do that but right now it's more
+# annoying than dangerous so I'll get rid of the noise first
+*.o
+# Attic where zygmunt puts random stuff
+_attic
+# Orig files from diffs and patches
+*.orig
+# Ignore stuff we get from somewhere else
+support/external-tarballs
+support/checkbox-packaging

=== added file '.travis.yml'
--- .travis.yml	1970-01-01 00:00:00 +0000
+++ .travis.yml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,5 @@
+language: python
+python:
+    - "3.2"
+    - "3.3"
+script: cd plainbox && python3 setup.py test

=== added file 'Vagrantfile'
--- Vagrantfile	1970-01-01 00:00:00 +0000
+++ Vagrantfile	2014-03-20 14:51:45 +0000
@@ -0,0 +1,57 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 :
+
+Vagrant::Config.run do |config|
+
+  config.ssh.timeout = 60
+
+  # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
+  config.vm.define :precise do |precise_config|
+    precise_config.vm.box = "precise-cloud-i386"
+    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
+  config.vm.define :quantal do |quantal_config|
+    quantal_config.vm.box = "quantal-cloud-i386"
+    quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 13.04 release (raring)
+  config.vm.define :raring do |raring_config|
+    raring_config.vm.box = "raring-cloud-i386"
+    raring_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 13.10 release (saucy)
+  config.vm.define :saucy do |saucy_config|
+    saucy_config.vm.box = "saucy-cloud-i386"
+    saucy_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 14.04 release (trusty)
+  config.vm.define :trusty do |trusty_config|
+    trusty_config.vm.box = "trusty-cloud-i386"
+    trusty_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # For debugging and later future GUI testing
+  if ENV.key? "VAGRANT_GUI"
+    config.vm.boot_mode = :gui
+  end
+
+  if ENV.key? "VAGRANT_APT_CACHE"
+    # Setup an apt cache if one is available and explicitly configured
+    config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"#{ENV['VAGRANT_APT_CACHE']}\"; };' > /etc/apt/apt.conf"
+  elsif File.exists? "/etc/apt-cacher-ng"
+    # If apt-cacher-ng is installed on this machine then just use it.
+    require 'socket'
+    guessed_address = Socket.ip_address_list.detect{|intf| !intf.ipv4_loopback?}
+    if guessed_address
+      config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"http://#{guessed_address.ip_address}:3142\"; };' > /etc/apt/apt.conf"
+    end
+  end
+
+  # Provision everything using a standalone shell script
+  config.vm.provision :shell, :path => "support/provision-vagrant"
+end

=== added directory 'checkbox-gui'
=== added file 'checkbox-gui/README.rst'
--- checkbox-gui/README.rst	1970-01-01 00:00:00 +0000
+++ checkbox-gui/README.rst	2014-03-20 14:51:45 +0000
@@ -0,0 +1,61 @@
+Checkbox GUI
+============
+
+Checkbox GUI is a Qt/QML GUI running over D-Bus to control Plainbox.
+
+Folder layout/structure
+
+gui-engine/		Contains the D-Bus framework and C++ plugin which represents
+				plainbox classes/API
+				
+checkbox-gui/   Contains the QML/Qt "skin" which is used to drive testing.
+                There may be other "skins" created later...
+
+External Documentation Links
+============================
+
+How to test and work with checkbox-gui code
+======================================
+To test checkbox-gui:  
+	Software Needed:
+		QT Creator (2.7.0 or greater)  
+		Ubuntu.Components 0.1 - This is part of the Ubunutu distribution 
+			and gets updated
+    How to install:
+        Run the mk-venv script on the top level directory, this will add the
+        required PPAs and install the needed packages.
+        Optionally, to install manually:
+        - sudo apt-add-repository ppa:ubuntu-sdk-team/ppa
+        - sudo apt-add-repository ppa:canonical-qt5-edgers/qt5-proper
+        - sudo apt-get update
+        - sudo apt-get install qtcreator
+        - sudo apt-get install ubuntu-sdk
+        - sudo apt-get dist-upgrade
+
+*NEW*. Since the UI is now getting live data through dbus, a plainbox service is required:
+
+- Open a new terminal
+- Change to the branch's top directory and run:
+  $ mk-venv /tmp/plainbox-venv
+- Activate the venv:
+  $ . /tmp/plainbox-venv/bin/activate #Note the dot is significant
+- Run plainbox in service mode:
+  $ plainbox service
+
+
+Once the required tools and dependencies are installed:
+
+1. Open QT Creator
+2. File->Open Project->checkbox-gui.pro
+3. Build->Run
+4. Interact with the UI
+
+There seems to be a visual glitch when starting the UI (step 3). You may notice
+that a "ghost" window opens, this looks like qt creator but it's a "mirror" or
+bitmap of that window. This is the actual application window. To make it react,
+simply try to move it around, or close it and restart it (the ghost window,
+not qt creator itself). This bug has been reported and is being looked at.
+
+TBD
+
+

=== added file 'checkbox-gui/TRANSLATIONS.rst'
--- checkbox-gui/TRANSLATIONS.rst	1970-01-01 00:00:00 +0000
+++ checkbox-gui/TRANSLATIONS.rst	2014-03-20 14:51:45 +0000
@@ -0,0 +1,36 @@
+Updating translations
+=====================
+
+Translations for Checkbox GUI happen in `Launchpad Translations
+<https://translations.launchpad.net/checkbox>`_ and
+are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps::
+
+    cd po
+    make pot
+
+Then commit the updated .pot file with the rest of your merge request. Once
+the branch lands Launchpad should take care of all the rest!
+
+Behind the scenes
+=================
+
+Behind the scenes, whenever the .pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual .po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations follow the standard `gettext format
+<https://www.gnu.org/software/gettext>`_.

=== added directory 'checkbox-gui/checkbox-gui'
=== added file 'checkbox-gui/checkbox-gui.pro'
--- checkbox-gui/checkbox-gui.pro	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui.pro	2014-03-20 14:51:45 +0000
@@ -0,0 +1,23 @@
+# This file is part of checkbox-gui
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Authors:
+# - Andrew Haigh <[e-mail]>
+#   Zygmunt Krynicki <[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/>.
+
+TEMPLATE = subdirs
+SUBDIRS = gui-engine checkbox-gui test-gui-engine po
+CONFIG = ordered

=== added file 'checkbox-gui/checkbox-gui/README.rst'
--- checkbox-gui/checkbox-gui/README.rst	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/README.rst	2014-03-20 14:51:45 +0000
@@ -0,0 +1,5 @@
+checkbox-gui
+===============
+
+This folder contains the Qml/Qt "skin" which represents the Checkbox workflow, and makes use of ../gui-engine to call Plainbox API's via D-Bus
+

=== added file 'checkbox-gui/checkbox-gui/WhiteListModelFactory.cpp'
--- checkbox-gui/checkbox-gui/WhiteListModelFactory.cpp	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/WhiteListModelFactory.cpp	2014-03-20 14:51:45 +0000
@@ -0,0 +1,72 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Andrew Haigh <[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/>.
+ */
+
+#include "WhiteListModelFactory.h"
+
+ListModel* WhiteListModelFactory::CreateWhiteListModel(ListModel *model, const QString &filter)
+{
+    qDebug("WhiteListModelFactory::CreateWhiteListModel()");
+
+    // We can create OR update the model
+    if (model==NULL) {
+        qDebug("Creating fresh WhiteListItem");
+        model = new ListModel(new WhiteListItem, qApp);
+        if (model == NULL) {
+            qDebug("Cannot allocate memory to our testitemmodel");
+        }
+
+    } else {
+        qDebug("Recreating TestItemModel");
+        model->clear();
+    }
+
+    const QString engname("");
+
+    GuiEngine* myengine = qApp->findChild<GuiEngine*>(engname);
+    if(myengine == NULL) {
+        qDebug("Cant find guiengine object");
+
+        // NB: Model will be empty at this point
+        return model;
+    }
+
+    QMap<QDBusObjectPath,QString> paths_and_names = \
+            myengine->GetWhiteListPathsAndNames();
+
+    QMap<QDBusObjectPath,QString>::const_iterator iter = paths_and_names.begin();
+
+    QRegExp rx(filter);
+
+    while(iter != paths_and_names.end() ) {
+        if (rx.exactMatch(iter.value())) {
+            qDebug() << iter.key().path();
+            qDebug() << " Name: " << iter.value();
+            model->appendRow(new WhiteListItem(iter.value(), \
+                                               iter.key().path(), \
+                                               model));
+        }
+        iter++;
+    }
+
+    qDebug("WhiteListModelFactory::CreateWhiteListModel() - Done");
+
+    return model;
+}

=== added file 'checkbox-gui/checkbox-gui/WhiteListModelFactory.h'
--- checkbox-gui/checkbox-gui/WhiteListModelFactory.h	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/WhiteListModelFactory.h	2014-03-20 14:51:45 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Andrew Haigh <[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/>.
+ */
+
+#ifndef WHITELISTMODELFACTORY_H
+#define WHITELISTMODELFACTORY_H
+
+#include <QObject>
+#include "whitelistitem.h"
+#include "../gui-engine/gui-engine.h"
+
+// Factory class to create or update a TestItem Model
+class WhiteListModelFactory : public QObject
+{
+    Q_OBJECT
+
+public:
+    WhiteListModelFactory() {};
+    ~WhiteListModelFactory() {};
+
+public slots:
+    ListModel* CreateWhiteListModel(ListModel* model=NULL, const QString &filter=QString());
+};
+
+#endif // WHITELISTMODELFACTORY_H

=== added file 'checkbox-gui/checkbox-gui/checkbox-gui.desktop'
--- checkbox-gui/checkbox-gui/checkbox-gui.desktop	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/checkbox-gui.desktop	2014-03-20 14:51:45 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=System Testing
+Comment=Test your systems compatibility with Ubuntu
+Type=Application
+Exec=checkbox-gui
+Icon=checkbox
+Categories=System;Qt;Application
+Keywords=testing;drivers;hardware;
+X-GNOME-Gettext-Domain=checkbox-gui
+X-Ayatana-Appmenu-Show-Stubs=False
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage

=== added file 'checkbox-gui/checkbox-gui/checkbox-gui.pro'
--- checkbox-gui/checkbox-gui/checkbox-gui.pro	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/checkbox-gui.pro	2014-03-20 14:51:45 +0000
@@ -0,0 +1,88 @@
+# This file is part of Checkbox
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Authors:
+# - Andrew Haigh <[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/>.
+#
+
+# Add more folders to ship with the application, here
+folder_01.source = qml
+folder_01.target = ../share/checkbox-gui
+DEPLOYMENTFOLDERS = folder_01
+
+QT += dbus widgets
+TARGET = checkbox-gui
+TEMPLATE = app
+
+isEmpty(PREFIX) {
+      PREFIX = /usr/local
+}
+
+LIBS += -L../lib/$$TARGET/plugins/ -lgui-engine
+
+# Additional import path used to resolve QML modules
+QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/../lib/checkbox-gui/plugins\''
+
+SOURCES += main.cpp \
+    whitelistitem.cpp \
+    testitem.cpp \
+    listmodel.cpp \
+    testitemmodel.cpp \
+    settings.cpp \
+    WhiteListModelFactory.cpp
+
+# Please do not modify the following two lines. Required for deployment.
+include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
+qtcAddDeployment()
+
+desktop.path = $$PREFIX/share/applications
+desktop.files += checkbox-gui.desktop
+
+INSTALLS += desktop
+
+icons.path = $$PREFIX/share/icons/hicolor
+icons.files += icons/* 
+
+INSTALLS += icons
+
+HEADERS += whitelistitem.h \
+    testitem.h \
+    listmodel.h \
+    testitemmodel.h \
+    settings.h \
+    WhiteListModelFactory.h
+
+target.path = $$PREFIX/bin
+INSTALLS += target
+
+qml_files.path = $$PREFIX/share/checkbox-gui
+qml_files.files = qml
+
+INSTALLS += qml_files
+
+OTHER_FILES += \
+    qml/DummyListModel.qml \
+    qml/TestSelectionButtons.qml \
+    qml/TestSelectionView.qml \
+    qml/TestSelectionListView.qml \
+    qml/TestSelectionSuiteDelegate.qml \
+    qml/TestSelectionTestDelegate.qml \
+    qml/SuiteSelectionDelegate.qml \
+    qml/SuiteSelectionView.qml \
+    qml/RunManagerView.qml \
+    qml/RunManagerSuiteDelegate.qml \
+    qml/SubmissionDialog.qml \
+    qml/checkbox-gui.qml

=== added file 'checkbox-gui/checkbox-gui/listmodel.cpp'
--- checkbox-gui/checkbox-gui/listmodel.cpp	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/listmodel.cpp	2014-03-20 14:51:45 +0000
@@ -0,0 +1,162 @@
+/*
+ * Author: Christophe Dumez <[e-mail]>
+ * License: Public domain (No attribution required)
+ * Website: http://cdumez.blogspot.com/
+ * Version: 1.0
+ */
+
+#include <qdebug.h>
+#include "listmodel.h"
+
+ListModel::ListModel(ListItem* prototype, QObject *parent) :
+    QAbstractListModel(parent), m_prototype(prototype)
+{
+}
+
+int ListModel::rowCount(const QModelIndex &parent) const
+{
+  Q_UNUSED(parent);
+  return m_list.size();
+}
+
+QVariant ListModel::data(const QModelIndex &index, int role) const
+{
+  if(index.row() < 0 || index.row() >= m_list.size())
+    return QVariant();
+  return m_list.at(index.row())->data(role);
+}
+
+bool ListModel::setData(const QModelIndex & index, const QVariant & value, int role){
+    if(index.row() < 0 || index.row() >= m_list.size())
+      return false;
+    m_list.at(index.row())->setData(value, role);
+    return true;
+}
+
+Qt::ItemFlags ListModel::flags(const QModelIndex &index) const
+{
+    if (index.isValid())
+        return (QAbstractListModel::flags(index)|Qt::ItemIsSelectable);
+
+    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
+}
+
+ListModel::~ListModel() {
+  delete m_prototype;
+  clear();
+}
+
+void ListModel::appendRow(ListItem *item)
+{
+  appendRows(QList<ListItem*>() << item);
+}
+
+void ListModel::appendRows(const QList<ListItem *> &items)
+{
+  beginInsertRows(QModelIndex(), rowCount(), rowCount()+items.size()-1);
+  foreach(ListItem *item, items) {
+    connect(item, SIGNAL(dataChanged()), SLOT(handleItemChange()));
+    m_list.append(item);
+  }
+  endInsertRows();
+}
+
+void ListModel::insertRow(int row, ListItem *item)
+{
+  beginInsertRows(QModelIndex(), row, row);
+  connect(item, SIGNAL(dataChanged()), SLOT(handleItemChange()));
+  m_list.insert(row, item);
+  endInsertRows();
+}
+
+void ListModel::handleItemChange()
+{
+  ListItem* item = static_cast<ListItem*>(sender());
+  QModelIndex index = indexFromItem(item);
+  if(index.isValid())
+    emit dataChanged(index, index);
+
+}
+
+ListItem * ListModel::find(const QString &id) const
+{
+  foreach(ListItem* item, m_list) {
+    if(item->id() == id) return item;
+  }
+  return 0;
+}
+
+QModelIndex ListModel::indexFromItem(const ListItem *item) const
+{
+  Q_ASSERT(item);
+  for(int row=0; row<m_list.size(); ++row) {
+    if(m_list.at(row) == item) return index(row);
+  }
+  return QModelIndex();
+}
+
+void ListModel::clear()
+{
+  qDeleteAll(m_list);
+  m_list.clear();
+}
+
+bool ListModel::removeRow(int row, const QModelIndex &parent)
+{
+  Q_UNUSED(parent);
+  if(row < 0 || row >= m_list.size()) return false;
+  beginRemoveRows(QModelIndex(), row, row);
+  delete m_list.takeAt(row);
+  endRemoveRows();
+  return true;
+}
+
+bool ListModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+  Q_UNUSED(parent);
+  if(row < 0 || (row+count) >= m_list.size()) return false;
+  beginRemoveRows(QModelIndex(), row, row+count-1);
+  for(int i=0; i<count; ++i) {
+    delete m_list.takeAt(row);
+  }
+  endRemoveRows();
+  return true;
+}
+
+ListItem * ListModel::takeRow(int row)
+{
+  beginRemoveRows(QModelIndex(), row, row);
+  ListItem* item = m_list.takeAt(row);
+  endRemoveRows();
+  return item;
+}
+
+QHash<int, QByteArray> ListModel::roleNames() const{
+    return m_prototype->roleNames();
+}
+
+QVariant ListModel::get(int row)
+{
+    ListItem * item = m_list.at(row);
+    QMap<QString, QVariant> itemData;
+    QHashIterator<int, QByteArray> hashItr(item->roleNames());
+    while(hashItr.hasNext()){
+        hashItr.next();
+        itemData.insert(hashItr.value(),item->data(hashItr.key()).toString());
+    }
+
+    return QVariant(itemData);
+}
+
+void ListModel::setProperty(int idx, const QString& property, const QVariant& value)
+{
+    if (rowCount() == 0 || idx >= rowCount() || idx < 0) {
+        return;
+    }
+
+    QHashIterator<int, QByteArray> hashItr(roleNames());
+
+    if ( hashItr.findNext(property.toUtf8()) ){
+        m_list[idx]->setData(value, hashItr.key());
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/listmodel.h'
--- checkbox-gui/checkbox-gui/listmodel.h	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/listmodel.h	2014-03-20 14:51:45 +0000
@@ -0,0 +1,78 @@
+/*
+ * Author: Christophe Dumez <[e-mail]>
+ * License: Public domain (No attribution required)
+ * Website: http://cdumez.blogspot.com/
+ * Version: 1.0
+ */
+
+#ifndef LISTMODEL_H
+#define LISTMODEL_H
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QVariant>
+
+class ListItem: public QObject {
+  Q_OBJECT
+
+public:
+  ListItem(QObject* parent = 0) : QObject(parent) {}
+  virtual ~ListItem() {}
+  virtual QString id() const = 0;
+  virtual QVariant data(int role) const = 0;
+  virtual void setData(const QVariant & value, int role) = 0;
+  virtual QHash<int, QByteArray> roleNames() const = 0;
+
+
+signals:
+  void dataChanged();
+};
+
+class ListModel : public QAbstractListModel
+{
+  Q_OBJECT
+  Q_PROPERTY( int count READ getCount() NOTIFY countChanged())
+
+signals:
+    void countChanged();
+
+
+public:
+  explicit ListModel(ListItem* prototype, QObject* parent = 0);
+  ~ListModel();
+  int rowCount(const QModelIndex &parent = QModelIndex()) const;
+  QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+  bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
+  Qt::ItemFlags flags(const QModelIndex &index) const;
+
+  int getCount() { this->count = this->rowCount(); return count; }
+
+  Q_INVOKABLE QVariant get(int row);
+  Q_INVOKABLE void setProperty(int index, const QString& property, const QVariant& value);
+
+
+  void appendRow(ListItem* item);
+  void appendRows(const QList<ListItem*> &items);
+  void insertRow(int row, ListItem* item);
+  bool removeRow(int row, const QModelIndex &parent = QModelIndex());
+  bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+  ListItem* takeRow(int row);
+  ListItem* find(const QString &id) const;
+  QModelIndex indexFromItem( const ListItem* item) const;
+  void clear();
+
+protected:
+    QHash<int, QByteArray> roleNames() const;
+
+
+private slots:
+  void handleItemChange();
+
+protected:
+  ListItem* m_prototype;
+  QList<ListItem*> m_list;
+  int count;
+};
+
+#endif // LISTMODEL_H

=== added file 'checkbox-gui/checkbox-gui/main.cpp'
--- checkbox-gui/checkbox-gui/main.cpp	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/main.cpp	2014-03-20 14:51:45 +0000
@@ -0,0 +1,136 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Andrew Haigh <[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/>.
+ */
+
+#include <QtWidgets/QApplication>
+#include <QtGui/QGuiApplication>
+#include <QCoreApplication>
+#include <QPluginLoader>
+#include <QQmlExtensionPlugin>
+#include <QDir>
+#include <QtQml>
+
+#include "qtquick2applicationviewer.h"
+#include "listmodel.h"
+#include "whitelistitem.h"
+#include "settings.h"
+#include "testitem.h"
+#include "testitemmodel.h"
+#include "WhiteListModelFactory.h"
+
+#include "../gui-engine/gui-engine.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QByteArray applicationName;
+    applicationName = QFileInfo(QCoreApplication::applicationFilePath()).fileName().toUtf8();
+    qputenv("APP_ID", applicationName);
+
+    qmlRegisterType<WhiteListItem>("Ubuntu.Checkbox", 0, 1, "WhiteListItem");
+    qmlRegisterType<TestItem>("Ubuntu.Checkbox", 0, 1, "TestItem");
+
+    QtQuick2ApplicationViewer viewer;
+
+    // Create our GuiEngine and hang it on QGuiApplication
+    GuiEngine guiengine((QObject*)&app);
+
+    // Register the applicationName with the QML runtime
+    viewer.rootContext()->setContextProperty("applicationName", applicationName);
+
+    // Register the GuiEngine with the QML runtime
+    viewer.rootContext()->setContextProperty("guiEngine", &guiengine);
+
+    // Initialise - connect to Plainbox
+    guiengine.Initialise();
+
+    Settings* settings;
+    settings = new Settings();
+    if (app.arguments().size() > 1) {
+        settings = new Settings(app.arguments().at(1));
+    }
+    viewer.rootContext()->setContextProperty("settings", settings);
+
+    WhiteListModelFactory whitelistfactory;
+
+    /* We need a placeholder object here or the QML integration is unhappy
+     * that this isnt a recognisable Qt object.
+     */
+    ListModel* whitelistmodel = new ListModel(new WhiteListItem, qApp);
+    if (!whitelistmodel) {
+        // Essentially we are likely out of memory here
+        qDebug("Cannot create whitelist model");
+        exit(1);
+    }
+
+    whitelistfactory.CreateWhiteListModel(whitelistmodel, settings->value("suite/whitelist_filter", ".*"));
+
+    viewer.rootContext()->setContextProperty("whiteListModel", whitelistmodel);
+
+    // Test Item Model Factory and placeholder model registered with QML engine
+    TestItemModel testitemFactory;
+    viewer.rootContext()->setContextProperty("testitemFactory",&testitemFactory);
+
+    /* We need a placeholder object here or the QML integration is unhappy
+     * that this isnt a recognisable Qt object.
+     */
+    ListModel* testlistmodel = new ListModel(new TestItem, qApp); //CreateTestListModel();
+    if (!testlistmodel) {
+        // Essentially we are likely out of memory here
+        qDebug("Cannot create testlist model");
+        exit(1);
+    }
+
+    viewer.rootContext()->setContextProperty("testListModel", testlistmodel);
+
+     // In the beginning, lets see if we need to resume
+    bool resumeSession = false;
+
+    QString previous = guiengine.GuiPreviousSessionFile();
+     if ( previous.isEmpty() ) {
+         // Show the Welcome screen
+     } else {
+          // show the resume screen
+         qDebug() << "Resume session file : " << previous;
+
+         resumeSession = true;
+     }
+
+    viewer.rootContext()->setContextProperty("resumePreviousSession",resumeSession);
+
+
+
+    // Now, load the main page
+    viewer.setMainQmlFile(QStringLiteral("../share/checkbox-gui/qml/checkbox-gui.qml"));
+
+    viewer.setTitle(settings->value("welcome/title", app.tr("System Testing")));
+
+    // Ensure a reasonable minimum size for this window
+    viewer.setMinimumSize(QSize(800,600));
+
+    viewer.showExpanded();
+
+    int errcode = app.exec();
+
+    // Shutdown the guiengine
+    guiengine.Shutdown();
+
+    return errcode;
+}

=== added directory 'checkbox-gui/checkbox-gui/qml'
=== added file 'checkbox-gui/checkbox-gui/qml/DemoWarnings.qml'
--- checkbox-gui/checkbox-gui/qml/DemoWarnings.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/DemoWarnings.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,112 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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.Popups 0.1
+
+Page {
+    title: "Warning Demo (not a production screen)"
+
+
+    Component {
+        id: warning_dialog
+        WarningDialog{
+            text: i18n.tr("What you are about to do will take a long time.  Are you sure you want to continue?")
+            showOK: true
+            showContinue: false
+            showCheckbox: true
+
+            onCont: {
+                checkIfChecked();
+                console.log("continue clicked");
+            }
+
+            onCancel: {
+                checkIfChecked();
+                console.log("cancel clicked");
+            }
+
+            function checkIfChecked(){
+                if (isChecked)
+                    console.log("do not warn again!");
+                else
+                    console.log("warn again");
+            }
+
+        }
+    }
+
+
+
+    Row {
+        visible: true
+        spacing: units.gu(6)
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.topMargin: units.gu(2)
+        Button {
+            id: warning_button
+            color: "yellow"
+            text: "warning..."
+            width: units.gu(25)
+            onClicked:{
+                PopupUtils.open(warning_dialog, warning_button);
+            }
+        }
+
+
+        Button {
+            color: "pink"
+            text: "failed..."
+            width: units.gu(25)
+            onClicked:{
+                var warningDlg = Qt.createComponent("WarningDialog.qml");
+                if (warningDlg.status == Component.Ready) {
+                    var warningObj = warningDlg.createObject(parent, {"title": "Failed!",
+                                                                 "text": "Oh man!",
+                                                                 "showOK": true,
+                                                                 "showContinue": false,
+                                                                 "showCancel": false,
+                                                                 "showCheckbox" :true
+                                                             });
+                    warningObj.show();
+
+                    // need call this when object is closed (not sure how yet)
+                    if (warningObj.isChecked)
+                        console.log("do not warn again!");
+                    else
+                        console.log("warn AGAIN!")
+                }
+            }
+        }
+    }
+
+    Button {
+         anchors.centerIn: parent
+         text: i18n.tr("Move on to the Welcome Screen")
+         color: UbuntuColors.lightAubergine
+         width: units.gu(30)
+         onClicked: {mainView.state = "WELCOME"}
+    }
+}
+

=== added file 'checkbox-gui/checkbox-gui/qml/DummyListModel.qml'
--- checkbox-gui/checkbox-gui/qml/DummyListModel.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/DummyListModel.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,45 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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.Checkbox 0.1
+
+
+ListModel {
+    id: testSuiteModel
+
+    ListElement { name: "Orange"; type: "Fruit"}
+    ListElement { name: "Apple"; type: "Fruit" }
+    ListElement { name: "Tomato"; type: "Fruit" }
+    ListElement { name: "Banana"; type: "Fruit"}
+    ListElement { name: "Cherry"; type: "Fruit" }
+    ListElement { name: "Apricot"; type: "Fruit" }
+    ListElement { name: "Potato"; type: "Vegetable" }
+    ListElement { name: "Carrot"; type: "Vegetable" }
+    ListElement { name: "Celery"; type: "Vegetable" }
+    ListElement { name: "Cucumber"; type: "Vegetable" }
+    ListElement { name: "Pepper"; type: "Vegetable" }
+    ListElement { name: "Onion"; type: "Vegetable" }
+
+
+
+}

=== added file 'checkbox-gui/checkbox-gui/qml/LogViewer.qml'
--- checkbox-gui/checkbox-gui/qml/LogViewer.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/LogViewer.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,87 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Sylvain Pineau <[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.Popups 0.1
+
+WideDialog {
+    id: logview
+    title: "Not Set"
+    property string jobPath: "Not Set"
+    Rectangle {
+        color: "black"
+        radius: units.gu(1)
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: backButton.top
+            topMargin: units.gu(5)
+            bottomMargin: units.gu(2)
+        }
+
+        Item {
+            id: logitem
+            anchors.margins: units.gu(1)
+            anchors.fill: parent
+
+            Flickable {
+                id: flickable
+                width: parent.width
+                height: parent.height
+                contentWidth: logtext.width
+                contentHeight: logtext.height
+                flickableDirection: Flickable.VerticalFlick
+                clip: true
+
+                TextEdit {
+                    id: logtext
+                    width:logitem.width
+                    selectionColor: Theme.palette.selected.background
+                    color: Qt.rgba(1, 1, 1, 0.9)
+                    wrapMode: Text.Wrap
+                    text: "<code>Unable to load IO log</code>"
+                    readOnly: true
+                    selectByMouse: true
+                    textFormat: TextEdit.RichText
+
+                    Component.onCompleted: {
+                        // get the log info from guiengine
+                        text = "<code>" + guiEngine.GetIOLog(jobPath) + "</code>";
+                    }
+                }
+            }
+            Scrollbar {
+                flickableItem: flickable
+                align: Qt.AlignTrailing
+            }
+        }
+    }
+    Button {
+        id: backButton
+        text: "Back"
+        onClicked: PopupUtils.close(logview)
+        anchors.bottom: parent.bottom
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/ManualInteractionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/ManualInteractionDialog.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/ManualInteractionDialog.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,245 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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.Popups 0.1
+
+/* TODO - Default Yes/No/Skip based on plainbox interpretation of result
+ * which the user can then change if they wish.
+ */
+Dialog {
+    id: dialog
+
+    property var testItem;
+    /* Manual jobs may define a shell command as part of the test procedure.
+     * When such command exists, the following property is set, enabling
+     * the corresponding "Test" button. Otherwise it's greyed out.
+     */
+    property var showTestButton;
+    property var testStatus;
+
+    title: i18n.tr("Manual Test")
+    text: testItem.testname//i18n.tr("Name of the Test.")
+
+    ActivityIndicator {
+        id: manual_interaction_activity
+
+        anchors.horizontalCenter: instructions.horizontalCenter
+
+        running: false
+    }
+
+    TextArea{
+        id: instructions
+        text: testItem.description//"This is where we put our instructions\n2- This is 1\n3 -This is where we put our instructions\n4- This is where we put our instructions\n5 -where we put our instructions\n"
+        Text { font.family: "Helvetica"; font.pointSize: 13; font.bold: true }
+        color: "black"
+        readOnly: true
+        activeFocusOnPress: false
+        highlighted: true
+        selectionColor: "black"
+        selectedTextColor: "white"
+        height: units.gu(24)
+        cursorVisible: false
+        cursorDelegate: Item { id: emptycursor }
+    }
+
+    Button {
+        id: manualtestbutton
+        text: i18n.tr("Test")
+        color: UbuntuColors.orange
+        enabled: showTestButton ? true : false
+        onClicked: {
+            /* So the user knows this is happening, grey the buttons until
+             * we get a reply.
+             */
+            manualtestbutton.enabled = false;
+            continuebutton.enabled = false;
+            yescheck.enabled = false;
+            nocheck.enabled = false;
+            skipcheck.enabled = false;
+
+            manual_interaction_activity.running = true;
+
+            // Ok, run this test. Result and comments dont matter here
+            guiEngine.ResumeFromManualInteractionDialog(true,"fail","no comment")
+        }
+    }
+
+    Row {
+        spacing: units.gu(8)
+        CheckBox {
+            id: yescheck
+            text: i18n.tr("Yes")
+            checked: testStatus === 2 /* PBJobResult_Pass */ ? true : false
+            onClicked: {
+                if (checked){
+                    nocheck.checked = !checked
+                    skipcheck.checked = !checked
+                }
+                else
+                    checked = true;
+            }
+            Label{
+                anchors.left: yescheck.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: units.gu(1)
+                text: i18n.tr("Yes")
+            }
+        }
+
+        CheckBox {
+            id: nocheck
+            text: i18n.tr("No")
+            checked: testStatus === 3 /* PBJobResult_Fail */ ? true : false
+            onClicked: {
+                if (checked){
+                    yescheck.checked = !checked
+                    skipcheck.checked = !checked
+                }
+                else
+                    checked = true;
+            }
+            Label{
+                anchors.left: nocheck.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: units.gu(1)
+                text: i18n.tr("No")
+            }
+        }
+
+        CheckBox {
+            id: skipcheck
+            text: i18n.tr("Skip")
+            checked: testStatus === 1 /* PBJobResult_Skip */ ? true : false
+            onClicked: {
+                if (checked){
+                    nocheck.checked = !checked
+                    yescheck.checked = !checked
+                }
+                else
+                    checked = true;
+            }
+            Label{
+                anchors.left: skipcheck.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: units.gu(1)
+                text: i18n.tr("Skip")
+            }
+        }
+    }
+
+
+    Column {
+        Label{
+            text: i18n.tr("Comments")
+        }
+
+        TextArea {
+            id: comments
+            text: ""
+        }
+    }
+
+
+
+
+    Button {
+        id: continuebutton
+        text: i18n.tr("Continue")
+        color: UbuntuColors.warmGrey
+        onClicked: {
+            if (skipcheck.checked && comments.text === "")
+            {
+                PopupUtils.open(skip_warning_dialog, continuebutton);
+            }
+            else {
+                // Ok, we can continue
+
+                // Get the right outcome...
+                if (yescheck.checked) {
+                    // Pass
+                    guiEngine.ResumeFromManualInteractionDialog(false,"pass",comments.text)
+                } else if (nocheck.checked) {
+                    // Fail
+                    guiEngine.ResumeFromManualInteractionDialog(false,"fail",comments.text)
+                } else if (skipcheck.checked) {
+                    // Fail
+                    guiEngine.ResumeFromManualInteractionDialog(false,"skip",comments.text)
+                }
+
+                PopupUtils.close(dialog)
+            }
+        }
+    }
+
+
+
+    Component {
+        id: skip_warning_dialog
+        WarningDialog{
+            text: i18n.tr("Skipping a test requires a reason to be entered in the Comments field.  Please update that field and click 'Continue' again.");
+
+            showCancel: false
+            showContinue: false
+            showCheckbox: false
+
+            onOk: {
+            }
+        }
+    }
+
+    Connections {
+        id: manual_interaction_connections
+        target: guiEngine
+        onUpdateManualInteractionDialog: {
+            // Remove the activity indicator
+            manual_interaction_activity.running = false;
+
+            // Re-enable these buttons as the test has completed
+            if (show_test) {
+                manualtestbutton.enabled = true;
+            } else {
+                manualtestbutton.enabled = false;
+            }
+            continuebutton.enabled = true;
+            yescheck.enabled = true;
+            nocheck.enabled = true;
+            skipcheck.enabled = true;
+
+            // Outcome values refer to PBJobResult enums
+            if (suggested_outcome === 2 /* PBJobResult_Pass */) {
+                yescheck.checked = true;
+                nocheck.checked = false;
+                skipcheck.checked = false; // we didnt skip it
+            } else {
+                yescheck.checked = false;
+                nocheck.checked = true;
+                skipcheck.checked = false; // we didnt skip it
+            }
+        }
+        onCloseManualInteractionDialog: {
+            PopupUtils.close(dialog)
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/Progress.qml'
--- checkbox-gui/checkbox-gui/qml/Progress.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/Progress.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,48 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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
+
+Item {
+    property alias title: progresslabel.text
+    property alias value: progressbar.value
+    property alias maxValue: progressbar.maximumValue
+
+    Label {
+        id: progresslabel
+        text: ""
+        anchors.left: parent.left
+    }
+
+    ProgressBar {
+        id: progressbar
+        width: parent.width
+        anchors.top: progresslabel.bottom
+        anchors.topMargin: units.gu(1)
+        indeterminate: false
+        minimumValue: 0
+        maximumValue: 100
+        value: 0
+        anchors.left: parent.left
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/ResumeView.qml'
--- checkbox-gui/checkbox-gui/qml/ResumeView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/ResumeView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,115 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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
+
+
+Page {
+    title: i18n.tr("Resume")
+
+    tools: ToolbarItems {
+        locked: true
+        opened: false
+    }
+
+    Text {
+        id: querylabel
+        width: parent.width - units.gu(40)
+        wrapMode: Text.Wrap
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: parent.top
+            topMargin: units.gu(10)
+        }
+
+        text: "Checkbox did not finish completely.  \nDo you want to rerun the last test, \ncontinue to the next test, \nor restart from the begining?"
+        color: "black"
+        horizontalAlignment: Text.AlignHCenter
+        font.pointSize: 20
+    }
+
+    Column {
+        id: buttoncol
+        spacing: units.gu(6)
+        anchors {
+            top: querylabel.bottom
+            topMargin: units.gu(12)
+            horizontalCenter: parent.horizontalCenter
+        }
+        property int buttonWidth: parent.width - units.gu(40)
+
+
+        Button {
+            id: rerunButton
+            text: i18n.tr("Rerun last test")
+            width: buttoncol.buttonWidth
+            color: UbuntuColors.orange
+            onClicked: {
+
+                // Prepare for the run
+                guiEngine.GuiResumeSession(true /* re-run last test */);
+
+                // We need this to show the list of stuff
+                testitemFactory.CreateTestListModel(testListModel);
+
+                mainView.state = "RUNMANAGER"
+            }
+        }
+
+        Button {
+            id: continueButton
+            text: i18n.tr("Continue")
+            width: buttoncol.buttonWidth
+            color: UbuntuColors.lightAubergine
+            onClicked: {
+
+
+                // Prepare for the run
+                guiEngine.GuiResumeSession(false /* re-run last test */);
+
+                // We need this to show the list of stuff
+                testitemFactory.CreateTestListModel(testListModel);
+
+                mainView.state = "RUNMANAGER"
+            }
+        }
+
+        Button {
+            id: restartButton
+            text: i18n.tr("Restart")
+            width: buttoncol.buttonWidth
+            color: UbuntuColors.warmGrey
+            onClicked: {
+
+                // Lets clean up the old session
+                guiEngine.GuiSessionRemove();
+
+                // And create a fresh one
+                guiEngine.GuiCreateSession();
+
+                mainView.state = "WELCOME"
+            }
+        }
+    }
+
+}

=== added file 'checkbox-gui/checkbox-gui/qml/RunManagerButtons.qml'
--- checkbox-gui/checkbox-gui/qml/RunManagerButtons.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/RunManagerButtons.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,99 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Sylvain Pineau <[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)
+
+    property alias pauseButtonEnabled: pauseButton.enabled
+    property alias resultsButtonEnabled: resultsButton.enabled
+    property alias rerunButtonShown: pauseButton.showRerun
+    property alias rerunButtonEnabled: pauseButton.enabled
+
+    signal exit
+    signal pauseTest
+    signal resumeTest
+    signal reRunTest
+    signal results
+
+
+    Button {
+         id:cancelButton // todo rename as the exit button
+         text: i18n.tr("Exit")
+         color: UbuntuColors.coolGrey
+         width: units.gu(18)
+         onClicked: {
+             bottombuttons.exit();
+         }
+    }
+
+    // This can be Resume, Pause, or Re-run
+    Button {
+        id: pauseButton
+        property bool showPause: true  // either Pause or Resume
+        property bool showRerun: false // We may re-run
+        enabled: true
+        text: showRerun ? i18n.tr("Re-run") :( showPause ? i18n.tr("Pause") : i18n.tr("Resume"))
+        color: UbuntuColors.lightAubergine
+        width: units.gu(18)
+
+        onClicked:{
+
+            // Behaviour depends on state
+            if (showRerun) {
+                // Update the list of things the user _really_ wants to rerun
+                testitemFactory.GetSelectedRerunJobs(testListModel);
+
+                // return the button to pause/re-run
+                showRerun = false;
+
+                // Get on with it
+                reRunTest()
+                guiEngine.RunJobs();
+
+            } else {
+                showPause?pauseTest():resumeTest()
+                showPause = !showPause
+            }
+        }
+
+    }
+
+    Button {
+        id: resultsButton
+        enabled: false
+        text: i18n.tr("Results")
+        color: UbuntuColors.orange
+        width: units.gu(18)
+        onClicked: {
+            bottombuttons.results()
+        }
+
+    }
+
+
+}

=== added file 'checkbox-gui/checkbox-gui/qml/RunManagerListView.qml'
--- checkbox-gui/checkbox-gui/qml/RunManagerListView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/RunManagerListView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,215 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Andrew Haigh <[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
+
+    property alias itemindex: groupedList.currentIndex              // use this to change the current selection
+    property alias curSectionTested: groupedList.curSectionTested   // used by suite delegate to display 1 of 4 when tests are executed
+    property alias curTest: groupedList.curTest                     // used by suite delegate to display first number of 1 of 4
+
+    color: "white"
+    height: parent.height
+    width: parent.width
+
+    Flickable {
+        id: listflick
+        anchors.fill: parent
+        height: parent.height
+        contentHeight: groupedList.height
+        boundsBehavior : Flickable.StopAtBounds
+        clip: true
+        interactive: true
+
+        // The List of Tests
+        ListView {
+            id: groupedList
+            width: parent.width
+            height:units.gu(7) * (groupedList.count - groupedList.closedCount)
+            interactive: false
+            model: testListModel
+
+            // Tree view expansion/collapse support properties
+            property int sectionCount: 0                // contain the number of sections for calculating height
+            property int closedCount: 0                 // contains number of closed items for calculating height
+            property bool userChangingIndex: false      //  indicates if user is changing index so 1 of 4 heading doesn't get messed up
+            property string curSectionTested: currentSection // which section is currently under test
+            property int curTest: 0                     // test index of test in relation to section
+            property int hiddenCount: 0                 // the number of unchecked boxes from Test Selection. We dont show these ever
+
+            delegate: RunManagerTestDelegate {}
+
+            onCurrentIndexChanged: {
+                // This code is used for counting up tests in the section for 1 of 5 header
+                // when incrementing through test.  If index is being changed
+                // by the user, don't mess up the group summary
+                if (!userChangingIndex){
+                    if (currentIndex != -1){
+                        var item = testListModel.get(currentIndex);
+                        if (item.group === groupedList.curSectionTested){
+                            groupedList.curTest++;
+                        }
+                        else {
+                            groupedList.curSectionTested = item.group
+                            groupedList.curTest = 1
+                        }
+                    }
+                }
+            }
+
+            // Counts all the hidden items so we get the listview height correct
+            function countHiddenItems() {
+                var count = 0;
+
+                // We need to find the index for the item passed in as item_id
+                for (var i = 0; i < testListModel.count; i++)
+                {
+                    var item = testListModel.get(i);
+
+                    if (item.check === "true") {
+                        // do nothing, this is shown
+                    } else {
+                        count++;
+                    }
+                }
+                return count;
+            }
+
+            //  Open/Close groups
+            function openShutSubgroup(item_id, sel){
+                var oldCurrent = currentIndex;
+                currentIndex = -1
+
+                // We need to find the index for the item passed in as item_id
+                for (var i = 0; i < groupedList.contentItem.children.length; i++)
+                {
+                    var cI = groupedList.contentItem.children[i];
+
+                    var top_depth = cI.my_depth;
+
+                    if (cI === item_id) {
+                        // ok, so now we hide/make visible the remaining items
+                        // which have a depth greater than our current depth
+
+                        for (var j = i+1; j < groupedList.contentItem.children.length; j++) {
+                            // check this item has a greater depth than the top item
+                            var cur_depth = groupedList.contentItem.children[j].my_depth;
+
+                            // Should we hide this item?
+                            if (top_depth < cur_depth) {
+                                // Yes, because its clearly deeper
+                                var hideItem = groupedList.contentItem.children[j];
+                                hideItem.visible = sel;
+                                hideItem.height = sel? units.gu(7):units.gu(0);
+                                if (sel) {
+                                    closedCount--;
+                                    listflick.contentHeight += units.gu(7);
+                                }
+                                else {
+                                    closedCount++;
+                                    listflick.contentHeight -= units.gu(7);
+                                }
+
+                            } else {
+                                // we must have reached the end, so return
+                                return;
+                            }
+                        }
+
+                    }
+                }
+                currentIndex = oldCurrent;
+            }
+
+
+            // counts the total test in the group
+            function getTotalTests(groupName){
+                var testcnt = 0
+                for (var i = testListModel.count - 1; i >= 0; i--){
+                    var item = testListModel.get(i);
+                    if (item.group === groupName)
+                        testcnt++;
+                }
+                return testcnt;
+            }
+
+            function groupStatus(section){
+                var grpstatus = 0
+                for (var i = testListModel.count - 1; i >= 0; i--){
+                    var item = testListModel.get(i);
+                    if (item.group === section){
+                        grpstatus = item.groupstatus;
+                        i = -1;
+                    }
+                }
+                return grpstatus
+            }
+
+
+            function getSectionCount(){
+                // if this is the first time called, count the number of sections
+                var secCnt = sectionCount
+                if (secCnt === 0){
+                    var curItem = testListModel.get(0);
+                    var curSec = curItem.group;
+                    secCnt = 1;
+                    for (var i = 1; i < testListModel.count; i++){
+                        curItem = testListModel.get(i);
+                        if (curItem.group !== curSec){
+                            curSec = curItem.group
+                            secCnt++;
+                        }
+                    }
+                }
+                return secCnt;
+            }
+
+        }
+    }
+
+    Scrollbar {
+        flickableItem: listflick
+        align: Qt.AlignTrailing
+    }
+
+    // Runs when this ListView is fully initialised
+    Component.onCompleted:{
+        groupedList.sectionCount = groupedList.getSectionCount()
+
+        // Update the number counted to get the right height
+        groupedList.hiddenCount = groupedList.countHiddenItems();
+
+        groupedList.height = units.gu(7) * (groupedList.count - groupedList.closedCount - groupedList.hiddenCount)
+        listflick.contentHeight = groupedList.height
+
+        /* kick off the real tests now */
+        guiEngine.RunJobs();
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/RunManagerSuiteDelegate.qml'
--- checkbox-gui/checkbox-gui/qml/RunManagerSuiteDelegate.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/RunManagerSuiteDelegate.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,168 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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)
+
+        // properties for opening/closing sections
+        property string groupname: section
+        property string labelname: section
+        property bool open: true
+
+        onOpenChanged: {
+            open?progressIcon.source = "artwork/DownArrow.png":progressIcon.source = "artwork/RightArrow.png"
+        }
+
+        MouseArea {
+            width: parent.width
+            height: parent.height
+            anchors.fill: parent
+
+            onClicked: {
+                groupedList.userChangingIndex = true;
+                itemdelegate.open = !itemdelegate.open
+                groupedList.openShutSubgroup(section, itemdelegate.open)
+                groupedList.userChangingIndex = false;
+            }
+        }
+
+        Item {
+            id: groupfiller
+            width: units.gu(2)
+        }
+
+        Image {
+            id: progressIcon
+            source: "artwork/DownArrow.png"
+            width: units.gu(2)
+            height: units.gu(2)
+            anchors {
+                verticalCenter: parent.verticalCenter
+                left: groupfiller.left
+
+            }
+            opacity: enabled ? 1.0 : 0.5
+        }
+
+
+        Text {
+            id: grouptext
+            text: section
+            width: units.gu(20)
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: progressIcon.right
+                leftMargin: units.gu(1)
+            }
+            font.bold: true
+            color: UbuntuColors.coolGrey
+        }
+
+        Item {
+            id: progressfiller
+            width: units.gu(22)
+            anchors.left: grouptext.right
+        }
+
+        Text {
+            id: progresstext
+
+            property int totalTests: groupedList.getTotalTests(section)
+            property int testCnt: groupedList.curTest
+            property bool inTest: (section === groupedList.curSectionTested)
+
+
+            text: {inTest && !groupedList.testsComplete ? testCnt + " of " + totalTests: ""}
+            width: units.gu(10)
+            anchors.left:  progressfiller.right
+            anchors.verticalCenter: parent.verticalCenter
+            horizontalAlignment: Text.AlignHCenter
+            color: "green"
+            font.bold : true
+        }
+
+        Image {
+            id: statusicon
+            property int testStatus: {
+                if (!progresstext.inTest)
+                    return groupedList.groupStatus(section);
+                return 0;
+            }
+
+
+            width: units.gu(3)
+            height: units.gu(3)
+
+            sourceSize.width: parent.width
+            sourceSize.height: parent.height
+
+            anchors{
+                left: progressfiller.right
+                verticalCenter: parent.verticalCenter
+                leftMargin: units.gu(3)
+            }
+            source: ""
+
+            onTestStatusChanged: {
+                // TODO these number are made up, change to what comes out of plainbox
+                switch (testStatus){
+                case 0:
+                    // not executed
+                    source = ""
+                    break;
+                case 1:
+                    source = "./artwork/skipped.svg"
+                    break;
+                case 2:                 // pass
+                    source = "./artwork/passed.svg"
+                    break;
+                case 3:                 // fail
+                    source = "./artwork/failed.svg"
+                    break;
+                case 4:                 // error
+                    source = "./artwork/error.svg"
+                    break;
+                case 5:                 // user info required
+                    source = "./artwork/userreq.svg"
+                    break;
+                default:
+                    source = ""
+                    break;
+                }
+
+            }
+
+        }
+        ListItem.ThinDivider {}
+    }
+}
+

=== added file 'checkbox-gui/checkbox-gui/qml/RunManagerTestDelegate.qml'
--- checkbox-gui/checkbox-gui/qml/RunManagerTestDelegate.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/RunManagerTestDelegate.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,294 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Sylvain Pineau <[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 Ubuntu.Components.Popups 0.1
+import "./artwork"
+
+/* In order to simulate a tree with ListView, we end up having to embed some knowledge
+  in the display component and the underlying model. Qt 5.1 was meant to have a QML TreeView
+  but it doesnt seem to have transpired :(
+
+ */
+
+Component {
+    id: testDelegate
+
+    Item{
+        id: testitem
+        width: parent.width
+
+        property string groupname: group
+        property string labelname: testname
+
+        // visibility - now follows what the user selected in test selection
+        visible: check
+        height: check ? units.gu(7) : units.gu(0);
+
+        // These properties help to simulate the treeview
+        property bool open: true
+        property bool is_branch: branch
+        property int my_depth: depth
+
+        property int icon_size_gu: 4    // Adjustable icon size based on this
+
+        onOpenChanged: {
+            open?openshutIcon.source = "artwork/DownArrow.png":openshutIcon.source = "artwork/RightArrow.png"
+        }
+
+        MouseArea {
+            id: openshutbutton
+            width: parent.width;
+            height: parent.height
+            anchors.fill: parent
+
+            onClicked: {
+                groupedList.userChangingIndex = true;
+                groupedList.currentIndex = index;
+                groupedList.userChangingIndex = false;
+
+                testitem.open = !testitem.open
+                groupedList.openShutSubgroup(testitem, testitem.open)
+
+            }
+        }
+
+        Item {
+            id: testitemview
+            anchors.fill: parent
+
+            Item {
+                id: filler
+                // this is our indentation level. we get this out of the model
+                width: (depth * openshutIcon.width) + units.gu(2)
+            }
+
+            Image {
+                id: openshutIcon
+                source: "artwork/DownArrow.png"
+                width: units.gu(2)
+                height: units.gu(2)
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: filler.right
+
+                }
+                opacity: enabled ? 1.0 : 0.5
+
+                visible: is_branch
+                enabled: is_branch
+            }
+
+            Text {
+                id: namelabel
+                text: testname
+                elide: Text.ElideRight
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                anchors.left: openshutIcon.right
+                anchors.leftMargin: units.gu(2)
+
+                anchors.right: statusicon.left
+                anchors.rightMargin: units.gu(9-(icon_size_gu/2))
+            }
+
+
+            Image {
+                id: statusicon
+                property int testStatus: runstatus// TODO this should be coming from the testitem status
+
+                width: units.gu(icon_size_gu)
+                height: units.gu(icon_size_gu)
+
+                sourceSize.width: parent.width
+                sourceSize.height: parent.height
+
+                anchors.right: timelabel.left
+                anchors.rightMargin: units.gu(6)
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                source: ""
+
+                onTestStatusChanged: {
+                    // Update the other icons once the status is run
+                    if (testStatus !== 0 && testStatus !== 99 /* PBJobResult_NotRun or selected for Rerun */) {
+                        rerunicon.visible = true;
+                        rerunicon.enabled = true;
+
+                        // Update the timelabel
+                        timelabel.text = utils.formatElapsedTime(elapsedtime);
+                    }
+
+                    // These numbers match PBTreeNode.h:PBJobResult enums
+                    switch (testStatus){
+                    case 0: // PBJobResult_NotRun
+                        // not executed
+                        source = ""
+                        break;
+                    case 1: // PBJobResult_Skip
+                        source = "./artwork/skip-manual.svg"
+                        break;
+                    case 2: // PBJobResult_Pass
+                        source = "./artwork/passed.svg"
+                        break;
+                    case 3: // PBJobResult_Fail
+                        source = "./artwork/failed.svg"
+                        break;
+                    case 6: // PBJobResult_DepsNotMet
+                        source = "./artwork/skip-deps-not-met.svg"
+                        rerunicon.enabled = false
+                        detailsicon.gradient = UbuntuColors.greyGradient
+                        detailsicon.enabled = false
+                        break;
+                    case 7: // PBJobResult_Running
+                        source = ""
+                        break;
+                    case 99: // ReRun selected
+                        break;
+                    default:
+                        source = ""
+                        break;
+                    }
+
+                }
+
+            }
+
+            Text {
+                id: timelabel
+                text: {!elapsedtime ? "" : utils.formatElapsedTime(elapsedtime)}
+                width: units.gu(6)
+                anchors.right: rerunicon.left
+                anchors.rightMargin: units.gu(10-icon_size_gu)
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignRight
+
+           }
+
+            Switch {
+                id: rerunicon
+                width: units.gu(icon_size_gu*2)
+                height: units.gu(icon_size_gu)
+                anchors.right: detailsicon.left
+                anchors.rightMargin: units.gu(10-icon_size_gu)
+                anchors.verticalCenter: parent.verticalCenter
+                enabled: false
+                checked: false
+                visible: false
+
+                onCheckedChanged:{
+                    groupedList.userChangingIndex = true;
+                    groupedList.currentIndex = index
+
+                    if (rerunicon.checked) {
+                        testListModel.setProperty(index,"runstatus",99); // As if its not run
+                        testListModel.setProperty(index,"rerun",true); // mark this for rerun
+                        runbuttons.rerunButtonEnabled = true;
+                        rerunCount += 1;
+                    }
+                    else {
+                        testListModel.setProperty(index,"rerun", false)
+                        if (rerunCount > 0) rerunCount -= 1;
+                        if (rerunCount == 0) runbuttons.rerunButtonEnabled = false;
+                    }
+
+                    groupedList.userChangingIndex = false;
+                }
+
+                Connections { target: runmanagerview; onReRunRequested: rerunicon.checked = false }
+            }
+
+            Button {
+                text: "≡"
+                id: detailsicon
+                property bool detailsStatus: {!runstatus?false:true} // TODO this should be coming if the test has run or not
+                                                  // currently assumes 0 = not run yet, 1 == completed
+
+                width: units.gu(icon_size_gu)
+                height: units.gu(icon_size_gu)
+                visible: false
+                anchors.right:  parent.right
+                anchors.rightMargin: units.gu(9-(icon_size_gu/2))
+                anchors.verticalCenter: parent.verticalCenter
+		enabled: false
+
+                onClicked:{
+                    groupedList.userChangingIndex = true;
+                    groupedList.currentIndex = index;
+
+                    //detailsicon.source = "./artwork/pictogram-articles-grey-hex.svg"
+                    detailsicon.enabled = false
+                    detailsicon.gradient = UbuntuColors.greyGradient
+                    // start timer with 1 ms delay,
+                    // this has to be enough for the GUI to redraw
+                    myTimer.start()
+
+                    groupedList.userChangingIndex = false;
+                }
+
+                onDetailsStatusChanged:{
+                    if (detailsStatus)               // completed
+                        detailsicon.visible = true
+                    else                            // not run yet
+                        detailsicon.visible = false
+                }
+            	Connections { target: runmanagerview; onPauseOrEndRun: detailsicon.enabled = true }
+                Connections { target: runmanagerview; onResumeRun: detailsicon.enabled = false }
+            }
+
+        Timer {
+            id: myTimer
+            interval: 1; running: false; repeat: false
+            onTriggered: {
+                // Open the log viewer
+                PopupUtils.open(log_viewer)
+                detailsicon.enabled = true
+                detailsicon.gradient = UbuntuColors.orangeGradient
+            }
+        }
+
+        }
+
+        // Item dividing line
+        ListItem.ThinDivider {}
+
+        Component {
+            id: log_viewer
+            LogViewer{
+               jobPath: objectpath
+               title: testname
+            }
+        }
+
+        Component {
+            id: manual_dialog
+            ManualInteractionDialog{
+                testItem: testListModel.get(index);
+            }
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/RunManagerView.qml'
--- checkbox-gui/checkbox-gui/qml/RunManagerView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/RunManagerView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,450 @@
+/*
+ * This file is part of plainbox-gui
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Sylvain Pineau <[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.Popups 0.1
+import "."
+
+
+Page {
+    id: runmanagerview
+    title: i18n.tr("Run Manager")
+
+    tools: ToolbarItems {
+        locked: true
+        opened: false
+    }
+
+    property bool reportIsSaved: false;
+    property bool testingComplete: false;
+    property bool showTest: true;
+    property int suggestedOutcome: 1;
+    property int rerunCount: 0;
+    signal reRunRequested
+    signal pauseOrEndRun
+    signal resumeRun
+
+    // Updates the test status based on GuiEngine signals
+    Item {
+        id: updater
+        property int completed: 0   // How many tests have we run so far?
+        property int testIndex: 0   // which test we are running from the list
+
+        // totalTests: Denotes lines in the testListModel (display) model, NOT real number of tests
+        property int totalTests: testListModel.count
+
+        // Times the total run of tests
+        property var startTime: new Date()
+
+        // start time for each test in turn
+        property var testStartTime: new Date()
+
+        property bool running;
+
+        Connections {
+            target: guiEngine
+
+            onJobsBegin: {
+                // update things like the progress bar
+                progress.enabled = true;
+                updater.running = true;
+
+                progress.value = 0;
+
+                runmanagerview.testingComplete = false;
+            }
+
+            onJobsCompleted: {
+                // All tests are done
+                pauseOrEndRun()
+                runmanagerview.testingComplete = true;
+
+                // update ui
+                //runbuttons.pauseButtonEnabled = false;
+                runbuttons.resultsButtonEnabled = true;
+                progress.title = "Completed  (" + utils.formatElapsedTime((new Date() - updater.startTime)) + ")";
+                progress.enabled = false;
+                updater.running = false;
+
+                // Progress is 100% even if we only re-ran a few jobs
+                progress.value = guiEngine.ValidRunListCount();
+
+                // now we should start with the re-run options
+                runbuttons.rerunButtonShown = true;
+                runbuttons.rerunButtonEnabled = false;  // needs the user to pick something
+
+                // set flags in list (for group details)
+                testsuitelist.curSectionTested = "";  // set this as there is no more tested
+            }
+
+            // from gui-engine.h for reference:
+//            void updateGuiBeginJob(const QString& job_id, \
+//                                  const int current_job_index);
+            onUpdateGuiBeginJob: {
+                /* we must translate from job_id ("/plainbox/job/<id_string>
+                 * Into the index for one of the displayed items
+                 */
+                var i = 0;
+                for (i = 0; i < testListModel.count; i++) {
+
+                    // Compare the m_path to the job_id
+                    var item = testListModel.get(i);
+
+                    if (item.objectpath === job_id ) {
+                        updater.testIndex = i ;
+                    }
+                }
+
+                // Record the start time of this test
+                var timenow = new Date();
+                updater.testStartTime = timenow;
+
+                // Update the progress bar
+                progress.maxValue = guiEngine.ValidRunListCount();
+
+                /* +1 because the index is from zero, but we want to show the
+                 * zero'th test as test 1
+                 */
+                progress.value = current_job_index+1; // from onUpdateGuiObjects
+
+                progress.title = "Running " + (progress.value)
+                        + " of "+ progress.maxValue
+                        + "  (" + utils.formatElapsedTime(timenow - updater.startTime) + ")"
+                        + "   " + test_name;
+            }
+
+            // from gui-engine.h for reference:
+//            void updateGuiEndJob(const QString& job_id, \
+//                                  const int current_job_index,
+//                                  const int outcome);
+            onUpdateGuiEndJob: {
+                /* we must translate from job_id ("/plainbox/job/<id_string>
+                 * Into the index for one of the displayed items
+                 */
+                var i = 0;
+                for (i = 0; i < testListModel.count; i++) {
+
+                    // Compare the m_path to the job_id
+                    var item = testListModel.get(i);
+
+                    if (item.objectpath === job_id ) {
+                        updater.testIndex =i ;
+                    }
+                }
+
+                // set elapsed time
+                var stopTime = new Date();
+
+                var jobduration = stopTime - updater.testStartTime;
+
+                testListModel.setProperty(updater.testIndex, "elapsedtime", jobduration);
+
+                // outcome comes from guiengine in this signal
+                testListModel.setProperty(updater.testIndex, "runstatus", outcome);
+
+                /* Note that this has now been run, so doesnt need to be re-run
+                * unless the user subsequently selects it
+                */
+                testListModel.setProperty(updater.testIndex, "rerun",false);
+
+                // We may consider setting the IO Log details too here, but not yet
+
+                // set the group status to the worst runstatus outcome ... failure?  userreq?, check runstatus
+                testListModel.setProperty(updater.testIndex, "groupstatus", 2);
+
+                // Update the progress bar
+                progress.maxValue = guiEngine.ValidRunListCount();
+
+                /* +1 because the index is from zero, but we want to show the
+                 * zero'th test as test 1
+                 */
+                progress.value = current_job_index+1; // from onUpdateGuiObjects
+
+                progress.title = "Completed " + (progress.value)
+                        + " of "+ progress.maxValue
+                        + "  (" + utils.formatElapsedTime(stopTime - updater.startTime) + ")"
+                        + "   " + test_name;
+            }
+        }
+    }
+
+    Item {
+        id: filler
+        height: units.gu(0)
+        anchors.top: parent.top
+    }
+
+    // Test List Header Bar
+    Item {
+        id: runmanagerlistheaders
+        width: parent.width - units.gu(4)
+        height: units.gu(3)
+
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: filler.bottom
+            margins: units.gu(2)
+        }
+
+        Text  {
+            id: testcasenamelabel
+            text: i18n.tr("Test Case Name")
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(6)
+
+            anchors.right: statuslabel.left
+            anchors.rightMargin: units.gu(6)
+        }
+
+        Text  {
+            id: statuslabel
+            text: i18n.tr("Status")
+
+            width: units.gu(6)
+
+            anchors.right: elapsedtimelabel.left
+            anchors.rightMargin: units.gu(6)
+
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Text  {
+            id: elapsedtimelabel
+            text: i18n.tr("Elapsed Time")
+
+            width: units.gu(6)
+
+            anchors.right: actionslabel.left
+            anchors.rightMargin: units.gu(6)
+
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Text  {
+            id: actionslabel
+            text: i18n.tr("Re-run")
+
+            width: units.gu(6)
+
+            anchors.right: detailslabel.left
+            anchors.rightMargin: units.gu(6)
+
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Text  {
+            id: detailslabel
+            text: i18n.tr("Console Output")
+
+            width: units.gu(6)
+
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(6)
+
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
+
+
+    RunManagerListView {
+        id: testsuitelist
+        width: parent.width - units.gu(4)
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top: runmanagerlistheaders.bottom
+            bottom: progress.top
+            bottomMargin: units.gu(2)
+        }
+    }
+
+    Progress {
+        id: progress
+        height: units.gu(4)
+        width: parent.width - units.gu(20)
+
+        anchors {
+            bottom: runbuttons.top
+            bottomMargin: units.gu(6) // SDK Bug? 0 places it Over the buttons!
+            horizontalCenter: parent.horizontalCenter
+        }
+        title: i18n.tr("Running")
+        maxValue: guiEngine.ValidRunListCount();
+        value: 0
+
+    }
+
+    RunManagerButtons {
+        id: runbuttons
+
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+
+        onExit:{
+            if (!runmanagerview.testingComplete){
+                PopupUtils.open(incomplete_warning_dialog, runbuttons);
+                pause();
+            }
+            else if (!reportIsSaved)
+                PopupUtils.open(submission_warning_dialog, runbuttons);
+            else
+            {
+                // We should clean up the session before we go
+                guiEngine.GuiSessionRemove();
+
+                Qt.quit();
+            }
+        }
+
+        onPauseTest: {
+            pause();
+        }
+        onResumeTest: {
+            resume();
+        }
+        onResults: {
+            PopupUtils.open(submission_dialog, runbuttons);
+        }
+        onReRunTest: {
+            reRunRequested();
+        }
+
+        function resume(){
+            resumeRun();
+            updater.testStartTime = new Date()
+            updater.running = true;
+            console.log("Resume...");
+
+            guiEngine.Resume();
+        }
+
+        function pause(){
+            pauseOrEndRun();
+            updater.running = false;
+            progress.title = progress.title.replace("Running", "Paused ")
+            console.log("Pause...")
+
+            guiEngine.Pause();
+        }
+
+        Component {
+            id: submission_dialog
+            SubmissionDialog{
+            }
+        }
+
+        Component {
+            id: manual_dialog
+            ManualInteractionDialog{
+                testItem: testListModel.get(updater.testIndex);
+                showTestButton: showTest;
+                testStatus: suggestedOutcome;
+            }
+        }
+
+        Component {
+            id: submission_warning_dialog
+            WarningDialog{
+                // TRANSLATORS: Be careful not to translate the \n (newline) characters
+                text: i18n.tr("You are about to exit this test run without saving your results report. \n\nAre you sure? \n\n(Press Continue to Quit)");
+
+                showOK: false
+                showContinue: true
+                showCheckbox: false
+
+                onCont: {
+                    // We should clean up the session before we go
+                    guiEngine.GuiSessionRemove();
+                    Qt.quit();
+                }
+            }
+        }
+
+        Component {
+            id: incomplete_warning_dialog
+            WarningDialog{
+                text: i18n.tr("You are about to cancel an active test run.  Your system might be left in an unstable state.  Are you sure you want to exit?");
+                showOK: true
+                showCancel: true
+                showContinue: false
+                showCheckbox: false
+
+                onOk: {
+                    Qt.quit();
+                }
+
+                onCancel: {
+                    // resume
+                    runbuttons.resume()
+                }
+            }
+        }
+
+
+
+        Item {
+            id: utils
+            function formatElapsedTime(elap){
+                // strip the miliseconds
+                elap = parseInt(elap / 1000);
+
+                // get seconds (Original had 'round' which incorrectly counts 0:28, 0:29, 1:30 ... 1:59, 1:0)
+                var seconds = parseInt(Math.round(elap % 60));
+
+                // remove seconds from the date
+                elap = parseInt(Math.floor(elap / 60));
+
+                // get minutes
+                var minutes = parseInt(Math.round(elap % 60));
+
+                // remove minutes from the date
+                elap = parseInt(Math.floor(elap / 60));
+
+
+                // get hours
+                var hours = parseInt(Math.round(elap % 24));
+
+                var timeStr = ""
+
+                if (hours)
+                    timeStr = hours + ":";
+                timeStr = timeStr +  ("0" + minutes).slice(-2) + ":" + ("0" + seconds).slice(-2);
+
+                return timeStr;
+            }
+        }
+    }
+
+    Connections {
+        id: myconnections
+        target: guiEngine
+        onRaiseManualInteractionDialog: {
+            showTest = show_test;
+            suggestedOutcome = suggested_outcome;
+            PopupUtils.open(manual_dialog, runmanagerview);
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,148 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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.Popups 0.1
+import "."
+
+Dialog {
+    id: dialog
+
+    title: i18n.tr("Report")
+    text: settings.value("submission/message", i18n.tr("The following test report has been generated. You may view it now or save it for later."))
+
+    TextField {
+        RegExpValidator {
+            id: regex_validator
+            regExp: new RegExp(settings.value("submission/regex", ".*"));
+        }
+        function initialize() {
+            var input_type = settings.value("submission/input_type", "")
+            if (input_type == "regex") {
+                validator = regex_validator;
+                visible = true;
+            }
+            else if (input_type == "email") {
+                inputMethodHints = Qt.ImhEmailCharactersOnly;
+                visible = true;
+            }
+            else {
+                visible = false;
+            }
+            var secure_id = settings.value("submission/secure_id","");
+            if (secure_id) {
+                text = secure_id;
+            }
+        }
+
+        id: upload_input
+        placeholderText: settings.value("submission/input_placeholder", "")
+        Component.onCompleted: initialize()
+    }
+
+    Row {
+        function initialize() {
+            if (settings.value("submission/submit_to_hexr","false").toLowerCase() == "true") {
+                visible = true;
+            }
+        }
+
+        spacing: units.gu(8)
+        visible: false
+        Label {
+            id: submit_to_hexr_label
+            text: i18n.tr("Submit to HEXR:")
+        }
+
+        CheckBox {
+            id: submit_to_hexr
+            text: i18n.tr("Submit to HEXR:")
+        }
+        Component.onCompleted: initialize()
+
+    }
+
+    Button {
+        id: submitbutton
+        text: settings.value("submission/ok_btn_text", "Save Results")
+        enabled: upload_input.acceptableInput
+        color: UbuntuColors.orange
+        onClicked: {
+            var submit_to = settings.value("transport/submit_to", "")
+            var export_path = settings.value("exporter/xml_export_path", "")
+
+            if (!export_path) {
+                export_path = guiEngine.GetSaveFileName();
+            }
+            var success = guiEngine.GuiExportSessionToFileAsXML(export_path);
+            if (submit_to == "certification") {
+                if (success) {
+                    dialog.text = guiEngine.SendSubmissionViaCertificationTransport(export_path,
+                                                                                    upload_input.text,
+                                                                                    submit_to_hexr.checked);
+                }
+                else {
+                    dialog.text = i18n.tr("Could not export the tests results for uploading.");
+                }
+            }
+            else {
+                runmanagerview.reportIsSaved = success;
+            }
+        }
+    }
+    Button {
+        id: view_button
+        text: i18n.tr("View Results")
+        color: UbuntuColors.lightAubergine
+        onClicked: {
+            onClicked:{
+                var mysavepath = '/tmp/report.html';
+                runmanagerview.reportIsSaved = guiEngine.GuiExportSessionToFileAsHTML(mysavepath);
+                Qt.openUrlExternally(mysavepath)
+            }
+        }
+    }
+    Button {
+        id: donebutton
+        text: i18n.tr("Done")
+        color: UbuntuColors.warmGrey
+        onClicked: {
+            if (!runmanagerview.reportIsSaved)
+                PopupUtils.open(submission_warning_dialog, donebutton);
+            else
+                PopupUtils.close(dialog)
+        }
+    }
+
+    Component {
+        id: submission_warning_dialog
+        WarningDialog{
+            text: settings.value("submission/cancel_warning", i18n.tr("You are about to exit this test run without saving your results report.  Do you want to save the report?"))
+
+            showContinue: false
+            showCheckbox: false
+
+            onCancel: PopupUtils.close(dialog)
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/SuiteSelectionDelegate.qml'
--- checkbox-gui/checkbox-gui/qml/SuiteSelectionDelegate.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/SuiteSelectionDelegate.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,90 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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)
+
+        Item {
+            id: suitefiller
+            width: units.gu(1)
+        }
+
+        CheckBox {
+            id: suitecheckbox
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: suitefiller.right
+            checked: false
+            onCheckedChanged: {
+                // Update the list of selected whitelists
+                update_selection(testname, checked)
+                /* Update the ListView, primarily to ensure we dont
+                 * uncheck ALL the whitelists.
+                 */
+                suitelist.ensure_one_selection();
+            }
+            function suiteSelectHandler() {
+                checked = check
+            }
+            Component.onCompleted: {
+                testselection.suiteSelect.connect(suiteSelectHandler)
+            }
+        }
+
+        function update_selection(testname, checked){
+            for (var i = whiteListModel.count - 1; i >= 0; i--){
+                var item = whiteListModel.get(i);
+                if (item.testname === testname){
+                    whiteListModel.setProperty(i, "check", checked);
+                }
+            }
+        }
+
+        function remove_prefix_and_capitalize_first(prefix, suite) {
+            var suitename = suite.replace(prefix, '')
+            return suitename.substr(0, 1).toUpperCase() + suitename.substr(1)
+        }
+
+        Text {
+            id: suitetext
+            text: remove_prefix_and_capitalize_first('ihv-', testname)
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: suitecheckbox.right
+            anchors.leftMargin: units.gu(1)
+        }
+
+        ListItem.ThinDivider {}
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                suitecheckbox.checked = !suitecheckbox.checked
+            }
+        }
+    }

=== added file 'checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml'
--- checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,158 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Andrew Haigh <[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 {
+    id: suiteselection
+    title: i18n.tr("Suite Selection")
+
+    tools: ToolbarItems {
+        locked: true
+        opened: false
+    }
+
+    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) * whiteListModel.count
+            interactive: true
+            clip: true
+            boundsBehavior : Flickable.StopAtBounds
+            model: whiteListModel
+
+            delegate: SuiteSelectionDelegate{}
+
+            signal suiteSelect();
+
+            Component.onCompleted: {
+                // First uncheck all the suites
+                for (var i = whiteListModel.count - 1; i >= 0; i--){
+                    var item = whiteListModel.get(i);
+                    whiteListModel.setProperty(i, "check", false);
+                }
+                // Select only the one(s) mathing the 'default' pattern
+                for (var i = whiteListModel.count - 1; i >= 0; i--){
+                    var item = whiteListModel.get(i);
+                    if (item.testname.match(/default/i)) {
+                        whiteListModel.setProperty(i, "check", true);
+                    }
+                }
+                suiteSelect();
+            }
+        }
+
+        Scrollbar {
+            flickableItem: testselection
+            align: Qt.AlignTrailing
+        }
+
+        // At least one whitelist MUST be selected
+        function ensure_one_selection() {
+            var one_selection = false;
+
+            for (var i = whiteListModel.count - 1; i >= 0; i--){
+                var item = whiteListModel.get(i);
+
+                if (item.check === "true") {
+                    one_selection = true;
+                }
+            }
+
+            // If nothing is selected, disable the ok button
+            okbutton.enabled = one_selection
+        }
+    }
+
+    ActivityIndicator {
+        id: suite_sel_activity
+
+        running: false
+
+        anchors.horizontalCenter: suitelist.horizontalCenter
+        anchors.verticalCenter: suitelist.verticalCenter
+    }
+
+    Button {
+        id: okbutton
+        width: parent.width - units.gu(4)
+        anchors {
+            horizontalCenter:parent.horizontalCenter
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+        enabled: false
+        text: i18n.tr("OK")
+        color: UbuntuColors.lightAubergine
+        onClicked: {
+            // Ensure we only ask the service about this once (Bug 1209284)
+            okbutton.enabled = false;
+
+            suite_sel_activity.running = true;
+
+            suitelist.visible = false;
+
+            /* Now, we should go run the guiengine update to run the local jobs
+              which happen to match the whitelist. Then we can collect the
+              test jobs and show them to the user.
+             */
+            guiEngine.RunLocalJobs();
+        }
+    }
+
+    Connections {
+        target: guiEngine
+        onLocalJobsCompleted: {
+            suite_sel_activity.running = false;
+
+            // Now, we should repopulate the testlistmodel...
+            testitemFactory.CreateTestListModel(testListModel);
+            // NOTE: When the user is done, this is where to load up the TestSelection list
+            mainView.state = "TESTSELECTION"
+        }
+    }
+
+}

=== added file 'checkbox-gui/checkbox-gui/qml/TestSelectionDetails.qml'
--- checkbox-gui/checkbox-gui/qml/TestSelectionDetails.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/TestSelectionDetails.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,110 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Sylvain Pineau <[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.Popups 0.1
+
+WideDialog {
+    id: detailsview
+    title: currentTestItem.testname
+    dialogHeight: testdetails.height + (backButton.height * 3) + units.gu(1) > Math.round(mainView.height / 1.618) ? Math.round(mainView.height / 1.618) : testdetails.height + (backButton.height * 3) + units.gu(1)
+    dialogWidth: Math.round(parent.width / 2 * 1.618)
+    Flickable {
+        id: flickable
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: backButton.top
+            topMargin: units.gu(5)
+            bottomMargin: units.gu(2)
+        }
+        width: parent.width
+        height: parent.height
+        contentHeight: testdetails.height
+        flickableDirection: Flickable.VerticalFlick
+        clip: true
+
+        Rectangle {
+            id: testdetails
+            height: detailsblock.height
+            width: parent.width
+            color: "transparent"
+
+            Item{
+                id: detailsblock
+
+                height: nameText.height + descriptionText.height + dependsText.height + requiresText.height + commandText.height + units.gu(1)
+                width: parent.width
+
+                TestSelectionDetailsItems{
+                    id: nameText
+                    labelName: i18n.tr("name")
+                    anchors.top: parent.top
+                    text: currentTestItem.testname
+                }
+
+                TestSelectionDetailsItems{
+                    id: descriptionText
+                    labelName: i18n.tr("description")
+                    anchors.top: nameText.bottom
+                    text: currentTestItem.description
+                }
+
+                TestSelectionDetailsItems{
+                    id: dependsText
+                    labelName: i18n.tr("depends")
+                    anchors.top: descriptionText.bottom
+                    text: currentTestItem.depends
+                }
+
+                TestSelectionDetailsItems{
+                    id: requiresText
+                    labelName: i18n.tr("requires")
+                    anchors.top: dependsText.bottom
+                    text:currentTestItem.requires
+                }
+
+                TestSelectionDetailsItems{
+                    id: commandText
+                    labelName: i18n.tr("command")
+                    anchors.top: requiresText.bottom
+                    text: "<code>" + currentTestItem.command.replace(/\n/g, "<br />") + "</code>"
+                    textFormat: TextEdit.RichText
+                }
+            }
+        }
+    }
+
+    Scrollbar {
+        flickableItem: flickable
+        align: Qt.AlignTrailing
+    }
+
+    Button {
+        id: backButton
+        text: "Back"
+        onClicked: PopupUtils.close(detailsview)
+        anchors.bottom: parent.bottom
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/TestSelectionDetailsItems.qml'
--- checkbox-gui/checkbox-gui/qml/TestSelectionDetailsItems.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/TestSelectionDetailsItems.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,63 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: details_items
+    height: nameRect.height + units.gu(1)
+
+    anchors {
+        right: parent.right
+        left: parent.left
+    }
+
+    property alias labelName: nameLabel.text
+    property alias text: nameText.text
+    property alias textFormat: nameText.textFormat
+
+    Label {
+        id: nameLabel
+        text: ""
+        color: Qt.rgba(1, 1, 1, 0.9)
+        width: units.gu(10)
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(1)
+            verticalCenter: nameRect.verticalCenter
+        }
+    }
+
+    Rectangle {
+        id: nameRect
+        height: nameText.height + units.gu(1)
+        width: parent.width - nameLabel.width - units.gu(3)
+        color: Theme.palette.normal.background
+        antialiasing: true
+        radius: 6
+        border{
+            color: UbuntuColors.warmGrey
+            width: 1
+        }
+        anchors {
+            left: nameLabel.right
+            leftMargin: units.gu(1)
+            top: parent.top
+            topMargin: units.gu(1)
+        }
+    }
+
+    TextEdit {
+        id: nameText
+        width: parent.width - nameLabel.width - units.gu(4)
+        wrapMode: Text.Wrap
+        anchors {
+            left: nameLabel.right
+            leftMargin: units.gu(2)
+            verticalCenter: nameRect.verticalCenter
+        }
+        selectionColor: Theme.palette.selected.foreground
+        selectedTextColor: Theme.palette.selected.background
+        text:""
+        selectByMouse: true
+        readOnly: true
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/TestSelectionListView.qml'
--- checkbox-gui/checkbox-gui/qml/TestSelectionListView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/TestSelectionListView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,554 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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 QtQuick.LocalStorage 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import "."
+
+
+
+Rectangle {
+    id: suitetestlist
+    color: Theme.palette.normal.background
+    height: parent.height - units.gu(3)
+    width: parent.width
+
+    function selectAll(sel) {
+        groupedList.selectAll(sel);
+    }
+
+    Flickable {
+        id: listflick
+        anchors.fill: parent
+        height: parent.height
+
+        clip: true
+        contentHeight: groupedList.height
+        boundsBehavior : Flickable.StopAtBounds
+
+        // Blue Highlight Bar
+        Component {
+            id: highlight
+            Rectangle {
+                width: groupedList.width
+                height: units.gu(7)
+                color: "lightsteelblue";
+                radius: 5
+            }
+
+        }
+
+        // The List of Tests
+        ListView {
+            id: groupedList
+            width: parent.width
+            height: units.gu(7) * (groupedList.count - groupedList.closedCount)
+            interactive: false
+            model: testListModel
+
+            // Tree view expansion/collapse support properties
+            property int sectionCount: 0// this will contain the number of sections
+            property int closedCount: 0 // this contains nuber of closed items
+            property bool displayWarnings: true
+            property var db: null
+
+            delegate: TestSelectionTestDelegate {}
+
+            highlight: highlight
+            highlightFollowsCurrentItem: true
+
+            // Runs when this ListView is fully initialised
+            Component.onCompleted: {
+                displayWarnings = getSetting('deselection_warning')!=0?true:false;
+                selectAll(true)
+                currentTestItem = testListModel.get(currentItem);
+                sectionCount = getSectionCount()
+                setListSummary();
+            }
+
+            function openDB() {
+                if(db !== null) return;
+
+                // db = LocalStorage.openDatabaseSync(identifier, version, description, estimated_size, callback(db))
+                db = LocalStorage.openDatabaseSync("ui_settings", "0.1", "UI LocalStorage", 1000);
+
+                try {
+                    db.transaction(function(tx){
+                        tx.executeSql('CREATE TABLE IF NOT EXISTS settings(key TEXT UNIQUE, value INTEGER)');
+                        var table  = tx.executeSql("SELECT * FROM settings");
+                        // Seed the table with default values
+                        if (table.rows.length == 0) {
+                            tx.executeSql('INSERT INTO settings VALUES(?, ?)', ["deselection_warning", 1]);
+                        };
+                    });
+                } catch (err) {
+                    console.log("Error creating table in database: " + err);
+                };
+            }
+
+            function saveSetting(key, value) {
+                openDB();
+                db.transaction( function(tx){
+                    tx.executeSql('INSERT OR REPLACE INTO settings VALUES(?, ?)', [key, value]);
+                });
+            }
+
+            function getSetting(key) {
+                openDB();
+                var res = "";
+                db.transaction(function(tx) {
+                    var rs = tx.executeSql('SELECT value FROM settings WHERE key=?;', [key]);
+                    res = rs.rows.item(0).value;
+                });
+                return res;
+            }
+
+            function showWarning(caller_button){
+                displayWarnings = getSetting('deselection_warning')!=0?true:false;
+                if (displayWarnings === true)
+                    PopupUtils.open(warning_dialog, caller_button);
+            }
+
+            // Select/De-select all items - Called from TestSelectionView.qml
+            function selectAll(sel){
+
+                // show the warning if sel is false
+                if(!sel) {
+                    showWarning(groupedList);
+                }
+
+                for (var i = testListModel.count - 1; i >=0; i--)
+                    testListModel.setProperty(i, "check", sel);
+
+                // make sure the UI is updated
+                var oldCurrent = currentIndex
+                currentIndex = -1
+                for (var j = 0; j < groupedList.contentItem.children.length; j++){
+                    var curItem = groupedList.contentItem.children[j];
+                    curItem.checked = sel;
+                }
+                currentIndex = oldCurrent
+
+                // reset the summary
+                setListSummary()
+            }
+
+
+            // when a group item is checked/unchecked the subitems are checked/unchecked
+            function selectGroup(groupName, sel){
+                // select in the model
+                for (var i = testListModel.count -                                 1; i >=0; i--){
+                   var item = testListModel.get(i);
+                    if (item.group === groupName)
+                        testListModel.setProperty(i, "check", sel);
+                }
+
+                // make sure data is updated on the UI
+                var oldCurrent = currentIndex
+                currentIndex = -1
+                for (var i = 0; i < groupedList.contentItem.children.length; i++)
+                {
+                    var curItem = groupedList.contentItem.children[i];
+                    if (curItem.groupname === groupName)
+                        curItem.checked = sel;
+                }
+                currentIndex = oldCurrent
+                setListSummary()
+            }
+
+            // determines if one or more subitems are checked
+            // if at least one subitem is checked, the group is checked
+            function setGroupCheck(item_id){
+                var oldCurrent = currentIndex
+                currentIndex = -1
+
+                // We need to find the index for the item passed in as item_id
+                for (var i = 0; i < groupedList.contentItem.children.length; i++) {
+
+                    // cI = The item which was clicked by the user
+                    var cI = groupedList.contentItem.children[i];
+                    var cI_depth = cI.my_depth;
+
+                    if (cI === item_id) {
+                        /* Branch rules:
+
+                          Branch: Set
+                            Set all the leaves below us
+
+                          Branch: Un-set
+                            Un-set all the leaves below us
+                         */
+                        for (var j = i+1; j < groupedList.contentItem.children.length; j++) {
+
+                            // check this item has a greater depth than the top item
+                            var cur_depth = groupedList.contentItem.children[j].my_depth;
+
+                            // Should we check this item?
+                            if (cI_depth < cur_depth) {
+                                // Yes, because its deeper
+                                var thisItem = groupedList.contentItem.children[j];
+                                thisItem.checked = cI.checked;
+                            } else {
+                                // we've reached the end of this branch, so stop
+                                break;
+                            }
+                        }
+
+                        /* Leaf rules
+
+                            Leaf: Set
+                              If any branch above us is unchecked, we must set it.
+
+                            Leaf: Un-set
+                              If all the leaves at this level are unchecked, we uncheck
+                              the containing branch above us.
+                        */
+
+                        // Leaf set case. i is the current item index
+                        /* we go up each level and check the box */
+                        var interim_depth = cI_depth; // Track progress to the top
+
+                        if (cI.checked) {
+                            for (var j=i-1; j >= 0 ; j--) {
+                                // We are going UP the list/tree now
+                                var thisItem = groupedList.contentItem.children[j];
+                                var cur_depth = thisItem.my_depth;
+
+                                if (cur_depth < interim_depth) {
+                                    // we have gone up another level
+                                    interim_depth--;
+
+                                    // lets check this item
+                                    thisItem.checked = true;
+                                }
+
+                                // Have we reached the top-most branch?
+                                if (cur_depth === 0) {
+                                    // We dont need to go any further
+                                    break;  // end of for(j)
+                                }
+                            }
+                        } else {
+                            // Un set rule
+                            // recursive: Update parent
+                            updateBranchSelection(i);
+                        }
+                    }
+                }
+                currentIndex = oldCurrent;
+            }
+
+            /* Updates the item and child items based on whether it has
+              selected children.
+
+              Arguments:
+                item_index - Index into groupedList.contentItem.children[]
+
+              */
+            function updateBranchSelection(item_index) {
+                // The starting point (generally the root branch)
+                var curItem = groupedList.contentItem.children[item_index]
+                var cI_depth = curItem.my_depth;
+
+                // Avoid bad arguments
+                if (item_index < 0) {
+                    return false;
+                }
+
+                // We dont need to do anything if its a root node
+                if (cI_depth === 0) {
+                    return;
+                }
+
+                // we assume its not checked
+                var result = false;
+
+                /* Find the bottommost item at this level.
+                  then, go up until the depth goes down by one. Then update that
+                  item.
+
+                  Example Tree as follows:
+
+                    ...
+                    [*]         <- top_Index computed below
+                        [ ]     <- Newly unchecked item suppiled as item_Index
+                        [*]
+                        [ ]
+                            [ ] <- bottom_Index computed below
+                    [ ]
+                    ...
+                  */
+
+                // Find bottom_Index
+                var bottom_Index = item_index;
+                for (var i = item_index+1; i < groupedList.contentItem.children.length; i++) {
+                    var this_Item = groupedList.contentItem.children[i];
+                    var tI_depth = this_Item.my_depth;
+
+                    // Have we reached the bottom of the tree?
+                    if (tI_depth < cI_depth) {
+                        bottom_Index = i;
+                        break;
+                    }
+
+                    // Is this a root node?
+                    if (tI_depth === 0) {
+                        bottom_Index = i;
+                        break;
+                    }
+                }
+
+                /* we should move up bottom_Index to be the bottom of our tree
+                 * and not the start of the next tree
+                 */
+                bottom_Index--;
+
+                /* top_Index is checked if _anything above bottom_Index
+                 * is selected.
+                 */
+                var result = false; // assume its unchecked
+                var top_Index = item_index;
+                for(var i = bottom_Index; i>=0; i--) {
+                    // have we reached the branch holding these children?
+                    if (groupedList.contentItem.children[i].my_depth < cI_depth) {
+                        // yes
+                        top_Index = i;
+                        break;
+                    }
+
+                    if (groupedList.contentItem.children[i].checked ) {
+                        result = true;  // at least one item is true
+                    }
+                }
+
+                // Now update the checked status of this box
+                groupedList.contentItem.children[top_Index].checked = result;
+
+                // Now, if we havent reached the root, do the next level
+                if (groupedList.contentItem.children[top_Index].my_depth >0 ) {
+                    updateBranchSelection(top_Index);
+                }
+            }
+
+            // Update the underlying model based on the UI display of check/uncheck items
+            function updateListModel() {
+
+                // do it for each item
+                for (var i=0; i < groupedList.contentItem.children.length; i++) {
+                    var thisItem = groupedList.contentItem.children[i];
+                    var sel = thisItem.checked;
+
+                    testListModel.setProperty(i, "check", sel);
+                }
+            }
+
+            // Add up all the selected tests in a group
+            // FIXME: function unused, See comment in qml/TestSelectionSuiteDelegate.qml
+            function getEstimatedTime(section){
+                var estTimeStr = "";
+                var estTimeInt=0;
+                var foundGroup = false;  // list is ordered in groups, after whole group found return
+
+                for (var i = 0; i <testListModel.count; i++)
+                {
+                    var curItem = testListModel.get(i);
+
+                    if (curItem.group === section && curItem.check === "true"){
+                        foundGroup = true;
+                        estTimeInt = parseInt(curItem.duration) + parseInt(estTimeInt);
+                    }
+                    if (foundGroup && curItem.group != section)
+                        i = testListModel.count;
+
+                }
+                if (estTimeInt == 0)
+                    estTimeStr = "";
+                else if (estTimeInt/60 < 1)
+                    // TRANSLATORS: min here stands for minute, not minimum.
+                    estTimeStr = i18n.tr("< 1 min");
+                else {
+                    var durMinutes = Math.round(estTimeInt/60);
+                    // TRANSLATORS: min here stands for minute, not minimum.
+                    estTimeStr = durMinutes.toString() + i18n.tr(" min");
+                }
+                return  estTimeStr;
+            }
+
+            //  Open/Close groups
+            function openShutSubgroup(item_id, sel){
+                var oldCurrent = currentIndex;
+                currentIndex = -1
+
+                // We need to find the index for the item passed in as item_id
+                for (var i = 0; i < groupedList.contentItem.children.length; i++)
+                {
+                    var cI = groupedList.contentItem.children[i];
+
+                    var cI_depth = cI.my_depth;
+
+                    if (cI === item_id) {
+                        // ok, so now we hide/make visible the remaining items
+                        // which have a depth greater than our current depth
+
+                        for (var j = i+1; j < groupedList.contentItem.children.length; j++) {
+                            // check this item has a greater depth than the top item
+                            var cur_depth = groupedList.contentItem.children[j].my_depth;
+
+                            // Should we hide this item?
+                            if (cI_depth < cur_depth) {
+                                // Yes, because its clearly deeper
+                                var hideItem = groupedList.contentItem.children[j];
+                                hideItem.visible = sel;
+                                hideItem.height = sel? units.gu(7):units.gu(0);
+                                if (sel)
+                                    closedCount--;
+                                else
+                                    closedCount++;
+
+                            } else {
+                                // we must have reached the end, so return
+                                return;
+                            }
+                        }
+
+                    }
+                }
+                currentIndex = oldCurrent;
+            }
+
+            // Update List Summary
+            function updateListSummary(testItem, sel){
+                if (sel){
+                    totalTests += 1;
+                    if (testItem.type === "Manual")
+                        totalManualTests += 1;
+                }
+                else {
+                    totalTests -= 1;
+                    if (testItem.type === "Manual")
+                        totalManualTests -= 1
+                 }
+            }
+
+            // Set List Summary
+            function setListSummary(){
+                var start = new Date();
+
+                // TODO count how many manuals testListModel
+                var testCnt = 0;
+                var manualCnt = 0;
+
+                var estTimeInt=0;
+
+                // We count from the bottom up, and we dont count anything
+                // that is a "branch" as this is a local/group kind of thing
+                for (var i = testListModel.count - 1; i >=0; i--)
+                {
+                    var curItem = testListModel.get(i);
+                    // is it a branch? if so we dont count it
+                    if (curItem.branch === "0") {
+                        // not a branch
+                        if ( curItem.check === "true"){
+                            testCnt++;
+                            if (curItem.type === "Manual")
+                                manualCnt++;
+                            estTimeInt = parseInt(curItem.duration) + parseInt(estTimeInt);
+                        }
+                    }
+                }
+                totalTests = testCnt;
+                totalManualTests = manualCnt;
+
+                /* We should call into guiengine to find out the number of
+                 * implicit tests (really we will get a count of ALL of them...
+                 */
+
+                // Ok, we shouldnt need to do this tooo often!
+
+                // Update the really selected testsuitelist
+                testitemFactory.GetSelectedRealJobs(testListModel);
+
+                // Mark all the jobs for one run-through
+                testitemFactory.GetSelectedRerunJobs(testListModel);
+
+                /* Ensure the gui-engine stores the list of visible tests as
+                 * as they will be needed when the gui is resumed from a saved
+                 * session.
+                 */
+                testitemFactory.GetSelectedVisibleJobs(testListModel);
+
+                // Prep the jobs (we cant start them without this)
+                var total_generated_tests = guiEngine.PrepareJobs();
+
+                // All the above lets us count the number of real jobs
+                totalImplicitTests = total_generated_tests - totalTests;
+
+                // Not strictly needed here
+                var end = new Date();
+            }
+
+            function getSectionCount(){
+               var start = new Date();
+                // if this is the first time called, find all sections
+                var secCnt = sectionCount
+                if (secCnt === 0){
+                    var curItem = testListModel.get(0);
+                    var curSec = curItem.group;
+                    secCnt = 1;
+                    for (var i = 1; i < testListModel.count; i++){
+                        curItem = testListModel.get(i);
+                        if (curItem.group !== curSec){
+                            curSec = curItem.group
+                            secCnt++;
+                        }
+                      }
+                }
+                var end = new Date();
+                return secCnt;
+            }
+        }
+    }
+
+    Scrollbar {
+        flickableItem: listflick
+        align: Qt.AlignTrailing
+    }
+
+    Component {
+        id: warning_dialog
+        WarningDialog{
+            text: i18n.tr("Deselecting tests may reduce your ability to detect potential problems with the device driver.");
+            showOK: true
+            showCancel: false
+            showContinue: false
+            showCheckbox: true
+
+            onOk: {
+                if (isChecked)
+                    groupedList.saveSetting("deselection_warning", 0);
+            }
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/TestSelectionSuiteDelegate.qml'
--- checkbox-gui/checkbox-gui/qml/TestSelectionSuiteDelegate.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/TestSelectionSuiteDelegate.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,119 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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?openshutIcon.source = "artwork/DownArrow.png":openshutIcon.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)
+            }
+        }
+
+        Item {
+            id: groupfiller
+            width: units.gu(2)
+        }
+
+        Image {
+            id: openshutIcon
+            source: "artwork/DownArrow.png"
+            width: units.gu(2)
+            height: units.gu(2)
+            anchors {
+                verticalCenter: parent.verticalCenter
+                left: groupfiller.left
+            }
+
+            opacity: enabled ? 1.0 : 0.5
+        }
+
+        CheckBox {
+            id: groupcheckbox
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: openshutIcon.right
+            anchors.leftMargin: units.gu(1)
+            checked: true
+            onClicked: {
+                groupedList.selectGroup(section, checked)
+                if (!checked)
+                    groupedList.showWarning(groupcheckbox);
+            }
+        }
+
+
+        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(38)
+            anchors.left: grouptext.right
+        }
+
+        Text {
+            id: estimatedTimeText
+            text: "Unknown" // ajh - to do - this is very slow AND inconsistent groupedList.getEstimatedTime(section)
+            width: units.gu(10)
+            anchors.left:  estfiller.right
+            anchors.verticalCenter: parent.verticalCenter
+            horizontalAlignment: Text.AlignHCenter
+            color: "green"
+            font.bold : true
+        }
+
+
+
+        ListItem.ThinDivider {}
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/TestSelectionTestDelegate.qml'
--- checkbox-gui/checkbox-gui/qml/TestSelectionTestDelegate.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/TestSelectionTestDelegate.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,173 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Andrew Haigh <[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"
+
+/* In order to simulate a tree with ListView, we end up having to embed some knowledge
+  in the display component and the underlying model. Qt 5.1 was meant to have a QML TreeView
+  but it doesnt seem to have transpired :(
+
+ */
+
+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
+
+        // These properties help to simulate the treeview
+        property bool open: true
+        property bool is_branch: branch
+        property int my_depth: depth
+
+        // Select the highlight area
+        MouseArea {
+            id: selecthighlight
+            anchors.fill: parent
+
+            onClicked: {
+                currentTestItem = testListModel.get(index);
+                groupedList.currentIndex = index;
+            }
+        }
+
+        onOpenChanged: {
+            open?openshutIcon.source = "artwork/DownArrow.png":openshutIcon.source = "artwork/RightArrow.png"
+        }
+
+        Item {
+            anchors.fill: parent
+
+            Item {
+                id: filler
+
+                // this is our indentation level. we get this out of the model
+                width: (depth * itemcheckbox.width) + units.gu(2)
+            }
+
+            Image {
+                id: openshutIcon
+                source: "artwork/DownArrow.png"
+                width: units.gu(2)
+                height: units.gu(2)
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: filler.right
+                }
+
+                opacity: enabled ? 1.0 : 0.5
+
+                visible: is_branch
+                enabled: is_branch
+
+                MouseArea {
+                    id: openshutbutton
+                    anchors.fill: parent
+
+                    onClicked: {
+                        testitem.open = !testitem.open
+                        groupedList.openShutSubgroup(testitem, testitem.open)
+                    }
+                }
+            }
+
+            CheckBox {
+                id: itemcheckbox
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: openshutIcon.right
+                anchors.leftMargin: units.gu(2)
+                checked: check
+                onClicked: {
+                    // Update the ListView (display)
+                    groupedList.setGroupCheck(testitem);
+
+                    // Update the underlying model
+                    groupedList.updateListModel();
+		    
+                    // Update the summary bar at the bottom of TestSelectionView
+
+                    groupedList.setListSummary();
+
+
+                    // Warn the user if they are de-selecting tests
+                    if (!checked)
+                        groupedList.showWarning(itemcheckbox);
+                    testsuitelist.ensure_one_selection()
+                }
+            }
+
+            Text {
+                id: nameLabel
+                text: testname
+                elide: Text.ElideRight
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                anchors.left: itemcheckbox.right
+                anchors.leftMargin: units.gu(2)
+
+                anchors.right: typelabel.left
+                anchors.rightMargin: units.gu(2)
+            }
+
+            Text {
+                id: typelabel
+                text: type
+                width: units.gu(6)
+
+                anchors.right: esttimelabel.left
+                anchors.rightMargin: units.gu(6)
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                horizontalAlignment: Text.AlignHCenter
+
+            }
+
+            Text {
+                id: esttimelabel
+                text: formatTotalTime(duration)
+                width: units.gu(6)
+
+                anchors.right: parent.right
+                anchors.rightMargin: units.gu(6)
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+
+        // Item dividing line
+        ListItem.ThinDivider {}
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/TestSelectionView.qml'
--- checkbox-gui/checkbox-gui/qml/TestSelectionView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/TestSelectionView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,277 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Julia Segal <[e-mail]>
+ * - Sylvain Pineau <[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.Popups 0.1
+import Ubuntu.Layouts 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "."
+
+
+Page {
+    title: i18n.tr("Choose tests to run on your system:")
+
+    property var currentTestItem;
+    property int totalTests: 6
+    property int totalManualTests: 2
+    property int totalImplicitTests: 999
+
+    Item { // puts a space at the top
+        id: filler
+        height: units.gu(0)
+        anchors {
+            left: parent.left
+            top: parent.top
+        }
+    }
+
+    function formatTotalTime(s){
+        var estTimeStr = ""
+        if (s == 0)
+            estTimeStr = "0 min";
+        else if (s < 0)
+            estTimeStr = "N/A";
+        else if (s / 60 < 1)
+            estTimeStr = "< 1 min";
+        else if (Math.round(s / 60) < 60){
+            var durMinutes = Math.round(s / 60);
+            estTimeStr = durMinutes.toString() + " min";
+        }
+        else {
+            var hr = Math.round(s / (60 * 60));
+            s -= hr * (60 * 60);
+            estTimeStr = hr + " h " + Math.round(s / 60) + " min"
+        }
+        return  estTimeStr;
+    }
+
+    function validTotalTime(total_duration){
+        return Object.keys(total_duration).map(function (key) {return total_duration[key]}).indexOf(-1)
+    }
+
+    // Test List Header Bar
+    Item {
+        id: testlistheaders
+        width: parent.width - units.gu(4)
+        height: units.gu(3)
+
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: filler.bottom
+            margins: units.gu(2)
+        }
+
+        Text  {
+            id: complabel
+            text: i18n.tr("Components")
+            font.bold: true
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(6)
+            anchors.right: typelabel.left
+            anchors.rightMargin: units.gu(2)
+        }
+
+        Text  {
+            id: typelabel
+            text: i18n.tr("Type")
+            font.bold: true
+            width: units.gu(6)
+            anchors.right: esttimelabel.left
+            anchors.rightMargin: units.gu(6)
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Text  {
+            id: esttimelabel
+            text: i18n.tr("Estimated Time")
+            font.bold: true
+            width: units.gu(6)
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(6)
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
+
+    // List of actual Tests.
+    TestSelectionListView {
+        id: testsuitelist
+        width: testlistheaders.width
+
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top: testlistheaders.bottom
+        }
+
+   	    // At least one test MUST be selected
+    	function ensure_one_selection() {
+            var one_selection = false;
+            for (var i = testListModel.count - 1; i >= 0; i--){
+                var item = testListModel.get(i);
+                if (item.check === "true") {
+                    one_selection = true;
+                }
+            }
+
+            // If nothing is selected, disable the ok button
+            startTesting.enabled = one_selection
+        }
+    }
+
+    Component {
+        id: details_dialog
+        // Test Details (Properties)
+        TestSelectionDetails {
+            id: testdetails
+        }
+    }
+
+    // Select All, Deselect All, Start Testing Buttons
+    tools: ToolbarItems {
+        back: Row {
+            anchors {
+                verticalCenter: parent.verticalCenter
+            }
+            spacing: units.gu(1)
+            Button {
+                 id: infoButton
+                 text: i18n.tr("Info")
+                 color: UbuntuColors.lightAubergine
+                 onClicked: {
+                     PopupUtils.open(actionSelectionPopover, infoButton)
+                 }
+            }
+            Button {
+                 id:selectButton
+                 text: i18n.tr("Select All")
+                 color: UbuntuColors.coolGrey
+                 width: units.gu(18)
+                 onClicked: {
+                     testsuitelist.selectAll(true)
+                     testsuitelist.ensure_one_selection()
+                 }
+            }
+            Button {
+                 id: deselectButton
+                 text: i18n.tr("Deselect All")
+                 color: UbuntuColors.coolGrey
+                 width: units.gu(18)
+                 onClicked: {
+                     testsuitelist.selectAll(false)
+                     testsuitelist.ensure_one_selection()
+                 }
+            }
+        }
+        Row {
+            anchors {
+                verticalCenter: parent.verticalCenter
+            }
+            Button {
+                id: startTesting
+                text: i18n.tr("Start Testing")
+                width: units.gu(18)
+                onClicked: {
+                    mainView.state = "RUNMANAGER"
+
+                }
+            }
+        }
+        locked: true
+        opened: true
+    }
+
+    Component {
+        id: actionSelectionPopover
+        ActionSelectionPopover {
+            callerMargin: units.gu(1)
+            contentWidth: units.gu(15)
+            actions: ActionList {
+                Action {
+                    text: i18n.tr("Selection Stats")
+                    onTriggered: {
+                        PopupUtils.open(stats_dialog)
+                    }
+                }
+                Action {
+                    text: i18n.tr("Test Details")
+                    onTriggered: PopupUtils.open(details_dialog)
+                }
+            }
+        }
+    }
+    Component {
+        id: stats_dialog
+        Dialog{
+            id: dialog
+            title: i18n.tr("Selection Stats")
+            property var total_duration: guiEngine.GetEstimatedDuration();
+            Rectangle {
+                id: statrect
+                color: "transparent"
+                height: statrow.height + okButton.height
+                Row {
+                    id: statrow
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    spacing: units.gu(4)
+                    Column {
+                        id: col1
+                        Label {text: i18n.tr("Total tests");fontSize: "large"; color: "white"}
+                        Label {text: i18n.tr("Selected")}
+                        Label {text: i18n.tr("Manual")}
+                        Label {text: i18n.tr("Implicit")}
+                        Label {text: " "; fontSize: "large"}
+                        Label {text: i18n.tr("Estimated time"); fontSize: "large"; color: "white"}
+                        Label {text: i18n.tr("Automated")}
+                        Label {text: i18n.tr("Manual")}
+                    }
+                    Column {
+                        id: col2
+                        Label {
+                            text: (parseInt(totalTests) + parseInt(totalImplicitTests));
+                            anchors.right: col2.right;
+                            fontSize: "large"; color: "white"
+                        }
+                        Label {text: totalTests; anchors.right: col2.right}
+                        Label {text: totalManualTests; anchors.right: col2.right}
+                        Label {text: totalImplicitTests; anchors.right: col2.right}
+                        Label {text: " "; fontSize: "large"}
+                        Label {
+                            text: validTotalTime(total_duration)?formatTotalTime(total_duration["automated_duration"] + total_duration["manual_duration"]):"N/A";
+                            anchors.right: col2.right;
+                            fontSize: "large"; color: "white"
+                        }
+                        Label {text: formatTotalTime(total_duration["automated_duration"]); anchors.right: col2.right}
+                        Label {text: formatTotalTime(total_duration["manual_duration"]); anchors.right: col2.right}
+                    }
+                }
+            }
+            Button {
+                id: okButton
+                text: i18n.tr("Back")
+                onClicked: {
+                    PopupUtils.close(dialog);
+                }
+            }
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/WarningDialog.qml'
--- checkbox-gui/checkbox-gui/qml/WarningDialog.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/WarningDialog.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,102 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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.Popups 0.1
+
+
+Dialog {
+    id: dialog
+    signal ok
+    signal cancel
+    signal cont
+
+    property alias title: dialog.title
+    property alias text: dialog.text
+    property alias showOK: okButton.visible
+    property alias showContinue: continueButton.visible
+    property alias showCancel: cancelButton.visible
+    property alias showCheckbox: checkboxitem.visible
+    property alias isChecked: checkbox.checked
+
+
+    title: i18n.tr("Warning!")
+    text: i18n.tr("Change me to a real warning.")
+
+
+    Item {
+        id: checkboxitem
+        width: childrenRect.width
+        height: childrenRect.height
+
+        CheckBox {
+            id: checkbox
+        }
+
+        Label {
+            id: checkbox_label
+            text: i18n.tr("Do not show this warning again.")
+            fontSize: "small"
+            color: "white"
+            anchors.left: checkbox.right
+            anchors.leftMargin: 8
+            anchors.verticalCenter: checkbox.verticalCenter
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    checkbox.checked = !checkbox.checked
+                }
+            }
+        }
+
+    }
+
+    Button {
+        id: okButton
+        text: i18n.tr("OK")
+        color: UbuntuColors.orange
+        onClicked: {
+            ok();
+            PopupUtils.close(dialog);
+        }
+    }
+    Button {
+        id: continueButton
+        text: i18n.tr("Continue")
+        color: UbuntuColors.orange
+        onClicked: {
+            cont()
+            PopupUtils.close(dialog)
+        }
+    }
+    Button {
+        id: cancelButton
+        text: i18n.tr("Cancel")
+        color: UbuntuColors.warmGrey
+        onClicked: {
+            cancel()
+            PopupUtils.close(dialog)
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/WelcomeView.qml'
--- checkbox-gui/checkbox-gui/qml/WelcomeView.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/WelcomeView.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,133 @@
+/*
+ * This file is part of Checkbox
+ *
+ * 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
+
+
+Page {
+    id: welcomePage
+    title: settings.value("welcome/title", i18n.tr("System Testing"));
+
+    tools: ToolbarItems {
+        locked: true
+        opened: false
+    }
+
+    Image {
+        id: logo
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            margins: units.gu(2)
+        }
+        source:"artwork/checkbox-qt-head.png"
+    }
+
+    Rectangle {
+        id: logo_extend_left
+        color: "#3c3b3f" // matches the background colour of the logo
+        anchors.top: logo.top
+        anchors.bottom: logo.bottom
+        anchors.left: parent.left
+        anchors.right: logo.left
+        anchors.leftMargin: units.gu(2)
+    }
+
+    Rectangle {
+        id: logo_extend_right
+        color: "#3c3b3f" // matches the background colour of the logo
+        anchors.top: logo.top
+        anchors.bottom: logo.bottom
+        anchors.left: logo.right
+        anchors.right: parent.right
+        anchors.rightMargin: units.gu(2)
+    }
+
+    Rectangle{
+        color: "white"
+        clip: true
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: logo.bottom
+            bottom: continueButton.top
+            margins: units.gu(2)
+        }
+
+        Flickable {
+            id: welcomeflick
+            anchors.fill: parent
+            contentHeight: parent.height
+            boundsBehavior: Flickable.StopAtBounds
+
+            TextEdit{
+                id: welcometext
+
+                anchors {
+                    fill: parent
+                    margins: units.gu(2)
+                }
+
+                // TRANSLATORS: The <p> tags are HTML - DO NOT translate them.
+                text: settings.value("welcome/text", i18n.tr("<p>Welcome to System Testing.</p><p></p><p>This program contains automated and manual tests to help you assess how well your system works with Ubuntu.</p><p></p><p>This application will step the user through these tests in a predetermined order and automatically collect both system information as well as test results. It will also prompt the user for input when manual testing is required.</p><p></p><p>The run time for the tests is determined by which tests you decide to execute. The user will have the opportunity to customize the test run based on the hardware components they are interested in and the amount of time they have available.</p><p></p><p>To begin, simply click the Continue button below and follow the onscreen instructions.</p><p></p>"))
+
+                height: units.gu(60)
+                width: units.gu(30)
+                cursorVisible : true
+                readOnly: true
+                selectByMouse : true
+                textFormat: TextEdit.AutoText
+                wrapMode: TextEdit.Wrap
+                color: "black"
+                selectedTextColor: Theme.palette.selected.foregroundText
+                selectionColor: Theme.palette.selected.foreground
+                font.pixelSize: FontUtils.sizeToPixels("medium")
+
+                onLinkActivated:  {
+                    Qt.openUrlExternally(link)
+                }
+            }
+        }
+
+        Scrollbar {
+            flickableItem: welcomeflick
+            align: Qt.AlignTrailing
+        }
+    }
+
+    Button {
+        id: continueButton
+        anchors{
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+
+        text: i18n.tr("Continue")
+        color: UbuntuColors.lightAubergine
+        onClicked: {
+            // Move to the whitelist selection screen
+            mainView.state = "SUITESELECTION"
+        }
+    }
+}

=== added file 'checkbox-gui/checkbox-gui/qml/WideDialog.qml'
--- checkbox-gui/checkbox-gui/qml/WideDialog.qml	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/WideDialog.qml	2014-03-20 14:51:45 +0000
@@ -0,0 +1,79 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2012-2013 Canonical Ltd.
+ *
+ * Authors:
+ * - Sylvain Pineau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.Popups 0.1
+
+PopupBase {
+    id: dialog
+    // See Dialog.qml
+    default property alias contents: contentsColumn.data
+    property alias title: foreground.title
+    property bool modal: true
+    // Cannot override FINAL property, so alias names have to be different
+    property alias dialogWidth: foreground.width
+    property alias dialogHeight: foreground.height
+
+    __foreground: foreground
+    __eventGrabber.enabled: modal
+    __dimBackground: modal
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
+
+    StyledItem {
+        id: foreground
+        // Default settings, the Dialog will take the full MainView size
+        width: parent.width
+        height: parent.height
+        anchors.centerIn: parent
+
+        // used by the style
+        property string title
+        property real margins: units.gu(2)
+        property Item dismissArea: dialog.dismissArea
+
+        Item {
+            id: contentsColumn
+            anchors {
+                fill: parent
+                margins: foreground.margins
+            }
+            onWidthChanged: updateChildrenWidths();
+
+            Label {
+                horizontalAlignment: Text.AlignHCenter
+                text: dialog.title
+                fontSize: "large"
+                color: Qt.rgba(1, 1, 1, 0.9)
+            }
+
+            onChildrenChanged: updateChildrenWidths()
+
+            function updateChildrenWidths() {
+                for (var i = 0; i < children.length; i++) {
+                    children[i].width = contentsColumn.width;
+                }
+            }
+        }
+
+        style: Theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
+    }
+}

=== added directory 'checkbox-gui/checkbox-gui/qml/artwork'
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/[e-mail]'
Binary files checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	2014-03-20 14:51:45 +0000 differ
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/[e-mail]'
Binary files checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	2014-03-20 14:51:45 +0000 differ
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/[e-mail]'
Binary files checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	2014-03-20 14:51:45 +0000 differ
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/[e-mail]'
Binary files checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	2014-03-20 14:51:45 +0000 differ
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/[e-mail]'
Binary files checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and checkbox-gui/checkbox-gui/qml/artwork/[e-mail]	2014-03-20 14:51:45 +0000 differ
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/checkbox-qt-head.png'
Binary files checkbox-gui/checkbox-gui/qml/artwork/checkbox-qt-head.png	1970-01-01 00:00:00 +0000 and checkbox-gui/checkbox-gui/qml/artwork/checkbox-qt-head.png	2014-03-20 14:51:45 +0000 differ
=== added file 'checkbox-gui/checkbox-gui/qml/artwork/failed.svg'
--- checkbox-gui/checkbox-gui/qml/artwork/failed.svg	1970-01-01 00:00:00 +0000
+++ checkbox-gui/checkbox-gui/qml/artwork/failed.svg	2014-03-20 14:51:45 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="141.732px"
+   height="141.732px"
+   viewBox="68.866 69.866 141.732 141.732"
+   enable-background="new 68.866 69.866 141.732 141.732"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="failed.svg"><metadata
+     id="metadata3190"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs3188" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1551"
+     inkscape:window-height="876"
+     id="namedview3186"
+     showgrid="false"
+     inkscape:zoom="4.709655"
+     inkscape:cx="46.129578"
+     inkscape:cy="70.865997"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero"
+     id="path2984"
+     sodipodi:cx="70.705818"
+     sodipodi:cy="71.026176"