Unity 8

Merge lp:~nick-dedekind/unity8/indicators-client-textual-app into lp:unity8

indicators-client-textual-app
Merge into trunk

Proposed by Nick Dedekind on 2013-07-16

Status:	Merged
Approved by:	Daniel d'Andrada on 2013-07-31
Approved revision:	101
Merged at revision:	149
Proposed branch:	lp:~nick-dedekind/unity8/indicators-client-textual-app
Merge into:	lp:unity8
Diff against target:	414 lines (+298/-25) 8 files modified Panel/Indicators/client/IndicatorsClient.qml (+8/-9) Panel/Indicators/client/IndicatorsPage.qml (+60/-15) Panel/Indicators/client/IndicatorsTree.qml (+62/-0) plugins/Unity/Indicators/CMakeLists.txt (+1/-0) plugins/Unity/Indicators/modelprinter.cpp (+114/-0) plugins/Unity/Indicators/modelprinter.h (+50/-0) plugins/Unity/Indicators/plugin.cpp (+2/-0) tests/autopilot/unity8/indicators_client/tests/test_battery.py (+1/-1)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/indicators-client-textual-app
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-31
Daniel d'Andrada (community)			Approve on 2013-07-31
Michał Sawicz		2013-07-16	Needs Fixing on 2013-07-17
Review via email: mp+175143@code.launchpad.net

Commit message

Added a text tree representation of the qmenumodel to the indicators-client application.

Description of the change

Added a text tree representation of the qmenumodel to the indicators-client application.
Intended for debugging indicator issues.

The new functionality can be seen as a switch ('Enable Visual Representation') at the top of an indicator page in the indicators-client app.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-16:

FAILED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/unity8-ci/283/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/635/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1181/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-07-17:

plugins/Unity/Indicators/modelprinter.h: multiple new lines at end of file

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-17:

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

review: Approve (continuous-integration)

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-18:

> plugins/Unity/Indicators/modelprinter.h: multiple new lines at end of file

Removed.

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-23:

Added back button to the indicators page.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-23:

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/unity8-ci/378/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/752/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1457/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-26:

Some unsolved merge conflicts

200 +<<<<<<< TREE
201 menucontentactivator.cpp
202 +=======
203 + modelprinter.cpp
204 +>>>>>>> MERGE-SOURCE

369 +<<<<<<< TREE
370 #include "menucontentactivator.h"
371 +=======
372 +#include "modelprinter.h"
373 +>>>>>>> MERGE-SOURCE

381 +<<<<<<< TREE
382 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
383 +=======
384 + qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
385 +>>>>>>> MERGE-SOURCE

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-29:

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

review: Approve (continuous-integration)

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-30:

> Some unsolved merge conflicts
>
> 200 +<<<<<<< TREE
> 201 menucontentactivator.cpp
> 202 +=======
> 203 + modelprinter.cpp
> 204 +>>>>>>> MERGE-SOURCE
>
> 369 +<<<<<<< TREE
> 370 #include "menucontentactivator.h"
> 371 +=======
> 372 +#include "modelprinter.h"
> 373 +>>>>>>> MERGE-SOURCE
>
> 381 +<<<<<<< TREE
> 382 qmlRegisterType<MenuContentActivator>(uri, 0, 1,
> "MenuContentActivator");
> 383 +=======
> 384 + qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
> 385 +>>>>>>> MERGE-SOURCE

Fixed.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-30:

Panel/Indicators/client/IndicatorsPage.qml

Please add your name to the "Authors" list in the header

- property alias pageSource : page_loader.source
+ property string pageSource : page_loader.source

Let's take the opportunity to s/page_loader/pageLoader

-----

Panel/Indicators/client/IndicatorsTree.qml

+ * Nick Dedekind <<email address hidden>

Missing the closing ">"

+ Text {
+ id: all_data
+ color: "white"
+ }

s/all_data/allData

+ Indicators.ModelPrinter {
+ id: printer
+ model: menuModel
+
+ onSourceChanged: page.refresh()
+ }

+ function refresh() {
+ all_data.text = printer.getString();
+ }

Couldn't we make it more QMLish by making the string a property of ModelPrinter (and name it "text")?
So code would be simply:

   Text {
      id: allData
      color: "white"
      text: printer.text
   }

----------------

plugins/Unity/Indicators/modelprinter.cpp

s/2012/2013

+ QString recurse_string(const QModelIndex& index, int level) const;

s/recurse_string/recurseString

+// Qt
+#include <QDebug>

s/QDebug/QTextStream

