Merge lp:~greggory-hz/noise/bug-1044347 into lp:~elementary-apps/noise/trunk

[greggory.hz]

Added an option to disable desktop notifications

--updated to fix coding style

[David Gomes (davidgomes)]

disable_notifications_toggle.set_active(Settings.Main.instance.disable_notifications);

should be:

disable_notifications_toggle.set_active (Settings.Main.instance.disable_notifications);

Settings.Main.instance.disable_notifications = disable_notifications_toggle.get_active();

should be:

Settings.Main.instance.disable_notifications = disable_notifications_toggle.get_active ();

Regarding the code, you should fix those before merge.

review: Needs Fixing (code-style)

[David Gomes (davidgomes)]

Great job man, love this fix, ever since I reported the bug I've been waiting for it!

review: Approve

[Victor Martinez (victored)]

+1 to what David said. This looks perfect. I would have preferred to use "enabled" instead of "disabled" to avoid the implicit double negation, but that's a matter of preferences.

I approve the code, but we still need Daniel to approve the UI changes.

review: Approve

[greggory.hz (greggory-hz)]

Thanks guys!

[Victor Martinez (victored)]

Daniel, do you agree with adding this option to Noise's preferences?

[Harvey Cabaguio (harveycabaguio)]

I don't mind this, although I think the label should say "Enable Notifications".

[Danielle Foré (danrabbit)]

Fun fact: Noise doesn't compile with vala 0.17 haha.

I think it's a little confusing with the checkbox. Am I turning notifications on or off? Not really clear. I would personally use a switch instead and change the label to "Notification bubbles"

see: http://elementaryos.org/docs/human-interface-guidelines/ui-toolkit-elements/switches

review: Needs Fixing

[Danielle Foré (danrabbit)]

FWIW, I think in Luna +1 we should be doing this in a plug to configure all notifications centrally.

=== modified file 'core/Settings.vala'
--- core/Settings.vala	2012-08-28 22:14:21 +0000
+++ core/Settings.vala	2012-09-17 18:45:27 +0000
@@ -69,6 +69,7 @@
         public bool update_folder_hierarchy { get; set; }
         public bool write_metadata_to_file { get; set; }
         public bool copy_imported_music { get; set; }
+        public bool disable_notifications { get; set; }
         public bool download_new_podcasts { get; set; }
         public int last_media_playing { get; set; }
         public int last_media_position { get; set; }

=== modified file 'schemas/org.pantheon.noise.gschema.xml'
--- schemas/org.pantheon.noise.gschema.xml	2012-08-28 22:14:21 +0000
+++ schemas/org.pantheon.noise.gschema.xml	2012-09-17 18:45:27 +0000
@@ -31,6 +31,11 @@
       <summary>Whether or not to copy imported files to music folder</summary>
       <description>Whether or not to copy imported files to music folder</description>
     </key>
+    <key type="b" name="disable-notifications">
+      <default>false</default>
+      <summary>Whether or not to disable desktop notifications</summary>
+      <description>Whether or not to disable desktop notifications</description>
+    </key>
     <key type="b" name="download-new-podcasts">
       <default>false</default>
       <summary>Whether or not to automatically download new podcasts</summary>

=== modified file 'src/Dialogs/PreferencesWindow.vala'
--- src/Dialogs/PreferencesWindow.vala	2012-09-15 07:14:46 +0000
+++ src/Dialogs/PreferencesWindow.vala	2012-09-17 18:45:27 +0000
@@ -190,6 +190,7 @@
     private Gtk.CheckButton organize_folders_toggle;
     private Gtk.CheckButton write_file_metadata_toggle;
     private Gtk.CheckButton copy_imported_music_toggle;
+    private Gtk.CheckButton disable_notifications_toggle;
 
 #if ENABLE_EXPERIMENTAL
     private Gtk.CheckButton is_default_application_toggle;
@@ -205,6 +206,7 @@
 
         add_library_folder_section ();
         add_library_management_section ();
+        add_notification_management_section ();
 #if ENABLE_EXPERIMENTAL
         add_default_application_section ();
 #endif
@@ -258,6 +260,17 @@
         add_subsection (_("Library Management"), contents_grid);
     }
 
+    private void add_notification_management_section () {
+        var contents_grid = new Gtk.Grid ();
+
+        disable_notifications_toggle = new Gtk.CheckButton.with_label (_("Disable desktop notifications"));
+        disable_notifications_toggle.set_active (Settings.Main.instance.disable_notifications);
+        
+        contents_grid.add (disable_notifications_toggle);
+
+        add_subsection (_("Notification Management"), contents_grid);
+    }
+
 #if ENABLE_EXPERIMENTAL
     private void add_default_application_section () {
         var contents_grid = new Gtk.Grid ();
@@ -281,6 +294,7 @@
         Settings.Main.instance.update_folder_hierarchy = organize_folders_toggle.get_active();
         Settings.Main.instance.write_metadata_to_file = write_file_metadata_toggle.get_active();
         Settings.Main.instance.copy_imported_music = copy_imported_music_toggle.get_active();
+        Settings.Main.instance.disable_notifications = disable_notifications_toggle.get_active ();
 
 #if ENABLE_EXPERIMENTAL
         Noise.App.instance.is_default_application = is_default_application_toggle.get_active ();

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2012-09-15 23:52:40 +0000
+++ src/LibraryWindow.vala	2012-09-17 18:45:27 +0000
@@ -329,6 +329,9 @@
     private Notify.Notification? notification = null;
 
     public void show_notification (string primary_text, string secondary_text, Gdk.Pixbuf? pixbuf = null) {
+        if (Settings.Main.instance.disable_notifications)
+            return;
+
         // Don't show notifications if the window is active
         if (this.is_active)
             return;