Tray Menu Redesign

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -0,0 +1,57 @@
+using Flow.Launcher.Infrastructure.Http;
+using Flow.Launcher.Infrastructure.Logger;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Core.ExternalPlugins
+{
+    public static class PluginsManifest
+    {
+        static PluginsManifest()
+        {
+            UpdateTask = UpdateManifestAsync();
+        }
+
+        public static List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
+
+        public static Task UpdateTask { get; private set; }
+
+        private static readonly SemaphoreSlim manifestUpdateLock = new(1);
+
+        public static Task UpdateManifestAsync()
+        {
+            if (manifestUpdateLock.CurrentCount == 0)
+            {
+                return UpdateTask;
+            }
+
+            return UpdateTask = DownloadManifestAsync();
+        }
+
+        private async static Task DownloadManifestAsync()
+        {
+            try
+            {
+                await manifestUpdateLock.WaitAsync().ConfigureAwait(false);
+
+                await using var jsonStream = await Http.GetStreamAsync("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json")
+                                 .ConfigureAwait(false);
+
+                UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(jsonStream).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
+
+                UserPlugins = new List<UserPlugin>();
+            }
+            finally
+            {
+                manifestUpdateLock.Release();
+            }
+        }
+    }
+}

Plugins/Flow.Launcher.Plugin.PluginsManager/Models/UserPlugin.cs → Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs

@@ -1,7 +1,6 @@
-
-namespace Flow.Launcher.Plugin.PluginsManager.Models
+namespace Flow.Launcher.Core.ExternalPlugins
 {
-    public class UserPlugin
+    public record UserPlugin
     {
         public string ID { get; set; }
         public string Name { get; set; }
@@ -12,5 +11,6 @@ public class UserPlugin
         public string Website { get; set; }
         public string UrlDownload { get; set; }
         public string UrlSourceCode { get; set; }
+        public string IcoPath { get; set; }
     }
 }

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -59,6 +59,11 @@ public interface IPublicAPI
         /// <param name="subTitle">Optional message subtitle</param>
         void ShowMsgError(string title, string subTitle = "");
 
+        /// <summary>
+        /// Show the MainWindow when hiding
+        /// </summary>
+        void ShowMainWindow();
+
         /// <summary>
         /// Show message box
         /// </summary>

Flow.Launcher/Helper/HotKeyMapper.cs

@@ -6,6 +6,8 @@
 using Flow.Launcher.Core.Resource;
 using System.Windows;
 using Flow.Launcher.ViewModel;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace Flow.Launcher.Helper
 {
@@ -19,7 +21,7 @@ internal static void Initialize(MainViewModel mainVM)
             mainViewModel = mainVM;
             settings = mainViewModel._settings;
 
-            SetHotkey(settings.Hotkey, OnHotkey);
+            SetHotkey(settings.Hotkey, mainViewModel.OnHotkey);
             LoadCustomPluginHotkey();
         }
 
@@ -53,44 +55,6 @@ internal static void RemoveHotkey(string hotkeyStr)
             }
         }
 
