0aa9a7e · unity8 · git.iko.soy

qml/Panel/IndicatorItem.qml+13−21

compare with xenial

unifiedsplit

@@ -19,37 +19,29 @@ import Ubuntu.Components 0.1

19import Unity.Indicators 0.1 as Indicators

20import "../Components"

21

22−Item {

22+Loader {

23− id: indicatorItem

23+ id: root

24

25− property alias widgetSource: loader.source

25+ property alias widgetSource: root.source

26 property bool dimmed: false

27 property var indicatorProperties: undefined

28− property bool indicatorVisible: loader.item ? loader.item.enabled : false

28+ property bool indicatorVisible: item ? item.enabled : false

29 property string identifier

30

31 opacity: dimmed ? 0.4 : 1

32 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration } }

33

34− width: loader.item ? loader.item.width : 0

35−

36− Loader {

37− id: loader

38−

39− onLoaded: {

34+ onLoaded: {

40− item.height = Qt.binding(function() { return indicatorItem.height; });

41−

42− for(var pName in indicatorProperties) {

35+ for(var pName in indicatorProperties) {

43− if (item.hasOwnProperty(pName)) {

36+ if (item.hasOwnProperty(pName)) {

44− item[pName] = indicatorProperties[pName];

37+ item[pName] = indicatorProperties[pName];

45− }

46 }

38 }

47 }

39 }

40+ }

48

41

49− Binding {

42+ Binding {

50− target: loader.item

43+ target: item

51− property: "objectName"

44+ property: "objectName"

52− value: identifier + "-widget"

45+ value: identifier + "-widget"

53− }

54 }

46 }

55}

47}

tests/mocks/Unity/Indicators/CMakeLists.txt+1

@@ -16,6 +16,7 @@ set(IndicatorsFakeQml_SOURCES

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19+ fakeindicatorsmodel.cpp

19)

20)

20

21

