1
=== modified file 'debian/control'
2
--- debian/control	2015-07-09 20:22:36 +0000
3
+++ debian/control	2015-07-23 11:13:36 +0000
4
@@ -30,7 +30,7 @@
5
30
               libqt5xmlpatterns5-dev,
30
               libqt5xmlpatterns5-dev,
6
31
               libsystemsettings-dev,
31
               libsystemsettings-dev,
7
32
               libudev-dev,
32
               libudev-dev,
9
33
               libunity-api-dev (>= 7.97),
33
               libunity-api-dev (>= 7.98),
10
34
               libusermetricsoutput1-dev,
34
               libusermetricsoutput1-dev,
11
35
               libxcb1-dev,
35
               libxcb1-dev,
12
36
               pkg-config,
36
               pkg-config,
13
@@ -101,7 +101,7 @@
14
101
         qtdeclarative5-ubuntu-telephony0.1,
101
         qtdeclarative5-ubuntu-telephony0.1,
15
102
         qtdeclarative5-ubuntu-web-plugin,
102
         qtdeclarative5-ubuntu-web-plugin,
16
103
         ubuntu-system-settings,
103
         ubuntu-system-settings,
18
104
         unity-launcher-impl-4,
104
         unity-launcher-impl-7,
19
105
         unity8-common (= ${source:Version}),
105
         unity8-common (= ${source:Version}),
20
106
         unity8-private (= ${binary:Version}),
106
         unity8-private (= ${binary:Version}),
21
107
         unity8-private | unity-launcher-impl,
107
         unity8-private | unity-launcher-impl,
22
@@ -191,7 +191,7 @@
23
191
         ${misc:Depends},
191
         ${misc:Depends},
24
192
         ${shlibs:Depends},
192
         ${shlibs:Depends},
25
193
Provides: unity-launcher-impl,
193
Provides: unity-launcher-impl,
27
194
          unity-launcher-impl-4,
194
          unity-launcher-impl-7,
28
195
Description: Unity 8 private libs
195
Description: Unity 8 private libs
29
196
 The Unity 8 shell is the primary user interface for Ubuntu devices.
196
 The Unity 8 shell is the primary user interface for Ubuntu devices.
30
197
 .
197
 .
31
198
198
32
=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
33
--- plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-04-24 09:53:37 +0000
34
+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-07-23 11:13:36 +0000
35
@@ -1,4 +1,4 @@
37
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
38
2
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
2
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
39
3
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
3
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
40
4
4
41
5
5
42
=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.cpp'
43
--- plugins/Greeter/Unity/Launcher/launcheritem.cpp	2015-02-11 14:02:24 +0000
44
+++ plugins/Greeter/Unity/Launcher/launcheritem.cpp	2015-07-23 11:13:36 +0000
45
@@ -31,6 +31,7 @@
46
31
    m_count(0),
31
    m_count(0),
47
32
    m_countVisible(false),
32
    m_countVisible(false),
48
33
    m_focused(false),
33
    m_focused(false),
49
34
    m_alerting(false),
50
34
    m_quickList(new QuickListModel(this))
35
    m_quickList(new QuickListModel(this))
51
35
{
36
{
52
36
    QuickListEntry nameAction;
37
    QuickListEntry nameAction;
53
@@ -165,6 +166,19 @@
54
165
    }
166
    }
55
166
}
167
}
56
167
168
57
169
bool LauncherItem::alerting() const
58
170
{
59
171
    return m_alerting;
60
172
}
61
173
62
174
void LauncherItem::setAlerting(bool alerting)
63
175
{
64
176
    if (m_alerting != alerting) {
65
177
        m_alerting = alerting;
66
178
        Q_EMIT alertingChanged(alerting);
67
179
    }
68
180
}
69
181
70
168
unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
182
unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
71
169
{
183
{
72
170
    return m_quickList;
184
    return m_quickList;
73
171
185
74
=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.h'
75
--- plugins/Greeter/Unity/Launcher/launcheritem.h	2015-02-11 14:02:24 +0000
76
+++ plugins/Greeter/Unity/Launcher/launcheritem.h	2015-07-23 11:13:36 +0000
77
@@ -41,6 +41,7 @@
78
41
    int count() const override;
41
    int count() const override;
79
42
    bool countVisible() const override;
42
    bool countVisible() const override;
80
43
    bool focused() const override;
43
    bool focused() const override;
81
44
    bool alerting() const override;
82
44
45
83
45
    unity::shell::launcher::QuickListModelInterface *quickList() const override;
46
    unity::shell::launcher::QuickListModelInterface *quickList() const override;
84
46
47
85
@@ -54,6 +55,8 @@
86
54
    void setCount(int count);
55
    void setCount(int count);
87
55
    void setCountVisible(bool countVisible);
56
    void setCountVisible(bool countVisible);
88
56
    void setFocused(bool focused);
57
    void setFocused(bool focused);
89
58
    void setAlerting(bool alerting);
90
59
91
57
60
92
58
private:
61
private:
93
59
    QString m_appId;
62
    QString m_appId;
94
@@ -66,6 +69,7 @@
95
66
    int m_count;
69
    int m_count;
96
67
    bool m_countVisible;
70
    bool m_countVisible;
97
68
    bool m_focused;
71
    bool m_focused;
98
72
    bool m_alerting;
99
69
    QuickListModel *m_quickList;
73
    QuickListModel *m_quickList;
100
70
74
101
71
    friend class LauncherModel;
75
    friend class LauncherModel;
102
72
76
103
=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.cpp'
104
--- plugins/Greeter/Unity/Launcher/launchermodelas.cpp	2015-02-11 14:02:24 +0000
105
+++ plugins/Greeter/Unity/Launcher/launchermodelas.cpp	2015-07-23 11:13:36 +0000
106
@@ -72,6 +72,13 @@
107
72
    return QVariant();
72
    return QVariant();
108
73
}
73
}
109
74
74
110
75
void LauncherModel::setAlerting(const QString &appId, bool alerting)
111
76
{
112
77
    Q_UNUSED(appId)
113
78
    Q_UNUSED(alerting)
114
79
    qWarning() << "This is a read only implementation. Cannot set alert-state of items.";
115
80
}
116
81
117
75
unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
82
unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
118
76
{
83
{
119
77
    if (index < 0 || index >= m_list.count()) {
84
    if (index < 0 || index >= m_list.count()) {
120
@@ -200,16 +207,24 @@
121
200
    Q_FOREACH (LauncherItem* item, m_list) {
207
    Q_FOREACH (LauncherItem* item, m_list) {
122
201
        bool found = false;
208
        bool found = false;
123
202
        Q_FOREACH(const QVariant &asItem, items) {
209
        Q_FOREACH(const QVariant &asItem, items) {
125
203
            if (asItem.toMap().value("id").toString() == item->appId()) {
210
            QVariantMap cachedMap = asItem.toMap();
126
211
            if (cachedMap.value("id").toString() == item->appId()) {
127
204
                // Only keep and update it if we either show unpinned or it is pinned
212
                // Only keep and update it if we either show unpinned or it is pinned
129
205
                if (!m_onlyPinned || asItem.toMap().value("pinned").toBool()) {
213
                if (!m_onlyPinned || cachedMap.value("pinned").toBool()) {
130
206
                    found = true;
214
                    found = true;
135
207
                    item->setName(asItem.toMap().value("name").toString());
215
                    item->setName(cachedMap.value("name").toString());
136
208
                    item->setIcon(asItem.toMap().value("icon").toString());
216
                    item->setIcon(cachedMap.value("icon").toString());
137
209
                    item->setCount(asItem.toMap().value("count").toInt());
217
                    item->setCount(cachedMap.value("count").toInt());
138
210
                    item->setCountVisible(asItem.toMap().value("countVisible").toBool());
218
                    item->setCountVisible(cachedMap.value("countVisible").toBool());
139
219
                    item->setProgress(cachedMap.value("progress").toInt());
140
211
                    int idx = m_list.indexOf(item);
220
                    int idx = m_list.indexOf(item);
142
212
                    Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
221
                    Q_EMIT dataChanged(index(idx),
143
222
                                       index(idx),
144
223
                                       {RoleName,
145
224
                                        RoleIcon,
146
225
                                        RoleCount,
147
226
                                        RoleCountVisible,
148
227
                                        RoleProgress});
149
213
                }
228
                }
150
214
                break;
229
                break;
151
215
            }
230
            }
152
@@ -247,14 +262,16 @@
153
247
        }
262
        }
154
248
263
155
249
        if (itemIndex == -1) {
264
        if (itemIndex == -1) {
156
265
            QVariantMap chachedMap = entry.toMap();
157
250
            // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
266
            // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
161
251
            LauncherItem *item = new LauncherItem(entry.toMap().value("id").toString(),
267
            LauncherItem *item = new LauncherItem(chachedMap.value("id").toString(),
162
252
                                                  entry.toMap().value("name").toString(),
268
                                                  chachedMap.value("name").toString(),
163
253
                                                  entry.toMap().value("icon").toString(),
269
                                                  chachedMap.value("icon").toString(),
164
254
                                                  this);
270
                                                  this);
165
255
            item->setPinned(true);
271
            item->setPinned(true);
168
256
            item->setCount(entry.toMap().value("count").toInt());
272
            item->setCount(chachedMap.value("count").toInt());
169
257
            item->setCountVisible(entry.toMap().value("countVisible").toBool());
273
            item->setCountVisible(chachedMap.value("countVisible").toBool());
170
274
            item->setProgress(chachedMap.value("progress").toInt());
171
258
            beginInsertRows(QModelIndex(), newPosition, newPosition);
275
            beginInsertRows(QModelIndex(), newPosition, newPosition);
172
259
            m_list.insert(newPosition, item);
276
            m_list.insert(newPosition, item);
173
260
            endInsertRows();
277
            endInsertRows();
174
261
278
175
=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.h'
176
--- plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-04-30 09:31:51 +0000
177
+++ plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-07-23 11:13:36 +0000
178
@@ -41,6 +41,7 @@
179
41
41
180
42
    QVariant data(const QModelIndex &index, int role) const override;
42
    QVariant data(const QModelIndex &index, int role) const override;
181
43
43
182
44
    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
183
44
    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
45
    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
184
45
    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
46
    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
185
46
    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
47
    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
186
47
48
187
=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
188
--- plugins/Unity/Launcher/CMakeLists.txt	2015-04-24 09:53:37 +0000
189
+++ plugins/Unity/Launcher/CMakeLists.txt	2015-07-23 11:13:36 +0000
190
@@ -1,4 +1,4 @@
192
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
193
2
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
2
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
194
3
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
3
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
195
4
4
196
5
5
197
=== modified file 'plugins/Unity/Launcher/asadapter.cpp'
198
--- plugins/Unity/Launcher/asadapter.cpp	2015-02-11 14:13:26 +0000
199
+++ plugins/Unity/Launcher/asadapter.cpp	2015-07-23 11:13:36 +0000
200
@@ -56,5 +56,6 @@
201
56
    details.insert("count", item->count());
56
    details.insert("count", item->count());
202
57
    details.insert("countVisible", item->countVisible());
57
    details.insert("countVisible", item->countVisible());
203
58
    details.insert("pinned", item->pinned());
58
    details.insert("pinned", item->pinned());
204
59
    details.insert("progress", item->progress());
205
59
    return details;
60
    return details;
206
60
}
61
}
207
61
62
208
=== modified file 'plugins/Unity/Launcher/dbusinterface.cpp'
209
--- plugins/Unity/Launcher/dbusinterface.cpp	2015-06-11 23:45:12 +0000
210
+++ plugins/Unity/Launcher/dbusinterface.cpp	2015-07-23 11:13:36 +0000
211
@@ -62,6 +62,8 @@
212
62
        "<interface name=\"com.canonical.Unity.Launcher.Item\">"
62
        "<interface name=\"com.canonical.Unity.Launcher.Item\">"
213
63
            "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
63
            "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
214
64
            "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
64
            "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
215
65
            "<property name=\"progress\" type=\"i\" access=\"readwrite\" />"
216
66
            "<method name=\"Alert\" />"
217
65
        "</interface>";
67
        "</interface>";
218
66
    return nodeiface;
68
    return nodeiface;
219
67
}
69
}
220
@@ -122,6 +124,20 @@
221
122
        return false;
124
        return false;
222
123
    }
125
    }
223
124
126
224
127
    /* Break down the path to just the app id */
225
128
    bool validpath = true;
226
129
    QString pathtemp = message.path();
227
130
    if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
228
131
        validpath = false;
229
132
    }
230
133
    pathtemp.remove("/com/canonical/Unity/Launcher/");
231
134
    if (pathtemp.indexOf('/') >= 0) {
232
135
        validpath = false;
233
136
    }
234
137
235
138
    /* Find ourselves an appid */
236
139
    QString appid = decodeAppId(pathtemp);
237
140
238
125
    // First handle methods of the Launcher interface
141
    // First handle methods of the Launcher interface
239
126
    if (message.interface() == "com.canonical.Unity.Launcher") {
142
    if (message.interface() == "com.canonical.Unity.Launcher") {
240
127
        if (message.member() == "Refresh") {
143
        if (message.member() == "Refresh") {
241
@@ -129,6 +145,13 @@
242
129
            Q_EMIT refreshCalled();
145
            Q_EMIT refreshCalled();
243
130
            return connection.send(reply);
146
            return connection.send(reply);
244
131
        }
147
        }
245
148
    } else if (message.interface() == "com.canonical.Unity.Launcher.Item") {
246
149
        // Handle methods of the Launcher-Item interface
247
150
        if (message.member() == "Alert" && validpath) {
248
151
            QDBusMessage reply = message.createReply();
249
152
            Q_EMIT alertCalled(appid);
250
153
            return connection.send(reply);
251
154
        }
252
132
    }
155
    }
253
133
156
254
134
    // Now handle dynamic properties (for launcher emblems)
157
    // Now handle dynamic properties (for launcher emblems)
255
@@ -140,50 +163,53 @@
256
140
        return false;
163
        return false;
257
141
    }