+ stream << tabify(level) << roleNames[role] << "." << iter.key() << ": " << iter.value().toString() << endl;

Too long

-------------------

plugins/Unity/Indicators/modelprinter.h

s/2012/2013

review: Needs Fixing

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-31:

> Panel/Indicators/client/IndicatorsPage.qml
>
> Please add your name to the "Authors" list in the header
>
> - property alias pageSource : page_loader.source
> + property string pageSource : page_loader.source
>
> Let's take the opportunity to s/page_loader/pageLoader
>
> -----
>
> Panel/Indicators/client/IndicatorsTree.qml
>
> + * Nick Dedekind <<email address hidden>
>
> Missing the closing ">"
>
> + Text {
> + id: all_data
> + color: "white"
> + }
>
>
> s/all_data/allData
>
>
> + Indicators.ModelPrinter {
> + id: printer
> + model: menuModel
> +
> + onSourceChanged: page.refresh()
> + }
>
> + function refresh() {
> + all_data.text = printer.getString();
> + }
>
>
> Couldn't we make it more QMLish by making the string a property of
> ModelPrinter (and name it "text")?
> So code would be simply:
>
> Text {
> id: allData
> color: "white"
> text: printer.text
> }
>
> ----------------
>
> plugins/Unity/Indicators/modelprinter.cpp
>
> + * Copyright (C) 2012 Canonical, Ltd.
>
> s/2012/2013
>
> + QString recurse_string(const QModelIndex& index, int level) const;
>
> s/recurse_string/recurseString
>
> +// Qt
> +#include <QDebug>
>
> s/QDebug/QTextStream
>
> + stream << tabify(level) << roleNames[role] << "." <<
> iter.key() << ": " << iter.value().toString() << endl;
>
> Too long
>
> -------------------
>
> plugins/Unity/Indicators/modelprinter.h
>
> + * Copyright (C) 2012 Canonical, Ltd.
>
> s/2012/2013

Thanks. All done.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-31:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-31:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-31:

There's still this one:

Panel/Indicators/client/IndicatorsTree.qml

+ Text {
+ id: all_data
+ color: "white"
+ text: printer.txt
+ }

s/all_data/allData

But since I'll be away for a month, it's not worth holding it up.

Looks good to go.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-31:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-07-31:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === modified file 'Panel/Indicators/client/IndicatorsClient.qml'
 --- Panel/Indicators/client/IndicatorsClient.qml	2013-06-18 18:02:29 +0000
 +++ Panel/Indicators/client/IndicatorsClient.qml	2013-07-31 14:12:23 +0000
@@ -27,16 +27,15 @@
      PageStack {
          id: pages
--
          anchors.fill: parent
--        Component.onCompleted: root.reset()
--    }
++        Component.onCompleted: reset()
--    function reset() {
--        pages.clear();
--        var component = Qt.createComponent("IndicatorsList.qml");
--        var page = component.createObject(pages);
--        console.log(component.errorString());
--        pages.push(page);
++        function reset() {
++            clear();
++            var component = Qt.createComponent("IndicatorsList.qml");
++            var page = component.createObject(pages);
++            console.log(component.errorString());
++            push(page);
++        }
+     }
+ }
 === modified file 'Panel/Indicators/client/IndicatorsPage.qml'
 --- Panel/Indicators/client/IndicatorsPage.qml	2013-06-18 18:02:29 +0000
 +++ Panel/Indicators/client/IndicatorsPage.qml	2013-07-31 14:12:23 +0000
@@ -15,35 +15,80 @@
+  *
   * Authors:
   *      Renato Araujo Oliveira Filho <renato@canonical.com>
