Remove tray icon & more WinForms references

Author: TBM13

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWpf>true</UseWpf>
-    <UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Core</RootNamespace>

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -145,7 +146,7 @@ public void Save()
                 API.LogException(ClassName, $"Failed to save plugin settings to path: {SettingPath}", e);
             }
         }
-        
+
         public bool NeedCreateSettingPanel()
         {
             // If there are no settings or the settings configuration is empty, return null
@@ -287,7 +288,9 @@ public Control CreateSettingPanel()
 
                             Btn.Click += (_, _) =>
                             {
-                                using System.Windows.Forms.CommonDialog dialog = type switch
+                                throw new NotImplementedException();
+
+                                /*using System.Windows.Forms.CommonDialog dialog = type switch
                                 {
                                     "inputWithFolderBtn" => new System.Windows.Forms.FolderBrowserDialog(),
                                     _ => new System.Windows.Forms.OpenFileDialog(),
@@ -306,7 +309,7 @@ public Control CreateSettingPanel()
                                 };
 
                                 textBox.Text = path;
-                                Settings[attributes.Name] = path;
+                                Settings[attributes.Name] = path;*/
                             };
 
                             var stackPanel = new StackPanel()

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -294,19 +294,6 @@ public bool KeepMaxResults
         public bool EnableUpdateLog { get; set; }
 
         public bool HideOnStartup { get; set; } = true;
-        private bool _hideNotifyIcon;
-        public bool HideNotifyIcon
-        {
-            get => _hideNotifyIcon;
-            set
-            {
-                if (_hideNotifyIcon != value)
-                {
-                    _hideNotifyIcon = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
 

Flow.Launcher/Flow.Launcher.csproj

@@ -4,7 +4,6 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <UseWindowsForms>false</UseWindowsForms>
     <StartupObject>Flow.Launcher.App</StartupObject>
     <ApplicationIcon>Resources\app.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Flow.Launcher/Languages/en.xaml

@@ -28,10 +28,6 @@
     <system:String x:Key="cancelTopMostInThisQuery">Cancel topmost in this query</system:String>
     <system:String x:Key="executeQuery">Execute query: {0}</system:String>
     <system:String x:Key="lastExecuteTime">Last execution time: {0}</system:String>
-    <system:String x:Key="iconTrayOpen">Open</system:String>
-    <system:String x:Key="iconTraySettings">Settings</system:String>
-    <system:String x:Key="iconTrayAbout">About</system:String>
-    <system:String x:Key="iconTrayExit">Exit</system:String>
     <system:String x:Key="closeWindow">Close</system:String>
     <system:String x:Key="copy">Copy</system:String>
     <system:String x:Key="cut">Cut</system:String>
@@ -94,8 +90,6 @@
     <system:String x:Key="select">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
     <system:String x:Key="hideOnStartupToolTip">Flow Launcher search window is hidden in the tray after starting up.</system:String>
-    <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
-    <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
     <system:String x:Key="SearchPrecisionNone">None</system:String>

Flow.Launcher/MainWindow.xaml.cs

@@ -18,11 +18,8 @@
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
-using ModernWpf.Controls;
 using DataObject = System.Windows.DataObject;
 using Key = System.Windows.Input.Key;
-using MouseButtons = System.Windows.Forms.MouseButtons;
-using NotifyIcon = System.Windows.Forms.NotifyIcon;
 
 namespace Flow.Launcher
 {
@@ -44,11 +41,6 @@ public partial class MainWindow : IDisposable
         private readonly Settings _settings;
         private readonly Theme _theme;
 
-        // Window Notify Icon
-        private NotifyIcon _notifyIcon;
-
-        // Window Context Menu
-        private readonly ContextMenu _contextMenu = new();
         private readonly MainViewModel _viewModel;
 
         // Window Event: Key Event
@@ -128,10 +120,6 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                 _viewModel.Show();
             }
 
-            // Initialize context menu & notify icon
-            InitializeContextMenu();
-            InitializeNotifyIcon();
-
             // Initialize color scheme
             if (_settings.ColorScheme == Constant.Light)
             {
@@ -198,11 +186,6 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                             _viewModel.QueryTextCursorMovedToEnd = false;
                         }
                         break;
-                    case nameof(MainViewModel.GameModeStatus):
-                        _notifyIcon.Icon = _viewModel.GameModeStatus
-                            ? Properties.Resources.gamemode
-                            : Properties.Resources.app;
-                        break;
                 }
             };
 
@@ -211,19 +194,12 @@ private void OnLoaded(object sender, RoutedEventArgs _)
             {
                 switch (e.PropertyName)
                 {
-                    case nameof(Settings.HideNotifyIcon):
-                        _notifyIcon.Visible = !_settings.HideNotifyIcon;
-                        break;
                     case nameof(Settings.Language):
-                        UpdateNotifyIconText();
                         if (_settings.ShowHomePage && _viewModel.QueryResultsSelected() && string.IsNullOrEmpty(_viewModel.QueryText))
                         {
                             _viewModel.QueryResults();
                         }
                         break;
-                    case nameof(Settings.Hotkey):
-                        UpdateNotifyIconText();
-                        break;
                     case nameof(Settings.WindowLeft):
                         Left = _settings.WindowLeft;
                         break;
@@ -257,7 +233,6 @@ private async void OnClosing(object sender, CancelEventArgs e)
             if (!CanClose)
             {
                 CanClose = true;
-                _notifyIcon.Visible = false;
                 App.API.SaveAppAllSettings();
                 e.Cancel = true;
                 await PluginManager.DisposePluginsAsync();
@@ -535,103 +510,6 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
         #endregion
 
-        #region Window Notify Icon
-
-        private void InitializeNotifyIcon()
-        {
-            _notifyIcon = new NotifyIcon
-            {
-                Text = Constant.FlowLauncherFullName,
-                Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
-                Visible = !_settings.HideNotifyIcon
-            };
-
-            _notifyIcon.MouseClick += (o, e) =>
-            {
-                switch (e.Button)
-                {
-                    case MouseButtons.Left:
-                        _viewModel.ToggleFlowLauncher();
-                        break;
-                    case MouseButtons.Right:
-
-                        _contextMenu.IsOpen = true;
-                        // Get context menu handle and bring it to the foreground
-                        if (PresentationSource.FromVisual(_contextMenu) is HwndSource hwndSource)
-                        {
-                            Win32Helper.SetForegroundWindow(hwndSource.Handle);
-                        }
-
-                        _contextMenu.Focus();
-                        break;
-                }
-            };
-        }
-
-        private void UpdateNotifyIconText()
-        {
-            var menu = _contextMenu;
-            ((MenuItem)menu.Items[0]).Header = App.API.GetTranslation("iconTrayOpen") +
-                                               " (" + _settings.Hotkey + ")";
-            ((MenuItem)menu.Items[1]).Header = App.API.GetTranslation("GameMode");
-            ((MenuItem)menu.Items[2]).Header = App.API.GetTranslation("PositionReset");
-            ((MenuItem)menu.Items[3]).Header = App.API.GetTranslation("iconTraySettings");
-            ((MenuItem)menu.Items[4]).Header = App.API.GetTranslation("iconTrayExit");
-        }
-
-        private void InitializeContextMenu()
-        {
-            var menu = _contextMenu;
-            menu.Items.Clear();
-            var openIcon = new FontIcon { Glyph = "\ue71e" };
-            var open = new MenuItem
-            {
-                Header = App.API.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")",
-                Icon = openIcon
-            };
-            var gamemodeIcon = new FontIcon { Glyph = "\ue7fc" };
-            var gamemode = new MenuItem
-            {
-                Header = App.API.GetTranslation("GameMode"),
-                Icon = gamemodeIcon
-            };
-            var positionresetIcon = new FontIcon { Glyph = "\ue73f" };
-            var positionreset = new MenuItem
-            {
-                Header = App.API.GetTranslation("PositionReset"),
-                Icon = positionresetIcon
-            };
-            var settingsIcon = new FontIcon { Glyph = "\ue713" };
-            var settings = new MenuItem
-            {
-                Header = App.API.GetTranslation("iconTraySettings"),
-                Icon = settingsIcon
-            };
-            var exitIcon = new FontIcon { Glyph = "\ue7e8" };
-            var exit = new MenuItem
-            {
-                Header = App.API.GetTranslation("iconTrayExit"),
-                Icon = exitIcon
-            };
-
-            open.Click += (o, e) => _viewModel.ToggleFlowLauncher();
-            gamemode.Click += (o, e) => _viewModel.ToggleGameMode();
-            positionreset.Click += (o, e) => _ = PositionResetAsync();
-            settings.Click += (o, e) => App.API.OpenSettingDialog();
-            exit.Click += (o, e) => Close();
-
-            gamemode.ToolTip = App.API.GetTranslation("GameModeToolTip");
-            positionreset.ToolTip = App.API.GetTranslation("PositionResetToolTip");
-
-            _contextMenu.Items.Add(open);
-            _contextMenu.Items.Add(gamemode);
-            _contextMenu.Items.Add(positionreset);
-            _contextMenu.Items.Add(settings);
-            _contextMenu.Items.Add(exit);
-        }
-
-        #endregion
-
         #region Window Position
 
         private void UpdatePosition()
@@ -914,7 +792,6 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _hwndSource?.Dispose();
-                    _notifyIcon?.Dispose();
                     _viewModel.ActualApplicationThemeChanged -= ViewModel_ActualApplicationThemeChanged;
                 }