6a3b886 · unity8 · git.iko.soy

git.iko.soy/unity8

Fixed issues raised in MP-comments.

commit6a3b8864a6ad0be231a79480af8b19b69d02cd43 authorMirco Müller <mirco.mueller@ubuntu.com> dateMon 29 Jun 2015, 17:28 (11 years ago) parentedc2583

3 files changed+2−11

compare with xenial

unifiedsplit

plugins/Greeter/Unity/Launcher/launchermodelas.cpp+1−10 plugins/Greeter/Unity/Launcher/launchermodelas.h−1 plugins/Unity/Launcher/asadapter.cpp+1

plugins/Greeter/Unity/Launcher/launchermodelas.cpp+1−10

@@ -123,16 +123,6 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

123123 }

124124}

125125

126−void LauncherModel::setProgress(const QString &appId, int progress)

127−{

128− int index = findApplication(appId);

129− if (index >= 0) {

130− m_list.at(index)->setProgress(progress);

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

132− Q_EMIT dataChanged(modelIndex, modelIndex);

133− }

134−}

135−

136126void LauncherModel::setUser(const QString &username)

137127{

138128 if (m_user != username) {

@@ -218,6 +208,7 @@ void LauncherModel::refresh()

218208 item->setIcon(asItem.toMap().value("icon").toString());

219209 item->setCount(asItem.toMap().value("count").toInt());

220210 item->setCountVisible(asItem.toMap().value("countVisible").toBool());

211+ item->setProgress(asItem.toMap().value("progress").toInt());

221212 int idx = m_list.indexOf(item);

222213 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);

223214 }

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

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

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

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

4747 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex) override;

48− Q_INVOKABLE void setProgress(const QString &appId, int progress) override;

4948 Q_INVOKABLE void setUser(const QString &username) override;

5049 Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;

5150

plugins/Unity/Launcher/asadapter.cpp+1

@@ -56,5 +56,6 @@ QVariantMap ASAdapter::itemToVariant(LauncherItem *item) const

5656 details.insert("count", item->count());

5757 details.insert("countVisible", item->countVisible());

5858 details.insert("pinned", item->pinned());

59+ details.insert("progress", item->progress());

5960 return details;

6061}