++ *      Nick Dedekind <nick.dedekind@canonical.com>
   */
  import QtQuick 2.0
  import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
  Page {
--    id: _page
++    id: page
      title: indicatorProperties && indicatorProperties.title ?  indicatorProperties.title : ""
      property variant indicatorProperties
--    property alias pageSource : page_loader.source
++    property string pageSource : pageLoader.source
      anchors.fill: parent
++    ListItem.Standard {
++        id: visualCheckItem
++        text: "Enable Visual Representation"
++        control: Switch {
++            id: visualCheck
++            checked: true
++        }
++    }
++
      Loader {
--        id: page_loader
--        objectName: "page_loader"
--
--        anchors.fill: parent
--
--        onStatusChanged: {
--            if (status == Loader.Ready) {
--                for(var pName in indicatorProperties) {
--                    if (item.hasOwnProperty(pName)) {
--                        item[pName] = indicatorProperties[pName];
--                    }
++        id: pageLoader
++        objectName: "pageLoader"
++
++        anchors {
++            top: visualCheckItem.bottom
++            left: parent.left
++            right: parent.right
++            bottom: buttons.top
++            topMargin: units.gu(2)
++            bottomMargin: units.gu(2)
++        }
++        source : visualCheck.checked ? page.pageSource : "IndicatorsTree.qml"
++
++        onLoaded: {
++            for(var pName in indicatorProperties) {
++                if (item.hasOwnProperty(pName)) {
++                    item[pName] = indicatorProperties[pName];
+                 }
--                item.start();
--            }
++            }
++            item.start();
++        }
++    }
++
++    Item {
++        id: buttons
++        anchors {
++            left: parent.left
++            right: parent.right
++            bottom: parent.bottom
++            margins: units.gu(1)
++        }
++        height: childrenRect.height
++
++        Button {
++            anchors {
++                left: parent.left
++            }
++            text: "Back"
++            onClicked: page.pageStack.reset()
++        }
++        Button {
++            id: refresh
++            visible: !visualCheck.checked
++            anchors {
++                right: parent.right
++            }
++            text: "Refresh"
++            onClicked: pageLoader.item.refresh()
+         }
+     }
+ }
 === added file 'Panel/Indicators/client/IndicatorsTree.qml'
 --- Panel/Indicators/client/IndicatorsTree.qml	1970-01-01 00:00:00 +0000
 +++ Panel/Indicators/client/IndicatorsTree.qml	2013-07-31 14:12:23 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright 2013 Canonical Ltd.
++ *
++ * 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/>.
++ *
++ * Authors:
++ *      Nick Dedekind <nick.dededkind@canonical.com>
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Unity.Indicators 0.1 as Indicators
++import QMenuModel 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++Page {
++    id: page
++    anchors.fill: parent
++
++    property alias busType: menuModel.busType
++    property alias busName: menuModel.busName
++    property string actionsObjectPath
++    property var menuObjectPaths: undefined
++    readonly property string device: "phone"
++
++    property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""
++
++    function start() {
++        menuModel.start();
++    }
++
++    QDBusMenuModel {
++        id: menuModel
++        objectPath: page.deviceMenuObjectPath
++    }
++
++    Indicators.ModelPrinter {
++        id: printer
++        model: menuModel
++    }
++
++    Flickable {
++        anchors.fill: parent
++        contentHeight: all_data.height
++        clip:true
++        Text {
++            id: all_data
++            color: "white"
++            text: printer.text
++        }
++    }
++}
 === modified file 'plugins/Unity/Indicators/CMakeLists.txt'
 --- plugins/Unity/Indicators/CMakeLists.txt	2013-07-17 09:11:03 +0000
 +++ plugins/Unity/Indicators/CMakeLists.txt	2013-07-31 14:12:23 +0000
@@ -24,6 +24,7 @@
      indicatorsmanager.cpp
      indicatorsmodel.cpp
      menucontentactivator.cpp
++    modelprinter.cpp
      plugin.cpp
+ )
  add_definitions(-DUNITYINDICATORS_LIBRARY)
 === added file 'plugins/Unity/Indicators/modelprinter.cpp'
 --- plugins/Unity/Indicators/modelprinter.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Unity/Indicators/modelprinter.cpp	2013-07-31 14:12:23 +0000
@@ -0,0 +1,114 @@
++/*
++ * Copyright 2013 Canonical Ltd.
++ *
++ * 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/>.
++ *
++ * Authors:
++ *      Nick Dedekind <nick.dedekind@canonical.com>
++ */
++
++// self
++#include "modelprinter.h"
++
++// Qt
++#include <QTextStream>
++
++ModelPrinter::ModelPrinter(QObject *parent)
++    : QObject(parent)
++    , m_model(NULL)
++{
++}
++
++void ModelPrinter::setSourceModel(QAbstractItemModel * sourceModel)
++{
++    if (m_model != NULL) {
++        disconnect(m_model);
++    }
++    if (m_model != sourceModel) {
++        m_model = sourceModel;
++        Q_EMIT modelChanged();
++        Q_EMIT textChanged();
++    }
++    if (m_model != NULL) {
++        connect(m_model, SIGNAL(modelReset()), this, SIGNAL(textChanged()));
++        connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(textChanged()));
++        connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(textChanged()));
++    }
++}
++
++QAbstractItemModel* ModelPrinter::sourceModel() const
++{
++    return m_model;
++}
++
++QString ModelPrinter::text(const QModelIndex& index) const
++{
++    return recurseString(index, 0);
++}
++
++QString tabify(int level) {    QString str;
++    for (int i = 0; i < level; i++) {
++        str += "   ";
++    }
++    return str;
++}
++
++QString ModelPrinter::recurseString(const QModelIndex& index, int level) const
++{
++    if (!m_model)
++        return "";
++
++    QString str;
++    QTextStream stream(&str);
++
++    QHash<int, QByteArray> roleNames = m_model->roleNames();
++    QList<int> roles = roleNames.keys();
++    qSort(roles);
++    Q_FOREACH(int role, roles) {
++        QVariant vData = m_model->data(index, role);
++        if (vData.canConvert(QMetaType::QVariantMap)) {
++            QMapIterator<QString, QVariant> iter(vData.toMap());
++            while (iter.hasNext()) {
++                iter.next();
++                stream << tabify(level)
++                       << roleNames[role]
++                       << "."
++                       << iter.key()
++                       << ": "
++                       << iter.value().toString()
++                       << endl;
++            }
++        }
++        else {
++            stream << tabify(level)
++                   << roleNames[role]
++                   << ": "
++                   << vData.toString()
++                   << endl;
++        }
++    }
++
++    int rowCount = m_model->rowCount(index);
++    stream << tabify(level)
++           << "child count"
++           << ": "
++           << rowCount
++           << endl
++           << endl;
++
++    for (int i = 0; i < rowCount; i++) {
++        QModelIndex child = m_model->index(i, 0, index);
++        str += recurseString(child, level+1);
++    }
++    return str;
++}
 === added file 'plugins/Unity/Indicators/modelprinter.h'
 --- plugins/Unity/Indicators/modelprinter.h	1970-01-01 00:00:00 +0000
 +++ plugins/Unity/Indicators/modelprinter.h	2013-07-31 14:12:23 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright 2013 Canonical Ltd.
