Merge into trunk : notification-plugin : Code : ubuntu-system-settings

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

Revision history for this message

Diego Sarmentero (diegosarmentero) wrote on 2014-07-18:

#

+1

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1084/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-30:

#

Thanks, there are some issues though, review comments inline

You use the "com.ubuntu.touch.notifications" schemas, what is shipping it? Don't you need a depends to be added or versionned (new gsettings-ubuntu-touch-schemas?)

Can you also give some hints on how to test those changes?

review: Needs Fixing

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-07-30

796. By Roberto Alsina on 2014-07-30: alphabetical sorting of includes
797. By Roberto Alsina on 2014-07-30: removed unnecessary comment
798. By Roberto Alsina on 2014-07-30: set has_helper to the right value
799. By Roberto Alsina on 2014-07-30: describe what the plugin lists
800. By Roberto Alsina on 2014-07-30: better keywords

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-30:

#

> Thanks, there are some issues though, review comments inline

Answered those inline as well, except fr the QML which I am playing with.

> You use the "com.ubuntu.touch.notifications" schemas, what is shipping it?
> Don't you need a depends to be added or versionned (new gsettings-ubuntu-
> touch-schemas?)

Yes, there is a branch (see link above) that adds that schema in gsettings-ubuntu-touch-schemas. To test it you'd need to buld that, install it, then build this and try it.

To see it in action, you need to:

1) Install a few click apps that support push.

Since those are rare, you can change has_helper to true in line 134 of notification_manager.cpp and that will make this show all click apps.

2) Start system settings, open this page, play around with it, enable/disable a few

3) Start it again, see that it keeps the settings correctly.

>
> Can you also give some hints on how to test those changes?

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-30:

#

> Answered those inline as well, except fr the QML which I am playing with.

Did you click the "save" button on the right of your replies? I didn't get/can't see your reply

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-30:

#

I did... ok, for most, just check the latest commits, they should be
self-explanatory :-)

On Wed, Jul 30, 2014 at 11:44 AM, Sebastien Bacher <email address hidden>
wrote:

> > Answered those inline as well, except fr the QML which I am playing with.
>
> Did you click the "save" button on the right of your replies? I didn't
> get/can't see your reply
> --
>
> https://code.launchpad.net/~ralsina/ubuntu-system-settings/notification-plugin/+merge/227344
> You are the owner of
> lp:~ralsina/ubuntu-system-settings/notification-plugin.
>

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-30:

#

Bah, I can't see yours anymore, either. Beta feature indeed :-)

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-07-30

801. By Roberto Alsina on 2014-07-30: change logic so apps by default show notifications

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1086/rebuild

review: Approve (continuous-integration)

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-07-30

802. By Roberto Alsina on 2014-07-30: changed text according to https://wiki.ubuntu.com/Notification

Revision history for this message

Roberto Alsina (ralsina) on 2014-07-30:

#

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-30:

#

Thanks for the fixes, looks good now, waiting for Chipaca to comment on the remaining issues still though

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-07-30

803. By Roberto Alsina on 2014-07-30: use a Base Item for subtitle

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-30:

#

> Thanks for the fixes, looks good now, waiting for Chipaca to comment on the
> remaining issues still though

Changed the QML to use a Base item (the text is very long, so it does need wrapping).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1091/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1094/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-31:

#

Testing on an unity8 desktop session, system settings is listed but the item is not correctly vertically centered and miss an icon

review: Needs Fixing

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-31:

#

changes to the status are also not stored it seems (re-entering the panel reset to false)

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-31:

#

> Testing on an unity8 desktop session, system settings is listed but the item
> is not correctly vertically centered and miss an icon

I don't understand, missing icon where? In the system settings? I get an icon with a bell on it.

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-31:

#

> changes to the status are also not stored it seems (re-entering the panel
> reset to false)

It's working here (running system-settings on unity7, though)

Can you show me the out put of this command?

gsettings get com.ubuntu.touch.notifications popup-blacklist

Basically, it should be empty if all your click apps checkboxes are ticked, and list something like

[('com.ubuntu.developer.victorsemyonov.mymaps', 'mymaps')]

for each one you disable.

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-31:

#

> Thanks for the fixes, looks good now, waiting for Chipaca to comment on the
> remaining issues still though

I can change the schema name, and do a new branch to land the new name, if we can leave the hardcoded path for a later branch.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-31:

#