-        internal static void OnHotkey(object sender, HotkeyEventArgs e)
-        {
-            if (!ShouldIgnoreHotkeys())
-            {
-                UpdateLastQUeryMode();
-
-                mainViewModel.ToggleFlowLauncher();
-                e.Handled = true;
-            }
-        }
-
-        /// <summary>
-        /// Checks if Flow Launcher should ignore any hotkeys
-        /// </summary>
-        private static bool ShouldIgnoreHotkeys()
-        {
-            return settings.IgnoreHotkeysOnFullscreen && WindowsInteropHelper.IsWindowFullscreen();
-        }
-
-        private static void UpdateLastQUeryMode()
-        {
-            switch(settings.LastQueryMode)
-            {
-                case LastQueryMode.Empty:
-                    mainViewModel.ChangeQueryText(string.Empty);
-                    break;
-                case LastQueryMode.Preserved:
-                    mainViewModel.LastQuerySelected = true;
-                    break;
-                case LastQueryMode.Selected:
-                    mainViewModel.LastQuerySelected = false;
-                    break;
-                default:
-                    throw new ArgumentException($"wrong LastQueryMode: <{settings.LastQueryMode}>");
-
-            }
-        }
-
         internal static void LoadCustomPluginHotkey()
         {
             if (settings.CustomPluginHotkeys == null)
@@ -106,7 +70,7 @@ internal static void SetCustomQueryHotkey(CustomPluginHotkey hotkey)
         {
             SetHotkey(hotkey.Hotkey, (s, e) =>
             {
-                if (ShouldIgnoreHotkeys())
+                if (mainViewModel.ShouldIgnoreHotkeys())
                     return;
 
                 mainViewModel.MainWindowVisibility = Visibility.Visible;

Flow.Launcher/Languages/en.xaml

@@ -42,18 +42,18 @@
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
     <!--Setting Plugin-->
-    <system:String x:Key="plugin">Plugin</system:String>
+    <system:String x:Key="plugin">Plugins</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
-    <system:String x:Key="enable">Enable</system:String>
-    <system:String x:Key="disable">Disable</system:String>
-    <system:String x:Key="actionKeywords">Action keyword:</system:String>
+    <system:String x:Key="enable">On</system:String>
+    <system:String x:Key="disable">Off</system:String>
+    <system:String x:Key="actionKeywords">Action keyword</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
     <system:String x:Key="newActionKeyword">New action keyword:</system:String>
     <system:String x:Key="currentPriority">Current Priority:</system:String>
     <system:String x:Key="newPriority">New Priority:</system:String>
-    <system:String x:Key="priority">Priority:</system:String>
+    <system:String x:Key="priority">Priority</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
-    <system:String x:Key="author">Author</system:String>
+    <system:String x:Key="author">Author:</system:String>
     <system:String x:Key="plugin_init_time">Init time:</system:String>
     <system:String x:Key="plugin_query_time">Query time:</system:String>
 

Flow.Launcher/MainWindow.xaml.cs

@@ -30,7 +30,9 @@ public partial class MainWindow
         private bool isProgressBarStoryboardPaused;
         private Settings _settings;
         private NotifyIcon _notifyIcon;
+        private ContextMenu contextMenu;
         private MainViewModel _viewModel;
+
 
         #endregion
 
@@ -159,14 +161,19 @@ private void InitializePosition()
 
         private void UpdateNotifyIconText()
         {
-            var menu = _notifyIcon.ContextMenuStrip;
-            var open = menu.Items[0];
-            var setting = menu.Items[1];
-            var exit = menu.Items[2];
-
-            open.Text = InternationalizationManager.Instance.GetTranslation("iconTrayOpen");
-            setting.Text = InternationalizationManager.Instance.GetTranslation("iconTraySettings");
-            exit.Text = InternationalizationManager.Instance.GetTranslation("iconTrayExit");
+            var menu = contextMenu;
+
+            var header = new MenuItem() { Header = "Flow Launcher", IsEnabled = false };
+            var open = new MenuItem() { Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") };
+            var settings = new MenuItem() { Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings") };
+            var exit = new MenuItem() { Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit") };
+            menu.Items[0] = header;
+            menu.Items[1] = open;
+            menu.Items[2] = settings;
+            menu.Items[3] = exit;
+            open.Click += (o, e) => Visibility = Visibility.Visible;
+            settings.Click += (o, e) => App.API.OpenSettingDialog();
+            exit.Click += (o, e) => Close();
         }
 
         private void InitializeNotifyIcon()
@@ -178,33 +185,38 @@ private void InitializeNotifyIcon()
                 Visible = !_settings.HideNotifyIcon
             };
             var menu = new ContextMenuStrip();
-            var items = menu.Items;
+            contextMenu = new ContextMenu();
+
+            MenuItem header = new MenuItem() { Header = "Flow Launcher", IsEnabled = false };
+            MenuItem open = new MenuItem() { Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") };
+            MenuItem settings = new MenuItem() { Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings") };
+            MenuItem exit = new MenuItem() { Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit") };
 
-            var open = items.Add(InternationalizationManager.Instance.GetTranslation("iconTrayOpen"));
             open.Click += (o, e) => Visibility = Visibility.Visible;
-            var setting = items.Add(InternationalizationManager.Instance.GetTranslation("iconTraySettings"));
-            setting.Click += (o, e) => App.API.OpenSettingDialog();
-            var exit = items.Add(InternationalizationManager.Instance.GetTranslation("iconTrayExit"));
+            settings.Click += (o, e) => App.API.OpenSettingDialog();
             exit.Click += (o, e) => Close();
+            contextMenu.Items.Add(header);
+            contextMenu.Items.Add(open);
+            contextMenu.Items.Add(settings);
+            contextMenu.Items.Add(exit);
 
-            _notifyIcon.ContextMenuStrip = menu;
+            _notifyIcon.ContextMenuStrip = menu; /*it need for close the context menu. if not, context menu can't close. */
             _notifyIcon.MouseClick += (o, e) =>
             {
-                if (e.Button == MouseButtons.Left)
+                switch (e.Button)
                 {
-                    if (menu.Visible)
-                    {
-                        menu.Close();
-                    }
-                    else
-                    {
-                        var p = System.Windows.Forms.Cursor.Position;
-                        menu.Show(p);
-                    }
+                    case MouseButtons.Left:
+                        _viewModel.ToggleFlowLauncher();
+                        break;
+
+                    case MouseButtons.Right:
+                        contextMenu.IsOpen = true;
+                        break;
                 }
             };
         }
 
+
         private void InitProgressbarAnimation()
         {
             var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150,
@@ -262,7 +274,7 @@ private void OnDeactivated(object sender, EventArgs e)
         {
             if (_settings.HideWhenDeactive)
             {
-                Hide();
+                _viewModel.Hide();
             }
         }
 

Flow.Launcher/PublicAPIInstance.cs

@@ -68,6 +68,8 @@ public void RestartApp()
 
         public void RestarApp() => RestartApp();
 
+        public void ShowMainWindow() => _mainVM.MainWindowVisibility = Visibility.Visible;
+
         public void CheckForNewUpdate() => _settingsVM.UpdateApp();
 
         public void SaveAppAllSettings()