164
    }
258
142
165
266
143
    /* Break down the path to just the app id */
166
    if (!validpath) {
260
144
    QString pathtemp = message.path();
261
145
    if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
262
146
        return false;
263
147
    }
264
148
    pathtemp.remove("/com/canonical/Unity/Launcher/");
265
149
    if (pathtemp.indexOf('/') >= 0) {
267
150
        return false;
167
        return false;
268
151
    }
168
    }
269
152
169
270
153
    /* Find ourselves an appid */
271
154
    QString appid = decodeAppId(pathtemp);
272
155
    int index = m_launcherModel->findApplication(appid);
170
    int index = m_launcherModel->findApplication(appid);
273
156
    LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
171
    LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
274
157
172
275
158
    QVariantList retval;
173
    QVariantList retval;
276
159
    if (message.member() == "Get") {
174
    if (message.member() == "Get") {
277
175
        QString cachedString = message.arguments()[1].toString();
278
160
        if (!item) {
176
        if (!item) {
279
161
            return false;
177
            return false;
280
162
        }
178
        }
282
163
        if (message.arguments()[1].toString() == "count") {
179
        if (cachedString == "count") {
283
164
            retval.append(QVariant::fromValue(QDBusVariant(item->count())));
180
            retval.append(QVariant::fromValue(QDBusVariant(item->count())));
285
165
        } else if (message.arguments()[1].toString() == "countVisible") {
181
        } else if (cachedString == "countVisible") {
286
166
            retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
182
            retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
287
183
        } else if (cachedString == "progress") {
288
184
            retval.append(QVariant::fromValue(QDBusVariant(item->progress())));
289
167
        }
185
        }
290
168
    } else if (message.member() == "Set") {
186
    } else if (message.member() == "Set") {
292
169
        if (message.arguments()[1].toString() == "count") {
187
        QString cachedString = message.arguments()[1].toString();
293
188
        if (cachedString == "count") {
294
170
            int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
189
            int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
295
171
            if (!item || newCount != item->count()) {
190
            if (!item || newCount != item->count()) {
296
172
                Q_EMIT countChanged(appid, newCount);
191
                Q_EMIT countChanged(appid, newCount);
297
173
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
192
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
298
174
            }
193
            }
300
175
        } else if (message.arguments()[1].toString() == "countVisible") {
194
        } else if (cachedString == "countVisible") {
301
176
            bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
195
            bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
302
177
            if (!item || newVisible != item->countVisible()) {
196
            if (!item || newVisible != item->countVisible()) {
303
178
                Q_EMIT countVisibleChanged(appid, newVisible);
197
                Q_EMIT countVisibleChanged(appid, newVisible);
304
179
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
198
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
305
180
            }
199
            }
306
200
        } else if (cachedString == "progress") {
307
201
            int newProgress = message.arguments()[2].value<QDBusVariant>().variant().toInt();
308
202
            if (!item || newProgress != item->progress()) {
309
203
                Q_EMIT progressChanged(appid, newProgress);
310
204
                notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "progress", QVariant(newProgress));
311
205
            }
312
181
        }
206
        }
313
182
    } else if (message.member() == "GetAll") {
207
    } else if (message.member() == "GetAll") {
314
183
        if (item) {
208
        if (item) {
315
184
            QVariantMap all;
209
            QVariantMap all;
316
185
            all.insert("count", item->count());
210
            all.insert("count", item->count());
317
186
            all.insert("countVisible", item->countVisible());
211
            all.insert("countVisible", item->countVisible());
318
212
            all.insert("progress", item->progress());
319
187
            retval.append(all);
213
            retval.append(all);
320
188
        }
214
        }
321
189
    } else {
215
    } else {
322
190
216
323
=== modified file 'plugins/Unity/Launcher/dbusinterface.h'
324
--- plugins/Unity/Launcher/dbusinterface.h	2015-06-11 23:45:12 +0000
325
+++ plugins/Unity/Launcher/dbusinterface.h	2015-07-23 11:13:36 +0000
326
@@ -36,7 +36,9 @@
327
36
Q_SIGNALS:
36
Q_SIGNALS:
328
37
    void countChanged(const QString &appId, int count);
37
    void countChanged(const QString &appId, int count);
329
38
    void countVisibleChanged(const QString &appId, bool countVisible);
38
    void countVisibleChanged(const QString &appId, bool countVisible);
330
39
    void progressChanged(const QString &appId, int progress);
331
39
    void refreshCalled();
40
    void refreshCalled();
332
41
    void alertCalled(const QString &appId);
333
40
42
334
41
private:
43
private:
335
42
    static QString decodeAppId(const QString& path);
44
    static QString decodeAppId(const QString& path);
336
43
45
337
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
338
--- plugins/Unity/Launcher/launcheritem.cpp	2014-11-19 17:43:09 +0000
339
+++ plugins/Unity/Launcher/launcheritem.cpp	2015-07-23 11:13:36 +0000
340
@@ -34,6 +34,7 @@
341
34
    m_count(0),
34
    m_count(0),
342
35
    m_countVisible(false),
35
    m_countVisible(false),
343
36
    m_focused(false),
36
    m_focused(false),
344
37
    m_alerting(false),
345
37
    m_quickList(new QuickListModel(this))
38
    m_quickList(new QuickListModel(this))
346
38
{
39
{
347
39
    QuickListEntry nameAction;
40
    QuickListEntry nameAction;
348
@@ -150,6 +151,9 @@
349
150
    if (m_count != count) {
151
    if (m_count != count) {
350
151
        m_count = count;
152
        m_count = count;
351
152
        Q_EMIT countChanged(count);
153
        Q_EMIT countChanged(count);
352
154
        if (m_countVisible) {
353
155
            setAlerting(true);
354
156
        }
355
153
    }
157
    }
356
154
}
158
}
357
155
159
358
@@ -163,6 +167,9 @@
359
163
    if (m_countVisible != countVisible) {
167
    if (m_countVisible != countVisible) {
360
164
        m_countVisible = countVisible;
168
        m_countVisible = countVisible;
361
165
        Q_EMIT countVisibleChanged(countVisible);
169
        Q_EMIT countVisibleChanged(countVisible);
362
170
        if (countVisible) {
363
171
            setAlerting(true);
364
172
        }
365
166
    }
173
    }
366
167
}
174
}
367
168
175
368
@@ -175,10 +182,26 @@
369
175
{
182
{
370
176
    if (m_focused != focused) {
183
    if (m_focused != focused) {
371
177
        m_focused = focused;
184
        m_focused = focused;
372
185
        if (focused) {
373
186
            setAlerting(false);
374
187
        }
375
178
        Q_EMIT focusedChanged(focused);
188
        Q_EMIT focusedChanged(focused);
376
179
    }
189
    }
377
180
}
190
}
378
181
191
379
192
bool LauncherItem::alerting() const
380
193
{
381
194
    return m_alerting;
382
195
}
383
196
384
197
void LauncherItem::setAlerting(bool alerting)
385
198
{
386
199
    if (m_alerting != alerting) {
387
200
        m_alerting = alerting;
388
201
        Q_EMIT alertingChanged(alerting);
389
202
    }
390
203
}
391
204
392
182
unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
205
unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
393
183
{
206
{
394
184
    return m_quickList;
207
    return m_quickList;
395
185
208
396
=== modified file 'plugins/Unity/Launcher/launcheritem.h'
397
--- plugins/Unity/Launcher/launcheritem.h	2014-09-02 18:22:37 +0000
398
+++ plugins/Unity/Launcher/launcheritem.h	2015-07-23 11:13:36 +0000
399
@@ -44,6 +44,7 @@
400
44
    int count() const override;
44
    int count() const override;
401
45
    bool countVisible() const override;
45
    bool countVisible() const override;
402
46
    bool focused() const override;
46
    bool focused() const override;
403
47
    bool alerting() const override;
404
47
48
405
48
    unity::shell::launcher::QuickListModelInterface *quickList() const override;
49
    unity::shell::launcher::QuickListModelInterface *quickList() const override;
406
49
50
407
@@ -57,6 +58,7 @@
408
57
    void setCount(int count);
58
    void setCount(int count);
409
58
    void setCountVisible(bool countVisible);
59
    void setCountVisible(bool countVisible);
410
59
    void setFocused(bool focused);
60
    void setFocused(bool focused);
411
61
    void setAlerting(bool alerting);
412
60
62
413
61
private:
63
private:
414
62
    QString m_appId;
64
    QString m_appId;
415
@@ -69,6 +71,7 @@
416
69
    int m_count;
71
    int m_count;
417
70
    bool m_countVisible;
72
    bool m_countVisible;
418
71
    bool m_focused;
73
    bool m_focused;
419
74
    bool m_alerting;
420
72
    QuickListModel *m_quickList;
75
    QuickListModel *m_quickList;
421
73
76
422
74
    friend class LauncherModel;
77
    friend class LauncherModel;
423
75
78
424
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
425
--- plugins/Unity/Launcher/launchermodel.cpp	2015-03-30 17:36:42 +0000
426
+++ plugins/Unity/Launcher/launchermodel.cpp	2015-07-23 11:13:36 +0000
427
@@ -40,7 +40,9 @@
428
40
{
40
{
429
41
    connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
41
    connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
430
42
    connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
42
    connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
431
43
    connect(m_dbusIface, &DBusInterface::progressChanged, this, &LauncherModel::progressChanged);
432
43
    connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
44
    connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
433
45
    connect(m_dbusIface, &DBusInterface::alertCalled, this, &LauncherModel::alert);
434
44
46
435
45
    connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
47
    connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
436
46
48
437
@@ -82,11 +84,25 @@
438
82
            return item->progress();
84
            return item->progress();
439
83
        case RoleFocused:
85
        case RoleFocused:
440
84
            return item->focused();
86
            return item->focused();
441
87
        case RoleAlerting:
442
88
            return item->alerting();
443
85
    }
89
    }
444
86
90
445
87
    return QVariant();
91
    return QVariant();
446
88
}
92
}
447
89
93
448
94
void LauncherModel::setAlerting(const QString &appId, bool alerting) {
449
95
    int index = findApplication(appId);
450
96
    if (index >= 0) {
451
97
        QModelIndex modelIndex = this->index(index);
452
98
        LauncherItem *item = m_list.at(index);
453
99
        if (!item->focused()) {
454
100
            item->setAlerting(alerting);
455
101
            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
456
102
        }
457
103
    }
458
104
}
459
105
460
90
unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
106
unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
461
91
{
107
{
462
92
    if (index < 0 || index >= m_list.count()) {
108
    if (index < 0 || index >= m_list.count()) {
463
@@ -334,6 +350,9 @@
464
334
    if (idx >= 0) {
350
    if (idx >= 0) {
465
335
        LauncherItem *item = m_list.at(idx);
351
        LauncherItem *item = m_list.at(idx);
466
336
        item->setCount(count);
352
        item->setCount(count);
467
353
        if (item->countVisible()) {
468
354
            setAlerting(item->appId(), true);
469
355
        }
470
337
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);
356
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);
471
338
        m_asAdapter->syncItems(m_list);
357
        m_asAdapter->syncItems(m_list);
472
339
    }
358
    }
473
@@ -345,6 +364,9 @@
474
345
    if (idx >= 0) {
364
    if (idx >= 0) {
475
346
        LauncherItem *item = m_list.at(idx);
365
        LauncherItem *item = m_list.at(idx);
476
347
        item->setCountVisible(countVisible);
366
        item->setCountVisible(countVisible);
477
367
        if (countVisible) {
478
368
            setAlerting(item->appId(), true);
479
369
        }
480
348
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
370
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
481
349
371
482
350
        // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
372
        // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
483
@@ -453,6 +475,16 @@
484
453
    m_asAdapter->syncItems(m_list);
475
    m_asAdapter->syncItems(m_list);
485
454
}
476
}
486
455
477
487
478
void LauncherModel::alert(const QString &appId)
488
479
{
489
480
    int idx = findApplication(appId);
490
481
    if (idx >= 0) {
491
482
        LauncherItem *item = m_list.at(idx);
492
483
        setAlerting(item->appId(), true);
493
484
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleAlerting);
494
485
    }
495
486
}
496
487
497
456
void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
488
void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
498
457
{
489
{
499
458
    Q_UNUSED(parent);
490
    Q_UNUSED(parent);
500
459
491
501
=== modified file 'plugins/Unity/Launcher/launchermodel.h'
502
--- plugins/Unity/Launcher/launchermodel.h	2015-04-30 09:31:51 +0000
503
+++ plugins/Unity/Launcher/launchermodel.h	2015-07-23 11:13:36 +0000
504
@@ -45,6 +45,7 @@
505
45
45
506
46
    QVariant data(const QModelIndex &index, int role) const override;
46
    QVariant data(const QModelIndex &index, int role) const override;
507
47
47
508
48
    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
509
48
    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
49
    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
510
49
    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
50
    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
511
50
    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
51
    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
512
@@ -63,6 +64,7 @@
513
63
public Q_SLOTS:
64
public Q_SLOTS:
514
64
    void requestRemove(const QString &appId) override;
65
    void requestRemove(const QString &appId) override;
515
65
    Q_INVOKABLE void refresh();
66
    Q_INVOKABLE void refresh();
516
67
    Q_INVOKABLE void alert(const QString &appId);
517
66
68
518
67
private:
69
private:
519
68
    void storeAppList();
70
    void storeAppList();
520
69
71
521
=== modified file 'qml/Launcher/LauncherDelegate.qml'
522
--- qml/Launcher/LauncherDelegate.qml	2014-10-14 12:28:07 +0000
523
+++ qml/Launcher/LauncherDelegate.qml	2015-07-23 11:13:36 +0000
524
@@ -15,7 +15,7 @@
525
15
 */
15
 */
526
16
16
527
17
import QtQuick 2.0
17
import QtQuick 2.0
529
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.1
530
19
19
531
20
Item {
20
Item {
532
21
    id: root
21
    id: root
533
@@ -27,6 +27,8 @@
534
27
    property bool itemFocused: false
27
    property bool itemFocused: false
535
28
    property real maxAngle: 0
28
    property real maxAngle: 0
536
29
    property bool inverted: false
29
    property bool inverted: false
537
30
    property bool alerting: false
538
31
    readonly property alias wiggling: wiggleAnim.running
539
30
32
540
31
    readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
33
    readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
541
32
    readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
34
    readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
542
@@ -39,6 +41,82 @@
543
39
    property real offset: 0
41
    property real offset: 0
544
40
    property real itemOpacity: 1
42
    property real itemOpacity: 1
545
41
    property real brightness: 0
43
    property real brightness: 0
546
44
    property double maxWiggleAngle: 5.0
547
45
548
46
    QtObject {
549
47
        id: priv
550
48
551
49
        readonly property int wiggleDuration: UbuntuAnimation.SnapDuration
552
50
        property real wiggleAngle: 0
553
51
    }
554
52
555
53
    SequentialAnimation {
556
54
        id: wiggleAnim
557
55
558
56
        running: alerting
559
57
        loops: 1
560
58
        alwaysRunToEnd: true
561
59
562
60
        NumberAnimation {
563
61
            target: priv
564
62
            property: "wiggleAngle"
565
63
            from: 0
566
64
            to: maxWiggleAngle
567
65
            duration: priv.wiggleDuration
568
66
            easing.type: Easing.InQuad
569
67
        }
570
68
571
69
        NumberAnimation {
572
70
            target: priv
573
71
            property: "wiggleAngle"
574
72
            from: maxWiggleAngle
575
73
            to: -maxWiggleAngle
576
74
            duration: priv.wiggleDuration
577
75
            easing.type: Easing.InOutQuad
578
76
        }
579
77
580
78
        NumberAnimation {
581
79
            target: priv
582
80
            property: "wiggleAngle"
583
81
            from: -maxWiggleAngle
584
82
            to: maxWiggleAngle
585
83
            duration: priv.wiggleDuration
586
84
            easing.type: Easing.InOutQuad
587
85
        }
588
86
589
87
        NumberAnimation {
590
88
            target: priv
591
89
            property: "wiggleAngle"
592
90
            from: maxWiggleAngle
593
91
            to: -maxWiggleAngle
594
92
            duration: priv.wiggleDuration
595
93
            easing.type: Easing.InOutQuad
596
94
        }
597
95
598
96
        NumberAnimation {
599
97
            target: priv
600
98
            property: "wiggleAngle"
601
99
            from: -maxWiggleAngle
602
100
            to: maxWiggleAngle
603
101
            duration: priv.wiggleDuration
604
102
            easing.type: Easing.InOutQuad
605
103
        }
606
104
607
105
        NumberAnimation {
608
106
            target: priv
609
107
            property: "wiggleAngle"
610
108
            from: maxWiggleAngle
611
109
            to: 0
612
110
            duration: priv.wiggleDuration
613
111
            easing.type: Easing.OutQuad
614
112
        }
615
113
616
114
        UbuntuNumberAnimation {
617
115
            target: root
618
116
            property: "alerting"
619
117
            to: 0
620
118
        }
621
119
    }
622
42
120
623
43
    Item {
121
    Item {
624
44
        id: iconItem
122
        id: iconItem
625
@@ -75,7 +153,7 @@
626
75
            objectName: "countEmblem"
153
            objectName: "countEmblem"
627
76
            anchors {
154
            anchors {
628
77
                right: parent.right
155
                right: parent.right
630
78
                top: parent.top
156
                bottom: parent.bottom
631
79
                margins: units.dp(3)
157
                margins: units.dp(3)
632
80
            }
158
            }
633
81
            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
159
            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
634
@@ -100,23 +178,21 @@
635
100
            }
178
            }
636
101
        }
179
        }
637
102
180
639
103
        BorderImage {
181
        UbuntuShape {
640
104
            id: progressOverlay
182
            id: progressOverlay
641
105
            objectName: "progressOverlay"
183
            objectName: "progressOverlay"
642
184
643
106
            anchors {
185
            anchors {
644
107
                left: iconItem.left
186
                left: iconItem.left
645
108
                right: iconItem.right
187
                right: iconItem.right
650
109
                bottom: iconItem.bottom
188
                verticalCenter: parent.verticalCenter
651
110
                leftMargin: units.gu(1)
189
                leftMargin: units.gu(1.5)
652
111
                rightMargin: units.gu(1)
190
                rightMargin: units.gu(1.5)
649
112
                bottomMargin: units.gu(1)
653
113
            }
191
            }
655
114
            height: units.gu(1.5)
192
            height: units.gu(1)
656
115
            visible: root.progress > -1
193
            visible: root.progress > -1
661
116
            source: "graphics/progressbar-trough.sci"
194
            color: UbuntuColors.darkGrey
662
117
195
            borderSource: "none"
659
118
            // For fill calculation we need to remove the 2 units of border defined in .sci file
660
119
            property int adjustedWidth: width - units.gu(2)
663
120
196
664
121
            Item {
197
            Item {
665
122
                anchors {
198
                anchors {
666
@@ -124,20 +200,22 @@
667
124
                    top: parent.top
200
                    top: parent.top
668
125
                    bottom: parent.bottom
201
                    bottom: parent.bottom
669
126
                }
202
                }
671
127
                width: Math.min(100, root.progress) / 100 * parent.adjustedWidth + units.gu(1)
203
                width: Math.min(100, root.progress) / 100 * parent.width
672
128
                clip: true
204
                clip: true
673
129
205
675
130
                BorderImage {
206
                UbuntuShape {
676
131
                    anchors {
207
                    anchors {
677
132
                        left: parent.left
208
                        left: parent.left
678
133
                        top: parent.top
209
                        top: parent.top
679
134
                        bottom: parent.bottom
210
                        bottom: parent.bottom
680
135
                    }
211
                    }
681
212
                    color: "white"
682
213
                    borderSource: "none"
683
136
                    width: progressOverlay.width
214
                    width: progressOverlay.width
684
137
                    source: "graphics/progressbar-fill.sci"
685
138
                }
215
                }
686
139
            }
216
            }
687
140
        }
217
        }
688
218
689
141
        Image {
219
        Image {
690
142
            objectName: "focusedHighlight"
220
            objectName: "focusedHighlight"
691
143
            anchors {
221
            anchors {
692
@@ -167,6 +245,14 @@
693
167
        }
245
        }
694
168
246
695
169
        transform: [
247
        transform: [
696
248
            // The rotation about the icon's center/z-axis for the wiggle
697
249
            // needs to happen here too, because there's no other way to
698
250
            // align the wiggle with the icon-folding otherwise
699
251
            Rotation {
700
252
                axis { x: 0; y: 0; z: 1 }
701
253
                origin { x: iconItem.width / 2; y: iconItem.height / 2; z: 0 }
702
254
                angle: priv.wiggleAngle
703
255
            },
704
170
            // Rotating 3 times at top/bottom because that increases the perspective.
256
            // Rotating 3 times at top/bottom because that increases the perspective.
705
171
            // This is a hack, but as QML does not support real 3D coordinates
257
            // This is a hack, but as QML does not support real 3D coordinates
706
172
            // getting a higher perspective can only be done by a hack. This is the most
258
            // getting a higher perspective can only be done by a hack. This is the most
707
173
259
708
=== modified file 'qml/Launcher/LauncherPanel.qml'
709
--- qml/Launcher/LauncherPanel.qml	2015-07-01 11:39:49 +0000
710
+++ qml/Launcher/LauncherPanel.qml	2015-07-23 11:13:36 +0000
711
@@ -86,6 +86,7 @@
712
86
            height: parent.height - dashItem.height - parent.spacing*2
86
            height: parent.height - dashItem.height - parent.spacing*2
713
87
87
714
88
            Item {
88
            Item {
715
89
                id: launcherListViewItem
716
89
                anchors.fill: parent
90
                anchors.fill: parent
717
90
                clip: true
91
                clip: true
718
91
92
719
@@ -109,12 +110,21 @@
720
109
                    preferredHighlightBegin: (height - itemHeight) / 2
110
                    preferredHighlightBegin: (height - itemHeight) / 2
721
110
                    preferredHighlightEnd: (height + itemHeight) / 2
111
                    preferredHighlightEnd: (height + itemHeight) / 2
722
111
112
723
113
                    // for the single peeking icon, when alert-state is set on delegate
724
114
                    property int peekingIndex: -1
725
115
726
112
                    // The size of the area the ListView is extended to make sure items are not
116
                    // The size of the area the ListView is extended to make sure items are not
727
113
                    // destroyed when dragging them outside the list. This needs to be at least
117
                    // destroyed when dragging them outside the list. This needs to be at least
728
114
                    // itemHeight to prevent folded items from disappearing and DragArea limits
118
                    // itemHeight to prevent folded items from disappearing and DragArea limits
729
115
                    // need to be smaller than this size to avoid breakage.
119
                    // need to be smaller than this size to avoid breakage.
730
116
                    property int extensionSize: 0
120
                    property int extensionSize: 0
731
117
121
732
122
                    // These properties are needed to facilitate implicitly unfolding the
733
123
                    // launcher to the peeking icon, if it is not already fully flat
734
124
                    // and in view for the user
735
125
                    property real moveToIndexYFrom
736
126
                    property real moveToIndexYTo
737
127
738
118
                    // Setting extensionSize after the list has been populated because it has
128
                    // Setting extensionSize after the list has been populated because it has
739
119
                    // the potential to mess up with the intial positioning in combination
129
                    // the potential to mess up with the intial positioning in combination
740
120
                    // with snapping to the center of the list. This catches all the cases
130
                    // with snapping to the center of the list. This catches all the cases
741
@@ -128,6 +138,14 @@
742
128
                        flick(0, clickFlickSpeed)
138
                        flick(0, clickFlickSpeed)
743
129
                    }
139
                    }
744
130
140
745
141
                    UbuntuNumberAnimation {
746
142
                        id: moveToIndexAnimation
747
143
                        target: launcherListView
748
144
                        property: "contentY"
749
145
                        from: launcherListView.moveToIndexYFrom
750
146
                        to: launcherListView.moveToIndexYTo
751
147
                    }
752
148
753
131
                    // The height of the area where icons start getting folded
149
                    // The height of the area where icons start getting folded
754
132
                    property int foldingStartHeight: units.gu(6.5)
150
                    property int foldingStartHeight: units.gu(6.5)
755
133
                    // The height of the area where the items reach the final folding angle
151
                    // The height of the area where the items reach the final folding angle
756
@@ -180,10 +198,63 @@
757
180
                        progress: model.progress
198
                        progress: model.progress
758
181
                        itemFocused: model.focused
199
                        itemFocused: model.focused
759
182
                        inverted: root.inverted
200
                        inverted: root.inverted
760
201
                        alerting: model.alerting
761
183
                        z: -Math.abs(offset)
202
                        z: -Math.abs(offset)
762
184
                        maxAngle: 55
203
                        maxAngle: 55
763
185
                        property bool dragging: false
204
                        property bool dragging: false
764
186
205
765
206
                        SequentialAnimation {
766
207
                            id: peekingAnimation
767
208
768
209
                            // revealing
769
210
                            PropertyAction { target: root; property: "visible"; value: (launcher.visibleWidth === 0) ? 1 : 0 }
770
211
                            PropertyAction { target: launcherListViewItem; property: "clip"; value: 0 }
771
212
772
213
                            UbuntuNumberAnimation {
773
214
                                target: launcherDelegate
774
215
                                alwaysRunToEnd: true
775
216
                                loops: 1
776
217
                                properties: "x"
777
218
                                to: (units.gu(.5) + launcherListView.width * .5) * (root.inverted ? -1 : 1)
778
219
                                duration: UbuntuAnimation.BriskDuration
779
220
                            }
780
221
781
222
                            // hiding
782
223
                            UbuntuNumberAnimation {
783
224
                                target: launcherDelegate
784
225
                                alwaysRunToEnd: true
785
226
                                loops: 1
786
227
                                properties: "x"
787
228
                                to: 0
788
229
                                duration: UbuntuAnimation.BriskDuration
789
230
                            }
790
231
791
232
                            PropertyAction { target: launcherListViewItem; property: "clip"; value: 1 }
792
233
                            PropertyAction { target: root; property: "visible"; value: (launcher.visibleWidth === 0) ? 0 : 1 }
793
234
                        }
794
235
795
236
                        onAlertingChanged: {
796
237
                            if(alerting) {
797
238
                                if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
798
239
                                    launcherListView.moveToIndexYFrom = launcherListView.contentY
799
240
                                    launcherListView.positionViewAtIndex(index, ListView.Center)
800
241
                                    launcherListView.moveToIndexYTo = launcherListView.contentY
801
242
                                    moveToIndexAnimation.start()
802
243
                                    if (!dragging && launcher.state !== "visible") {
803
244
                                        peekingAnimation.start()
804
245
                                    }
805
246
                                }
806
247
807
248
                                if (launcherListView.peekingIndex === -1) {
808
249
                                    launcherListView.peekingIndex = index
809
250
                                }
810
251
                            } else {
811
252
                                if (launcherListView.peekingIndex === index) {
812
253
                                    launcherListView.peekingIndex = -1
813
254
                                }
814
255
                            }
815
256
                        }
816
257
817
187
                        ThinDivider {
258
                        ThinDivider {
818
188
                            id: dropIndicator
259
                            id: dropIndicator
819
189
                            objectName: "dropIndicator"
260
                            objectName: "dropIndicator"
820
@@ -521,7 +592,7 @@
821
521
        Image {
592
        Image {
822
522
            anchors {
593
            anchors {
823
523
                left: parent.left
594
                left: parent.left
825
524
                leftMargin: quickList.item ? (quickList.item.width - units.gu(1)) / 2 - width / 2 : 0
595
                leftMargin: quickList.item !== undefined ? (quickList.item.width - units.gu(1)) / 2 - width / 2 : 0
826
525
                verticalCenter: parent.verticalCenter
596
                verticalCenter: parent.verticalCenter
827
526
                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
597
                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
828
527
            }
598
            }
829
@@ -564,10 +635,9 @@
830
564
635
831
565
        // internal
636
        // internal
832
566
        property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
637
        property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
834
567
        property int offset: item ? itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
638
        property int offset: item !== undefined ? (itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
835
568
                                 -(item.height/2) - height - units.gu(.5) :
639
                                 -(item.height/2) - height - units.gu(.5) :
838
569
                                 (item.height/2) + units.gu(.5) :
640
                                 (item.height/2) + units.gu(.5)) : 0
837
570
                                    0
839
571
641
840
572
        Column {
642
        Column {
841
573
            id: quickListColumn
643
            id: quickListColumn
842
574
644
843
=== removed file 'qml/Launcher/graphics/progressbar-fill@30.png'
844
575
Binary files qml/Launcher/graphics/progressbar-fill@30.png	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/progressbar-fill@30.png	1970-01-01 00:00:00 +0000 differ
645
Binary files qml/Launcher/graphics/progressbar-fill@30.png	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/progressbar-fill@30.png	1970-01-01 00:00:00 +0000 differ
845
=== removed file 'qml/Launcher/graphics/progressbar-fill@30.sci'
846
--- qml/Launcher/graphics/progressbar-fill@30.sci	2013-08-19 19:34:03 +0000
847
+++ qml/Launcher/graphics/progressbar-fill@30.sci	1970-01-01 00:00:00 +0000
848
@@ -1,5 +0,0 @@
849
1
border.left: 36
850
2
border.top: 16
851
3
border.bottom: 28
852
4
border.right: 36
853
5
source: progressbar-fill@30.png
854
6
\ No newline at end of file
0
\ No newline at end of file
855
7
1
856
=== removed file 'qml/Launcher/graphics/progressbar-trough@30.png'
857
8
Binary files qml/Launcher/graphics/progressbar-trough@30.png	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/progressbar-trough@30.png	1970-01-01 00:00:00 +0000 differ
2
Binary files qml/Launcher/graphics/progressbar-trough@30.png	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/progressbar-trough@30.png	1970-01-01 00:00:00 +0000 differ
858
=== removed file 'qml/Launcher/graphics/progressbar-trough@30.sci'
859
--- qml/Launcher/graphics/progressbar-trough@30.sci	2013-08-19 19:34:03 +0000
860
+++ qml/Launcher/graphics/progressbar-trough@30.sci	1970-01-01 00:00:00 +0000
861
@@ -1,5 +0,0 @@
862
1
border.left: 36
863
2
border.top: 16
864
3
border.bottom: 26
865
4
border.right: 36
866
5
source: progressbar-trough@30.png
867
6
\ No newline at end of file
0
\ No newline at end of file
868
7
1
869
=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
870
--- tests/mocks/Unity/Launcher/CMakeLists.txt	2015-04-13 09:33:28 +0000
871
+++ tests/mocks/Unity/Launcher/CMakeLists.txt	2015-07-23 11:13:36 +0000
872
@@ -1,4 +1,4 @@
874
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
875
2
2
876
3
include_directories(
3
include_directories(
877
4
    ${CMAKE_CURRENT_SOURCE_DIR}
4
    ${CMAKE_CURRENT_SOURCE_DIR}
878
5
5
879
=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
880
--- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2014-09-03 13:30:52 +0000
881
+++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2015-07-23 11:13:36 +0000
882
@@ -37,6 +37,7 @@
883
37
    m_count(0),
37
    m_count(0),
884
38
    m_countVisible(false),
38
    m_countVisible(false),
885
39
    m_focused(false),
39
    m_focused(false),
886
40
    m_alerting(false),
887
40
    m_quickList(new MockQuickListModel(this))
41
    m_quickList(new MockQuickListModel(this))
888
41
{
42
{
889
42
43
890
@@ -129,6 +130,9 @@
891
129
    {
130
    {
892
130
        m_count = count;
131
        m_count = count;
893
131
        Q_EMIT countChanged(count);
132
        Q_EMIT countChanged(count);
894
133
        if (m_countVisible) {
895
134
            setAlerting(true);
896
135
        }
897
132
    }
136
    }
898
133
}
137
}
899
134
138
900
@@ -142,6 +146,9 @@
901
142
    if (m_countVisible != countVisible) {
146
    if (m_countVisible != countVisible) {
902
143
        m_countVisible = countVisible;
147
        m_countVisible = countVisible;
903
144
        Q_EMIT countVisibleChanged(countVisible);
148
        Q_EMIT countVisibleChanged(countVisible);
904
149
        if (countVisible) {
905
150
            setAlerting(true);
906
151
        }
907
145
    }
152
    }
908
146
}
153
}
909
147
154
910
@@ -159,6 +166,18 @@
911
159
    }
166
    }
912
160
}
167
}
913
161
168
914
169
bool MockLauncherItem::alerting() const
915
170
{
916
171
    return m_alerting;
917
172
}
918
173
919
174
void MockLauncherItem::setAlerting(bool alerting)
920
175
{
921
176
    if (m_alerting != alerting) {
922
177
        m_alerting = alerting;
923
178
        Q_EMIT alertingChanged(alerting);
924
179
    }
925
180
}
926
162
181
927
163
unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const
182
unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const
928
164
{
183
{
929
165
184
930
=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
931
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-04-30 09:31:51 +0000
932
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-07-23 11:13:36 +0000
933
@@ -44,6 +44,7 @@
934
44
    int count() const override;
44
    int count() const override;
935
45
    bool countVisible() const override;
45
    bool countVisible() const override;
936
46
    bool focused() const override;
46
    bool focused() const override;
937
47
    bool alerting() const override;
938
47
48
939
48
    unity::shell::launcher::QuickListModelInterface *quickList() const override;
49
    unity::shell::launcher::QuickListModelInterface *quickList() const override;
940
49
50
941
@@ -55,6 +56,7 @@
942
55
    void setCount(int count);
56
    void setCount(int count);
943
56
    void setCountVisible(bool countVisible);
57
    void setCountVisible(bool countVisible);
944
57
    void setFocused(bool focused);
58
    void setFocused(bool focused);
945
59
    void setAlerting(bool alerting);
946
58
60
947
59
    QString m_appId;
61
    QString m_appId;
948
60
    QString m_desktopFile;
62
    QString m_desktopFile;
949
@@ -67,6 +69,7 @@
950
67
    int m_count;
69
    int m_count;
951
68
    bool m_countVisible;
70
    bool m_countVisible;
952
69
    bool m_focused;
71
    bool m_focused;
953
72
    bool m_alerting;
954
70
    MockQuickListModel *m_quickList;
73
    MockQuickListModel *m_quickList;
955
71
74
956
72
    friend class MockLauncherModel;
75
    friend class MockLauncherModel;
957
73
76
958
=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
959
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-03-06 04:44:11 +0000
960
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-07-23 11:13:36 +0000
961
@@ -34,6 +34,7 @@
962
34
    item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
34
    item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
963
35
    item->setProgress(50);
35
    item->setProgress(50);
964
36
    item->setCountVisible(true);
36
    item->setCountVisible(true);
965
37
    item->setAlerting(false);
966
37
    m_list.append(item);
38
    m_list.append(item);
967
38
    item = new MockLauncherItem("music-app", "/usr/share/applications/music-app.desktop", "Music", "soundcloud", this);
39
    item = new MockLauncherItem("music-app", "/usr/share/applications/music-app.desktop", "Music", "soundcloud", this);
968
39
    m_list.append(item);
40
    m_list.append(item);
969
@@ -43,25 +44,30 @@
970
43
    item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
44
    item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
971
44
    item->setCount(1);
45
    item->setCount(1);
972
45
    item->setCountVisible(true);
46
    item->setCountVisible(true);
973
47
    item->setAlerting(false);
974
46
    m_list.append(item);
48
    m_list.append(item);
975
47
    item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);
49
    item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);
976
48
    item->setCount(12);
50
    item->setCount(12);
977
49
    item->setCountVisible(true);
51
    item->setCountVisible(true);
978
52
    item->setAlerting(false);
979
50
    item->setPinned(true);
53
    item->setPinned(true);
980
51
    m_list.append(item);
54
    m_list.append(item);
981
52
    item = new MockLauncherItem("gmail-webapp", "/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail", this);
55
    item = new MockLauncherItem("gmail-webapp", "/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail", this);
982
53
    item->setCount(123);
56
    item->setCount(123);
983
54
    item->setCountVisible(true);
57
    item->setCountVisible(true);
984
58
    item->setAlerting(false);
985
55
    m_list.append(item);
59
    m_list.append(item);
986
56
    item = new MockLauncherItem("ubuntu-weather-app", "/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather", this);
60
    item = new MockLauncherItem("ubuntu-weather-app", "/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather", this);
987
57
    item->setCount(1234567890);
61
    item->setCount(1234567890);
988
58
    item->setCountVisible(true);
62
    item->setCountVisible(true);
989
63
    item->setAlerting(false);
990
59
    item->setPinned(true);
64
    item->setPinned(true);
991
60
    m_list.append(item);
65
    m_list.append(item);
992
61
    item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);
66
    item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);
993
62
    item->setProgress(50);
67
    item->setProgress(50);
994
63
    item->setCount(5);
68
    item->setCount(5);
995
64
    item->setCountVisible(true);
69
    item->setCountVisible(true);
996
70
    item->setAlerting(false);
997
65
    item->setFocused(true);
71
    item->setFocused(true);
998
66
    item->setPinned(true);
72
    item->setPinned(true);
999
67
    m_list.append(item);
73
    m_list.append(item);
1000
@@ -105,6 +111,8 @@
1001
105
        return item->countVisible();
111
        return item->countVisible();
1002
106
    case RoleFocused:
112
    case RoleFocused:
1003
107
        return item->focused();
113
        return item->focused();
1004
114
    case RoleAlerting:
1005
115
        return item->alerting();
1006
108
    }
116
    }
1007
109
117
1008
110
    return QVariant();
118
    return QVariant();
1009
@@ -119,6 +127,18 @@
1010
119
    return m_list.at(index);
127
    return m_list.at(index);
1011
120
}
128
}
1012
121
129
1013
130
void MockLauncherModel::setAlerting(const QString &appId, bool alerting) {
1014
131
    int index = findApp(appId);
1015
132
    if (index >= 0) {
1016
133
        QModelIndex modelIndex = this->index(index);
1017
134
        MockLauncherItem *item = m_list.at(index);
1018
135
        if (!item->focused()) {
1019
136
            item->setAlerting(alerting);
1020
137
            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
1021
138
        }
1022
139
    }
1023
140
}
1024
141
1025
122
void MockLauncherModel::move(int oldIndex, int newIndex)
142
void MockLauncherModel::move(int oldIndex, int newIndex)
1026
123
{
143
{
1027
124
    // Make sure its not moved outside the lists
144
    // Make sure its not moved outside the lists
1028
@@ -195,6 +215,16 @@
1029
195
    return -1;
215
    return -1;
1030
196
}
216
}
1031
197
217
1032
218
void MockLauncherModel::setProgress(const QString &appId, int progress)
1033
219
{
1034
220
    int index = findApp(appId);
1035
221
    if (index >= 0) {
1036
222
        m_list.at(index)->setProgress(progress);
1037
223
        QModelIndex modelIndex = this->index(index);
1038
224
        Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleProgress);
1039
225
    }
1040
226
}
1041
227
1042
198
void MockLauncherModel::setUser(const QString &username)
228
void MockLauncherModel::setUser(const QString &username)
1043
199
{
229
{
1044
200
    Q_UNUSED(username)
230
    Q_UNUSED(username)
1045
@@ -226,6 +256,26 @@
1046
226
    Q_EMIT hint();
256
    Q_EMIT hint();
1047
227
}
257
}
1048
228
258
1049
259
void MockLauncherModel::setCount(const QString &appId, int count)
1050
260
{
1051
261
    int index = findApp(appId);
1052
262
    if (index >= 0) {
1053
263
        m_list.at(index)->setCount(count);
1054
264
        QModelIndex modelIndex = this->index(index);
1055
265
        Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleCount);
1056
266
    }
1057
267
}
1058
268
1059
269
void MockLauncherModel::setCountVisible(const QString &appId, bool countVisible)
1060
270
{
1061
271
    int index = findApp(appId);
1062
272
    if (index >= 0) {
1063
273
        m_list.at(index)->setCountVisible(countVisible);
1064
274
        QModelIndex modelIndex = this->index(index);
1065
275
        Q_EMIT dataChanged(modelIndex, modelIndex);
1066
276
    }
1067
277
}
1068
278
1069
229
unity::shell::application::ApplicationManagerInterface *MockLauncherModel::applicationManager() const
279
unity::shell::application::ApplicationManagerInterface *MockLauncherModel::applicationManager() const
1070
230
{
280
{
1071
231
    return nullptr;
281
    return nullptr;
1072
232
282
1073
=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.h'
1074
--- tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-04-30 09:31:51 +0000
1075
+++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-07-23 11:13:36 +0000
1076
@@ -38,6 +38,7 @@
1077
38
38
1078
39
    QVariant data(const QModelIndex& index, int role) const override;
39
    QVariant data(const QModelIndex& index, int role) const override;
1079
40
40
1080
41
    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
1081
41
    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;
42
    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;
1082
42
    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
43
    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
1083
43
    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
44
    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
1084
@@ -54,6 +55,9 @@
1085
54
55
1086
55
    // For testing
56
    // For testing
1087
56
    Q_INVOKABLE void emitHint();
57
    Q_INVOKABLE void emitHint();
1088
58
    Q_INVOKABLE void setProgress(const QString &appId, int progress);
1089
59
    Q_INVOKABLE void setCount(const QString &appId, int count);
1090
60
    Q_INVOKABLE void setCountVisible(const QString &appId, bool countVisible);
1091
57
61
1092
58
Q_SIGNALS:
62
Q_SIGNALS:
1093
59
    void quickListTriggered(const QString &appId, int index);
63
    void quickListTriggered(const QString &appId, int index);
1094
60
64
1095
=== modified file 'tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt'
1096
--- tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-06-17 12:14:27 +0000
1097
+++ tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-07-23 11:13:36 +0000
1098
@@ -1,4 +1,4 @@
1100
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
1
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
1101
2
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
2
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
1102
3
3
1103
4
include_directories(
4
include_directories(
1104
5
5
1105
=== modified file 'tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp'
1106
--- tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2015-02-11 14:11:26 +0000
1107
+++ tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp	2015-07-23 11:13:36 +0000
1108
@@ -43,6 +43,7 @@
1109
43
        item.insert("name", "Item 1");
43
        item.insert("name", "Item 1");
1110
44
        item.insert("icon", "fake.svg");
44
        item.insert("icon", "fake.svg");
1111
45
        item.insert("count", 0);
45
        item.insert("count", 0);
1112
46
        item.insert("progress", 0);
1113
46
        item.insert("countVisible", false);
47
        item.insert("countVisible", false);
1114
47
        item.insert("pinned", true);
48
        item.insert("pinned", true);
1115
48
        list.append(item);
49
        list.append(item);
1116
@@ -67,6 +68,7 @@
1117
67
            inSync &= model->get(i)->name() == list.at(i).value("name").toString();
68
            inSync &= model->get(i)->name() == list.at(i).value("name").toString();
1118
68
            inSync &= model->get(i)->icon() == list.at(i).value("icon").toString();
69
            inSync &= model->get(i)->icon() == list.at(i).value("icon").toString();
1119
69
            inSync &= model->get(i)->count() == list.at(i).value("count").toInt();
70
            inSync &= model->get(i)->count() == list.at(i).value("count").toInt();
1120
71
            inSync &= model->get(i)->progress() == list.at(i).value("progress").toInt();
1121
70
            inSync &= model->get(i)->countVisible() == list.at(i).value("countVisible").toBool();
72
            inSync &= model->get(i)->countVisible() == list.at(i).value("countVisible").toBool();
1122
71
        }
73
        }
1123
72
        return inSync;
74
        return inSync;
1124
@@ -111,6 +113,7 @@
1125
111
        newEntry.insert("name", "New app");
113
        newEntry.insert("name", "New app");
1126
112
        newEntry.insert("icon", "some-icon.svg");
114
        newEntry.insert("icon", "some-icon.svg");
1127
113
        newEntry.insert("count", 0);
115
        newEntry.insert("count", 0);
1128
116
        newEntry.insert("progress", 42);
1129
114
        newEntry.insert("countVisible", false);
117
        newEntry.insert("countVisible", false);
1130
115
        newEntry.insert("pinned", true);
118
        newEntry.insert("pinned", true);
1131
116
        newList.append(newEntry);
119
        newList.append(newEntry);
1132
117
120
1133
=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
1134
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2015-06-17 12:14:27 +0000
1135
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2015-07-23 11:13:36 +0000
1136
@@ -1,5 +1,5 @@
1137
1
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
1
pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
1139
2
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
2
pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
1140
3
3
1141
4
include_directories(
4
include_directories(
1142
5
    ${CMAKE_CURRENT_SOURCE_DIR}
5
    ${CMAKE_CURRENT_SOURCE_DIR}
1143
6
6
1144
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
1145
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-06-12 16:07:43 +0000
1146
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-07-23 11:13:36 +0000
1147
@@ -368,11 +368,18 @@
1148
368
    }
368
    }
1149
369
369
1150
370
    void testCountEmblems() {
370
    void testCountEmblems() {
1151
371
        QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
1152
372
1153
371
        // Call GetAll on abs-icon
373
        // Call GetAll on abs-icon
1154
372
        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
374
        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
1155
373
        QDBusReply<QVariantMap> reply = interface.call("GetAll");
375
        QDBusReply<QVariantMap> reply = interface.call("GetAll");
1156
374
        QVariantMap map = reply.value();
376
        QVariantMap map = reply.value();
1157
375
377
1158
378
        // Check that the alerting-status is still false, and the item on the upper side of the API
1159
379
        int index = launcherModel->findApplication("abs-icon");
1160
380
        QCOMPARE(index >= 0, true);
1161
381
        QVERIFY(launcherModel->get(index)->alerting() == false);
1162
382
1163
376
        // Make sure GetAll returns a map with count and countVisible props
383
        // Make sure GetAll returns a map with count and countVisible props
1164
377
        QCOMPARE(map.contains("count"), true);
384
        QCOMPARE(map.contains("count"), true);
1165
378
        QCOMPARE(map.contains("countVisible"), true);
385
        QCOMPARE(map.contains("countVisible"), true);
1166
@@ -393,13 +400,8 @@
1167
393
        QCOMPARE(map.value("count").toInt(), 55);
400
        QCOMPARE(map.value("count").toInt(), 55);
1168
394
        QCOMPARE(map.value("countVisible").toBool(), true);
401
        QCOMPARE(map.value("countVisible").toBool(), true);
1169
395
402
1177
396
        // Now the item on the upper side of the API
403
        // Finally check, that the change to "count" implicitly also set the alerting-state to true
1178
397
        int index = launcherModel->findApplication("abs-icon");
404
        QVERIFY(launcherModel->get(index)->alerting() == true);
1172
398
        QCOMPARE(index >= 0, true);
1173
399
1174
400
        // And make sure values have changed there as well
1175
401
        QCOMPARE(launcherModel->get(index)->countVisible(), true);
1176
402
        QCOMPARE(launcherModel->get(index)->count(), 55);
1179
403
    }
405
    }
1180
404
406
1181
405
    void testCountEmblemAddsRemovesItem_data() {
407
    void testCountEmblemAddsRemovesItem_data() {
1182
@@ -459,6 +461,20 @@
1183
459
        QCOMPARE(index == -1, !isRunning && !isPinned && !startWhenVisible);
461
        QCOMPARE(index == -1, !isRunning && !isPinned && !startWhenVisible);
1184
460
    }
462
    }
1185
461
463
1186
464
    void testAlert() {
1187
465
        // Check that the alerting-status is still false
1188
466
        int index = launcherModel->findApplication("abs-icon");
1189
467
        QCOMPARE(index >= 0, true);
1190
468
        QVERIFY(launcherModel->get(index)->alerting() == false);
1191
469
1192
470
        // Call Alert() on "abs-icon"
1193
471
        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "com.canonical.Unity.Launcher.Item");
1194
472
        interface.call("Alert");
1195
473
1196
474
        // Check that the alerting-status is now true
1197
475
        QVERIFY(launcherModel->get(index)->alerting() == true);
1198
476
    }
1199
477
1200
462
    void testRefreshAfterDeletedDesktopFiles_data() {
478
    void testRefreshAfterDeletedDesktopFiles_data() {
1201
463
        QTest::addColumn<bool>("deleted");
479
        QTest::addColumn<bool>("deleted");
1202
464
        QTest::newRow("have .desktop files") << false;
480
        QTest::newRow("have .desktop files") << false;
1203
465
481
1204
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
1205
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-04-24 09:53:37 +0000
1206
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-07-23 11:13:36 +0000
1207
@@ -93,6 +93,57 @@
1208
93
            onClicked: launcherLoader.item.inverted = !launcherLoader.item.inverted
93
            onClicked: launcherLoader.item.inverted = !launcherLoader.item.inverted
1209
94
            Layout.fillWidth: true
94
            Layout.fillWidth: true
1210
95
        }
95
        }
1211
96
1212
97
        Row {
1213
98
            spacing: units.gu(1)
1214
99
1215
100
            Button {
1216
101
                text: "35% bar"
1217
102
                onClicked: LauncherModel.setProgress(LauncherModel.get(parseInt(appIdEntryBar.displayText)).appId, 35)
1218
103
                Layout.fillWidth: true
1219
104
            }
1220
105
1221
106
            TextArea {
1222
107
                id: appIdEntryBar
1223
108
                anchors.verticalCenter: parent.verticalCenter
1224
109
                width: units.gu(4)
1225
110
                height: units.gu(4)
1226
111
                autoSize: true
1227
112
                text: "2"
1228
113
                maximumLineCount: 1
1229
114
            }
1230
115
1231
116
            Button {
1232
117
                text: "no bar"
1233
118
                onClicked: LauncherModel.setProgress(LauncherModel.get(parseInt(appIdEntryBar.displayText)).appId, -1)
1234
119
                Layout.fillWidth: true
1235
120
            }
1236
121
        }
1237
122
1238
123
        Row {
1239
124
            spacing: units.gu(1)
1240
125
1241
126
            Button {
1242
127
                text: "set alert"
1243
128
                onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, true)
1244
129
            }
1245
130
1246
131
            TextArea {
1247
132
                id: appIdEntryAlert
1248
133
                anchors.verticalCenter: parent.verticalCenter
1249
134
                width: units.gu(5)
1250
135
                height: units.gu(4)
1251
136
                autoSize: true
1252
137
                text: "2"
1253
138
                maximumLineCount: 1
1254
139
                Layout.fillWidth: true
1255
140
            }
1256
141
1257
142
            Button {
1258
143
                text: "unset alert"
1259
144
                onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, false)
1260
145
            }