only system settings is listed there, the key seems to not change everytime the switch is toggled for some reason (like it's not cleared when untoggling in my recent testing, tried under unity7 and unity8-desktop sessions). Note that settings is not a click

> I don't understand, missing icon where? In the system settings? I get an icon with a bell on it.

no, in the notifications panel itself, the listitem entry has no icon (it should according to the design)

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-31:

#

> only system settings is listed there, the key seems to not change everytime
> the switch is toggled for some reason (like it's not cleared when untoggling
> in my recent testing, tried under unity7 and unity8-desktop sessions). Note
> that settings is not a click
>
>
> > I don't understand, missing icon where? In the system settings? I get an
> icon with a bell on it.
>
> no, in the notifications panel itself, the listitem entry has no icon (it
> should according to the design)

Yes, system settings is the only deb-packaged app that should show here (only deb to support push), so that's good :-) I had not checked that until now because ... well, there weren't any to check with.

Maybe there's a bug in the saving code for debs. Thanks!

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-07-31

804. By Roberto Alsina on 2014-07-31: merged trunk
805. By Roberto Alsina on 2014-07-31: dpkg push notifications are also opt-out
806. By Roberto Alsina on 2014-07-31: make icon appear for .deb apps
807. By Roberto Alsina on 2014-07-31: set has_helper to correct value

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-31:

#

> only system settings is listed there, the key seems to not change everytime
> the switch is toggled for some reason (like it's not cleared when untoggling
> in my recent testing, tried under unity7 and unity8-desktop sessions). Note
> that settings is not a click
>
>
> > I don't understand, missing icon where? In the system settings? I get an
> icon with a bell on it.
>
> no, in the notifications panel itself, the listitem entry has no icon (it
> should according to the design)

Fixed, see attached image :-)

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-07-31:

#

Of course, I meant, see http://imgur.com/TK2VFVG

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1117/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1119/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-08-01:

#

Thanks, your screenshot shows some UI issue:
- the first row hasn't the right height (some top margin that shouldn't be there?)
- the divider shouldn't stop before the left/right borders

review: Needs Fixing

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-08-01:

#

can you also clean the debug output you added in r806?

review: Needs Fixing

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-01:

#

> can you also clean the debug output you added in r806?

Cleaned, also removed a bogus margin that caused the problems mentioned in the other comment.

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-08-01

808. By Roberto Alsina on 2014-08-01: merged trunk
809. By Roberto Alsina on 2014-08-01: removed debug code
810. By Roberto Alsina on 2014-08-01: remove bogus margin

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-01:

#

New screenshot: http://imgur.com/DNcfTVe

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-08-01:

#

Thanks, that looks better. But for some reason the items icons don't look correctly centered vertically ... is that an issue with the toolkit?

review: Needs Information

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-08-01:

#

oh, the schemas namespace should change to drop "touch", so this side is going to need an update as well

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1120/rebuild

review: Approve (continuous-integration)

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-01:

#

> Thanks, that looks better. But for some reason the items icons don't look
> correctly centered vertically ... is that an issue with the toolkit?

I am not doing anything strange there, just setting the icon, so maybe?

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-01:

#

> oh, the schemas namespace should change to drop "touch", so this side is going
> to need an update as well

That needs coordination in 3 branches, we'll change it. Can you approve conditionally with that promise? :-)

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-08-01

811. By Roberto Alsina on 2014-08-01: renamed gsettings schema/key

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-01:

#

> oh, the schemas namespace should change to drop "touch", so this side is going
> to need an update as well

renamed here, and renaming accross the other branches too.

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-01:

#

> oh, the schemas namespace should change to drop "touch", so this side is going
> to need an update as well

renamed here, and renaming accross the other branches too.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1122/rebuild

review: Needs Fixing (continuous-integration)

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-08-01

812. By Roberto Alsina on 2014-08-01: re-renamed to tvoss's suggested name

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1127/rebuild

review: Approve (continuous-integration)

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-08-04

813. By Roberto Alsina on 2014-08-03: change suggested by chipaca
814. By Roberto Alsina on 2014-08-03: merged trunk
815. By Roberto Alsina on 2014-08-03: scopes packaged as clicks
816. By Roberto Alsina on 2014-08-04: further fix

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1131/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1132/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-08-04:

#

Just three inline comments.

review: Needs Fixing

lp:~ralsina/ubuntu-system-settings/notification-plugin updated on 2014-08-04

