1
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
2
--- plugins/Unity/Launcher/launcheritem.cpp	2015-09-14 09:11:08 +0000
3
+++ plugins/Unity/Launcher/launcheritem.cpp	2016-03-10 13:07:25 +0000
4
@@ -37,6 +37,7 @@
5
37
    m_alerting(false),
37
    m_alerting(false),
6
38
    m_quickList(new QuickListModel(this))
38
    m_quickList(new QuickListModel(this))
7
39
{
39
{
8
40
    Q_ASSERT(parent != nullptr);
9
40
    QuickListEntry nameAction;
41
    QuickListEntry nameAction;
10
41
    nameAction.setActionId(QStringLiteral("launch_item"));
42
    nameAction.setActionId(QStringLiteral("launch_item"));
11
42
    nameAction.setText(m_name);
43
    nameAction.setText(m_name);
12
43
44
13
=== modified file 'plugins/Unity/Launcher/launcheritem.h'
14
--- plugins/Unity/Launcher/launcheritem.h	2015-07-23 14:13:57 +0000
15
+++ plugins/Unity/Launcher/launcheritem.h	2016-03-10 13:07:25 +0000
16
@@ -32,7 +32,7 @@
17
32
{
32
{
18
33
    Q_OBJECT
33
    Q_OBJECT
19
34
public:
34
public:
21
35
    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);
35
    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent);
22
36
36
23
37
    QString appId() const override;
37
    QString appId() const override;
24
38
    QString name() const override;
38
    QString name() const override;
25
39
39
26
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
27
--- plugins/Unity/Launcher/launchermodel.cpp	2015-09-14 09:11:08 +0000
28
+++ plugins/Unity/Launcher/launchermodel.cpp	2016-03-10 13:07:25 +0000
29
@@ -103,7 +103,7 @@
30
103
        LauncherItem *item = m_list.at(index);
103
        LauncherItem *item = m_list.at(index);
31
104
        if (!item->focused()) {
104
        if (!item->focused()) {
32
105
            item->setAlerting(alerting);
105
            item->setAlerting(alerting);
34
106
            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
106
            Q_EMIT dataChanged(modelIndex, modelIndex, {RoleAlerting});
35
107
        }
107
        }
36
108
    }
108
    }
37
109
}
109
}
38
@@ -389,7 +389,8 @@
39
389
        if (countVisible && desktopFile.isValid()) {
389
        if (countVisible && desktopFile.isValid()) {
40
390
            LauncherItem *item = new LauncherItem(appId,
390
            LauncherItem *item = new LauncherItem(appId,
41
391
                                                  desktopFile.displayName(),
391
                                                  desktopFile.displayName(),
43
392
                                                  desktopFile.icon());
392
                                                  desktopFile.icon(),
44
393
                                                  this);
45
393
            item->setCountVisible(true);
394
            item->setCountVisible(true);
46
394
            beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
395
            beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
47
395
            m_list.append(item);
396
            m_list.append(item);
48
@@ -414,10 +415,19 @@
49
414
        } else {
415
        } else {
50
415
            int idx = m_list.indexOf(item);
416
            int idx = m_list.indexOf(item);
51
416
            item->setName(desktopFile.displayName());
417
            item->setName(desktopFile.displayName());
52
417
            item->setIcon(desktopFile.icon());
53
418
            item->setPinned(item->pinned()); // update pinned text if needed
418
            item->setPinned(item->pinned()); // update pinned text if needed
54
419
            item->setRunning(item->running());
419
            item->setRunning(item->running());
56
420
            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleRunning});
420
            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleRunning});
57
421
58
422
            const QString oldIcon = item->icon();
59
423
            if (oldIcon == desktopFile.icon()) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
60
424
                item->setIcon(QString());
61
425
                Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
62
426
            }
63
427
64
428
            // now set the icon for real
65
429
            item->setIcon(desktopFile.icon());
66
430
            Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
67
421
        }
431
        }
68
422
    }
432
    }
69
423
433
70
@@ -489,7 +499,7 @@
71
489
    if (idx >= 0) {
499
    if (idx >= 0) {
72
490
        LauncherItem *item = m_list.at(idx);
500
        LauncherItem *item = m_list.at(idx);
73
491
        setAlerting(item->appId(), true);
501
        setAlerting(item->appId(), true);
75
492
        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleAlerting);
502
        Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});
76
493
    }
503
    }
77
494
}
504
}
78
495
505
79
496
506
80
=== modified file 'plugins/Unity/Launcher/launchermodel.h'
81
--- plugins/Unity/Launcher/launchermodel.h	2015-07-29 12:32:57 +0000
82
+++ plugins/Unity/Launcher/launchermodel.h	2016-03-10 13:07:25 +0000
83
@@ -38,7 +38,7 @@
84
38
   Q_OBJECT
38
   Q_OBJECT
85
39
39
86
40
public:
40
public:
88
41
    LauncherModel(QObject *parent = 0);
41
    LauncherModel(QObject *parent = nullptr);
89
42
    ~LauncherModel();
42
    ~LauncherModel();
90
43
43
91
44
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
44
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
92
45
45
93
=== modified file 'qml/Launcher/LauncherDelegate.qml'
94
--- qml/Launcher/LauncherDelegate.qml	2015-11-19 16:55:31 +0000
95
+++ qml/Launcher/LauncherDelegate.qml	2016-03-10 13:07:25 +0000
96
@@ -135,6 +135,7 @@
97
135
                sourceSize.width: iconShape.width
135
                sourceSize.width: iconShape.width
98
136
                sourceSize.height: iconShape.height
136
                sourceSize.height: iconShape.height
99
137
                source: root.iconName
137
                source: root.iconName
100
138
                cache: false // see lpbug#1543290 why no cache
101
138
            }
139
            }
102
139
        }
140
        }
103
140
141
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-09
Albert Astals Cid (community)		2016-03-08	Approve on 2016-03-09
Review via email: mp+288412@code.launchpad.net