1261
146
        }
1262
96
    }
147
    }
1263
97
148
1264
98
    SignalSpy {
149
    SignalSpy {
1265
@@ -169,6 +220,16 @@
1266
169
            tryCompare(panel, "x", -panel.width, 1000);
220
            tryCompare(panel, "x", -panel.width, 1000);
1267
170
        }
221
        }
1268
171
222
1269
223
        function waitForWiggleToStart(appIcon) {
1270
224
            verify(appIcon != undefined)
1271
225
            tryCompare(appIcon, "wiggling", true, 1000, "wiggle-anim should not be in stopped state")
1272
226
        }
1273
227
1274
228
        function waitForWiggleToStop(appIcon) {
1275
229
            verify(appIcon != undefined)
1276
230
            tryCompare(appIcon, "wiggling", false, 1000, "wiggle-anim should not be in running state")
1277
231
        }
1278
232
1279
172
        function positionLauncherListAtBeginning() {
233
        function positionLauncherListAtBeginning() {
1280
173
            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
234
            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
1281
174
            listView.contentY = -listView.topMargin;
235
            listView.contentY = -listView.topMargin;
1282
@@ -636,5 +697,125 @@
1283
636
            tryCompare(launcher, "state", "", 1000, "Launcher didn't hide after moving mouse away from it");
697
            tryCompare(launcher, "state", "", 1000, "Launcher didn't hide after moving mouse away from it");
1284
637
            waitUntilLauncherDisappears();
698
            waitUntilLauncherDisappears();
1285
638
        }
699
        }