21set(IndicatorsFakeQml_RESOURCES

22set(IndicatorsFakeQml_RESOURCES

tests/mocks/Unity/Indicators/IndicatorsModel.qml+3−5

@@ -17,12 +17,10 @@

17import QtQuick 2.0

18import Unity.Indicators 0.1 as Indicators

19

20−ListModel {

20+Indicators.FakeIndicatorsModel {

21

22− property var indicatorData : undefined

23−

24− function load() {

22+ function load(profile) {

25− clear();

23+ unload();

26

24

27 append({ "identifier": "indicator-fake1",

25 append({ "identifier": "indicator-fake1",

28 "position": 0,

26 "position": 0,

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cppnew file+116

@@ -0,0 +1,116 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#include "fakeindicatorsmodel.h"

21+#include "indicators.h"

22+

23+FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)

24+ : QAbstractListModel(parent)

25+{

26+ QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

27+ QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

28+ QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));

29+}

30+

31+/*! \internal */

32+FakeIndicatorsModel::~FakeIndicatorsModel()

33+{

34+ unload();

35+}

36+

37+int FakeIndicatorsModel::count() const

38+{

39+ return rowCount();

40+}

41+

42+void FakeIndicatorsModel::load(const QString&)

43+{

44+}

45+

46+void FakeIndicatorsModel::unload()

47+{

48+ beginResetModel();

49+

50+ qDeleteAll(m_indicators);

51+ m_indicators.clear();

52+

53+ endResetModel();

54+}

55+

56+

57+void FakeIndicatorsModel::append(const QVariantMap& row)

58+{

59+ Indicator* new_row = new QHash<int, QVariant>();

60+ for (auto iter = row.begin(); iter != row.end(); ++iter )

61+ {

62+ int key = roleNames().key(iter.key().toUtf8(), -1);

63+ if (key != -1) {

64+ new_row->insert(key, iter.value());

65+ }

66+ }

67+

68+ beginInsertRows(QModelIndex(), m_indicators.count(), m_indicators.count());

69+

70+ m_indicators.append(new_row);

71+

72+ endInsertRows();

73+}

74+

75+QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const

76+{

77+ static QHash<int, QByteArray> roles;

78+ if (roles.isEmpty())

79+ {

80+ roles[IndicatorsModelRole::Identifier] = "identifier";

81+ roles[IndicatorsModelRole::Position] = "position";

82+ roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

83+ roles[IndicatorsModelRole::PageSource] = "pageSource";

84+ roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

85+ }

86+ return roles;

87+}

88+

89+int FakeIndicatorsModel::columnCount(const QModelIndex &) const

90+{

91+ return 1;

92+}

93+

94+Q_INVOKABLE QVariant FakeIndicatorsModel::data(int row, int role) const

95+{

96+ return data(index(row, 0), role);

97+}

98+

99+QVariant FakeIndicatorsModel::data(const QModelIndex &index, int role) const

100+{

101+ if (!index.isValid() || index.row() >= m_indicators.size())

102+ return QVariant();

103+

104+ Indicator* indicator = m_indicators[index.row()];

105+ return indicator->value(role, QVariant());

106+}

107+

108+QModelIndex FakeIndicatorsModel::parent(const QModelIndex&) const

109+{

110+ return QModelIndex();

111+}

112+

113+int FakeIndicatorsModel::rowCount(const QModelIndex&) const

114+{

115+ return m_indicators.count();

116+}

tests/mocks/Unity/Indicators/fakeindicatorsmodel.hnew file+59

@@ -0,0 +1,59 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#ifndef FAKE_INDICATORSMODEL_H

21+#define FAKE_INDICATORSMODEL_H

22+

23+#include <QAbstractListModel>

24+

25+class FakeIndicatorsModel : public QAbstractListModel

26+{

27+ Q_OBJECT

28+ Q_ENUMS(Roles)

29+ Q_PROPERTY(int count READ count NOTIFY countChanged)

30+public:

31+

32+ FakeIndicatorsModel(QObject *parent=0);

33+ ~FakeIndicatorsModel();

34+

35+ Q_INVOKABLE void load(const QString& profile);

36+ Q_INVOKABLE void unload();

37+

38+ Q_INVOKABLE void append(const QVariantMap& row);

39+

40+ Q_INVOKABLE QVariant data(int row, int role) const;

41+

42+ /* QAbstractItemModel */

43+ QHash<int, QByteArray> roleNames() const;

44+ int columnCount(const QModelIndex &parent = QModelIndex()) const;

45+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

46+ QModelIndex parent (const QModelIndex &index) const;

47+ int rowCount(const QModelIndex &parent = QModelIndex()) const;

48+

49+Q_SIGNALS:

50+ void countChanged();

51+

52+private:

53+ int count() const;

54+

55+ typedef QHash<int, QVariant> Indicator;

56+ QList<Indicator*> m_indicators;

57+};

58+

59+#endif // FAKE_INDICATORSMODEL_H

tests/mocks/Unity/Indicators/fakeplugin.cpp+6

@@ -23,6 +23,7 @@

23#include "fakeplugin.h"

24

25// local

26+#include "fakeindicatorsmodel.h"

26#include "indicators.h"

27#include "indicators.h"

27#include "menucontentactivator.h"

28#include "menucontentactivator.h"

28#include "unitymenumodelstack.h"

29#include "unitymenumodelstack.h"

@@ -32,10 +33,15 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)

32{

33{

33 Q_INIT_RESOURCE(indicators_fake);

34 Q_INIT_RESOURCE(indicators_fake);

34

35

36+ // internal

37+ qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");

38+

39+ // external

35 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

40 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

36 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

41 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

37 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

42 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

38

43

44+ // external uncreatables

39 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

45 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

40 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

46 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

41 qmlRegisterUncreatableType<NetworkActionState>(uri, 0, 1, "NetworkActionState", "Can't create NetworkActionState class");

47 qmlRegisterUncreatableType<NetworkActionState>(uri, 0, 1, "NetworkActionState", "Can't create NetworkActionState class");

tests/qmltests/Panel/tst_IndicatorRow.qml+3−3

@@ -70,13 +70,13 @@ Item {

70 function test_set_current_item() {

71 init_test();

72 indicatorRow.setCurrentItemIndex(0);

73− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake1", "Incorrect item at position 0");

73+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake1", "Incorrect item at position 0");

74

75 indicatorRow.setCurrentItemIndex(1);

76− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake2", "Incorrect item at position 1");

76+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake2", "Incorrect item at position 1");

77

78 indicatorRow.setCurrentItemIndex(2);

79− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake3", "Incorrect item at position 2");

79+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake3", "Incorrect item at position 2");

80 }

81

82 function test_highlight_data() {

tests/qmltests/Panel/tst_MenuContent.qml+1−1

@@ -133,7 +133,7 @@ Item {

133 var menuIndex = i%menuCount;

134

135 activate_content(menuIndex);

136− testTabObjectName = indicatorsModel.get(menuIndex).identifier;

136+ testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);

137 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");

138 tryCompareFunction(selected_tab_equals_test_tab, true);

139 }