Merge lp:~unity-team/unity-notifications/extended-snap-decisions into lp:unity-notifications

[Michael Zanetti]

Unmerged revisions

185. By Michael Zanetti on 2013-09-04

merge trunk

184. By Mirco Müller on 2013-08-22

Add some helping debug-printf()s, make menu-model teardown more robust, change system-dialog-hint example to use a timeout for demo-purposes

183. By Mirco Müller on 2013-08-22

Improved the tear-down of menu-models used by extended snap-decisions.

182. By Mirco Müller on 2013-08-22

Make DBus-method collect() more robust

181. By Mirco Müller on 2013-08-21

Trying to get passing data from frontend to backend working.

180. By Mirco Müller on 2013-08-21

Made creation and teardown of menu-model better... act on-demand.

179. By Mirco Müller on 2013-08-21

Stripped old code from system-dialog example.

178. By Mirco Müller on 2013-08-21

Got linking to gio working... system-dialog hint now exports menu-model via DBus

177. By Mirco Müller on 2013-08-21

Make compiling and linking against gio work

176. By Mirco Müller on 2013-08-20

Added stand-alone example pulling/rendering menu-model

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-02 16:18:31 +0000
+++ CMakeLists.txt	2013-09-04 16:15:41 +0000
@@ -9,13 +9,15 @@
    message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
 endif()
 
+
 option(basic_warnings "Basic compiler warnings." ON)
 option(build_tools "Build developer tools." OFF)
 option(private_dbus "Use private dbus namespace to prevent clashes during development." OFF)
 
 include(cmake/coverage.cmake)
+include(cmake/FindGIO.cmake)
 include(FindPkgConfig)
-include (GNUInstallDirs)
+include(GNUInstallDirs)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
 add_definitions(-DQT_NO_KEYWORDS)
@@ -32,6 +34,8 @@
 # Workaround for https://bugreports.qt-project.org/browse/QTBUG-29987
 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
 
+include_directories(${GIO_INCLUDE_DIR})
+
 include_directories(include)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 add_subdirectory(include)

=== added file 'cmake/FindGIO.cmake'
--- cmake/FindGIO.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGIO.cmake	2013-09-04 16:15:41 +0000
@@ -0,0 +1,71 @@
+# - Try to find the GIO libraries
+# Once done this will define
+#
+#  GIO_FOUND - system has GIO
+#  GIO_INCLUDE_DIR - the GIO include directory
+#  GIO_LIBRARIES - GIO library
+#
+# Copyright (c) 2010 Dario Freddi <[e-mail]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if(GIO_INCLUDE_DIR AND GIO_LIBRARIES)
+    # Already in cache, be silent
+    set(GIO_FIND_QUIETLY TRUE)
+endif(GIO_INCLUDE_DIR AND GIO_LIBRARIES)
+
+if (NOT WIN32)
+   include(UsePkgConfig)
+   pkgconfig(gio-2.0 _LibGIOIncDir _LibGIOLinkDir _LibGIOLinkFlags _LibGIOCflags)
+endif(NOT WIN32)
+
+MESSAGE(STATUS "gio include dir: ${_LibGIOIncDir}")
+
+# first try without default paths to respect PKG_CONFIG_PATH
+
+find_path(GIO_MAIN_INCLUDE_DIR glib.h
+          PATH_SUFFIXES glib-2.0
+          PATHS ${_LibGIOIncDir}
+          NO_DEFAULT_PATH)
+
+find_path(GIO_MAIN_INCLUDE_DIR glib.h
+          PATH_SUFFIXES glib-2.0
+          PATHS ${_LibGIOIncDir} )
+
+MESSAGE(STATUS "found gio main include dir: ${GIO_MAIN_INCLUDE_DIR}")
+
+# search the glibconfig.h include dir under the same root where the library is found
+find_library(GIO_LIBRARIES
+             NAMES gio-2.0
+             PATHS ${_LibGIOLinkDir}
+             NO_DEFAULT_PATH)
+
+find_library(GIO_LIBRARIES
+             NAMES gio-2.0
+             PATHS ${_LibGIOLinkDir})
+
+
+get_filename_component(GIOLibDir "${GIO_LIBRARIES}" PATH)
+
+find_path(GIO_INTERNAL_INCLUDE_DIR glibconfig.h
+          PATH_SUFFIXES glib-2.0/include
+          PATHS ${_LibGIOIncDir} "${GIOLibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}
+          NO_DEFAULT_PATH)
+
+find_path(GIO_INTERNAL_INCLUDE_DIR glibconfig.h
+          PATH_SUFFIXES glib-2.0/include
+          PATHS ${_LibGIOIncDir} "${GIOLibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+set(GIO_INCLUDE_DIR "${GIO_MAIN_INCLUDE_DIR}")
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GIO_INTERNAL_INCLUDE_DIR)
+  set(GIO_INCLUDE_DIR ${GIO_INCLUDE_DIR} "${GIO_INTERNAL_INCLUDE_DIR}")
+endif(GIO_INTERNAL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GIO  DEFAULT_MSG  GIO_LIBRARIES GIO_MAIN_INCLUDE_DIR)
+
+mark_as_advanced(GIO_INCLUDE_DIR GIO_LIBRARIES)

=== added file 'com.canonical.snapdecisions.feedback.xml'
--- com.canonical.snapdecisions.feedback.xml	1970-01-01 00:00:00 +0000
+++ com.canonical.snapdecisions.feedback.xml	2013-09-04 16:15:41 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="com.canonical.snapdecisions.feedback">
+    <method name="collect">
+      <arg type="as" direction="out"/>
+      <arg name="id" type="u" direction="in"/>
+    </method>
+  </interface>
+</node>

=== added file 'create-feedback-dbus-interface-sources.sh'
--- create-feedback-dbus-interface-sources.sh	1970-01-01 00:00:00 +0000
+++ create-feedback-dbus-interface-sources.sh	2013-09-04 16:15:41 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+XML_FILE=com.canonical.snapdecisions.feedback.xml
+
+qdbuscpp2xml -M -s include/Feedback.h -o $XML_FILE
+qdbusxml2cpp -v -c FeedbackInterface -p include/FeedbackInterface.h:src/FeedbackInterface.cpp $XML_FILE
+qdbusxml2cpp -c FeedbackInterfaceAdaptor -a include/FeedbackInterfaceAdaptor.h:src/FeedbackInterfaceAdaptor.cpp $XML_FILE

