1
=== modified file 'plugins/CMakeLists.txt'
2
--- plugins/CMakeLists.txt	2014-03-17 22:12:26 +0000
3
+++ plugins/CMakeLists.txt	2014-08-04 14:04:23 +0000
4
@@ -10,6 +10,7 @@
5
10
add_subdirectory(example)
10
add_subdirectory(example)
6
11
add_subdirectory(flight-mode)
11
add_subdirectory(flight-mode)
7
12
add_subdirectory(language)
12
add_subdirectory(language)
8
13
add_subdirectory(notifications)
9
13
add_subdirectory(orientation-lock)
14
add_subdirectory(orientation-lock)
10
14
add_subdirectory(phone)
15
add_subdirectory(phone)
11
15
add_subdirectory(reset)
16
add_subdirectory(reset)
12
16
17
13
=== added directory 'plugins/notifications'
14
=== added file 'plugins/notifications/CMakeLists.txt'
15
--- plugins/notifications/CMakeLists.txt	1970-01-01 00:00:00 +0000
16
+++ plugins/notifications/CMakeLists.txt	2014-08-04 14:04:23 +0000
17
@@ -0,0 +1,18 @@
18
1
set(QML_SOURCES PageComponent.qml)
19
2
SET (CMAKE_AUTOMOC ON)
20
3
21
4
add_library(UbuntuNotificationsPanel MODULE plugin.h notification_manager.h
22
5
notification_item.h notification_item.cpp
23
6
plugin.cpp notification_manager.cpp
24
7
${QML_SOURCES})
25
8
26
9
include_directories(${GIO_INCLUDE_DIRS})
27
10
target_link_libraries(UbuntuNotificationsPanel ${GLIB_LDFLAGS} ${GIO_LDFLAGS})
28
11
qt5_use_modules(UbuntuNotificationsPanel Qml Quick)
29
12
30
13
set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Notifications)
31
14
install(TARGETS UbuntuNotificationsPanel DESTINATION ${PLUG_DIR})
32
15
install(FILES qmldir DESTINATION ${PLUG_DIR})
33
16
install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/notifications)
34
17
35
18
install(FILES notifications.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
36
0
19
37
=== added file 'plugins/notifications/PageComponent.qml'
38
--- plugins/notifications/PageComponent.qml	1970-01-01 00:00:00 +0000
39
+++ plugins/notifications/PageComponent.qml	2014-08-04 14:04:23 +0000
40
@@ -0,0 +1,85 @@
41
1
/*
42
2
 * This file is part of system-settings
43
3
 *
44
4
 * Copyright (C) 2013-2014 Canonical Ltd.
45
5
 *
46
6
 * This program is free software: you can redistribute it and/or modify it
47
7
 * under the terms of the GNU General Public License version 3, as published
48
8
 * by the Free Software Foundation.
49
9
 *
50
10
 * This program is distributed in the hope that it will be useful, but
51
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
52
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
53
13
 * PURPOSE.  See the GNU General Public License for more details.
54
14
 *
55
15
 * You should have received a copy of the GNU General Public License along
56
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
57
17
 */
58
18
59
19
import QtQuick 2.0
60
20
import Ubuntu.Components 0.1
61
21
import Ubuntu.Components.ListItems 0.1 as ListItem
62
22
import Ubuntu.SystemSettings.Notifications 1.0
63
23
import SystemSettings 1.0
64
24
65
25
ItemPage {
66
26
    id: root
67
27
    objectName: "systemNotificationsPage"
68
28
69
29
    title: i18n.tr("Notifications")
70
30
71
31
    NotificationsManager {
72
32
        id: notificationsManager
73
33
    }
74
34
75
35
    ListItem.Base {
76
36
        id: subtitle
77
37
        height: labelSubtitle.height + units.gu(2)
78
38
        Label {
79
39
            id: labelSubtitle
80
40
            text: i18n.tr("Selected apps can alert you using notification bubbles, sounds, vibrations, and the Notification Center.")
81
41
            wrapMode: Text.WordWrap
82
42
            anchors {
83
43
                top: parent.top
84
44
                left: parent.left
85
45
                right: parent.right
86
46
                margins: units.gu(1)
87
47
            }
88
48
            fontSize: "large"
89
49
        }
90
50
    }
91
51
92
52
    ListView {
93
53
        id: notificationsList
94
54
        objectName: "notificationsList"
95
55
        anchors {
96
56
            left: parent.left
97
57
            right: parent.right
98
58
            top: subtitle.bottom
99
59
            bottom: parent.bottom
100
60
        }
101
61
        model: notificationsManager.model
102
62
        clip: true
103
63
        contentHeight: contentItem.childrenRect.height
104
64
105
65
        delegate: ListItem.Standard {
106
66
            text: modelData.title
107
67
            Component.onCompleted: {
108
68
                if (modelData.icon.search("/") == -1) {
109
69
                    iconName = modelData.icon
110
70
                }
111
71
                else {
112
72
                    iconSource = modelData.icon
113
73
                }
114
74
            }
115
75
            iconFrame: false
116
76
            control: Switch {
117
77
                checked: modelData.status
118
78
119
79
                onCheckedChanged: {
120
80
                    modelData.status = checked;
121
81
                }
122
82
            }
123
83
        }
124
84
    }
125
85
}
126
0
86
127
=== added file 'plugins/notifications/notification_item.cpp'
128
--- plugins/notifications/notification_item.cpp	1970-01-01 00:00:00 +0000
129
+++ plugins/notifications/notification_item.cpp	2014-08-04 14:04:23 +0000
130
@@ -0,0 +1,48 @@
131
1
/*
132
2
 * Copyright (C) 2014 Canonical Ltd
133
3
 *
134
4
 * This program is free software: you can redistribute it and/or modify
135
5
 * it under the terms of the GNU General Public License version 3 as
136
6
 * published by the Free Software Foundation.
137
7
 *
138
8
 * This program is distributed in the hope that it will be useful,
139
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
140
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
141
11
 * GNU General Public License for more details.
142
12
 *
143
13
 * You should have received a copy of the GNU General Public License
144
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
145
15
 *
146
16
*/
147
17
148
18
#include "notification_item.h"
149
19
150
20
namespace NotificationsPlugin {
151
21
152
22
NotificationItem::NotificationItem(QObject *parent) :
153
23
    QObject(parent)
154
24
{
155
25
}
156
26
157
27
NotificationItem::~NotificationItem()
158
28
{
159
29
}
160
30
161
31
void NotificationItem::setItemData(QString title, QString icon, bool status, QString key)
162
32
{
163
33
    m_title = title;
164
34
    m_icon = icon;
165
35
    m_status = status;
166
36
    m_key = key;
167
37
    Q_EMIT titleChanged();
168
38
    Q_EMIT iconChanged();
169
39
    Q_EMIT statusChanged();
170
40
}
171
41
172
42
void NotificationItem::setStatus(bool status) {
173
43
    m_status = status;
174
44
    Q_EMIT statusChanged();
175
45
    Q_EMIT updateNotificationStatus(m_key, m_status);
176
46
}
177
47
178
48
}
179
0
49
180
=== added file 'plugins/notifications/notification_item.h'
181
--- plugins/notifications/notification_item.h	1970-01-01 00:00:00 +0000
182
+++ plugins/notifications/notification_item.h	2014-08-04 14:04:23 +0000
183
@@ -0,0 +1,62 @@
184
1
/*
185
2
 * Copyright (C) 2014 Canonical Ltd
186
3
 *
187
4
 * This program is free software: you can redistribute it and/or modify
188
5
 * it under the terms of the GNU General Public License version 3 as
189
6
 * published by the Free Software Foundation.
190
7
 *
191
8
 * This program is distributed in the hope that it will be useful,
192
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
193
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
194
11
 * GNU General Public License for more details.
195
12
 *
196
13
 * You should have received a copy of the GNU General Public License
197
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
198
15
 *
199
16
*/
200
17
201
18
#ifndef UPDATE_H
202
19
#define UPDATE_H
203
20
204
21
#include <QObject>
205
22
#include <QString>
206
23
#include <QStringList>
207
24
#include <QtQml>
208
25
209
26
namespace NotificationsPlugin {
210
27
211
28
class NotificationItem : public QObject
212
29
{
213
30
    Q_OBJECT
214
31
    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
215
32
    Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
216
33
    Q_PROPERTY(bool status READ status WRITE setStatus NOTIFY statusChanged)
217
34
    Q_PROPERTY(QString key MEMBER m_key)
218
35
219
36
Q_SIGNALS:
220
37
    void statusChanged();
221
38
    void titleChanged();
222
39
    void iconChanged();
223
40
    void updateNotificationStatus(QString id, bool value);
224
41
225
42
public:
226
43
    explicit NotificationItem(QObject *parent = 0);
227
44
    virtual ~NotificationItem();
228
45
    void setItemData(QString title, QString icon, bool status, QString key);
229
46
230
47
    bool status() { return m_status; }
231
48
    QString title() { return m_title; }
232
49
    QString icon() { return m_icon; }
233
50
234
51
    void setStatus(bool status);
235
52
236
53
private:
237
54
    QString m_title;
238
55
    QString m_icon;
239
56
    QString m_key;
240
57
    bool m_status;
241
58
};
242
59
243
60
}
244
61
245
62
#endif // UPDATE_H
246
0
63
247
=== added file 'plugins/notifications/notification_manager.cpp'
248
--- plugins/notifications/notification_manager.cpp	1970-01-01 00:00:00 +0000
249
+++ plugins/notifications/notification_manager.cpp	2014-08-04 14:04:23 +0000
250
@@ -0,0 +1,211 @@
251
1
/*
252
2
 * Copyright (C) 2014 Canonical Ltd
253
3
 *
254
4
 * This program is free software: you can redistribute it and/or modify
255
5
 * it under the terms of the GNU General Public License version 3 as
256
6
 * published by the Free Software Foundation.
257
7
 *
258
8
 * This program is distributed in the hope that it will be useful,
259
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
260
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
261
11
 * GNU General Public License for more details.
262
12
 *
263
13
 * You should have received a copy of the GNU General Public License
264
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
265
15
 *
266
16
*/
267
17
268
18
#include <gio/gio.h>
269
19
#include <gio/gdesktopappinfo.h>
270
20
271
21
#include "notification_manager.h"
272
22
#include "notification_item.h"
273
23
#include <iostream>
274
24
275
25
276
26
#define CLICK_COMMAND "click"
277
27
#define BLACKLIST_CONFIG_SCHEMA_ID "com.ubuntu.notifications.hub"
278
28
#define BLACKLIST_KEY "blacklist"
279
29
280
30
281
31
namespace NotificationsPlugin {
282
32
283
33
void app_data_from_desktop_id (const char* desktop_id, char **display_name, char **icon_fname) {
284
34
    GAppInfo* app_info = (GAppInfo*)g_desktop_app_info_new(desktop_id);
285
35
    if (app_info != NULL) {
286
36
        *display_name = g_strdup(g_app_info_get_display_name(app_info));
287
37
        GIcon* icon = g_app_info_get_icon (app_info);
288
38
        if (icon != NULL) {
289
39
            *icon_fname = g_icon_to_string (icon);
290
40
        }
291
41
        g_object_unref (app_info);
292
42
    }
293
43
    else {
294
44
        *display_name = NULL;
295
45
        *icon_fname = NULL;
296
46
    }
297
47
}
298
48
299
49
// XXX: lots of code copied from the update plugin.
300
50
// XXX: and lots of it is also reimplemented differently
301
51
// XXX: in the about plugin!
302
52
// XXX: And all of them should be replaced with libclick calls
303
53
// XXX: instead of calling out to the click command
304
54
305
55
NotificationsManager::NotificationsManager(QObject *parent):
306
56
    QObject(parent),
307
57
    m_pushSettings(g_settings_new(BLACKLIST_CONFIG_SCHEMA_ID))
308
58
{
309
59
    QObject::connect(&m_process, SIGNAL(finished(int)),
310
60
                  this, SLOT(loadModel()));
311
61
312
62
    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
313
63
    QString command = environment.value("CLICK_COMMAND", QString(CLICK_COMMAND));
314
64
    QStringList args("list");
315
65
    args << "--manifest";
316
66
    m_process.start(command, args);
317
67
}
318
68
319
69
NotificationsManager::~NotificationsManager()
320
70
{
321
71
    g_object_unref(m_pushSettings);
322
72
}
323
73
324
74
void NotificationsManager::loadModel()
325
75
{
326
76
    // Load the blacklist
327
77
    GVariant *blacklist = g_settings_get_value(m_pushSettings, BLACKLIST_KEY);
328
78
    GVariantIter *iter;
329
79
    g_variant_get (blacklist, "a(ss)", &iter);
330
80
    gchar *pkg;
331
81
    gchar *app;
332
82
    m_blacklist.clear();
333
83
    while (g_variant_iter_loop (iter, "(ss)", &pkg, &app)) {
334
84
        m_blacklist[QString(pkg)+"::::"+app] = true;
335
85
    }
336
86
    g_variant_iter_free (iter);
337
87
    g_variant_unref (blacklist);
338
88
339
89
    // Add legacy dpkg apps
340
90
    QDir legacy_helpers_dir = QDir("/usr/lib/ubuntu-push-client/legacy-helpers/");
341
91
    legacy_helpers_dir.setFilter(QDir::Files);
342
92
    QStringList legacy_helpers = legacy_helpers_dir.entryList();
343
93
    for (int i = 0; i < legacy_helpers.size(); ++i) {
344
94
            QString appname = legacy_helpers.at(i);
345
95
            QString appid = appname + ".desktop";
346
96
            QString key = "::::"+appname;
347
97
            char *display_name;
348
98
            char *icon_fname;
349
99
            app_data_from_desktop_id(appid.toUtf8().constData(), &display_name, &icon_fname);
350
100
            bool blacklisted = m_blacklist.contains(key);
351
101
            if (!display_name || !icon_fname) {
352
102
                continue; // Broken .desktop file
353
103
            }
354
104
            NotificationItem *item = new NotificationItem();
355
105
            item->setItemData(QString(display_name), QString(icon_fname), !blacklisted, key);
356
106
            g_free(display_name);
357
107
            g_free(icon_fname);
358
108
            m_model.append(QVariant::fromValue(item));
359
109
            connect(item, &NotificationItem::updateNotificationStatus,
360
110
                    this, &NotificationsManager::checkUpdates);
361
111
    }
362
112
363
113
    // Add Click Packages
364
114
365
115
    QString output(m_process.readAllStandardOutput());
366
116
    QJsonDocument document = QJsonDocument::fromJson(output.toUtf8());
367
117
    QJsonArray array = document.array();
368
118
369
119
370
120
	// Iterate over all the installed click packages,
371
121
	// and, for those packages that have a push-helper hook,
372
122
	// list all apps (hooks entries with a desktop field)
373
123
374
124
    for (int i = 0; i < array.size(); i++) { // This iterates over packages
375
125
        QJsonObject object = array.at(i).toObject();
376
126
377
127
        QString pkgname = object.value("name").toString();
378
128
        QString version = object.value("version").toString();
379
129
380
130
        // This iterates over apps
381
131
        QVariantMap hooks = object.value("hooks").toObject().toVariantMap();
382
132
        QList<QString> keys = hooks.keys();
383
133
384
134
        // We need one app that has a push-helper key
385
135
        bool has_helper = false;
386
136
        for (int j = 0; j < keys.size(); ++j) {
387
137
            QVariantMap hook = hooks.value(keys.at(j)).toMap();
388
138
            if (hook.contains("push-helper")) {
389
139
                has_helper = true;
390
140
            }
391
141
        }
392
142
        if (!has_helper) {
393
143
            continue;
394
144
        }
395
145
396
146
        // It has a helper, so add items for all entries that have
397
147
        // a "desktop" key.
398
148
        for (int j = 0; j < keys.size(); ++j) {
399
149
            QString appname = keys.at(j);
400
150
            QVariantMap hook = hooks.value(appname).toMap();
401
151
            if (hook.contains("desktop") || hook.contains("scope")) {
402
152
                QString key = pkgname+"::::"+appname;
403
153
                QString appid = pkgname+"_"+appname+"_"+version+".desktop"; // Full versioned APP_ID + ".desktop"
404
154
                char *display_name;
405
155
                char *icon_fname;
406
156
                app_data_from_desktop_id(appid.toUtf8().constData(), &display_name, &icon_fname);
407
157
                // fall back to the manifest's title & icon if missing from .desktop
408
158
                if (!display_name) {
409
159
                    display_name = g_strdup(object.value("title").toString().toUtf8().data());
410
160
                }
411
161
                if (!icon_fname) {
412
162
                    icon_fname =  g_strdup(object.value("icon").toString().toUtf8().data());
413
163
                }
414
164
                NotificationItem *item = new NotificationItem();
415
165
                bool blacklisted = m_blacklist.contains(key);
416
166
                item->setItemData(QString(display_name), QString(icon_fname), !blacklisted, key);
417
167
                g_free(display_name);
418
168
                g_free(icon_fname);
419
169
                m_model.append(QVariant::fromValue(item));
420
170
                connect(item, &NotificationItem::updateNotificationStatus,
421
171
                        this, &NotificationsManager::checkUpdates);
422
172
            }
423
173
        }
424
174
    }
425
175
    Q_EMIT modelChanged();
426
176
}
427
177
428
178
void NotificationsManager::checkUpdates(QString key, bool value)
429
179
{
430
180
    // Update the internal blacklist
431
181
    if (!value) {
432
182
        if (!m_blacklist.contains(key)) {
433
183
            m_blacklist[key] = true;
434
184
        }
435
185
    } else {
436
186
        if (m_blacklist.contains(key)) {
437
187
            m_blacklist.remove(key);
438
188
        }
439
189
    }
440
190
    // Save the config settings
441
191
    GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ss)"));
442
192
    QList<QString> keys = m_blacklist.keys();
443
193
    for (int j = 0; j < keys.size(); ++j) {
444
194
        // Keys are in the form package::::app for click or appid::::appid for legacy apps
445
195
        QStringList splitted = keys.at(j).split("::::");
446
196
        if (splitted.count() != 2) {
447
197
            // Should never ever ever ever ever happen
448
198
            continue;
449
199
        }
450
200
        QString pkgname = splitted.at(0);
451
201
        QString appname = splitted.at(1);
452
202
        g_variant_builder_add(builder, "(ss)", pkgname.toUtf8().constData(), appname.toUtf8().constData());
453
203
    }
454
204
    GVariant *bl = g_variant_new("a(ss)", builder);
455
205
    g_variant_builder_unref (builder);
456
206
    g_settings_set_value(m_pushSettings, BLACKLIST_KEY, bl);
457
207
    g_variant_unref (bl);
458
208
}
459
209
460
210
}
461
211
462
0
212
463
=== added file 'plugins/notifications/notification_manager.h'
464
--- plugins/notifications/notification_manager.h	1970-01-01 00:00:00 +0000
465
+++ plugins/notifications/notification_manager.h	2014-08-04 14:04:23 +0000
466
@@ -0,0 +1,59 @@
467
1
/*
468
2
 * Copyright (C) 2014 Canonical Ltd
469
3
 *
470
4
 * This program is free software: you can redistribute it and/or modify
471
5
 * it under the terms of the GNU General Public License version 3 as
472
6
 * published by the Free Software Foundation.
473
7
 *
474
8
 * This program is distributed in the hope that it will be useful,
475
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
476
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
477
11
 * GNU General Public License for more details.
478
12
 *
479
13
 * You should have received a copy of the GNU General Public License
480
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
481
15
 *
482
16
*/
483
17
484
18
#ifndef NOTIFICATIONMANAGER_H
485
19
#define NOTIFICATIONMANAGER_H
486
20
487
21
#include <QObject>
488
22
#include <QMap>
489
23
#include <QtQml>
490
24
#include <QList>
491
25
#include <QVariant>
492
26
#include <QVariantList>
493
27
494
28
typedef struct _GSettings GSettings;
495
29
496
30
namespace NotificationsPlugin {
497
31
498
32
class NotificationsManager : public QObject
499
33
{
500
34
    Q_OBJECT
501
35
    Q_PROPERTY(QVariantList model READ model NOTIFY modelChanged)
502
36
503
37
Q_SIGNALS:
504
38
    void modelChanged();
505
39
506
40
public:
507
41
    explicit NotificationsManager(QObject *parent = 0);
508
42
    ~NotificationsManager();
509
43
510
44
    QVariantList model() const { return m_model; }
511
45
512
46
private Q_SLOTS:
513
47
    void checkUpdates(QString id, bool value);
514
48
    void loadModel();
515
49
516
50
private:
517
51
    QVariantList m_model;
518
52
    QProcess m_process;
519
53
    GSettings *m_pushSettings;
520
54
    QMap <QString, bool> m_blacklist;
521
55
};
522
56
523
57
}
524
58
525
59
#endif // NOTIFICATIONMANAGER_H
526
0
60
527
=== added file 'plugins/notifications/notifications.settings'
528
--- plugins/notifications/notifications.settings	1970-01-01 00:00:00 +0000
529
+++ plugins/notifications/notifications.settings	2014-08-04 14:04:23 +0000
530
@@ -0,0 +1,15 @@
531
1
{
532
2
    "icon": "preferences-desktop-notifications-symbolic",
533
3
    "name": "Notifications",
534
4
    "translations": "ubuntu-system-settings",
535
5
    "category": "personal",
536
6
    "priority": 5,
537
7
    "keywords": [
538
8
        "software",
539
9
        "notifications",
540
10
        "settings"
541
11
    ],
542
12
    "has-dynamic-keywords": false,
543
13
    "has-dynamic-visibility": false,
544
14
    "page-component": "PageComponent.qml"
545
15
}
546
0
16
547
=== added file 'plugins/notifications/plugin.cpp'
548
--- plugins/notifications/plugin.cpp	1970-01-01 00:00:00 +0000
549
+++ plugins/notifications/plugin.cpp	2014-08-04 14:04:23 +0000
550
@@ -0,0 +1,38 @@
551
1
/*
552
2
 * Copyright (C) 2013-2014 Canonical Ltd
553
3
 *
554
4
 * This program is free software: you can redistribute it and/or modify
555
5
 * it under the terms of the GNU General Public License version 3 as
556
6
 * published by the Free Software Foundation.
557
7
 *
558
8
 * This program is distributed in the hope that it will be useful,
559
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
560
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
561
11
 * GNU General Public License for more details.
562
12
 *
563
13
 * You should have received a copy of the GNU General Public License
564
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
565
15
 *
566
16
*/
567
17
568
18
#include <QtQml>
569
19
#include <QtQml/QQmlContext>
570
20
#include "plugin.h"
571
21
#include "notification_manager.h"
572
22
#include "notification_item.h"
573
23
574
24
using namespace NotificationsPlugin;
575
25
576
26
577
27
void BackendPlugin::registerTypes(const char *uri)
578
28
{
579
29
    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Notifications"));
580
30
581
31
    qmlRegisterType<NotificationsManager>(uri, 1, 0, "NotificationsManager");
582
32
    qmlRegisterType<NotificationItem>(uri, 1, 0, "NotificationItem");
583
33
}
584
34
585
35
void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
586
36
{
587
37
    QQmlExtensionPlugin::initializeEngine(engine, uri);
588
38
}
589
0
39
590
=== added file 'plugins/notifications/plugin.h'
591
--- plugins/notifications/plugin.h	1970-01-01 00:00:00 +0000
592
+++ plugins/notifications/plugin.h	2014-08-04 14:04:23 +0000
593
@@ -0,0 +1,33 @@
594
1
/*
595
2
 * Copyright (C) 2013 Canonical Ltd
596
3
 *
597
4
 * This program is free software: you can redistribute it and/or modify
598
5
 * it under the terms of the GNU General Public License version 3 as
599
6
 * published by the Free Software Foundation.
600
7
 *
601
8
 * This program is distributed in the hope that it will be useful,
602
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
603
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
604
11
 * GNU General Public License for more details.
605
12
 *
606
13
 * You should have received a copy of the GNU General Public License
607
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
608
15
 *
609
16
*/
610
17
611
18
#ifndef PLUGIN_H
612
19
#define PLUGIN_H
613
20
614
21
#include <QtQml/QQmlEngine>
615
22
#include <QtQml/QQmlExtensionPlugin>
616
23
617
24
class BackendPlugin : public QQmlExtensionPlugin
618
25
{
619
26
    Q_OBJECT
620
27
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
621
28
622
29
public:
623
30
    void registerTypes(const char *uri);
624
31
    void initializeEngine(QQmlEngine *engine, const char *uri);
625
32
};
626
33
#endif // PLUGIN_H
627
0
34
628
=== added file 'plugins/notifications/qmldir'
629
--- plugins/notifications/qmldir	1970-01-01 00:00:00 +0000
630
+++ plugins/notifications/qmldir	2014-08-04 14:04:23 +0000
631
@@ -0,0 +1,2 @@
632
1
module Ubuntu.SystemSettings.Notifications
633
2
plugin UbuntuNotificationsPanel
Status:	Merged
Approved by:	Łukasz Zemczak on 2014-08-04
Approved revision:	818
Merged at revision:	860
Proposed branch:	lp:~ralsina/ubuntu-system-settings/notification-plugin
Merge into:	lp:ubuntu-system-settings
Diff against target:	633 lines (+572/-0) 11 files modified plugins/CMakeLists.txt (+1/-0) plugins/notifications/CMakeLists.txt (+18/-0) plugins/notifications/PageComponent.qml (+85/-0) plugins/notifications/notification_item.cpp (+48/-0) plugins/notifications/notification_item.h (+62/-0) plugins/notifications/notification_manager.cpp (+211/-0) plugins/notifications/notification_manager.h (+59/-0) plugins/notifications/notifications.settings (+15/-0) plugins/notifications/plugin.cpp (+38/-0) plugins/notifications/plugin.h (+33/-0) plugins/notifications/qmldir (+2/-0)
To merge this branch:	bzr merge lp:~ralsina/ubuntu-system-settings/notification-plugin
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-08-04
Alberto Mardegan			Approve on 2014-08-04
Sebastien Bacher (community)		2014-07-18	Needs Information on 2014-08-01
Diego Sarmentero (community)			Approve on 2014-07-18
Review via email: mp+227344@code.launchpad.net