817. By Roberto Alsina on 2014-08-04: no tabs
818. By Roberto Alsina on 2014-08-04: added g_strdup

Revision history for this message

Roberto Alsina (ralsina) wrote on 2014-08-04:

#

> Just three inline comments.

Fixed in revnos 817 and 818

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-08-04:

#

I don't have time to test it, but code-wise it looks fine.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1134/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Łukasz Zemczak (sil2100) wrote on 2014-08-04:

#

Top-approved as it has been approved in a comment.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1137/rebuild

review: Needs Fixing (continuous-integration)

ubuntu-system-settings

Merge lp:~ralsina/ubuntu-system-settings/notification-plugin into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'plugins/CMakeLists.txt'
 --- plugins/CMakeLists.txt	2014-03-17 22:12:26 +0000
 +++ plugins/CMakeLists.txt	2014-08-04 14:04:23 +0000
@@ -10,6 +10,7 @@
  add_subdirectory(example)
  add_subdirectory(flight-mode)
  add_subdirectory(language)
++add_subdirectory(notifications)
  add_subdirectory(orientation-lock)
  add_subdirectory(phone)
  add_subdirectory(reset)
 === added directory 'plugins/notifications'
 === added file 'plugins/notifications/CMakeLists.txt'
 --- plugins/notifications/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/CMakeLists.txt	2014-08-04 14:04:23 +0000