=== added file 'examples/export-model.py'
--- examples/export-model.py	1970-01-01 00:00:00 +0000
+++ examples/export-model.py	2013-09-04 16:15:41 +0000
@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+
+import sys
+
+from gi.repository import Gio, GLib, Notify
+
+BUS_NAME = 'com.canonical.snapdecisions.systemdialog'
+BUS_OBJECT_PATH = '/com/canonical/snapdecisions/systemdialog'
+
+def activate_cancel(action, data):
+    print('Called cancel (%s)' % action.get_name())
+
+def activate_connect(action, data):
+    print('Called connect (%s)' % action.get_name())
+    print('passed: %s' % data)
+
+def bus_acquired(bus, name):
+    menu = Gio.Menu()
+
+    item = Gio.MenuItem.new('Connect to \"Calamari\"', None)
+    item.set_attribute_value('x-canonical-type', GLib.Variant.new_string('com.canonical.snapdecision.title'))
+    menu.append_item(item)
+
+    item2 = Gio.MenuItem.new('Login name:', None)
+    item2.set_attribute_value('x-canonical-type', GLib.Variant.new_string('com.canonical.snapdecision.textfield'))
+    item2.set_attribute_value('x-echo-mode-password', GLib.Variant.new_boolean(False))
+    menu.append_item(item2)
+
+    item3 = Gio.MenuItem.new('Password:', None)
+    item3.set_attribute_value('x-canonical-type', GLib.Variant.new_string('com.canonical.snapdecision.textfield'))
+    item3.set_attribute_value('x-echo-mode-password', GLib.Variant.new_boolean(True))
+    menu.append_item(item3)
+
+    item4 = Gio.MenuItem.new('Cancel', None)
+    item4.set_attribute_value('x-canonical-type', GLib.Variant.new_string('com.canonical.snapdecision.button'))
+    item4.set_attribute_value('x-tint-button', GLib.Variant.new_boolean(False))
+    menu.append_item(item4)
+
+    item5 = Gio.MenuItem.new('Connect', None)
+    item5.set_attribute_value('x-canonical-type', GLib.Variant.new_string('com.canonical.snapdecision.button'))
+    item5.set_attribute_value('x-tint-button', GLib.Variant.new_boolean(True))
+    menu.append_item(item5)
+
+    actions = Gio.SimpleActionGroup.new()
+    cancel = Gio.SimpleAction.new("cancel", None)
+    actions.insert(cancel)
+    cancel.connect('activate', activate_cancel)
+    connect = Gio.SimpleAction.new("connect", None) #GLib.VariantType.new("ss"))
+    actions.insert(connect)
+    connect.connect('activate', activate_connect)
+    bus.export_action_group(BUS_OBJECT_PATH, actions)
+
+    bus.export_menu_model(BUS_OBJECT_PATH, menu)
+
+def quit_callback(notification):
+    GLib.MainLoop().quit()
+
+def connect_callback(notification, action, data):
+    if action == "connect_id":
+        print("Triggering Connect")
+    else:
+        print("That should not have happened (connect_id)!")
+
+def cancel_callback(notification, action, data):
+    if action == "cancel_id":
+        print("Triggering Cancel")
+    else:
+        print("That should not have happened (cancel_id)!")
+
+def pushNotification ():
+    n = Notify.Notification.new("Connect to \"Calamari\"", "dummy", "totem");
+    n.add_action ("connect_id", "Connect", connect_callback, None, None)
+    n.add_action ("cancel_id", "Cancel", cancel_callback, None, None)
+    n.set_hint_string ("x-canonical-snap-decisions", "true")
+    n.set_hint_string ("x-canonical-private-button-tint", "true")
+    variant_password = GLib.Variant('as', ["Login name:", "Password:"])
+    variant_listview = GLib.Variant('as', ["wifi-medium", "BTOpenZone", "sec-wep", "wifi-low", "Calamari", "sec-wpa"])
+    #variant_feedback = GLib.Variant('as', [DBUS_NAME, DBUS_PATH, DBUS_METHOD])
+    #n.set_hint ("x-canonical-private-system-dialog-password", variant_password)
+    #n.set_hint ("x-canonical-private-system-dialog-listview", variant_listview)
+    #n.set_hint ("x-canonical-private-system-dialog-feedback", variant_feedback)
+    n.set_hint_string ("x-canonical-private-system-dialog", "user-auth")
+    return n
+
+if __name__ == '__main__':
+    Gio.bus_own_name(Gio.BusType.SESSION, BUS_NAME, 0, bus_acquired, None, None)
+    #Notify.init("password-dialog-test")
+    #n = pushNotification()
+    #n.connect('closed', quit_callback)
+    #n.show ()
+    GLib.MainLoop().run()

