#16. Sound notification can now be disabled and have all notification…

… settings saved..
zionyx · May 25, 2015 · f7ed91f · f7ed91f
1 parent 25f4f13
commit f7ed91f
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 80 deletions.
diff --git a/HudsonTrayTracker/BusinessComponents/ConfigurationService.cs b/HudsonTrayTracker/BusinessComponents/ConfigurationService.cs
@@ -197,6 +197,11 @@ public bool IsTreadUnstableAsFailed()
             return NotificationSettings.TreatUnstableAsFailed;
         }
 
+        public bool IsSoundNotificationsEnabled()
+        {
+            return NotificationSettings.SoundNotifications;
+        }
+
         public void SetTreadUnstableAsFailed(bool value)
         {
             NotificationSettings.TreatUnstableAsFailed = value;
@@ -220,5 +225,11 @@ public void SetIntegrateWithClaimPlugin(bool value)
             GeneralSettings.IntegrateWithClaimPlugin = value;
             SaveConfiguration();
         }
+
+        public void SetSoundNotifications(bool value)
+        {
+            NotificationSettings.SoundNotifications = value;
+            SaveConfiguration();
+        }
     }
 }
diff --git a/HudsonTrayTracker/BusinessComponents/NotificationService.cs b/HudsonTrayTracker/BusinessComponents/NotificationService.cs
@@ -28,17 +28,20 @@ public void Execute()
         {
             allServersStatus.Update(ConfigurationService.Servers);
 
-            string fileToPlay = null;
-            if (allServersStatus.StillFailingProjects.Count > 0)
-                fileToPlay = ConfigurationService.NotificationSettings.StillFailingSoundPath;
-            else if (allServersStatus.FailingProjects.Count > 0)
-                fileToPlay = ConfigurationService.NotificationSettings.FailedSoundPath;
-            else if (allServersStatus.FixedProjects.Count > 0)
-                fileToPlay = ConfigurationService.NotificationSettings.FixedSoundPath;
-            else if (allServersStatus.SucceedingProjects.Count > 0)
-                fileToPlay = ConfigurationService.NotificationSettings.SucceededSoundPath;
-            if (fileToPlay != null)
-                SoundPlayer.PlayFile(fileToPlay);
+            if (ConfigurationService.NotificationSettings.SoundNotifications)
+            {
+                string fileToPlay = null;
+                if (allServersStatus.StillFailingProjects.Count > 0)
+                    fileToPlay = ConfigurationService.NotificationSettings.StillFailingSoundPath;
+                else if (allServersStatus.FailingProjects.Count > 0)
+                    fileToPlay = ConfigurationService.NotificationSettings.FailedSoundPath;
+                else if (allServersStatus.FixedProjects.Count > 0)
+                    fileToPlay = ConfigurationService.NotificationSettings.FixedSoundPath;
+                else if (allServersStatus.SucceedingProjects.Count > 0)
+                    fileToPlay = ConfigurationService.NotificationSettings.SucceededSoundPath;
+                if (fileToPlay != null)
+                    SoundPlayer.PlayFile(fileToPlay);
+            }
         }
 
         private bool TreatAsFailure(BuildStatusEnum status)

diff --git a/HudsonTrayTracker/Entities/NotificationSettings.cs b/HudsonTrayTracker/Entities/NotificationSettings.cs
@@ -4,6 +4,9 @@ namespace Hudson.TrayTracker.Entities
     [JsonObject(MemberSerialization.OptIn)]
     public class NotificationSettings
     {
+        [JsonProperty("soundNotifications")]
+        public bool SoundNotifications { get; set; }
+
         [JsonProperty("failedSoundPath")]
         public string FailedSoundPath { get; set; }
 
@@ -19,4 +22,4 @@ public class NotificationSettings
         [JsonProperty("treatUnstableAsFailed")]
         public bool TreatUnstableAsFailed { get; set; }
     }
-}
+}
diff --git a/HudsonTrayTracker/UI/Controls/NotificationsSettingsControl.Designer.cs b/HudsonTrayTracker/UI/Controls/NotificationsSettingsControl.Designer.cs
diff --git a/HudsonTrayTracker/UI/Controls/NotificationsSettingsControl.cs b/HudsonTrayTracker/UI/Controls/NotificationsSettingsControl.cs
@@ -29,17 +29,30 @@ protected override void OnLoad(EventArgs e)
                 return;
 
             configurationService = (ConfigurationService)ContextRegistry.GetContext().GetObject("ConfigurationService");
-
+            treatUnstableAsFailedCheckBox.Checked = configurationService.IsTreadUnstableAsFailed();
+            enableSoundCheckBox.Checked = configurationService.IsSoundNotificationsEnabled();
             enableSoundCheckBox_CheckedChanged(null, null);
         }
 
+        public bool SoundNotificationsEnabled()
+        {
+            return enableSoundCheckBox.Checked;
+        }
+
         private void enableSoundCheckBox_CheckedChanged(object sender, EventArgs e)
         {
             notificationSettingsControl1.Enabled =
                 notificationSettingsControl2.Enabled =
                 notificationSettingsControl3.Enabled =
                 notificationSettingsControl4.Enabled =
+                treatUnstableAsFailedCheckBox.Enabled =
                 enableSoundCheckBox.Checked;
+            configurationService.SetSoundNotifications(enableSoundCheckBox.Checked);
+        }
+
+        public bool TreadUnstableAsFailed()
+        {
+            return treatUnstableAsFailedCheckBox.Checked;
         }
 
         public void InvalidateData()
@@ -49,5 +62,10 @@ public void InvalidateData()
             notificationSettingsControl3.InvalidateData();
             notificationSettingsControl4.InvalidateData();
         }
+
+        private void treatUnstableAsFailedCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            configurationService.SetTreadUnstableAsFailed(treatUnstableAsFailedCheckBox.Checked);
+        }
     }
 }
diff --git a/HudsonTrayTracker/UI/SettingsForm.Designer.cs b/HudsonTrayTracker/UI/SettingsForm.Designer.cs