1286
700
1287
701
        function test_progressChangeViaModel() {
1288
702
            dragLauncherIntoView();
1289
703
            var item = findChild(launcher, "launcherDelegate0")
1290
704
            verify(item != undefined)
1291
705
            LauncherModel.setProgress(LauncherModel.get(0).appId, -1)
1292
706
            compare(findChild(item, "progressOverlay").visible, false)
1293
707
            LauncherModel.setProgress(LauncherModel.get(0).appId, 20)
1294
708
            compare(findChild(item, "progressOverlay").visible, true)
1295
709
            LauncherModel.setProgress(LauncherModel.get(0).appId, 0)
1296
710
        }
1297
711
1298
712
        function test_alertPeekingIcon() {
1299
713
            var listView = findChild(launcher, "launcherListView")
1300
714
            verify(listView != undefined)
1301
715
            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
1302
716
            tryCompare(listView, "peekingIndex", 5, 1000, "Wrong appId set as peeking-index")
1303
717
            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
1304
718
            tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
1305
719
        }
1306
720
1307
721
        function test_alertHidingIcon() {
1308
722
            var listView = findChild(launcher, "launcherListView")
1309
723
            verify(listView != undefined)
1310
724
            var appIcon6 = findChild(launcher, "launcherDelegate6")
1311
725
            verify(appIcon6 != undefined)
1312
726
            LauncherModel.setAlerting(LauncherModel.get(6).appId, true)
1313
727
            waitForWiggleToStart(appIcon6)
1314
728
            LauncherModel.setAlerting(LauncherModel.get(6).appId, false)
1315
729
            waitForWiggleToStop(appIcon6)
1316
730
            tryCompare(appIcon6, "x", 0, 1000, "x-value of appId #6 should not be non-zero")
1317
731
            waitForRendering(listView)
1318
732
        }