++ *
++ * 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/>.
++ *
++ * Authors:
++ *      Nick Dedekind <nick.dedekind@canonical.com>
++ */
++
++#ifndef MODELPRINTER_H
++#define MODELPRINTER_H
++
++#include <QSortFilterProxyModel>
++
++// This class acts as a namespace only, with the addition that its enums
++// are registered to be exposed on the QML side.
++class ModelPrinter : public QObject
++{
++    Q_OBJECT
++
++    Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setSourceModel NOTIFY modelChanged)
++    Q_PROPERTY(QString text READ text NOTIFY textChanged)
++public:
++    ModelPrinter(QObject* parent=0);
++
++    void setSourceModel(QAbstractItemModel* sourceModel);
++    QAbstractItemModel* sourceModel() const;
++
++    Q_INVOKABLE QString text(const QModelIndex& index = QModelIndex()) const;
++
++Q_SIGNALS:
++    void modelChanged();
++    void textChanged();
++
++private:
++  QString recurseString(const QModelIndex& index, int level) const;
++  QAbstractItemModel* m_model;
++};
++
++#endif // MODELPRINTER_H
 === modified file 'plugins/Unity/Indicators/plugin.cpp'
 --- plugins/Unity/Indicators/plugin.cpp	2013-07-17 09:11:03 +0000
 +++ plugins/Unity/Indicators/plugin.cpp	2013-07-31 14:12:23 +0000
@@ -28,6 +28,7 @@
  #include "indicatorsmodel.h"
  #include "indicators.h"
  #include "menucontentactivator.h"
++#include "modelprinter.h"
  void IndicatorsPlugin::registerTypes(const char *uri)
+ {
@@ -36,6 +37,7 @@
      qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
      qmlRegisterType<FlatMenuProxyModel>(uri, 0, 1, "FlatMenuProxyModel");
      qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
++    qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
      qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
      qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
 === modified file 'tests/autopilot/unity8/indicators_client/tests/test_battery.py'
 --- tests/autopilot/unity8/indicators_client/tests/test_battery.py	2013-07-24 13:56:28 +0000
 +++ tests/autopilot/unity8/indicators_client/tests/test_battery.py	2013-07-31 14:12:23 +0000
@@ -26,7 +26,7 @@
          self.pointing_device.move_to_object(self.main_window.get_battery_menu())
          self.pointing_device.click()
--        fn_loader = lambda: self.app.select_single("IndicatorsPage/QQuickLoader", objectName="page_loader");
++        fn_loader = lambda: self.app.select_single("IndicatorsPage/QQuickLoader", objectName="pageLoader");
          self.assertThat(fn_loader, Eventually(NotEquals(None)));
          page_loader = fn_loader();
          self.assertThat(page_loader.progress, Eventually(Equals(1.0)))