Merge pull request #53 from kajzersoze/master

Add option to disable notifications #52
haecker-felix · Aug 18, 2016 · 530ddde · 530ddde
2 parents 9c0eb3f + 8c80e2e
commit 530ddde
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/data/ui/settings-dialog.ui b/data/ui/settings-dialog.ui
@@ -131,6 +131,30 @@
                 <property name="top_attach">3</property>
               </packing>
             </child>           
+			<child>
+              <object class="GtkLabel" id="label7">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Show notifications:</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="ShowNotificationsSwitch">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkSwitch" id="OnlyShowWorkingStationsSwitch">
                 <property name="visible">True</property>

diff --git a/schemas/de.haecker-felix.gradio.gschema.xml b/schemas/de.haecker-felix.gradio.gschema.xml
@@ -26,10 +26,15 @@
     </key>
 
     <key name="close-to-tray" type="b">
-      <default>true</default>
+      <default>false</default>
       <summary>Close window to tray</summary>
     </key>
 
+    <key name="show-notifications" type="b">
+      <default>false</default>
+      <summary>Show notifications</summary>
+    </key>
+
     <key name="window-height" type="i">
       <default>500</default>
       <summary>Height of the window</summary>

diff --git a/src/Widgets/PlayerToolbar.vala b/src/Widgets/PlayerToolbar.vala
@@ -99,7 +99,8 @@ namespace Gradio{
 			BitrateLabel.set_text(App.player.tag_bitrate.to_string()  + " Bit/s");
 			CodecLabel.set_text(App.player.tag_audio_codec);
 			ChannelModeLabel.set_text(App.player.tag_channel_mode);
-			if(current_title != App.player.tag_title && App.player.tag_title != null) {
+			if (App.settings.get_boolean ("show-notifications")) {
+	  		 if(current_title != App.player.tag_title && App.player.tag_title != null) {
 				if (App.player.tag_homepage != "") {
 					Util.get_image_from_url.begin(App.player.tag_homepage, 48, 48, (obj, res) => {
 			        	var icon = Util.get_image_from_url.end(res);
@@ -119,7 +120,8 @@ namespace Gradio{
 						}		
 						});
 				}
-			current_title = App.player.tag_title;
+		    	current_title = App.player.tag_title;
+		 	 }
 			}
 		}
 

diff --git a/src/Widgets/SettingsDialog.vala b/src/Widgets/SettingsDialog.vala
@@ -12,6 +12,8 @@ namespace Gradio{
 		private Switch LoadPicturesSwitch;
 		[GtkChild]
 		private Switch CloseToTraySwitch;
+		[GtkChild]
+		private Switch ShowNotificationsSwitch;
 
 		private GLib.Settings settings;
 
@@ -58,13 +60,23 @@ namespace Gradio{
 
 			});
 
+			ShowNotificationsSwitch.notify["active"].connect (() => {
+				if (ShowNotificationsSwitch.active) {
+					settings.set_boolean ("show-notifications", true);
+				} else {
+					settings.set_boolean ("show-notifications", false);
+				}
+
+			});
+
 		}
 
 		private void load_settings(GLib.Settings settings){
 			UseDarkDesignSwitch.set_active(settings.get_boolean ("use-dark-design"));
 			LoadPicturesSwitch.set_active(settings.get_boolean ("load-pictures"));
 			OnlyShowWorkingStationsSwitch.set_active(settings.get_boolean ("only-show-working-stations"));
 			CloseToTraySwitch.set_active(settings.get_boolean ("close-to-tray"));
+			ShowNotificationsSwitch.set_active(settings.get_boolean ("show-notifications"));
 		}
 
 	}