1319
733
1320
734
        function test_alertIgnoreFocusedApp() {
1321
735
            LauncherModel.setAlerting(LauncherModel.get(0).appId, true)
1322
736
            compare(LauncherModel.get(0).alerting, false, "Focused app should not have the alert-state set")
1323
737
        }
1324
738
1325
739
        function test_alertOnlyOnePeekingIcon() {
1326
740
            var listView = findChild(launcher, "launcherListView")
1327
741
            verify(listView != undefined)
1328
742
            LauncherModel.setAlerting(LauncherModel.get(3).appId, true)
1329
743
            LauncherModel.setAlerting(LauncherModel.get(1).appId, true)
1330
744
            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
1331
745
            tryCompare(listView, "peekingIndex", 3, 1000, "Wrong appId set as peeking-index")
1332
746
            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
1333
747
            LauncherModel.setAlerting(LauncherModel.get(3).appId, false)
1334
748
            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
1335
749
            tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
1336
750
            waitForRendering(listView)
1337
751
        }
1338
752
1339
753
        function test_alertMultipleApps() {
1340
754
            LauncherModel.setAlerting(LauncherModel.get(1).appId, true)
1341
755
            LauncherModel.setAlerting(LauncherModel.get(3).appId, true)
1342
756
            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
1343
757
            LauncherModel.setAlerting(LauncherModel.get(7).appId, true)
1344
758
            compare(LauncherModel.get(1).alerting, true, "Alert-state of appId #1 should not be false")
1345
759
            compare(LauncherModel.get(3).alerting, true, "Alert-state of appId #3 should not be false")
1346
760
            compare(LauncherModel.get(5).alerting, true, "Alert-state of appId #5 should not be false")
1347
761
            compare(LauncherModel.get(7).alerting, true, "Alert-state of appId #7 should not be false")
1348
762
            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
1349
763
            LauncherModel.setAlerting(LauncherModel.get(3).appId, false)
1350
764
            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
1351
765
            LauncherModel.setAlerting(LauncherModel.get(7).appId, false)
1352
766
            compare(LauncherModel.get(1).alerting, false, "Alert-state of appId #1 should not be true")
1353
767
            compare(LauncherModel.get(3).alerting, false, "Alert-state of appId #1 should not be true")
1354
768
            compare(LauncherModel.get(5).alerting, false, "Alert-state of appId #1 should not be true")
1355
769
            compare(LauncherModel.get(7).alerting, false, "Alert-state of appId #1 should not be true")
1356
770
        }
