e053239 · unity8 · git.iko.soy

plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -1,4 +1,4 @@

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

2pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3

4add_definitions(-DSM_BUSNAME=systemBus)

plugins/Greeter/Unity/Launcher/launchermodelas.cpp−7

@@ -76,13 +76,6 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

76 return QVariant();

77}

78

79−void LauncherModel::setAlerting(const QString &appId, bool alerting)

80−{

81− Q_UNUSED(appId)

82− Q_UNUSED(alerting)

83− qWarning() << "This is a read only implementation. Cannot set alert-state of items.";

84−}

85−

86unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

79unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

87{

80{

88 if (index < 0 || index >= m_list.count()) {

81 if (index < 0 || index >= m_list.count()) {

plugins/Greeter/Unity/Launcher/launchermodelas.h−1

@@ -41,7 +41,6 @@ public:

41

42 QVariant data(const QModelIndex &index, int role) const override;

43

44− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;

45 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

44 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

46 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

45 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

47 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

46 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

plugins/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,4 +1,4 @@

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

2pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3

4add_definitions(-DSM_BUSNAME=systemBus)

plugins/Unity/Launcher/launcheritem.cpp−9

@@ -163,9 +163,6 @@ void LauncherItem::setCount(int count)

163 if (m_count != count) {

164 m_count = count;

165 Q_EMIT countChanged(count);

166− if (m_countVisible) {

167− setAlerting(true);

168− }

169 }

166 }

170}

167}

171

168

@@ -179,9 +176,6 @@ void LauncherItem::setCountVisible(bool countVisible)

179 if (m_countVisible != countVisible) {

176 if (m_countVisible != countVisible) {

180 m_countVisible = countVisible;

177 m_countVisible = countVisible;

181 Q_EMIT countVisibleChanged(countVisible);

178 Q_EMIT countVisibleChanged(countVisible);

182− if (countVisible) {

183− setAlerting(true);

184− }

185 }

179 }

186}

180}

187

181

@@ -194,9 +188,6 @@ void LauncherItem::setFocused(bool focused)

194{

188{

195 if (m_focused != focused) {

189 if (m_focused != focused) {

196 m_focused = focused;

190 m_focused = focused;

197− if (focused) {

198− setAlerting(false);

199− }

200 Q_EMIT focusedChanged(focused);

191 Q_EMIT focusedChanged(focused);

201 }

192 }

202}

193}

plugins/Unity/Launcher/launchermodel.cpp+20−20

@@ -99,18 +99,6 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

99 return QVariant();

100}

101

102−void LauncherModel::setAlerting(const QString &appId, bool alerting) {

103− int index = findApplication(appId);

104− if (index >= 0) {

105− QModelIndex modelIndex = this->index(index);

106− LauncherItem *item = m_list.at(index);

107− if (!item->focused()) {

108− item->setAlerting(alerting);

109− Q_EMIT dataChanged(modelIndex, modelIndex, {RoleAlerting});

110− }

111− }

112−}

113−

114unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

102unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

