Implement the KeepSystray feature

Fixes #128
Belphemur · Dec 8, 2016 · 4b36f01 · 4b36f01
1 parent 1b07605
commit 4b36f01
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 16 deletions.
diff --git a/SoundSwitch/Properties/SettingsString.Designer.cs b/SoundSwitch/Properties/SettingsString.Designer.cs
diff --git a/SoundSwitch/Properties/SettingsString.fr.resx b/SoundSwitch/Properties/SettingsString.fr.resx
@@ -172,4 +172,10 @@
 	<data name="cycleDevice" xml:space="preserve">
 		<value>Switcher entre</value>
 	</data>
+	<data name="keepSystrayIconHelp" xml:space="preserve">
+		<value>Si coché, l'icone dans la barre de tache restera celle de l'application quand le périférique par défault est changé.</value>
+	</data>
+	<data name="keepSystrayIcon" xml:space="preserve">
+		<value>Garder l'icone intacte</value>
+	</data>
 </root>
diff --git a/SoundSwitch/Properties/SettingsString.resx b/SoundSwitch/Properties/SettingsString.resx
@@ -175,4 +175,7 @@
 	<data name="keepSystrayIcon" xml:space="preserve">
 		<value>Keep systray icon</value>
 	</data>
+	<data name="keepSystrayIconHelp" xml:space="preserve">
+		<value>If selected, the Systray Icon won't change when the default device changes.</value>
+	</data>
 </root>
diff --git a/SoundSwitch/UI/Forms/Settings.Designer.cs b/SoundSwitch/UI/Forms/Settings.Designer.cs
diff --git a/SoundSwitch/UI/Forms/Settings.cs b/SoundSwitch/UI/Forms/Settings.cs
@@ -105,6 +105,10 @@ public Settings()
             new DeviceCyclerFactory().ConfigureListControl(cyclerComboBox);
             cyclerComboBox.SelectedValue = DeviceCyclerManager.CurrentCycler;
 
+            var toolTipSystray = new ToolTip();
+            toolTipSystray.SetToolTip(checkboxSystrayIcon, SettingsString.keepSystrayIconHelp);
+            checkboxSystrayIcon.Checked = AppConfigs.Configuration.KeepSystrayIcon;
+
             _loaded = true;
         }
 
@@ -446,5 +450,11 @@ private void stealthUpdateCheckbox_CheckedChanged(object sender, EventArgs e)
         {
             AppModel.Instance.StealthUpdate = stealthUpdateCheckbox.Checked;
         }
+
+        private void checkboxSystrayIcon_CheckedChanged(object sender, EventArgs e)
+        {
+            AppConfigs.Configuration.KeepSystrayIcon = checkboxSystrayIcon.Checked;
+            AppConfigs.Configuration.Save();
+        }
     }
 }
diff --git a/SoundSwitch/Util/TrayIcon.cs b/SoundSwitch/Util/TrayIcon.cs
@@ -25,6 +25,7 @@
 using AudioEndPointControllerWrapper;
 using SoundSwitch.Framework;
 using SoundSwitch.Framework.Audio;
+using SoundSwitch.Framework.Configuration;
 using SoundSwitch.Framework.TooltipInfoManager;
 using SoundSwitch.Framework.Updater;
 using SoundSwitch.Model;
@@ -39,6 +40,7 @@ public sealed class TrayIcon : IDisposable
         private readonly ContextMenuStrip _settingsMenu = new ContextMenuStrip();
         private readonly SynchronizationContext _context = SynchronizationContext.Current ?? new SynchronizationContext();
         private volatile bool _needToUpdateList = true;
+        private bool _iconChanged = false;
         public NotifyIcon NotifyIcon { get; }    = new NotifyIcon
         {
             Icon = Icon.FromHandle(Resources.SoundSwitch16.GetHicon()),
@@ -164,8 +166,16 @@ private void SetEventHandlers()
                     {
                         return;
                     }
-                    _needToUpdateList = true;
-                    NotifyIcon.Icon = AudioDeviceIconExtractor.ExtractIconFromAudioDevice(audioChangeEvent.device, false);
+                    if (!AppConfigs.Configuration.KeepSystrayIcon)
+                    {
+                        NotifyIcon.Icon = AudioDeviceIconExtractor.ExtractIconFromAudioDevice(audioChangeEvent.device, false);
+                        _iconChanged = true;
+                    }
+                    else if (_iconChanged)
+                    {
+                        NotifyIcon.Icon = Icon.FromHandle(Resources.SoundSwitch16.GetHicon());
+                        _iconChanged = false;
+                    }
                 };
             AppModel.Instance.SelectedDeviceChanged +=
                  (sender, @event) => { _needToUpdateList = true; };