1357
771
1358
772
        function test_alertMoveIconIntoView() {
1359
773
            dragLauncherIntoView();
1360
774
            var appIcon1 = findChild(launcher, "launcherDelegate1");
1361
775
            var appIcon7 = findChild(launcher, "launcherDelegate7");
1362
776
            LauncherModel.setAlerting(LauncherModel.get(1).appId, true)
1363
777
            tryCompare(appIcon1, "angle", 0, 1000, "angle of appId #1 should not be non-zero")
1364
778
            waitForWiggleToStart(appIcon1)
1365
779
            LauncherModel.setAlerting(LauncherModel.get(7).appId, true)
1366
780
            tryCompare(appIcon7, "angle", 0, 1000, "angle of appId #7 should not be non-zero")
1367
781
            waitForWiggleToStart(appIcon7)
1368
782
            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
1369
783
            waitForWiggleToStop(appIcon1)
1370
784
            LauncherModel.setAlerting(LauncherModel.get(7).appId, false)
1371
785
            waitForWiggleToStop(appIcon7)
1372
786
        }
1373
787
1374
788
        function test_alertWigglePeekDrag() {
1375
789
            var appIcon5 = findChild(launcher, "launcherDelegate5");
1376
790
            var listView = findChild(launcher, "launcherListView")
1377
791
            verify(listView != undefined)
1378
792
            LauncherModel.setAlerting(LauncherModel.get(5).appId, true)
1379
793
            tryCompare(listView, "peekingIndex", 5, 1000, "Wrong appId set as peeking-index")
1380
794
            waitForWiggleToStart(appIcon5)
1381
795
            tryCompare(appIcon5, "wiggling", true, 1000, "appId #6 should not be still")
1382
796
            dragLauncherIntoView();
1383
797
            tryCompare(listView, "peekingIndex", -1, 1000, "peeking-index should be -1")
1384
798
            LauncherModel.setAlerting(LauncherModel.get(5).appId, false)
1385
799
            waitForWiggleToStop(appIcon5)
1386
800
            tryCompare(appIcon5, "wiggling", false, 1000, "appId #1 should not be wiggling")
1387
801
        }
