feat(QuickMenu): The user can enable or disable the quick menu in the…

… settings. BREAKING CHANGE: Quick menu will appear when using hotkey akin to the Windows language menu. Quick Menu is a new feature that changes the way you can interact with your selected devices. You can disable it in the Settings Menu. Fixes #625
Belphemur · Aug 25, 2021 · fd44ca3 · fd44ca3
1 parent bb3e7d8
commit fd44ca3
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 28 deletions.
diff --git a/SoundSwitch/Framework/Configuration/ISoundSwitchConfiguration.cs b/SoundSwitch/Framework/Configuration/ISoundSwitchConfiguration.cs
@@ -84,5 +84,10 @@ public interface ISoundSwitchConfiguration : IConfiguration
         /// Is telemetry enabled
         /// </summary>
         bool Telemetry { get; set; }
+
+        /// <summary>
+        /// Is the quick menu showed when using a hotkey
+        /// </summary>
+        bool QuickMenuEnabled { get; set; }
     }
 }
diff --git a/SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs b/SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs
@@ -116,6 +116,11 @@ public SoundSwitchConfiguration()
         /// </summary>
         public bool Telemetry { get; set; } = true;
 
+        /// <summary>
+        /// Is the quick menu showed when using a hotkey
+        /// </summary>
+        public bool QuickMenuEnabled { get; set; } = true;
+
         // Needed by Interface
         [JsonIgnore]
         public string FileLocation { get; set; }

diff --git a/SoundSwitch/Framework/DeviceCyclerManager/DeviceCycler/ADeviceCycler.cs b/SoundSwitch/Framework/DeviceCyclerManager/DeviceCycler/ADeviceCycler.cs
@@ -41,7 +41,11 @@ public bool CycleAudioDevice(DataFlow type)
             bool CycleDevice()
             {
                 var nextDevice = GetNextDevice(audioDevices, type);
-                QuickMenuManager<DeviceFullInfo>.Instance.DisplayMenu(audioDevices.Select(info => new DeviceDataContainer(info, info.Id == nextDevice.Id)), @event => SetActiveDevice(@event.Item.Payload));
+                if (AppModel.Instance.QuickMenuEnabled)
+                {
+                    QuickMenuManager<DeviceFullInfo>.Instance.DisplayMenu(audioDevices.Select(info => new DeviceDataContainer(info, info.Id == nextDevice.Id)), @event => SetActiveDevice(@event.Item.Payload));
+                }
+
                 return SetActiveDevice(nextDevice);
             }
 
@@ -61,11 +65,10 @@ bool CycleDevice()
         /// <param name="audioDevices"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        private DeviceInfo GetNextDevice(IEnumerable<DeviceInfo> audioDevices, DataFlow type)
+        private DeviceInfo GetNextDevice(DeviceInfo[] audioDevices, DataFlow type)
         {
-            var deviceInfos = audioDevices as DeviceInfo[] ?? audioDevices.ToArray();
-            var defaultDev = AudioSwitcher.Instance.GetDefaultAudioEndpoint((EDataFlow) type, ERole.eConsole) ?? deviceInfos.Last();
-            var next = deviceInfos.SkipWhile((device, _) => device.Id != defaultDev.Id).Skip(1).FirstOrDefault() ?? deviceInfos[0];
+            var defaultDev = AudioSwitcher.Instance.GetDefaultAudioEndpoint((EDataFlow) type, ERole.eConsole) ?? audioDevices.Last();
+            var next = audioDevices.SkipWhile((device, _) => device.Id != defaultDev.Id).Skip(1).FirstOrDefault() ?? audioDevices[0];
             return next;
         }
 

diff --git a/SoundSwitch/Localization/SettingsStrings.Designer.cs b/SoundSwitch/Localization/SettingsStrings.Designer.cs
diff --git a/SoundSwitch/Localization/SettingsStrings.fr.resx b/SoundSwitch/Localization/SettingsStrings.fr.resx
@@ -448,4 +448,10 @@ Restaurer l'état du système quand l'application est fermée.</value>
   <data name="telemetry" xml:space="preserve">
 	  <value>Télémétrie</value>
   </data>
+  <data name="quickMenu" xml:space="preserve">
+	  <value>Menu rapide</value>
+  </data>
+  <data name="quickMenu.desc" xml:space="preserve">
+	  <value>Affiche un menu sous la souris quand un raccourcis clavier est utilisé.</value>
+  </data>
 </root>