@@ -0,0 +1,18 @@
++set(QML_SOURCES PageComponent.qml)
++SET (CMAKE_AUTOMOC ON)
++
++add_library(UbuntuNotificationsPanel MODULE plugin.h notification_manager.h
++notification_item.h notification_item.cpp
++plugin.cpp notification_manager.cpp
++${QML_SOURCES})
++
++include_directories(${GIO_INCLUDE_DIRS})
++target_link_libraries(UbuntuNotificationsPanel ${GLIB_LDFLAGS} ${GIO_LDFLAGS})
++qt5_use_modules(UbuntuNotificationsPanel Qml Quick)
++
++set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Notifications)
++install(TARGETS UbuntuNotificationsPanel DESTINATION ${PLUG_DIR})
++install(FILES qmldir DESTINATION ${PLUG_DIR})
++install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/notifications)
++
++install(FILES notifications.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
 === added file 'plugins/notifications/PageComponent.qml'
 --- plugins/notifications/PageComponent.qml	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/PageComponent.qml	2014-08-04 14:04:23 +0000
@@ -0,0 +1,85 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2013-2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++import Ubuntu.SystemSettings.Notifications 1.0
++import SystemSettings 1.0
++
++ItemPage {
++    id: root
++    objectName: "systemNotificationsPage"
++
++    title: i18n.tr("Notifications")
++
++    NotificationsManager {
++        id: notificationsManager
++    }
++
++    ListItem.Base {
++        id: subtitle
++        height: labelSubtitle.height + units.gu(2)
++        Label {
++            id: labelSubtitle
++            text: i18n.tr("Selected apps can alert you using notification bubbles, sounds, vibrations, and the Notification Center.")
++            wrapMode: Text.WordWrap
++            anchors {
++                top: parent.top
++                left: parent.left
++                right: parent.right
++                margins: units.gu(1)
++            }
++            fontSize: "large"
++        }
++    }
++
++    ListView {
++        id: notificationsList
++        objectName: "notificationsList"
++        anchors {
++            left: parent.left
++            right: parent.right
++            top: subtitle.bottom
++            bottom: parent.bottom
++        }
++        model: notificationsManager.model
++        clip: true
++        contentHeight: contentItem.childrenRect.height
++
++        delegate: ListItem.Standard {
++            text: modelData.title
++            Component.onCompleted: {
++                if (modelData.icon.search("/") == -1) {
++                    iconName = modelData.icon
++                }
++                else {
++                    iconSource = modelData.icon
++                }
++            }
++            iconFrame: false
++            control: Switch {
++                checked: modelData.status
++
++                onCheckedChanged: {
++                    modelData.status = checked;
++                }
++            }
++        }
++    }
++}
 === added file 'plugins/notifications/notification_item.cpp'
 --- plugins/notifications/notification_item.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/notification_item.cpp	2014-08-04 14:04:23 +0000
@@ -0,0 +1,48 @@
++/*
++ * Copyright (C) 2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#include "notification_item.h"
++
++namespace NotificationsPlugin {
++
++NotificationItem::NotificationItem(QObject *parent) :
++    QObject(parent)
++{
++}
++
++NotificationItem::~NotificationItem()
++{
++}
++
++void NotificationItem::setItemData(QString title, QString icon, bool status, QString key)
++{
++    m_title = title;
++    m_icon = icon;
++    m_status = status;
++    m_key = key;
++    Q_EMIT titleChanged();
++    Q_EMIT iconChanged();
++    Q_EMIT statusChanged();
++}
++
++void NotificationItem::setStatus(bool status) {
++    m_status = status;
++    Q_EMIT statusChanged();
++    Q_EMIT updateNotificationStatus(m_key, m_status);
++}
++
++}
 === added file 'plugins/notifications/notification_item.h'
 --- plugins/notifications/notification_item.h	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/notification_item.h	2014-08-04 14:04:23 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#ifndef UPDATE_H
++#define UPDATE_H
++
++#include <QObject>
++#include <QString>
++#include <QStringList>
++#include <QtQml>
++
++namespace NotificationsPlugin {
++
++class NotificationItem : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
++    Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
++    Q_PROPERTY(bool status READ status WRITE setStatus NOTIFY statusChanged)
++    Q_PROPERTY(QString key MEMBER m_key)
++
++Q_SIGNALS:
++    void statusChanged();
++    void titleChanged();
++    void iconChanged();
++    void updateNotificationStatus(QString id, bool value);
++
++public:
++    explicit NotificationItem(QObject *parent = 0);
++    virtual ~NotificationItem();
++    void setItemData(QString title, QString icon, bool status, QString key);
++
++    bool status() { return m_status; }
++    QString title() { return m_title; }
++    QString icon() { return m_icon; }
++
++    void setStatus(bool status);
++
++private:
++    QString m_title;
++    QString m_icon;
++    QString m_key;
++    bool m_status;
++};
++
++}
++
++#endif // UPDATE_H
 === added file 'plugins/notifications/notification_manager.cpp'
 --- plugins/notifications/notification_manager.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/notification_manager.cpp	2014-08-04 14:04:23 +0000
@@ -0,0 +1,211 @@
++/*
++ * Copyright (C) 2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#include <gio/gio.h>
++#include <gio/gdesktopappinfo.h>
++
++#include "notification_manager.h"
++#include "notification_item.h"
++#include <iostream>
++
++
++#define CLICK_COMMAND "click"
++#define BLACKLIST_CONFIG_SCHEMA_ID "com.ubuntu.notifications.hub"
++#define BLACKLIST_KEY "blacklist"
++
++
++namespace NotificationsPlugin {
++
++void app_data_from_desktop_id (const char* desktop_id, char **display_name, char **icon_fname) {
++    GAppInfo* app_info = (GAppInfo*)g_desktop_app_info_new(desktop_id);
++    if (app_info != NULL) {
++        *display_name = g_strdup(g_app_info_get_display_name(app_info));
++        GIcon* icon = g_app_info_get_icon (app_info);
++        if (icon != NULL) {
++            *icon_fname = g_icon_to_string (icon);
++        }
++        g_object_unref (app_info);
++    }
++    else {
++        *display_name = NULL;
++        *icon_fname = NULL;
++    }
++}
++
++// XXX: lots of code copied from the update plugin.
++// XXX: and lots of it is also reimplemented differently
++// XXX: in the about plugin!
++// XXX: And all of them should be replaced with libclick calls
++// XXX: instead of calling out to the click command
++
++NotificationsManager::NotificationsManager(QObject *parent):
++    QObject(parent),
++    m_pushSettings(g_settings_new(BLACKLIST_CONFIG_SCHEMA_ID))
++{
++    QObject::connect(&m_process, SIGNAL(finished(int)),
++                  this, SLOT(loadModel()));
++
++    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
++    QString command = environment.value("CLICK_COMMAND", QString(CLICK_COMMAND));
++    QStringList args("list");
++    args << "--manifest";
++    m_process.start(command, args);
++}
++
++NotificationsManager::~NotificationsManager()
++{
++    g_object_unref(m_pushSettings);
++}
++
++void NotificationsManager::loadModel()
++{
++    // Load the blacklist
++    GVariant *blacklist = g_settings_get_value(m_pushSettings, BLACKLIST_KEY);
++    GVariantIter *iter;
++    g_variant_get (blacklist, "a(ss)", &iter);
++    gchar *pkg;
++    gchar *app;
++    m_blacklist.clear();
++    while (g_variant_iter_loop (iter, "(ss)", &pkg, &app)) {
++        m_blacklist[QString(pkg)+"::::"+app] = true;
++    }
++    g_variant_iter_free (iter);
++    g_variant_unref (blacklist);
++
++    // Add legacy dpkg apps
++    QDir legacy_helpers_dir = QDir("/usr/lib/ubuntu-push-client/legacy-helpers/");
++    legacy_helpers_dir.setFilter(QDir::Files);
++    QStringList legacy_helpers = legacy_helpers_dir.entryList();
++    for (int i = 0; i < legacy_helpers.size(); ++i) {
++            QString appname = legacy_helpers.at(i);
++            QString appid = appname + ".desktop";
++            QString key = "::::"+appname;
++            char *display_name;
++            char *icon_fname;
++            app_data_from_desktop_id(appid.toUtf8().constData(), &display_name, &icon_fname);
++            bool blacklisted = m_blacklist.contains(key);
++            if (!display_name || !icon_fname) {
++                continue; // Broken .desktop file
++            }
++            NotificationItem *item = new NotificationItem();
++            item->setItemData(QString(display_name), QString(icon_fname), !blacklisted, key);
++            g_free(display_name);
++            g_free(icon_fname);
++            m_model.append(QVariant::fromValue(item));
++            connect(item, &NotificationItem::updateNotificationStatus,
++                    this, &NotificationsManager::checkUpdates);
++    }
++
++    // Add Click Packages
++
++    QString output(m_process.readAllStandardOutput());
++    QJsonDocument document = QJsonDocument::fromJson(output.toUtf8());
++    QJsonArray array = document.array();
++
++
++	// Iterate over all the installed click packages,
++	// and, for those packages that have a push-helper hook,
++	// list all apps (hooks entries with a desktop field)
++
++    for (int i = 0; i < array.size(); i++) { // This iterates over packages
++        QJsonObject object = array.at(i).toObject();
++
++        QString pkgname = object.value("name").toString();
++        QString version = object.value("version").toString();
++
++        // This iterates over apps
++        QVariantMap hooks = object.value("hooks").toObject().toVariantMap();
++        QList<QString> keys = hooks.keys();
++
++        // We need one app that has a push-helper key
++        bool has_helper = false;
++        for (int j = 0; j < keys.size(); ++j) {
++            QVariantMap hook = hooks.value(keys.at(j)).toMap();
++            if (hook.contains("push-helper")) {
++                has_helper = true;
++            }
++        }
++        if (!has_helper) {
++            continue;
++        }
++
++        // It has a helper, so add items for all entries that have
++        // a "desktop" key.
++        for (int j = 0; j < keys.size(); ++j) {
++            QString appname = keys.at(j);
++            QVariantMap hook = hooks.value(appname).toMap();
++            if (hook.contains("desktop") || hook.contains("scope")) {
++                QString key = pkgname+"::::"+appname;
++                QString appid = pkgname+"_"+appname+"_"+version+".desktop"; // Full versioned APP_ID + ".desktop"
++                char *display_name;
++                char *icon_fname;
++                app_data_from_desktop_id(appid.toUtf8().constData(), &display_name, &icon_fname);
++                // fall back to the manifest's title & icon if missing from .desktop
++                if (!display_name) {
++                    display_name = g_strdup(object.value("title").toString().toUtf8().data());
++                }
++                if (!icon_fname) {
++                    icon_fname =  g_strdup(object.value("icon").toString().toUtf8().data());
++                }
++                NotificationItem *item = new NotificationItem();
++                bool blacklisted = m_blacklist.contains(key);
++                item->setItemData(QString(display_name), QString(icon_fname), !blacklisted, key);
++                g_free(display_name);
++                g_free(icon_fname);
++                m_model.append(QVariant::fromValue(item));
++                connect(item, &NotificationItem::updateNotificationStatus,
++                        this, &NotificationsManager::checkUpdates);
++            }
++        }
++    }
++    Q_EMIT modelChanged();
++}
++
++void NotificationsManager::checkUpdates(QString key, bool value)
++{
++    // Update the internal blacklist
++    if (!value) {
++        if (!m_blacklist.contains(key)) {
++            m_blacklist[key] = true;
++        }
++    } else {
++        if (m_blacklist.contains(key)) {
++            m_blacklist.remove(key);
++        }
++    }
++    // Save the config settings
++    GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ss)"));
++    QList<QString> keys = m_blacklist.keys();
++    for (int j = 0; j < keys.size(); ++j) {
++        // Keys are in the form package::::app for click or appid::::appid for legacy apps
++        QStringList splitted = keys.at(j).split("::::");
++        if (splitted.count() != 2) {
++            // Should never ever ever ever ever happen
++            continue;
++        }
++        QString pkgname = splitted.at(0);
++        QString appname = splitted.at(1);
++        g_variant_builder_add(builder, "(ss)", pkgname.toUtf8().constData(), appname.toUtf8().constData());
++    }
++    GVariant *bl = g_variant_new("a(ss)", builder);
++    g_variant_builder_unref (builder);
++    g_settings_set_value(m_pushSettings, BLACKLIST_KEY, bl);
++    g_variant_unref (bl);
++}
++
++}
++
 === added file 'plugins/notifications/notification_manager.h'
 --- plugins/notifications/notification_manager.h	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/notification_manager.h	2014-08-04 14:04:23 +0000
@@ -0,0 +1,59 @@
++/*
++ * Copyright (C) 2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#ifndef NOTIFICATIONMANAGER_H
++#define NOTIFICATIONMANAGER_H
++
++#include <QObject>
++#include <QMap>
++#include <QtQml>
++#include <QList>
++#include <QVariant>
++#include <QVariantList>
++
++typedef struct _GSettings GSettings;
++
++namespace NotificationsPlugin {
++
++class NotificationsManager : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QVariantList model READ model NOTIFY modelChanged)
++
++Q_SIGNALS:
++    void modelChanged();
++
++public:
++    explicit NotificationsManager(QObject *parent = 0);
++    ~NotificationsManager();
++
++    QVariantList model() const { return m_model; }
++
++private Q_SLOTS:
++    void checkUpdates(QString id, bool value);
++    void loadModel();
++
++private:
++    QVariantList m_model;
++    QProcess m_process;
++    GSettings *m_pushSettings;
++    QMap <QString, bool> m_blacklist;
++};
++
++}
++
++#endif // NOTIFICATIONMANAGER_H
 === added file 'plugins/notifications/notifications.settings'
 --- plugins/notifications/notifications.settings	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/notifications.settings	2014-08-04 14:04:23 +0000
@@ -0,0 +1,15 @@
++{
++    "icon": "preferences-desktop-notifications-symbolic",
++    "name": "Notifications",
++    "translations": "ubuntu-system-settings",
++    "category": "personal",
++    "priority": 5,
++    "keywords": [
++        "software",
++        "notifications",
++        "settings"
++    ],
++    "has-dynamic-keywords": false,
++    "has-dynamic-visibility": false,
++    "page-component": "PageComponent.qml"
++}
 === added file 'plugins/notifications/plugin.cpp'
 --- plugins/notifications/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/plugin.cpp	2014-08-04 14:04:23 +0000
@@ -0,0 +1,38 @@
++/*
++ * Copyright (C) 2013-2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#include <QtQml>
++#include <QtQml/QQmlContext>
++#include "plugin.h"
++#include "notification_manager.h"
++#include "notification_item.h"
++
++using namespace NotificationsPlugin;
++
++
++void BackendPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Notifications"));
++
++    qmlRegisterType<NotificationsManager>(uri, 1, 0, "NotificationsManager");
++    qmlRegisterType<NotificationItem>(uri, 1, 0, "NotificationItem");
++}
++
++void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
++{
++    QQmlExtensionPlugin::initializeEngine(engine, uri);
++}
 === added file 'plugins/notifications/plugin.h'
 --- plugins/notifications/plugin.h	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/plugin.h	2014-08-04 14:04:23 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 2013 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#ifndef PLUGIN_H
++#define PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class BackendPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++    void initializeEngine(QQmlEngine *engine, const char *uri);
++};
++#endif // PLUGIN_H
 === added file 'plugins/notifications/qmldir'
 --- plugins/notifications/qmldir	1970-01-01 00:00:00 +0000
 +++ plugins/notifications/qmldir	2014-08-04 14:04:23 +0000
@@ -0,0 +1,2 @@
++module Ubuntu.SystemSettings.Notifications
++plugin UbuntuNotificationsPanel