1388
802
1389
803
        function test_alertViaCountAndCountVisible() {
1390
804
            dragLauncherIntoView();
1391
805
            var appIcon1 = findChild(launcher, "launcherDelegate1")
1392
806
            var oldCount = LauncherModel.get(1).count
1393
807
            LauncherModel.setCount(LauncherModel.get(1).appId, 42)
1394
808
            tryCompare(appIcon1, "wiggling", false, 1000, "appId #1 should be still")
1395
809
            LauncherModel.setCountVisible(LauncherModel.get(1).appId, 1)
1396
810
            tryCompare(appIcon1, "wiggling", true, 1000, "appId #1 should not be still")
1397
811
            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
1398
812
            waitForWiggleToStop(appIcon1)
1399
813
            LauncherModel.setCount(LauncherModel.get(1).appId, 4711)
1400
814
            tryCompare(appIcon1, "wiggling", true, 1000, "appId #1 should not be still")
1401
815
            LauncherModel.setAlerting(LauncherModel.get(1).appId, false)
1402
816
            waitForWiggleToStop(appIcon1)
1403
817
            LauncherModel.setCountVisible(LauncherModel.get(1).appId, 0)
1404
818
            LauncherModel.setCount(LauncherModel.get(1).appId, oldCount)
1405
819
        }
