elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-25 18:24:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improved consitstency.

Browse Source
This commit is contained in:
Marcus Wichelmann 2014-11-14 16:17:19 +01:00
parent 6580447866
commit bb65c2f92f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/org.pantheon.desktop.gala.gschema.xml.in.in
View File

@ -14,10 +14,6 @@
<value nick='grid' value='0'/> <value nick='grid' value='0'/>
<value nick='natural' value='1'/> <value nick='natural' value='1'/>
</enum> </enum>
<enum id="GalaNotificationPriority">
<value nick='hide' value='0'/>
<value nick='show' value='1'/>
</enum>
<schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior" gettext-domain="gala"> <schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior" gettext-domain="gala">
<key enum="GalaActionType" name="hotcorner-topleft"> <key enum="GalaActionType" name="hotcorner-topleft">
@ -223,11 +219,11 @@
<default>false</default> <default>false</default>
<summary>Disable all notifications</summary> <summary>Disable all notifications</summary>
</key> </key>
<key enum="GalaNotificationPriority" name="default-priority"> <key type="b" name="default-bubbles">
<default>'show'</default> <default>true</default>
<summary>The default priority that would be used for new apps</summary> <summary>The default setting for the bubbles that would be used for new apps</summary>
</key> </key>
<key type="b" name="default-sounds-enabled"> <key type="b" name="default-sounds">
<default>true</default> <default>true</default>
<summary>The default setting for the sounds that would be used for new apps</summary> <summary>The default setting for the sounds that would be used for new apps</summary>
</key> </key>

8
plugins/notify/NotifyServer.vala
View File

@ -187,9 +187,13 @@ namespace Gala.Plugins.Notify
apps_new[i] = options.apps[i]; apps_new[i] = options.apps[i];
} }
parameters[0] = options.default_priority; if (options.default_bubbles) {
parameters[0] = "show";
} else {
parameters[0] = "hide";
}
if (options.default_sounds_enabled) { if (options.default_sounds) {
parameters[1] = "on"; parameters[1] = "on";
} else { } else {
parameters[1] = "off"; parameters[1] = "off";

4
plugins/notify/NotifySettings.vala
View File

@ -23,8 +23,8 @@ namespace Gala.Plugins.Notify
public class NotifySettings : Granite.Services.Settings public class NotifySettings : Granite.Services.Settings
{ {
public bool do_not_disturb { get; set; } public bool do_not_disturb { get; set; }
public string default_priority { get; set; } public bool default_bubbles { get; set; }
public bool default_sounds_enabled { get; set; } public bool default_sounds { get; set; }
public string[] apps { get; set; } public string[] apps { get; set; }
static NotifySettings? instance = null; static NotifySettings? instance = null;