115{

103{

116 if (index < 0 || index >= m_list.count()) {

104 if (index < 0 || index >= m_list.count()) {

@@ -361,11 +349,13 @@ void LauncherModel::countChanged(const QString &appId, int count)

361 if (idx >= 0) {

349 if (idx >= 0) {

362 LauncherItem *item = m_list.at(idx);

350 LauncherItem *item = m_list.at(idx);

363 item->setCount(count);

351 item->setCount(count);

352+ QVector<int> changedRoles = {RoleCount};

364− if (item->countVisible()) {

353+ if (item->countVisible() && !item->alerting() && !item->focused()) {

354+ changedRoles << RoleAlerting;

365− setAlerting(item->appId(), true);

355+ item->setAlerting(true);

366 }

356 }

367 m_asAdapter->syncItems(m_list);

357 m_asAdapter->syncItems(m_list);

368− Q_EMIT dataChanged(index(idx), index(idx), {RoleCount});

358+ Q_EMIT dataChanged(index(idx), index(idx), changedRoles);

369 }

359 }

370}

360}

371

361

@@ -375,10 +365,12 @@ void LauncherModel::countVisibleChanged(const QString &appId, bool countVisible)

375 if (idx >= 0) {

365 if (idx >= 0) {

376 LauncherItem *item = m_list.at(idx);

366 LauncherItem *item = m_list.at(idx);

377 item->setCountVisible(countVisible);

367 item->setCountVisible(countVisible);

368+ QVector<int> changedRoles = {RoleCount};

378− if (countVisible) {

369+ if (countVisible && !item->alerting() && !item->focused()) {

370+ changedRoles << RoleAlerting;

379− setAlerting(item->appId(), true);

371+ item->setAlerting(true);

380 }

372 }

381− Q_EMIT dataChanged(index(idx), index(idx), {RoleCountVisible});

373+ Q_EMIT dataChanged(index(idx), index(idx), changedRoles);

382

374

383 // If countVisible goes to false, and the item is neither pinned nor recent we can drop it

375 // If countVisible goes to false, and the item is neither pinned nor recent we can drop it

384 if (!countVisible && !item->pinned() && !item->recent()) {

376 if (!countVisible && !item->pinned() && !item->recent()) {

@@ -498,10 +490,12 @@ void LauncherModel::refresh()

498

490

499void LauncherModel::alert(const QString &appId)

491void LauncherModel::alert(const QString &appId)

500{

492{

493+ qDebug() << "alerting for appId" << appId;

501 int idx = findApplication(appId);

494 int idx = findApplication(appId);

502 if (idx >= 0) {

495 if (idx >= 0) {

503 LauncherItem *item = m_list.at(idx);

496 LauncherItem *item = m_list.at(idx);

497+ if (!item->focused() && !item->alerting())

504− setAlerting(item->appId(), true);

498+ item->setAlerting(true);

505 Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});

499 Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});

506 }

500 }

507}

501}

@@ -600,8 +594,14 @@ void LauncherModel::focusedAppIdChanged()

600 for (int i = 0; i < m_list.count(); ++i) {

594 for (int i = 0; i < m_list.count(); ++i) {

601 LauncherItem *item = m_list.at(i);

595 LauncherItem *item = m_list.at(i);

602 if (!item->focused() && item->appId() == appId) {

596 if (!item->focused() && item->appId() == appId) {

597+ QVector<int> changedRoles;

598+ changedRoles << RoleFocused;

603 item->setFocused(true);

599 item->setFocused(true);

604− Q_EMIT dataChanged(index(i), index(i), {RoleFocused});

600+ if (item->alerting()) {

601+ changedRoles << RoleAlerting;

602+ item->setAlerting(false);

603+ }

604+ Q_EMIT dataChanged(index(i), index(i), changedRoles);

605 } else if (item->focused() && item->appId() != appId) {

606 item->setFocused(false);

607 Q_EMIT dataChanged(index(i), index(i), {RoleFocused});

plugins/Unity/Launcher/launchermodel.h−1

@@ -45,7 +45,6 @@ public:

45

46 QVariant data(const QModelIndex &index, int role) const override;

47

48− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;

49 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

48 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

50 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

49 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

51 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

50 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

qml/Launcher/LauncherDelegate.qml+5−7

@@ -38,6 +38,10 @@ Item {

38 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight

39 readonly property alias wiggling: wiggleAnim.running

40

41+ onAlertingChanged: {

42+ print("item", index, "alerting:", alerting)

43+ }

44+

41 property int itemWidth

45 property int itemWidth

42 property int itemHeight

46 property int itemHeight

43 // The angle used for rotating

47 // The angle used for rotating

@@ -115,12 +119,6 @@ Item {

115 duration: priv.wiggleDuration

119 duration: priv.wiggleDuration

116 easing.type: Easing.OutQuad

120 easing.type: Easing.OutQuad

117 }

121 }

118−

119− UbuntuNumberAnimation {

120− target: root

121− property: "alerting"

122− to: 0

123− }

124 }

122 }

125

123

126 Item {

124 Item {

@@ -228,7 +226,7 @@ Item {

228 objectName: "runningHighlight" + index

226 objectName: "runningHighlight" + index

229 width: units.gu(0.25)

227 width: units.gu(0.25)

230 height: units.gu(.5)

228 height: units.gu(.5)

231− color: "white"

229+ color: root.alerting ? UbuntuColors.blue : "white"

232 visible: root.itemRunning

230 visible: root.itemRunning

233 }

231 }

234 }

232 }

qml/Launcher/LauncherPanel.qml+10

@@ -244,6 +244,15 @@ Rectangle {

244 maxAngle: 55

245 property bool dragging: false

246

247+ Timer {

248+ interval: 1000

249+ running: index == 2

250+ repeat: true

251+ onTriggered: {

252+ print("is alerting", model.alerting)

253+ }

254+ }

255+

247 SequentialAnimation {

256 SequentialAnimation {

248 id: peekingAnimation

257 id: peekingAnimation

249

258

@@ -275,6 +284,7 @@ Rectangle {

275 }

284 }

276

285

277 onAlertingChanged: {

286 onAlertingChanged: {

287+ print("panel alerting changed", alerting)

278 if(alerting) {

288 if(alerting) {

279 if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {

289 if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {

280 launcherListView.moveToIndex(index)

290 launcherListView.moveToIndex(index)

tests/mocks/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,4 +1,4 @@

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

2

3include_directories(

4 ${CMAKE_CURRENT_SOURCE_DIR}

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+2

@@ -21,6 +21,7 @@

21#include "MockQuickListModel.h"

22

23#include <paths.h>

24+#include <QDebug>

24

25

25using namespace unity::shell::launcher;

26using namespace unity::shell::launcher;

26

27

@@ -179,6 +180,7 @@ void MockLauncherItem::setAlerting(bool alerting)

179{

180{

180 if (m_alerting != alerting) {

181 if (m_alerting != alerting) {

181 m_alerting = alerting;

182 m_alerting = alerting;

183+ qDebug() << m_appId << "setting alerting" << alerting;

182 Q_EMIT alertingChanged(alerting);

184 Q_EMIT alertingChanged(alerting);

183 }

185 }

184}

186}

tests/mocks/Unity/Launcher/MockLauncherModel.h+1−1

@@ -38,7 +38,7 @@ public:

38

39 QVariant data(const QModelIndex& index, int role) const override;

40

41− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;

41+ Q_INVOKABLE void setAlerting(const QString &appId, bool alerting); // Only for testing

42 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;

43 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

44 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

tests/qmltests/Launcher/tst_Launcher.qml+4−1

@@ -176,7 +176,10 @@ Rectangle {

176

177 Button {

178 text: "set alert"

179+ onClicked: {

180+ print("should alert", LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId)

179− onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, true)

181+ LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, true)

182+ }

180 }

183 }

181

184

182 TextArea {

185 TextArea {