7b1c72f · unity8 · git.iko.soy

Panel/Indicators/DefaultIndicatorWidget.qml+6−6

compare with xenial

unifiedsplit

@@ -86,8 +86,8 @@ Indicators.IndicatorWidget {

86 }

87 }

88

89− onActionStateChanged: {

89+ onRootActionStateChanged: {

90− if (actionState == undefined) {

90+ if (rootActionState == undefined) {

91 leftLabel = "";

92 rightLabel = "";

93 icons = undefined;

@@ -95,9 +95,9 @@ Indicators.IndicatorWidget {

95 return;

96 }

97

98− leftLabel = actionState.leftLabel ? actionState.leftLabel : "";

98+ leftLabel = rootActionState.leftLabel ? rootActionState.leftLabel : "";

99− rightLabel = actionState.rightLabel ? actionState.rightLabel : "";

99+ rightLabel = rootActionState.rightLabel ? rootActionState.rightLabel : "";

100− icons = actionState.icons;

100+ icons = rootActionState.icons;

101− enabled = actionState.visible;

101+ enabled = rootActionState.visible;

102 }

103}

Panel/Indicators/NetworkIndicatorPage.qml+1−1

@@ -30,7 +30,7 @@ PageStack {

30 // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704

31 __propagated: null

32

33− property alias title: _mainPage.title

33+ property alias title: pluginItem.title

34 property alias emptyText: pluginItem.emptyText

35 property alias busName: pluginItem.busName

36 property alias actionsObjectPath : pluginItem.actionsObjectPath

Panel/IndicatorsDataModel.qml−31

@@ -27,39 +27,8 @@ Indicators.IndicatorsModel {

27 Component.onCompleted: load()

28

29 indicatorData : {

30− 'indicator-location' : {

31− 'title': 'Location',

32− 'description' : ''

33− },

34− 'indicator-bluetooth' : {

35− 'title': 'Bluetooth',

36− 'description' : ''

37− },

38− 'indicator-messages' : {

39− 'title': 'Messaging',

40− 'description' : ''

41− },

42− 'indicator-sound' : {

43− 'title': 'Sound',

44− 'description' : ''

45− },

46 'indicator-network' : {

30 'indicator-network' : {

47− 'title': 'Networks',

48− 'description' : '',

49− 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',

50 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'

31 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'

51 },

32 },

52− 'indicator-power' : {

53− 'title': 'Battery',

54− 'description' : ''

55− },

56− 'indicator-session' : {

57− 'title': 'Session',

58− 'description' : ''

59− },

60− 'indicator-datetime' : {

61− 'title': 'Date and Time',

62− 'description' : ''

63− }

64 }

33 }

65}

34}

Panel/MenuContent.qml+9−2

@@ -100,16 +100,17 @@ MainView {

100 Tab {

101 id: tab

102 objectName: model.identifier

103− title: model.title

104

103

105 page: Page {

104 page: Page {

106 Loader {

105 Loader {

106+ id: loader

107 clip: true

108 anchors.fill: parent

109 source: pageSource

110 asynchronous: true

111

112− property bool contentActive: content.__contentActive && menuActivator.content[index].active

112+ readonly property bool indexActive: index >= 0 && index < menuActivator.count && menuActivator.content[index].active

113+ readonly property bool contentActive: content.__contentActive && indexActive

113

114

114 onContentActiveChanged: {

115 onContentActiveChanged: {

115 if (contentActive && item) {

116 if (contentActive && item) {

@@ -136,6 +137,12 @@ MainView {

136 item.start()

137 item.start()

137 }

138 }

139 }

140+

141+ Binding {

142+ target: tab

143+ property: "title"

144+ value: loader.item && loader.item.hasOwnProperty("title") && loader.item.title !== "" ? loader.item.title : model.identifier

145+ }

139 }

146 }

140 }

147 }

141 }

148 }

plugins/Unity/Indicators/indicators.h−2

@@ -74,8 +74,6 @@ public:

74 enum Roles {

75 Identifier = 0,

76 Position,

77− Title,

78− Description,

79 WidgetSource,

77 WidgetSource,

80 PageSource,

78 PageSource,

81 IndicatorProperties,

79 IndicatorProperties,

plugins/Unity/Indicators/indicatorsmodel.cpp+1−9

@@ -201,8 +201,6 @@ QHash<int, QByteArray> IndicatorsModel::roleNames() const

201 {

202 roles[IndicatorsModelRole::Identifier] = "identifier";

203 roles[IndicatorsModelRole::Position] = "position";

204− roles[IndicatorsModelRole::Title] = "title";

205− roles[IndicatorsModelRole::Description] = "description";

206 roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

204 roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

207 roles[IndicatorsModelRole::PageSource] = "pageSource";

205 roles[IndicatorsModelRole::PageSource] = "pageSource";

208 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

206 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

@@ -223,10 +221,6 @@ QVariant IndicatorsModel::defaultData(Indicator::Ptr indicator, int role)

223 {

221 {

224 case IndicatorsModelRole::Position:

222 case IndicatorsModelRole::Position:

225 return 0;

223 return 0;

226− case IndicatorsModelRole::Title:

227− return indicator ? indicator->identifier() : "Unknown";

228− case IndicatorsModelRole::Description:

229− return "";

230 case IndicatorsModelRole::WidgetSource:

224 case IndicatorsModelRole::WidgetSource:

231 return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";

225 return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";

232 case IndicatorsModelRole::PageSource:

226 case IndicatorsModelRole::PageSource:

@@ -268,8 +262,6 @@ QVariant IndicatorsModel::data(const QModelIndex &index, int role) const

268 return QVariant(indicator->indicatorProperties());

262 return QVariant(indicator->indicatorProperties());

269 }

263 }

270 break;

264 break;

271− case IndicatorsModelRole::Title:

272− case IndicatorsModelRole::Description:

273 case IndicatorsModelRole::WidgetSource:

265 case IndicatorsModelRole::WidgetSource:

274 case IndicatorsModelRole::PageSource:

266 case IndicatorsModelRole::PageSource:

275 return indicatorData(indicator, role);

267 return indicatorData(indicator, role);

@@ -286,7 +278,7 @@ QVariant IndicatorsModel::indicatorData(const Indicator::Ptr& indicator, int rol

286 QVariantMap data = m_parsed_indicator_data[indicator->identifier()];

278 QVariantMap data = m_parsed_indicator_data[indicator->identifier()];

287 if (data.contains(roleNames()[role])) {

279 if (data.contains(roleNames()[role])) {

288 return data[roleNames()[role]];

280 return data[roleNames()[role]];

289− };

281+ }

290 }

282 }

291 return defaultData(indicator, role);

283 return defaultData(indicator, role);

292}

284}

plugins/Unity/Indicators/qml/IndicatorBase.qml+8−5

@@ -27,13 +27,11 @@ Item {

27 enabled: menuObjectPaths.hasOwnProperty(device)

28

29 //const

30− property string title

31 property string busName

30 property string busName

32 property string actionsObjectPath

31 property string actionsObjectPath

33 property var menuObjectPaths: undefined

32 property var menuObjectPaths: undefined

34 readonly property string device: "phone"

33 readonly property string device: "phone"

35 property string rootMenuType: "com.canonical.indicator.root"

34 property string rootMenuType: "com.canonical.indicator.root"

36− property bool active: false

37

35

38 property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""

36 property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""

39

37

@@ -41,8 +39,13 @@ Item {

41

39

42 CachedUnityMenuModel {

40 CachedUnityMenuModel {

43 id: cachedModel

41 id: cachedModel

44− busName: active ? indicatorItem.busName : ""

42+ busName: indicatorItem.busName

45− actionsObjectPath: active ? indicatorItem.actionsObjectPath : ""

43+ actionsObjectPath: indicatorItem.actionsObjectPath

46− menuObjectPath: active ? indicatorItem.deviceMenuObjectPath : ""

44+ menuObjectPath: indicatorItem.deviceMenuObjectPath

45+ }

46+

47+ property var rootActionState: Indicators.RootActionState {

48+ menu: menuModel

49+ onUpdated: indicatorItem.rootActionStateChanged()

47 }

50 }

48}

51}

plugins/Unity/Indicators/qml/IndicatorPage.qml+7−5

@@ -26,12 +26,14 @@ IndicatorBase {

26 id: main

27

28 //const

29+ property bool contentActive: false

30+ property string title: rootActionState.title

29 property alias emptyText: emptyLabel.text

31 property alias emptyText: emptyLabel.text

30 property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem

32 property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem

31

33

32 Indicators.UnityMenuModelStack {

34 Indicators.UnityMenuModelStack {

33 id: menuStack

35 id: menuStack

34− head: main.menuModel

36+ head: contentActive ? main.menuModel : null

35 }

37 }

36

38

37 ListView {

39 ListView {

@@ -162,15 +164,15 @@ IndicatorBase {

162 function start()

164 function start()

163 {

165 {

164 reset()

166 reset()

165− if (!active) {

167+ if (!contentActive) {

166− active = true;

168+ contentActive = true;

167 }

169 }

168 }

170 }

169

171

170 function stop()

172 function stop()

171 {

173 {

172− if (active) {

174+ if (contentActive) {

173− active = false;

175+ contentActive = false;

174 }

176 }

175 }

177 }

176

178

plugins/Unity/Indicators/qml/IndicatorWidget.qml−6

@@ -23,12 +23,6 @@ import Unity.Indicators 0.1 as Indicators

23IndicatorBase {

24 id: indicatorWidget

25

26− active: true

27 enabled: false

26 enabled: false

28 property int iconSize: height - units.gu(0.5)

27 property int iconSize: height - units.gu(0.5)

29−

30− property var actionState: Indicators.RootActionState {

31− menu: menuModel

32− onUpdated: indicatorWidget.actionStateChanged()

33− }

34}

28}

plugins/Unity/Indicators/rootactionstate.cpp+7−1

@@ -102,12 +102,18 @@ void RootActionState::updateActionState()

102 Q_EMIT updated();

103}

104

105−

106bool RootActionState::isValid() const

105bool RootActionState::isValid() const

107{

106{

108 return m_menu && m_menu->rowCount() > 0;

107 return m_menu && m_menu->rowCount() > 0;

109}

108}

110

109

110+QString RootActionState::title() const

111+{

112+ if (!isValid()) return QString();

113+

114+ return m_cachedState.value("title", QVariant::fromValue(QString())).toString();

115+}

116+

111QString RootActionState::leftLabel() const

117QString RootActionState::leftLabel() const

112{

118{

113 if (!isValid()) return QString();

119 if (!isValid()) return QString();

plugins/Unity/Indicators/rootactionstate.h+3

@@ -32,6 +32,7 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

32 Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

33

34 Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35+ Q_PROPERTY(QString title READ title NOTIFY titleChanged)

35 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

36 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

36 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

37 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

37 Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)

38 Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)

@@ -48,6 +49,7 @@ public:

48 void setIndex(int index);

49 void setIndex(int index);

49

50

50 bool isValid() const;

51 bool isValid() const;

52+ QString title() const;

51 QString leftLabel() const;

53 QString leftLabel() const;

52 QString rightLabel() const;

54 QString rightLabel() const;

53 QStringList icons() const;

55 QStringList icons() const;

@@ -64,6 +66,7 @@ Q_SIGNALS:

64 void indexChanged();

66 void indexChanged();

65

67

66 void validChanged();

68 void validChanged();

69+ void titleChanged();

67 void leftLabelChanged();

70 void leftLabelChanged();

68 void rightLabelChanged();

71 void rightLabelChanged();

69 void iconsChanged();

72 void iconsChanged();

plugins/Unity/Indicators/visibleindicatorsmodel.cpp−2

@@ -33,8 +33,6 @@ QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const

33 {

34 roles[IndicatorsModelRole::Identifier] = "identifier";

35 roles[IndicatorsModelRole::Position] = "position";

36− roles[IndicatorsModelRole::Title] = "title";

37− roles[IndicatorsModelRole::Description] = "description";

38 roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

36 roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

39 roles[IndicatorsModelRole::PageSource] = "pageSource";

37 roles[IndicatorsModelRole::PageSource] = "pageSource";

40 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

38 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

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

@@ -28,45 +28,35 @@ ListModel {

28 // which throws off the filter for non-visible indicators.

29 Component.onCompleted: {

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

31− "priority": 0,

31+ "position": 0,

32− "title": "Menu1",

33− "description": "",

34 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",

32 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",

35 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page1.qml",

33 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page1.qml",

36 "indicatorProperties": ""

34 "indicatorProperties": ""

37 });

35 });

38

36

39 append({ "identifier": "indicator-fake2",

37 append({ "identifier": "indicator-fake2",

40− "priority": 1,

38+ "position": 1,

41− "title": "Menu2",

42− "description": "",

43 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget2.qml",

39 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget2.qml",

44 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page2.qml",

40 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page2.qml",

45 "indicatorProperties": ""

41 "indicatorProperties": ""

46 });

42 });

47

43

48 append({ "identifier": "indicator-fake3",

44 append({ "identifier": "indicator-fake3",

49− "priority": 2,

45+ "position": 2,

50− "title": "Menu3",

51− "description": "",

52 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget3.qml",

46 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget3.qml",

53 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page3.qml",

47 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page3.qml",

54 "indicatorProperties": ""

48 "indicatorProperties": ""

55 });

49 });

56

50

57 append({ "identifier": "indicator-fake4",

51 append({ "identifier": "indicator-fake4",

58− "priority": 3,

52+ "position": 3,

59− "title": "Menu4",

60− "description": "",

61 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget4.qml",

53 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget4.qml",

62 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page4.qml",

54 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page4.qml",

63 "indicatorProperties": ""

55 "indicatorProperties": ""

64 });

56 });

65

57

66 append({ "identifier": "indicator-fake5",

58 append({ "identifier": "indicator-fake5",

67− "priority": 4,

59+ "position": 4,

68− "title": "Menu5",

69− "description": "",

70 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget5.qml",

60 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget5.qml",

71 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page5.qml",

61 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page5.qml",

72 "indicatorProperties": ""

62 "indicatorProperties": ""

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp−13

@@ -65,38 +65,25 @@ private Q_SLOTS:

65 void testDataAndOrder()

66 {

67 // Priority order. (2, 1, 4, 3)

68− QVariantMap map;

69− QVariantMap map1; map1["title"] = "fake1";

70− QVariantMap map2; map2["title"] = "fake2";

71− QVariantMap map3; map3["title"] = "fake3";

72− map["indicator-fake1"] = map1;

73− map["indicator-fake2"] = map2;

74− map["indicator-fake3"] = map3;

75−

76 IndicatorsModel model;

68 IndicatorsModel model;

77− model.setIndicatorData(map);

78 model.load();

69 model.load();

79

70

80 // should be in order:

71 // should be in order:

81 // fake3, fake4, fake1, fake2

72 // fake3, fake4, fake1, fake2

82

73

83 QCOMPARE(model.data(0, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake3"));

74 QCOMPARE(model.data(0, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake3"));

84− QCOMPARE(model.data(0, IndicatorsModelRole::Title).toString(), QString("fake3"));

85 QCOMPARE(model.data(0, IndicatorsModelRole::Position).toInt(), 3);

75 QCOMPARE(model.data(0, IndicatorsModelRole::Position).toInt(), 3);

86 QCOMPARE(model.data(0, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake3"));

76 QCOMPARE(model.data(0, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake3"));

87

77

88 QCOMPARE(model.data(1, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake4"));

78 QCOMPARE(model.data(1, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake4"));

89− QCOMPARE(model.data(1, IndicatorsModelRole::Title).toString(), QString("indicator-fake4"));

90 QCOMPARE(model.data(1, IndicatorsModelRole::Position).toInt(), 2);

79 QCOMPARE(model.data(1, IndicatorsModelRole::Position).toInt(), 2);

91 QCOMPARE(model.data(1, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake4"));

80 QCOMPARE(model.data(1, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake4"));

92

81

93 QCOMPARE(model.data(2, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake1"));

82 QCOMPARE(model.data(2, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake1"));

94− QCOMPARE(model.data(2, IndicatorsModelRole::Title).toString(), QString("fake1"));

95 QCOMPARE(model.data(2, IndicatorsModelRole::Position).toInt(), 1);

83 QCOMPARE(model.data(2, IndicatorsModelRole::Position).toInt(), 1);

96 QCOMPARE(model.data(2, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake1"));

84 QCOMPARE(model.data(2, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake1"));

97

85

98 QCOMPARE(model.data(3, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake2"));

86 QCOMPARE(model.data(3, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake2"));

99− QCOMPARE(model.data(3, IndicatorsModelRole::Title).toString(), QString("fake2"));

100 QCOMPARE(model.data(3, IndicatorsModelRole::Position).toInt(), 0);

87 QCOMPARE(model.data(3, IndicatorsModelRole::Position).toInt(), 0);

101 QCOMPARE(model.data(3, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake2"));

88 QCOMPARE(model.data(3, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake2"));

102 }

89 }

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

@@ -62,13 +62,13 @@ Item {

62 function test_set_current_item() {

63 init_test();

64 indicatorRow.setCurrentItem(0);

65− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu1", "Incorrect item at position 0");

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

66

67 indicatorRow.setCurrentItem(1);

68− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu2", "Incorrect item at position 1");

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

69

70 indicatorRow.setCurrentItem(2);

71− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu3", "Incorrect item at position 2");

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

72 }

73 }

74