diff --git a/SoundSwitch/Localization/SettingsStrings.resx b/SoundSwitch/Localization/SettingsStrings.resx
@@ -468,4 +468,10 @@ Restore the state of the system when the application is closed.</value>
   <data name="telemetry" xml:space="preserve">
     <value>Telemetry</value>
   </data>
+  <data name="quickMenu" xml:space="preserve">
+    <value>Quick Menu on hotkey</value>
+  </data>
+  <data name="quickMenu.desc" xml:space="preserve">
+    <value>Show a quick menu like Windows language when using a hotkey</value>
+  </data>
 </root>
diff --git a/SoundSwitch/Model/AppModel.cs b/SoundSwitch/Model/AppModel.cs
@@ -129,6 +129,16 @@ public bool Telemetry
                 AppConfigs.Configuration.Save();
             }
         }
+
+        public bool QuickMenuEnabled
+        {
+            get => AppConfigs.Configuration.QuickMenuEnabled;
+            set
+            {
+                AppConfigs.Configuration.QuickMenuEnabled = value;
+                AppConfigs.Configuration.Save();
+            }
+        }
 
 
         public IEnumerable<DeviceInfo> SelectedDevices => AppConfigs.Configuration.SelectedDevices.OrderBy(info => info.DiscoveredAt);

diff --git a/SoundSwitch/Model/IAppModel.cs b/SoundSwitch/Model/IAppModel.cs
@@ -115,6 +115,7 @@ public interface IAppModel : IDisposable
         IAudioDeviceLister ActiveUnpluggedAudioLister { get; set; }
 
         bool Telemetry { get; set; }
+        bool QuickMenuEnabled { get; set; }
 
         #endregion
 

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
@@ -168,8 +168,7 @@ public SettingsForm(IAudioDeviceLister audioDeviceLister)
             updateNeverToolTip.SetToolTip(updateNeverRadioButton, SettingsStrings.updateNeverTooltip);
 
             var includeBetaVersionsToolTip = new ToolTip();
-            includeBetaVersionsToolTip.SetToolTip(includeBetaVersionsCheckBox,
-                SettingsStrings.updateIncludeBetaVersionsTooltip);
+            includeBetaVersionsToolTip.SetToolTip(includeBetaVersionsCheckBox, SettingsStrings.updateIncludeBetaVersionsTooltip);
 
             // Settings - Language
             new LanguageFactory().ConfigureListControl(languageComboBox);
@@ -180,8 +179,10 @@ public SettingsForm(IAudioDeviceLister audioDeviceLister)
             toggleMuteLabel.Visible = false;
 
             telemetryCheckbox.DataBindings.Add(nameof(CheckBox.Checked), AppModel.Instance, nameof(AppModel.Telemetry), false, DataSourceUpdateMode.OnPropertyChanged);
-            telemetryCheckbox.Text = SettingsStrings.telemetry;
-
+            quickMenuCheckbox.DataBindings.Add(nameof(CheckBox.Checked), AppModel.Instance, nameof(AppModel.QuickMenuEnabled), false, DataSourceUpdateMode.OnPropertyChanged);
+            var quickMenuCheckboxToolTip = new ToolTip();
+            quickMenuCheckboxToolTip.SetToolTip(quickMenuCheckbox, SettingsStrings.quickMenu_desc);
+
             PopulateSettings();
 
             _loaded = true;
@@ -316,13 +317,16 @@ private void LocalizeForm()
             cycleThroughLabel.Text = SettingsStrings.cycleThrough;
             foregroundAppCheckbox.Text = SettingsStrings.foregroundApp;
             usePrimaryScreenCheckbox.Text = SettingsStrings.usePrimaryScreen;
+            quickMenuCheckbox.Text = SettingsStrings.quickMenu;
 
             // Settings - Update
             updateSettingsGroupBox.Text = SettingsStrings.updateSettings;
             updateSilentRadioButton.Text = SettingsStrings.updateInstallAutomatically;
             updateNotifyRadioButton.Text = SettingsStrings.updateNotify;
             updateNeverRadioButton.Text = SettingsStrings.updateNever;
             includeBetaVersionsCheckBox.Text = SettingsStrings.updateIncludeBetaVersions;
+            telemetryCheckbox.Text = SettingsStrings.telemetry;
+
 
             // Settings - Language
             languageGroupBox.Text = SettingsStrings.language;