=== added file 'examples/render-model.qml'
--- examples/render-model.qml	1970-01-01 00:00:00 +0000
+++ examples/render-model.qml	2013-09-04 16:15:41 +0000
@@ -0,0 +1,137 @@
+import QtQuick 2.0
+import QMenuModel 0.1
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Image {
+        id: background
+
+        source: "/home/mirco/Desktop/Bilder/Fotos/wheelie-kurve.jpg"
+        fillMode: Image.PreserveAspectCrop
+    }
+
+    UnityMenuModel {
+        id: menu
+
+        busName: "com.canonical.snapdecisions.systemdialog"
+        actions: { "connect": "/com/canonical/snapdecision/systemdialog" }
+        menuObjectPath: "/com/canonical/snapdecisions/systemdialog"
+    }
+
+    UbuntuShape {
+        color: Qt.rgba(0, 0, 0, 0.85)
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+
+        ListView {
+            id: listview
+
+            spacing: units.gu(2)
+
+            property string login
+            property string passwd
+
+            anchors {
+                fill: parent
+                margins: units.gu(2)
+            }
+
+            model: menu
+
+            delegate: Loader {
+                sourceComponent: {
+                    if (type == "com.canonical.snapdecision.title") {
+                        return title
+                    }
+                    else if (type == "com.canonical.snapdecision.textfield") {
+                        listview.model.loadExtendedAttributes(index, {'x-echo-mode-password': 'bool'});
+                        return textfield
+                    }
+                    else if (type == "com.canonical.snapdecision.button") {
+                        listview.model.loadExtendedAttributes(index, {'x-tint-button': 'bool'});
+                        return button
+                    }
+                }
+
+                Component {
+                    id: title
+
+                    Label {
+                        id: titleLabel
+
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        fontSize: "medium"
+                        font.bold: true
+                        color: "white"
+                        text: label
+                    }
+                }
+
+                Component {
+                    id: textfield
+
+                    Column {
+                        spacing: units.gu(.5)
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+
+                        Label {
+                            anchors.left: parent.left
+
+                            fontSize: "medium"
+                            color: "white"
+                            text: label
+                        }
+
+                        TextField {
+                            echoMode: ext.xEchoModePassword ? TextInput.Password : TextInput.Normal
+                            onAccepted: {
+                                if(echoMode == TextInput.Password) {
+                                    listview.passwd = text
+                                } else {
+                                    listview.login = text
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Component {
+                    id: button
+
+                    Button {
+                        text: label
+                        gradient: ext.xTintButton ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient
+                        onClicked: {
+                            print("Clicked on \"",label,"\"")
+                            print("Login:", listview.login)
+                            print("Password:", listview.passwd)
+                            print("")
+                            model.action.activate()
+                            //if(model.action.name == "button.cancel") {
+                            //    model.action.activate(index)
+                            //}
+                            //if(model.action.name == "button.connect") {
+                            //    model.target = listview.login
+                            //    model.action.activate()
+                            //}
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'examples/sd-example-incoming-call.py'
--- examples/sd-example-incoming-call.py	2013-05-17 14:57:48 +0000
+++ examples/sd-example-incoming-call.py	2013-09-04 16:15:41 +0000
@@ -74,12 +74,13 @@
 	# always comes first!
 	n.add_action ("action_accept",    "Accept",                         action_accept);
 	n.add_action ("action_decline_1", "Decline",                        action_decline_1);
-	#n.add_action ("action_decline_2", "\"Can't talk now, what's up?\"", action_decline_2);
-	#n.add_action ("action_decline_3", "\"I call you back.\"",           action_decline_3);
-	#n.add_action ("action_decline_4", "Send custom message...",         action_decline_4);
+	n.add_action ("action_decline_2", "\"Can't talk now, what's up?\"", action_decline_2);
+	n.add_action ("action_decline_3", "\"I call you back.\"",           action_decline_3);
+	n.add_action ("action_decline_4", "Send custom message...",         action_decline_4);
 
 	# indicate to the notification-daemon, that we want to use snap-decisions
 	n.set_hint_string ("x-canonical-snap-decisions", "true");
+	n.set_hint_string ("x-canonical-private-button-tint", "true");
 	n.set_hint_string ("x-canonical-secondary-icon", os.getcwd() + "/assets/icon_phone.png");
 
 	n.show ()

=== added file 'examples/test-system-dialog-hint.py'
--- examples/test-system-dialog-hint.py	1970-01-01 00:00:00 +0000
+++ examples/test-system-dialog-hint.py	2013-09-04 16:15:41 +0000
@@ -0,0 +1,60 @@
+#!/usr/bin/python
+
+import os
+import sys
+from gi.repository import Gio, GLib, Notify
+import dbus
+import dbus.service
+
+DBUS_NAME="com.canonical.snapdecisions.feedback"
+DBUS_PATH="/com/canonical/snapdecisions/feedback"
+DBUS_METHOD="collect"
+
+def collect_feedback(id):
+    print "collect_feedback() called"
+    interface = dbus.Interface(dbus.SessionBus().get_object(DBUS_NAME, DBUS_PATH), DBUS_NAME)
+    result = interface.collect(id)
+    if len(result) != 0:
+        print "Got reply: "
+        for index in range(len(result)):
+            print "\t%s" % result[index]
+        #return False
+    else:
+        print "result was empty"
+    return True
+
+def quit_callback(notification):
+    print "quit_callback() called"
+    loop.quit()
+
+def connect_callback(notification, action, data):
+    print "connect_callback() called"
+    if action == "connect_id":
+        print "Triggering Connect"
+        #collect_feedback(notification.get_property("id"))
+    else:
+        print "That should not have happened (connect_id)!"
+
+def cancel_callback(notification, action, data):
+    if action == "cancel_id":
+        print "Triggering Cancel"
+    else:
+        print "That should not have happened (cancel_id)!"
+
+def pushNotification ():
+    n = Notify.Notification.new("Connect to \"Calamari\"", "dummy", "totem");
+    n.add_action ("connect_id", "Connect", connect_callback, None, None)
+    n.add_action ("cancel_id", "Cancel", cancel_callback, None, None)
+    n.set_hint_string ("x-canonical-snap-decisions", "true")
+    n.set_hint_string ("x-canonical-private-button-tint", "true")
+    #n.set_hint_string ("x-canonical-private-system-dialog", "user-auth")
+    n.set_hint_string ("x-canonical-private-system-dialog", "wifi-auth")
+    return n
+
+loop = GLib.MainLoop.new(None, False)
+Notify.init("password-dialog-test")
+n = pushNotification()
+n.connect('closed', quit_callback)
+n.show ()
+GLib.timeout_add(1000, collect_feedback, n.get_property("id"))
+loop.run()

=== added file 'include/Feedback.h'
--- include/Feedback.h	1970-01-01 00:00:00 +0000
+++ include/Feedback.h	2013-09-04 16:15:41 +0000
@@ -0,0 +1,24 @@
+#include <QString>
+#include <QObject>
+#include <QtDBus>
+
+#define FEEDBACK_DBUS_NAME "com.canonical.snapdecisions.feedback"
+#define FEEDBACK_DBUS_PATH "/com/canonical/snapdecisions/feedback"
+#define FEEDBACK_DBUS_METHOD "collect"
+
+class NotificationModel;
+
+class Feedback : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", FEEDBACK_DBUS_NAME)
+
+    public:
+        Feedback(NotificationModel& m, QObject* parent = 0);
+
+    public Q_SLOTS:
+        QStringList collect(const unsigned int id);
+
+    private:
+        NotificationModel& model;
+};

=== added file 'include/FeedbackInterface.h'
--- include/FeedbackInterface.h	1970-01-01 00:00:00 +0000
+++ include/FeedbackInterface.h	2013-09-04 16:15:41 +0000
@@ -0,0 +1,56 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -v -c FeedbackInterface -p include/FeedbackInterface.h:src/FeedbackInterface.cpp com.canonical.snapdecisions.feedback.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef FEEDBACKINTERFACE_H_1376659323
+#define FEEDBACKINTERFACE_H_1376659323
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface com.canonical.snapdecisions.feedback
+ */
+class FeedbackInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "com.canonical.snapdecisions.feedback"; }
+
+public:
+    FeedbackInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~FeedbackInterface();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<QStringList> collect(uint id)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(id);
+        return asyncCallWithArgumentList(QLatin1String("collect"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
+namespace com {
+  namespace canonical {
+    namespace snapdecisions {
+      typedef ::FeedbackInterface feedback;
+    }
+  }
+}
+#endif

=== added file 'include/FeedbackInterfaceAdaptor.h'
--- include/FeedbackInterfaceAdaptor.h	1970-01-01 00:00:00 +0000
+++ include/FeedbackInterfaceAdaptor.h	2013-09-04 16:15:41 +0000
@@ -0,0 +1,51 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c FeedbackInterfaceAdaptor -a include/FeedbackInterfaceAdaptor.h:src/FeedbackInterfaceAdaptor.cpp com.canonical.snapdecisions.feedback.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef FEEDBACKINTERFACEADAPTOR_H_1376659323
+#define FEEDBACKINTERFACEADAPTOR_H_1376659323
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+QT_BEGIN_NAMESPACE
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+QT_END_NAMESPACE
+
+/*
+ * Adaptor class for interface com.canonical.snapdecisions.feedback
+ */
+class FeedbackInterfaceAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.snapdecisions.feedback")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"com.canonical.snapdecisions.feedback\">\n"
+"    <method name=\"collect\">\n"
+"      <arg direction=\"out\" type=\"as\"/>\n"
+"      <arg direction=\"in\" type=\"u\" name=\"id\"/>\n"
+"    </method>\n"
+"  </interface>\n"
+        "")
+public:
+    FeedbackInterfaceAdaptor(QObject *parent);
+    virtual ~FeedbackInterfaceAdaptor();
+
+public: // PROPERTIES
+public Q_SLOTS: // METHODS
+    QStringList collect(uint id);
+Q_SIGNALS: // SIGNALS
+};
+
+#endif

=== modified file 'include/Notification.h'
--- include/Notification.h	2013-09-03 12:41:34 +0000
+++ include/Notification.h	2013-09-04 16:15:41 +0000
@@ -37,6 +37,7 @@
     Q_ENUMS(Urgency)
     Q_ENUMS(Type)
     Q_ENUMS(Hint)
+    Q_ENUMS(SystemDialog)
     Q_PROPERTY(QString summary READ getSummary WRITE setSummary NOTIFY summaryChanged)
     Q_PROPERTY(QString body READ getBody WRITE setBody NOTIFY bodyChanged)
     Q_PROPERTY(NotificationID id READ getID)
@@ -46,6 +47,8 @@
     Q_PROPERTY(Urgency urgency READ getUrgency WRITE setUrgency NOTIFY urgencyChanged)
     Q_PROPERTY(Type type READ getType WRITE setType NOTIFY typeChanged)
     Q_PROPERTY(ActionModel* actions READ getActions NOTIFY actionsChanged)
+    Q_PROPERTY(QStringList entries READ getEntries WRITE setEntries NOTIFY entriesChanged)
+    Q_PROPERTY(SystemDialog systemDialog READ getSystemDialog NOTIFY systemDialogChanged)
     Q_PROPERTY(int hints READ getHints WRITE setHints NOTIFY hintsChanged)
 
 private:
@@ -53,8 +56,9 @@
 
 public:
     enum Urgency { Low, Normal, Critical };
-    enum Type { Confirmation, Ephemeral, Interactive, SnapDecision, PlaceHolder };
-    enum Hint { None = 0, ButtonTint = 1 << 1, IconOnly = 1 << 2 };
+    enum Type { Confirmation, Ephemeral, Interactive, SnapDecision, Dialog, PlaceHolder };
+    enum Hint { None = 0, ButtonTint = 1 << 1, IconOnly = 1 << 2, Truncation = 1 << 3, Sync = 1 << 4 };
+    enum SystemDialog { WifiSelect, WifiAuth, UserAuth };
 
 Q_SIGNALS:
     void bodyChanged(QString text);
@@ -64,6 +68,8 @@
     void valueChanged(int value);
     void urgencyChanged(Urgency urg);
     void typeChanged(Type type);
+    void entriesChanged(QStringList entries);
+    void systemDialogChanged(SystemDialog systemDialog);
     void actionsChanged(QStringList actions);
     void hintsChanged(int hints);
 
@@ -109,8 +115,12 @@
     void setUrgency(Urgency urg);
     Type getType() const;
     void setType(Type type);
+    QStringList getEntries() const;
+    void setEntries(QStringList entries);
     ActionModel* getActions() const;
     void setActions(QStringList actions);
+    SystemDialog getSystemDialog() const;
+    void setSystemDialog(SystemDialog systemDialog);
 
     int getHints() const;
     void setHints(int hints);

=== modified file 'include/NotificationModel.h'
--- include/NotificationModel.h	2013-09-03 12:41:34 +0000
+++ include/NotificationModel.h	2013-09-04 16:15:41 +0000
@@ -39,9 +39,11 @@
     RoleValue         = Qt::UserRole + 6,
     RoleIcon          = Qt::UserRole + 7,
     RoleSecondaryIcon = Qt::UserRole + 8,
-    RoleActions       = Qt::UserRole + 9,
-    RoleHints         = Qt::UserRole + 10,
-    RoleNotification  = Qt::UserRole + 11
+    RoleEntries       = Qt::UserRole + 9,
+    RoleActions       = Qt::UserRole + 10,
+    RoleHints         = Qt::UserRole + 11,
+    RoleNotification  = Qt::UserRole + 12,
+    RoleSystemDialog  = Qt::UserRole + 13
 };
 
 class NotificationModel : public QAbstractListModel {
@@ -96,6 +98,7 @@
     void insertEphemeral(QSharedPointer<Notification> n);
     void insertConfirmation(QSharedPointer<Notification> n);
     void insertInteractive(QSharedPointer<Notification> n);
+    void insertDialog(QSharedPointer<Notification> n);
     void insertSnap(QSharedPointer<Notification> n);
     void insertToVisible(QSharedPointer<Notification> n, int location=-1);
     void deleteFromVisible(int loc);

=== modified file 'include/NotificationServer.h'
--- include/NotificationServer.h	2013-09-03 12:41:34 +0000
+++ include/NotificationServer.h	2013-09-04 16:15:41 +0000
@@ -20,6 +20,8 @@
 #ifndef NOTIFICATIONSERVER_H
 #define NOTIFICATIONSERVER_H
 
+#include <gio/gio.h>
+
 #include "notify-backend.h"
 
 /* http://www.galago-project.org/specs/notification/0.9/x408.html#commands
@@ -72,11 +74,25 @@
     void ActionInvoked(unsigned int id, QString action_key);
     void dataChanged(unsigned int id);
 
+public:
+    GDBusConnection* wifiAuthConnection;
+    unsigned int     wifiAuthBusName;
+    unsigned int     wifiAuthModel;
+    GDBusConnection* wifiSelectConnection;
+    unsigned int     wifiSelectBusName;
+    unsigned int     wifiSelectModel;
+    GDBusConnection* userAuthConnection;
+    unsigned int     userAuthBusName;
+    unsigned int     userAuthModel;
+
 private:
+    void exportWifiAuthModel();
+    void exportWifiSelectModel();
+    void exportUserAuthModel();
+    void teardownMenuModels();
     Notification* buildNotification(NotificationID id, const Hints &hints);
     NotificationModel &model;
     unsigned int idCounter;
-
 };
 
 #endif

=== modified file 'include/notify-backend.h.in'
--- include/notify-backend.h.in	2013-09-03 12:41:34 +0000
+++ include/notify-backend.h.in	2013-09-04 16:15:41 +0000
@@ -55,9 +55,17 @@
 #define DBUS_PATH         "/org/freedesktop/Notifications"
 #endif
 
+#define SYSTEM_DIALOG_TYPE_WIFI_AUTH "wifi-auth"
+#define SYSTEM_DIALOG_TYPE_WIFI_SELECT "wifi-select"
+#define SYSTEM_DIALOG_TYPE_USER_AUTH "user-auth"
+
 #define URGENCY_HINT "urgency"
-#define SYNCH_HINT "x-canonical-private-synchronous"
+#define SYNC_HINT "x-canonical-private-synchronous"
 #define SNAP_HINT "x-canonical-snap-decisions"
+#define DIALOG_HINT "x-canonical-private-system-dialog"
+#define DIALOG_PASSWORD_HINT "x-canonical-private-system-dialog-password"
+#define DIALOG_LISTVIEW_HINT "x-canonical-private-system-dialog-listview"
+#define DIALOG_FEEDBACK_HINT "x-canonical-private-system-dialog-feedback"
 #define INTERACTIVE_HINT "x-canonical-switch-to-application"
 #define SECONDARY_ICON_HINT "x-canonical-secondary-icon"
 #define ICON_ONLY_HINT "x-canonical-private-icon-only"

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-06-18 08:36:08 +0000
+++ src/CMakeLists.txt	2013-09-04 16:15:41 +0000
@@ -9,6 +9,12 @@
 ../include/NotificationServer.h
 NotificationClient.cpp
 ../include/NotificationClient.h
+Feedback.cpp
+../include/Feedback.h
+FeedbackInterface.cpp
+../include/FeedbackInterface.h
+FeedbackInterfaceAdaptor.cpp
+../include/FeedbackInterfaceAdaptor.h
 )
 
 # Build everything twice. Since we have only a few
@@ -20,12 +26,16 @@
 ${CORE_SRCS}
 )
 
+target_link_libraries(notifybackend ${GIO_LIBRARIES})
+
 add_library(notifyplugin MODULE
 ${CORE_SRCS}
 NotificationPlugin.cpp
 ../include/NotificationPlugin.h
 )
 
+target_link_libraries(notifyplugin ${GIO_LIBRARIES})
+
 set_target_properties(notifyplugin PROPERTIES
   SOVERSION ${SONAME}
   VERSION ${SOVERSION}

=== added file 'src/Feedback.cpp'
--- src/Feedback.cpp	1970-01-01 00:00:00 +0000
+++ src/Feedback.cpp	2013-09-04 16:15:41 +0000
@@ -0,0 +1,32 @@
+#include <QString>
+#include <QObject>
+#include <QtDBus>
+#include <QSharedPointer>
+
+#include "Feedback.h"
+#include "FeedbackInterfaceAdaptor.h"
+#include "NotificationModel.h"
+#include "Notification.h"
+
+Feedback::Feedback(NotificationModel& m, QObject *parent) : QObject(parent), model(m) {
+    new FeedbackInterfaceAdaptor(this);
+	QDBusConnection connection = QDBusConnection::sessionBus();
+	connection.registerObject(FEEDBACK_DBUS_PATH, this);
+	connection.registerService(FEEDBACK_DBUS_NAME);
+}
+
+QStringList Feedback::collect(const unsigned int id) {
+    fprintf(stderr, "Feedback::collect()\n");
+    QStringList list;
+    QSharedPointer<Notification> notification;
+
+    notification = model.getNotification(id);
+    if(!notification.isNull()) {
+        list = notification->getEntries();        
+    }
+    else {
+        fprintf(stderr, "Feedback::collect() - could not get notification");
+    }
+
+    return list;
+}

=== added file 'src/FeedbackInterface.cpp'
--- src/FeedbackInterface.cpp	1970-01-01 00:00:00 +0000
+++ src/FeedbackInterface.cpp	2013-09-04 16:15:41 +0000
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -v -c FeedbackInterface -p include/FeedbackInterface.h:src/FeedbackInterface.cpp com.canonical.snapdecisions.feedback.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "FeedbackInterface.h"
+
+/*
+ * Implementation of interface class FeedbackInterface
+ */
+
+FeedbackInterface::FeedbackInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+FeedbackInterface::~FeedbackInterface()
+{
+}
+

=== added file 'src/FeedbackInterfaceAdaptor.cpp'
--- src/FeedbackInterfaceAdaptor.cpp	1970-01-01 00:00:00 +0000
+++ src/FeedbackInterfaceAdaptor.cpp	2013-09-04 16:15:41 +0000
@@ -0,0 +1,43 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -c FeedbackInterfaceAdaptor -a include/FeedbackInterfaceAdaptor.h:src/FeedbackInterfaceAdaptor.cpp com.canonical.snapdecisions.feedback.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "FeedbackInterfaceAdaptor.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class FeedbackInterfaceAdaptor
+ */
+
+FeedbackInterfaceAdaptor::FeedbackInterfaceAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+FeedbackInterfaceAdaptor::~FeedbackInterfaceAdaptor()
+{
+    // destructor
+}
+
+QStringList FeedbackInterfaceAdaptor::collect(uint id)
+{
+    // handle method call com.canonical.snapdecisions.feedback.collect
+    QStringList out0;
+    QMetaObject::invokeMethod(parent(), "collect", Q_RETURN_ARG(QStringList, out0), Q_ARG(uint, id));
+    return out0;
+}
+

=== modified file 'src/Notification.cpp'
--- src/Notification.cpp	2013-09-03 12:41:34 +0000
+++ src/Notification.cpp	2013-09-04 16:15:41 +0000
@@ -35,6 +35,8 @@
     QString icon;
     QString secondaryIcon;
     QStringList actions;
+    QStringList entries;
+    Notification::SystemDialog systemDialog;
     ActionModel* actionsModel;
     int hints;
     int displayTime;
@@ -174,6 +176,7 @@
     if(p->urg != urg) {
         p->urg = urg;
         Q_EMIT urgencyChanged(p->urg);
+        Q_EMIT dataChanged(p->id);
     }
 }
 
@@ -181,6 +184,32 @@
     if(p->type != p->type) {
         p->type = type;
         Q_EMIT typeChanged(p->type);
+        Q_EMIT dataChanged(p->id);
+    }
+}
+
+QStringList Notification::getEntries() const {
+    fprintf(stderr, "Notification::getEntries()\n");
+    return p->entries;
+}
+
+void Notification::setEntries(QStringList entries) {
+    if(p->entries != entries) {
+        p->entries = entries;
+        Q_EMIT entriesChanged(p->entries);
+        Q_EMIT dataChanged(p->id);
+    }
+}
+
+Notification::SystemDialog Notification::getSystemDialog() const {
+    return p->systemDialog;
+}
+
+void Notification::setSystemDialog(SystemDialog systemDialog) {
+    if (p->systemDialog != systemDialog) {
+        p->systemDialog = systemDialog;
+        Q_EMIT systemDialogChanged(p->systemDialog);
+        Q_EMIT dataChanged(p->id);
     }
 }
 
@@ -192,6 +221,7 @@
     if(p->actions != actions) {
         p->actions = actions;
         Q_EMIT actionsChanged(p->actions);
+        Q_EMIT dataChanged(p->id);
 
         for (int i = 0; i < p->actions.size(); i += 2) {
             p->actionsModel->insertAction(p->actions[i], p->actions[i+1]);
@@ -206,6 +236,7 @@
 void Notification::setHints(int hints) {
     p->hints = hints;
     Q_EMIT hintsChanged(p->hints);
+    Q_EMIT dataChanged(p->id);
 }
 
 void Notification::onHovered() {
@@ -217,6 +248,7 @@
 }
 
 void Notification::invokeAction(const QString action) {
+    fprintf(stderr, "Notification::invokeAction()\n");
     for(int i=0; i<p->actions.size(); i++) {
         if(p->actions[i] == action) {
             p->server->invokeAction(p->id, action);

=== modified file 'src/NotificationClient.cpp'
--- src/NotificationClient.cpp	2013-09-03 12:41:34 +0000
+++ src/NotificationClient.cpp	2013-09-04 16:15:41 +0000
@@ -40,7 +40,7 @@
     hints["urgency"] = (char)urg;
 
     if(ntype == Notification::Type::Confirmation) {
-        hints[SYNCH_HINT] = "yes";
+        hints[SYNC_HINT] = "yes";
     }
     if(ntype == Notification::Type::SnapDecision) {
         QStringList snaps;

=== modified file 'src/NotificationModel.cpp'
--- src/NotificationModel.cpp	2013-09-03 12:41:34 +0000
+++ src/NotificationModel.cpp	2013-09-04 16:15:41 +0000
@@ -32,6 +32,7 @@
     QVector<QSharedPointer<Notification> > ephemeralQueue;
     QVector<QSharedPointer<Notification> > interactiveQueue;
     QVector<QSharedPointer<Notification> > snapQueue;
+    QVector<QSharedPointer<Notification> > dialogQueue;
     QMap<NotificationID, int> displayTimes;
 };
 
@@ -82,6 +83,9 @@
         case RoleSecondaryIcon:
             return QVariant(p->displayedNotifications[index.row()]->getSecondaryIcon());
 
+        case RoleEntries:
+            return QVariant::fromValue(p->displayedNotifications[index.row()]->getEntries());
+
         case RoleActions: 
             return QVariant::fromValue(p->displayedNotifications[index.row()]->getActions());
 
@@ -91,6 +95,9 @@
         case RoleNotification:
             return QVariant(p->displayedNotifications[index.row()]);
 
+        case RoleSystemDialog:
+            return QVariant(p->displayedNotifications[index.row()]->getSystemDialog());
+
         default:
             return QVariant();
     }
@@ -108,6 +115,7 @@
     case Notification::Type::Confirmation : insertConfirmation(n); break;
     case Notification::Type::Interactive : insertInteractive(n); break;
     case Notification::Type::SnapDecision : insertSnap(n); break;
+    case Notification::Type::Dialog : insertDialog(n); break;
     default:
         printf("Unknown notification type, I should probably throw an exception here.\n");
         break;
@@ -119,6 +127,7 @@
 }
 
 QSharedPointer<Notification> NotificationModel::getNotification(NotificationID id) const {
+    fprintf(stderr, "NotificationModel::getNotification()\n");
     for(int i=0; i<p->ephemeralQueue.size(); i++) {
         if(p->ephemeralQueue[i]->getID() == id) {
             return p->ephemeralQueue[i];
@@ -134,6 +143,11 @@
             return p->snapQueue[i];
         }
     }
+    for(int i=0; i<p->dialogQueue.size(); i++) {
+        if(p->dialogQueue[i]->getID() == id) {
+            return p->dialogQueue[i];
+        }
+    }
     for(int i=0; i<p->displayedNotifications.size(); i++) {
         if(p->displayedNotifications[i]->getID() == id) {
             return p->displayedNotifications[i];
@@ -175,6 +189,7 @@
 }
 
 void NotificationModel::removeNotification(const NotificationID id) {
+    fprintf(stderr, "NotificationModel::removeNotification()\n");
     for(int i=0; i<p->ephemeralQueue.size(); i++) {
         if(p->ephemeralQueue[i]->getID() == id) {
             p->ephemeralQueue.erase(p->ephemeralQueue.begin() + i);
@@ -191,6 +206,14 @@
         }
     }
 
+    for(int i=0; i<p->dialogQueue.size(); i++) {
+        if(p->dialogQueue[i]->getID() == id) {
+            p->dialogQueue.erase(p->dialogQueue.begin() + i);
+            Q_EMIT queueSizeChanged(queued());
+            return;
+        }
+    }
+
     for(int i=0; i<p->interactiveQueue.size(); i++) {
         if(p->interactiveQueue[i]->getID() == id) {
             p->interactiveQueue.erase(p->interactiveQueue.begin() + i);
@@ -292,6 +315,7 @@
     for(int i=p->displayedNotifications.size()-1; i>=0; i--) {
         QSharedPointer<Notification> n = p->displayedNotifications[i];
         switch(n->getType()) {
+        case Notification::Type::Dialog : break;
         case Notification::Type::SnapDecision : break;
         case Notification::Type::Confirmation : deleteFromVisible(i); break;
         case Notification::Type::Ephemeral : deleteFromVisible(i); p->ephemeralQueue.push_front(n); queueSizeChanged(queued()); break;
@@ -409,6 +433,34 @@
     }
 }
 
+void NotificationModel::insertDialog(QSharedPointer<Notification> n) {
+    Q_ASSERT(n->getType() == Notification::Type::Dialog);
+    removeNonSnap();
+    int showing = countShowing(n->getType());
+    if(showing >= maxSnapsShown) {
+        int loc = findFirst(Notification::Type::SnapDecision);
+        bool replaced = false;
+        for(int i=0; i<showing; i++) {
+            if(p->displayedNotifications[loc+i]->getUrgency() < n->getUrgency()) {
+                QSharedPointer<Notification> lastShowing = p->displayedNotifications[loc+showing-1];
+                deleteFromVisible(loc+showing-1);
+                insertToVisible(n, loc+i);
+                p->dialogQueue.push_front(lastShowing);
+                replaced = true;
+                break;
+            }
+        }
+        if(!replaced) {
+            p->dialogQueue.push_back(n);
+        }
+        qStableSort(p->dialogQueue.begin(), p->dialogQueue.end(), notificationCompare);
+        Q_EMIT queueSizeChanged(queued());
+    } else {
+        int loc = insertionPoint(n);
+        insertToVisible(n, loc);
+    }
+}
+
 int NotificationModel::insertionPoint(const QSharedPointer<Notification> n) const {
     int i=0;
     if(n->getType() == Notification::Type::SnapDecision) {
@@ -514,9 +566,11 @@
     roles.insert(RoleValue, "value");
     roles.insert(RoleIcon, "icon");
     roles.insert(RoleSecondaryIcon, "secondaryIcon");
+    roles.insert(RoleEntries, "entries");
     roles.insert(RoleActions, "actions");
     roles.insert(RoleHints, "hints");
     roles.insert(RoleNotification, "notification");
+    roles.insert(RoleSystemDialog, "systemDialog");
 
     return roles;
 }

=== modified file 'src/NotificationServer.cpp'
--- src/NotificationServer.cpp	2013-09-03 12:41:34 +0000
+++ src/NotificationServer.cpp	2013-09-04 16:15:41 +0000
@@ -20,30 +20,62 @@
 #include "NotificationModel.h"
 #include "NotificationServer.h"
 #include "Notification.h"
+#include "Feedback.h"
+
 #include <QDBusMetaType>
 #include <QSharedPointer>
 
+#define DIALOG_MODEL_DBUS_NAME "com.canonical.snapdecisions.systemdialog"
+#define DIALOG_MODEL_DBUS_OBJECTPATH "/com/canonical/snapdecisions/systemdialog"
+
 NotificationServer::NotificationServer(NotificationModel &m, QObject *parent) :
     QDBusAbstractAdaptor(parent), model(m), idCounter(1) {
     qDBusRegisterMetaType<Hints>();
 
     connect(this, SIGNAL(dataChanged(unsigned int)), &m, SLOT(onDataChanged(unsigned int)));
+    Feedback* feedback = new Feedback(m);
+
+    wifiAuthConnection = NULL;
+    wifiAuthBusName    = 0;
+    wifiAuthModel      = 0;
+
+    wifiSelectConnection = NULL;
+    wifiSelectBusName    = 0;
+    wifiSelectModel      = 0;
+
+    userAuthConnection = NULL;
+    userAuthBusName    = 0;
+    userAuthModel      = 0;
+}
+
+void NotificationServer::teardownMenuModels() {
+    if(wifiAuthBusName > 0) {
+        g_bus_unown_name(wifiAuthBusName);
+        g_dbus_connection_unexport_menu_model(wifiAuthConnection, wifiAuthModel);
+    }
+
+    if(wifiSelectBusName > 0) {
+        g_bus_unown_name(wifiSelectBusName);
+        g_dbus_connection_unexport_menu_model(wifiSelectConnection, wifiSelectModel);
+    }
+
+    if(userAuthBusName)
+    {
+        g_bus_unown_name(userAuthBusName);
+        g_dbus_connection_unexport_menu_model(userAuthConnection, userAuthModel);
+    }
 }
 
 NotificationServer::~NotificationServer() {
-
 }
 
 void NotificationServer::invokeAction(unsigned int id, QString action) {
+    fprintf(stderr, "NotificationServer::invokeAction()\n");
     Q_EMIT ActionInvoked(id, action);
 }
 
-
 #define INTERACTIVE_HINT "x-canonical-switch-to-application"
 
-
-
-
 QStringList NotificationServer::GetCapabilities() const {
     QStringList capabilities;
     capabilities.push_back("actions");
@@ -52,12 +84,16 @@
     capabilities.push_back("icon-static");
     capabilities.push_back("image/svg+xml");
     capabilities.push_back(URGENCY_HINT);
-    capabilities.push_back(SYNCH_HINT);
+    capabilities.push_back(SYNC_HINT);
     capabilities.push_back(APPEND_HINT);
     capabilities.push_back(ICON_ONLY_HINT);
     capabilities.push_back(BUTTON_TINT_HINT);
     capabilities.push_back(TRUNCATION_HINT);
     capabilities.push_back(SNAP_HINT);
+    capabilities.push_back(DIALOG_HINT);
+    capabilities.push_back(DIALOG_PASSWORD_HINT);
+    capabilities.push_back(DIALOG_LISTVIEW_HINT);
+    capabilities.push_back(DIALOG_FEEDBACK_HINT);
     capabilities.push_back(SECONDARY_ICON_HINT);
 
     return capabilities;
@@ -76,7 +112,7 @@
     }
     Notification::Type ntype = Notification::Type::Ephemeral;
     expireTimeout = 5000;
-    if(hints.find(SYNCH_HINT) != hints.end()) {
+    if(hints.find(SYNC_HINT) != hints.end()) {
         expireTimeout = 3000;
         ntype = Notification::Type::Confirmation;
     } else if (hints.find(SNAP_HINT) != hints.end()) {
@@ -87,6 +123,20 @@
         expireTimeout = 5000;
     }
 
+    if(hints.find(DIALOG_HINT) != hints.end()) {
+        expireTimeout = 60000;
+        ntype = Notification::Type::Dialog;
+    }
+
+    // only allow the combination DIALOG_PASSWORD_HINT + DIALOG_FEEDBACK_HINT or
+    // DIALOG_LISTVIEW_HINT + DIALOG_FEEDBACK_HINT
+    /*if((hints.find(DIALOG_PASSWORD_HINT) != hints.end() ||
+       hints.find(DIALOG_LISTVIEW_HINT) != hints.end()) &&
+       hints.find(DIALOG_FEEDBACK_HINT) != hints.end()) {
+        expireTimeout = 60000;
+        ntype = Notification::Type::Dialog;
+    }*/
+
     Notification* n = new Notification(id, expireTimeout, urg, ntype, this);
     connect(n, SIGNAL(dataChanged(unsigned int)), this, SLOT(onDataChanged(unsigned int)));
     connect(n, SIGNAL(completed(unsigned int)), this, SLOT(onCompleted(unsigned int)));
@@ -100,7 +150,6 @@
     const unsigned int FAILURE = 0; // Is this correct?
     const int minActions = 4;
     const int maxActions = 12;
-    //QImage icon(app_icon);
     int currentId = idCounter;
     QSharedPointer<Notification> notification;
     if(replaces_id != 0) {
@@ -148,6 +197,30 @@
             idCounter = 1;
     }
 
+    if(hints.find(SYNC_HINT) != hints.end()) {
+        int hints = notification->getHints();
+        hints |= Notification::Hint::Sync;
+        notification->setHints(hints);
+    }
+
+    if(hints.find(ICON_ONLY_HINT) != hints.end()) {
+        int hints = notification->getHints();
+        hints |= Notification::Hint::IconOnly;
+        notification->setHints(hints);
+    }
+
+    if(hints.find(BUTTON_TINT_HINT) != hints.end()) {
+        int hints = notification->getHints();
+        hints |= Notification::Hint::ButtonTint;
+        notification->setHints(hints);
+    }
+
+    if(hints.find(TRUNCATION_HINT) != hints.end()) {
+        int hints = notification->getHints();
+        hints |= Notification::Hint::Truncation;
+        notification->setHints(hints);
+    }
+
     if(notification->getType() == Notification::Type::Interactive) {
         int numActions = actions.size();
         if(numActions != 2) {
@@ -157,6 +230,32 @@
         notification->setActions(actions);
     }
 
+    if(notification->getType() == Notification::Type::Dialog) {
+        int numActions = actions.size();
+        if(numActions != 4) {
+            fprintf(stderr, "Wrong number of actions for an system-dialog notification. Has %d, requires %d.\n", numActions, 4);
+            return FAILURE;
+        }
+        notification->setActions(actions);
+
+        if(hints.find(DIALOG_HINT) != hints.end()) {
+            QVariant variant = hints[DIALOG_HINT].variant();
+            if(variant.canConvert<QString>()) {
+                QString type = variant.toString();
+                if(type == SYSTEM_DIALOG_TYPE_WIFI_AUTH) {
+                    notification->setSystemDialog(Notification::SystemDialog::WifiAuth);
+                    exportWifiAuthModel();
+                } else if (type == SYSTEM_DIALOG_TYPE_WIFI_SELECT) {
+                    notification->setSystemDialog(Notification::SystemDialog::WifiSelect);
+                    exportWifiSelectModel();
+                } else if (type == SYSTEM_DIALOG_TYPE_USER_AUTH) {
+                    notification->setSystemDialog(Notification::SystemDialog::UserAuth);
+                    exportUserAuthModel();
+                }
+            }
+        }
+    }
+
     // Do this first because it can fail. In case we are updating an
     // existing notification exiting now means all old state is
     // preserved.
@@ -190,8 +289,10 @@
 }
 
 void NotificationServer::CloseNotification (unsigned int id) {
+    fprintf(stderr, "NotificationServer::CloseNotification()\n");
     Q_EMIT NotificationClosed(id, 1);
     model.removeNotification(id);
+    teardownMenuModels();
 }
 
 void NotificationServer::GetServerInformation (QString &name, QString &vendor, QString &version, QString &specVersion) const {
@@ -206,5 +307,91 @@
 }
 
 void NotificationServer::onCompleted(unsigned int id) {
+    fprintf(stderr, "NotificationServer::onCompleted()\n");
     CloseNotification(id);
 }
+
+void busAcquiredWifiAuthModel(GDBusConnection* connection,
+                              const gchar*     name,
+                              gpointer         data) {
+    NotificationServer* self = (NotificationServer*) data;
+    GMenu* menu = g_menu_new();
+    GMenuItem* item = g_menu_item_new("Password:", NULL);
+    g_menu_item_set_attribute_value(item, "x-canonical-type",
+                                    g_variant_new_string("com.canonical.snapdecision.textfield"));
+    g_menu_item_set_attribute_value(item, "x-echo-mode-password",
+                                    g_variant_new_boolean(true));
+    g_menu_append_item(menu, item);
+
+    self->wifiAuthConnection = connection;
+    self->wifiAuthModel = g_dbus_connection_export_menu_model(connection,
+                                                        DIALOG_MODEL_DBUS_OBJECTPATH,
+                                                        (GMenuModel*) menu,
+                                                        NULL);
+}
+
+void busAcquiredWifiSelectModel(GDBusConnection* connection,
+                                const gchar*     name,
+                                gpointer         data) {
+    NotificationServer* self = (NotificationServer*) data;
+    self->wifiSelectConnection = connection;
+}
+
+void busAcquiredUserAuthModel(GDBusConnection* connection,
+                              const gchar*     name,
+                              gpointer         data) {
+    NotificationServer* self = (NotificationServer*) data;
+    GMenu* menu = g_menu_new();
+    GMenuItem* item1 = g_menu_item_new("Login name:", NULL);
+    g_menu_item_set_attribute_value(item1, "x-canonical-type",
+                                    g_variant_new_string("com.canonical.snapdecision.textfield"));
+    g_menu_item_set_attribute_value(item1, "x-echo-mode-password",
+                                    g_variant_new_boolean(false));
+    g_menu_append_item(menu, item1);
+
+    GMenuItem* item2 = g_menu_item_new("Password:", NULL);
+    g_menu_item_set_attribute_value(item2, "x-canonical-type",
+                                    g_variant_new_string("com.canonical.snapdecision.textfield"));
+    g_menu_item_set_attribute_value(item2, "x-echo-mode-password",
+                                    g_variant_new_boolean(true));
+    g_menu_append_item(menu, item2);
+
+    self->userAuthConnection = connection;
+    self->userAuthModel = g_dbus_connection_export_menu_model(connection,
+                                                        DIALOG_MODEL_DBUS_OBJECTPATH,
+                                                        (GMenuModel*) menu,
+                                                        NULL);
+}
+
+void NotificationServer::exportWifiAuthModel() {
+    wifiAuthBusName = g_bus_own_name(G_BUS_TYPE_SESSION,
+                                     DIALOG_MODEL_DBUS_NAME,
+                                     (GBusNameOwnerFlags) 0,
+                                     busAcquiredWifiAuthModel,
+                                     NULL,
+                                     NULL,
+                                     this,
+                                     NULL);
+}
+
+void NotificationServer::exportWifiSelectModel() {
+    wifiSelectBusName = g_bus_own_name(G_BUS_TYPE_SESSION,
+                                       DIALOG_MODEL_DBUS_NAME,
+                                       (GBusNameOwnerFlags) 0,
+                                       busAcquiredWifiSelectModel,
+                                       NULL,
+                                       NULL,
+                                       this,
+                                       NULL);
+}
+
+void NotificationServer::exportUserAuthModel() {
+    userAuthBusName = g_bus_own_name(G_BUS_TYPE_SESSION,
+                                     DIALOG_MODEL_DBUS_NAME,
+                                     (GBusNameOwnerFlags) 0,
+                                     busAcquiredUserAuthModel,
+                                     NULL,
+                                     NULL,
+                                     this,
+                                     NULL);
+}