Compatibility to the notifications-plug added.

This adds settings to filter notifications on a per-app basis and define whether or not they may play sound.
This commit is contained in:
Marcus Wichelmann 2014-11-15 21:20:37 +00:00 committed by RabbitBot
commit ee19e68e79
4 changed files with 140 additions and 14 deletions

View File

@ -213,4 +213,24 @@
<_description>See normal-focused</_description>
</key>
</schema>
<schema path="/org/pantheon/desktop/gala/notifications/" id="org.pantheon.desktop.gala.notifications" gettext-domain="gala">
<key type="b" name="do-not-disturb">
<default>false</default>
<summary>Disable all notifications</summary>
</key>
<key type="b" name="default-bubbles">
<default>true</default>
<summary>The default setting for the bubbles that would be used for new apps</summary>
</key>
<key type="b" name="default-sounds">
<default>true</default>
<summary>The default setting for the sounds that would be used for new apps</summary>
</key>
<key type="as" name="apps">
<default>[]</default>
<summary>List of apps and their notification-permissions. Example: ['noise:show,on', 'pantheon-terminal:show,off']</summary>
<description>Structure: ['{APP-NAME}:{PRIORITY (show/hide)},{SOUNDS on/off}', ...]</description>
</key>
</schema>
</schemalist>

View File

@ -46,6 +46,7 @@ libgala_notify_la_VALASOURCES = \
Notification.vala \
NotificationStack.vala \
NotifyServer.vala \
NotifySettings.vala \
$(NULL)
nodist_libgala_notify_la_SOURCES = \
@ -69,4 +70,3 @@ EXTRA_DIST = \
$(image_DATA) \
$(libgala_notify_la_VALASOURCES) \
$(NULL)

View File

@ -151,6 +151,65 @@ namespace Gala.Plugins.Notify
var confirmation = hints.contains ("x-canonical-private-synchronous");
var progress = confirmation && hints.contains ("value");
var options = NotifySettings.get_default ();
// Default values for confirmations
var allow_bubble = true;
var allow_sound = true;
if (!confirmation) {
var app_found = false;
var param_bubbles = options.default_bubbles ? "show" : "hide";
var param_sounds = options.default_sounds ? "on" : "off";
for (int i = 0; i < options.apps.length; i++) {
var properties = options.apps[i].split (":");
// Don't crash! (If this entry is invalid search for another or create a new one)
if (properties.length == 2) {
if (properties[0] == app_name) {
var parameters = properties[1].split (",");
if (parameters.length == 2) {
param_bubbles = parameters[0];
param_sounds = parameters[1];
app_found = true;
break;
}
}
}
}
// App found?
if (!app_found) {
// No, add the default values to the list.
var apps_new = new string[options.apps.length + 1];
for (int i = 0; i < options.apps.length; i++) {
apps_new[i] = options.apps[i];
}
apps_new[options.apps.length] = app_name + ":" + param_bubbles + "," + param_sounds;
options.apps = apps_new;
}
if (options.do_not_disturb == false) {
if (param_bubbles == "show") {
allow_bubble = true;
} else {
allow_bubble = false;
}
} else {
allow_bubble = false;
}
allow_sound = (allow_bubble && param_sounds == "on");
}
#if 0 // enable to debug notifications
print ("Notification from '%s', replaces: %u\n" +
"\tapp icon: '%s'\n\tsummary: '%s'\n\tbody: '%s'\n\tn actions: %u\n\texpire: %i\n\tHints:\n",
@ -171,6 +230,7 @@ namespace Gala.Plugins.Notify
pid = bus_proxy.get_connection_unix_process_id (sender);
} catch (Error e) { warning (e.message); }
if (allow_sound)
handle_sounds (hints);
foreach (var child in stack.get_children ()) {
@ -209,6 +269,7 @@ namespace Gala.Plugins.Notify
}
}
if (allow_bubble) {
Notification notification;
if (confirmation)
notification = new ConfirmationNotification (id, pixbuf, icon_only,
@ -221,6 +282,7 @@ namespace Gala.Plugins.Notify
notification.action_invoked.connect (notification_action_invoked_callback);
notification.closed.connect (notification_closed_callback);
stack.show_notification (notification);
}
#if !VALA_0_26
// fixes memleaks as described in https://bugzilla.gnome.org/show_bug.cgi?id=698260
@ -477,4 +539,3 @@ namespace Gala.Plugins.Notify
}
}
}

View File

@ -0,0 +1,45 @@
//
// Copyright (C) 2014 Gala Developers
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// 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/>.
//
//
// Authored by: Marcus Wichelmann <admin@marcusw.de>
//
namespace Gala.Plugins.Notify
{
public class NotifySettings : Granite.Services.Settings
{
public bool do_not_disturb { get; set; }
public bool default_bubbles { get; set; }
public bool default_sounds { get; set; }
public string[] apps { get; set; }
static NotifySettings? instance = null;
private NotifySettings ()
{
base (Config.SCHEMA + ".notifications");
}
public static NotifySettings get_default ()
{
if (instance == null)
instance = new NotifySettings ();
return instance;
}
}
}