1406
639
    }
820
    }
1407
640
}
821
}
1408
641
822
1409
=== added directory 'tests/scripts'
1410
=== added file 'tests/scripts/README'
1411
--- tests/scripts/README	1970-01-01 00:00:00 +0000
1412
+++ tests/scripts/README	2015-07-23 11:13:36 +0000
1413
@@ -0,0 +1,9 @@
1414
1
This directory holds a few handy shell-scripts to simplify runtime-testing of DBus-APIs (requires qdbus-qt5 to be installed).
1415
2
1416
3
launcher-icon related:
1417
4
 * list-launcher-icons.sh - get all icons of unity8-launcher
1418
5
 * alert-launcher-icon.sh - trigger alert/wiggle of unfocused launcher-icon
1419
6
 * get-progress.sh - get progress-value of a launcher-icon
1420
7
 * set-progress.sh - set progress-value of a launcher-icon
1421
8
 * set-count.sh - set the count of a launcher-icon
1422
9
 * set-count-visible.sh - set the count-visible flag of a launcher-icon
1423
0
10
1424
=== added file 'tests/scripts/alert-launcher-icon.sh'
1425
--- tests/scripts/alert-launcher-icon.sh	1970-01-01 00:00:00 +0000
1426
+++ tests/scripts/alert-launcher-icon.sh	2015-07-23 11:13:36 +0000
1427
@@ -0,0 +1,3 @@
1428
1
#!/bin/sh
1429
2
1430
3
qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 com.canonical.Unity.Launcher.Item.Alert
1431
0
4
1432
=== added file 'tests/scripts/get-progress.sh'
1433
--- tests/scripts/get-progress.sh	1970-01-01 00:00:00 +0000
1434
+++ tests/scripts/get-progress.sh	2015-07-23 11:13:36 +0000
1435
@@ -0,0 +1,3 @@
1436
1
#!/bin/sh
1437
2
1438
3
qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Get com.canonical.Unity.Launcher.Item progress
1439
0
4
1440
=== added file 'tests/scripts/list-launcher-icons.sh'
1441
--- tests/scripts/list-launcher-icons.sh	1970-01-01 00:00:00 +0000
1442
+++ tests/scripts/list-launcher-icons.sh	2015-07-23 11:13:36 +0000
1443
@@ -0,0 +1,3 @@
1444
1
#!/bin/sh
1445
2
1446
3
qdbus com.canonical.Unity | grep Launcher | cut -f6 -d/
1447
0
4
1448
=== added file 'tests/scripts/set-count-visible.sh'
1449
--- tests/scripts/set-count-visible.sh	1970-01-01 00:00:00 +0000
1450
+++ tests/scripts/set-count-visible.sh	2015-07-23 11:13:36 +0000
1451
@@ -0,0 +1,3 @@
1452
1
#!/bin/sh
1453
2
1454
3
qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Set com.canonical.Unity.Launcher.Item countVisible $2
1455
0
4
1456
=== added file 'tests/scripts/set-count.sh'
1457
--- tests/scripts/set-count.sh	1970-01-01 00:00:00 +0000
1458
+++ tests/scripts/set-count.sh	2015-07-23 11:13:36 +0000
1459
@@ -0,0 +1,3 @@
1460
1
#!/bin/sh
1461
2
1462
3
qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Set com.canonical.Unity.Launcher.Item count $2
1463
0
4
1464
=== added file 'tests/scripts/set-progress.sh'
1465
--- tests/scripts/set-progress.sh	1970-01-01 00:00:00 +0000
1466
+++ tests/scripts/set-progress.sh	2015-07-23 11:13:36 +0000
1467
@@ -0,0 +1,3 @@
1468
1
#!/bin/sh
1469
2
1470
3
qdbus com.canonical.Unity.Launcher /com/canonical/Unity/Launcher/$1 org.freedesktop.DBus.Properties.Set com.canonical.Unity.Launcher.Item progress $2
Status:	Superseded
Proposed branch:	lp:~macslow/unity8/use-set-progress-api
Merge into:	lp:unity8
Diff against target:	1470 lines (+643/-69) 35 files modified debian/control (+3/-3) plugins/Greeter/Unity/Launcher/CMakeLists.txt (+1/-1) plugins/Greeter/Unity/Launcher/launcheritem.cpp (+14/-0) plugins/Greeter/Unity/Launcher/launcheritem.h (+4/-0) plugins/Greeter/Unity/Launcher/launchermodelas.cpp (+29/-12) plugins/Greeter/Unity/Launcher/launchermodelas.h (+1/-0) plugins/Unity/Launcher/CMakeLists.txt (+1/-1) plugins/Unity/Launcher/asadapter.cpp (+1/-0) plugins/Unity/Launcher/dbusinterface.cpp (+39/-13) plugins/Unity/Launcher/dbusinterface.h (+2/-0) plugins/Unity/Launcher/launcheritem.cpp (+23/-0) plugins/Unity/Launcher/launcheritem.h (+3/-0) plugins/Unity/Launcher/launchermodel.cpp (+32/-0) plugins/Unity/Launcher/launchermodel.h (+2/-0) qml/Launcher/LauncherDelegate.qml (+101/-15) qml/Launcher/LauncherPanel.qml (+74/-4) qml/Launcher/graphics/progressbar-fill@30.sci (+0/-5) qml/Launcher/graphics/progressbar-trough@30.sci (+0/-5) tests/mocks/Unity/Launcher/CMakeLists.txt (+1/-1) tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+19/-0) tests/mocks/Unity/Launcher/MockLauncherItem.h (+3/-0) tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+50/-0) tests/mocks/Unity/Launcher/MockLauncherModel.h (+4/-0) tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt (+1/-1) tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp (+3/-0) tests/plugins/Unity/Launcher/CMakeLists.txt (+1/-1) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+23/-7) tests/qmltests/Launcher/tst_Launcher.qml (+181/-0) tests/scripts/README (+9/-0) tests/scripts/alert-launcher-icon.sh (+3/-0) tests/scripts/get-progress.sh (+3/-0) tests/scripts/list-launcher-icons.sh (+3/-0) tests/scripts/set-count-visible.sh (+3/-0) tests/scripts/set-count.sh (+3/-0) tests/scripts/set-progress.sh (+3/-0)
To merge this branch:	bzr merge lp:~macslow/unity8/use-set-progress-api
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-07-22
Michael Zanetti (community)		2015-06-19	Approve on 2015-07-22
Lukáš Tinkl (community)			Approve on 2015-07-07
Nick Dedekind (community)			Needs Fixing on 2015-07-06
Review via email: mp+262448@code.launchpad.net