diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index cfa813d3f..dcccaebeb 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -613,5 +613,17 @@ namespace Flow.Launcher.Plugin
/// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
///
event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
+
+ ///
+ /// Get the user data directory of Flow Launcher.
+ ///
+ ///
+ string GetDataDirectory();
+
+ ///
+ /// Get the log directory of Flow Launcher.
+ ///
+ ///
+ string GetLogDirectory();
}
}
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index d865a087b..e0ed105cf 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -599,6 +599,10 @@ namespace Flow.Launcher
remove => _mainVM.ActualApplicationThemeChanged -= value;
}
+ public string GetDataDirectory() => DataLocation.DataDirectory();
+
+ public string GetLogDirectory() => DataLocation.VersionLogDirectory;
+
#endregion
#region Private Methods
diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs
index 24801cf52..ae0767934 100644
--- a/Flow.Launcher/ReportWindow.xaml.cs
+++ b/Flow.Launcher/ReportWindow.xaml.cs
@@ -1,15 +1,15 @@
-using Flow.Launcher.Core.ExternalPlugins;
-using System;
+using System;
using System.Globalization;
using System.IO;
-using System.Text;
using System.Linq;
+using System.Text;
using System.Windows;
using System.Windows.Documents;
+using Flow.Launcher.Core.ExternalPlugins;
using Flow.Launcher.Helper;
using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin.SharedCommands;
namespace Flow.Launcher
{
@@ -44,7 +44,7 @@ namespace Flow.Launcher
var websiteUrl = exception switch
{
- FlowPluginException pluginException =>GetIssuesUrl(pluginException.Metadata.Website),
+ FlowPluginException pluginException => GetIssuesUrl(pluginException.Metadata.Website),
_ => Constant.IssuesUrl
};
@@ -73,17 +73,36 @@ namespace Flow.Launcher
Margin = new Thickness(0)
};
- var link = new Hyperlink
+ Hyperlink link = null;
+ try
{
- IsEnabled = true
- };
- link.Inlines.Add(url);
- link.NavigateUri = new Uri(url);
- link.Click += (s, e) => SearchWeb.OpenInBrowserTab(url);
+ var uri = new Uri(url);
+
+ link = new Hyperlink
+ {
+ IsEnabled = true
+ };
+ link.Inlines.Add(url);
+ link.NavigateUri = uri;
+ link.Click += (s, e) => SearchWeb.OpenInBrowserTab(url);
+ }
+ catch (Exception)
+ {
+ // Leave link as null if the URL is invalid
+ }
paragraph.Inlines.Add(textBeforeUrl);
paragraph.Inlines.Add(" ");
- paragraph.Inlines.Add(link);
+ if (link is null)
+ {
+ // Add the URL as plain text if it is invalid
+ paragraph.Inlines.Add(url);
+ }
+ else
+ {
+ // Add the hyperlink if it is valid
+ paragraph.Inlines.Add(link);
+ }
paragraph.Inlines.Add("\n");
return paragraph;
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
index 999003fd8..1e2deb558 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
@@ -37,7 +37,6 @@
-
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
index ad3f8553b..56899eef3 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
@@ -63,6 +63,8 @@
Are you sure you want to restart the computer?
Are you sure you want to restart the computer with Advanced Boot Options?
Are you sure you want to log off?
+ Error
+ Failed to empty the recycle bin. This might happen if:{0}- Some items are currently in use{0}- Some items can't be deleted due to permissions{0}Please close any applications that might be using these files and try again.
Command Keyword Setting
Custom Command Keyword
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index d2dcf6e5a..77278a054 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -5,8 +5,6 @@ using System.Globalization;
using System.Linq;
using System.Runtime.InteropServices;
using System.Windows;
-using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.UserSettings;
using Windows.Win32;
using Windows.Win32.Foundation;
using Windows.Win32.Security;
@@ -52,6 +50,8 @@ namespace Flow.Launcher.Plugin.Sys
private const SHUTDOWN_REASON REASON = SHUTDOWN_REASON.SHTDN_REASON_MAJOR_OTHER |
SHUTDOWN_REASON.SHTDN_REASON_FLAG_PLANNED;
+ private const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";
+
private PluginInitContext _context;
private Settings _settings;
private ThemeSelector _themeSelector;
@@ -338,11 +338,9 @@ namespace Flow.Launcher.Plugin.Sys
var result = PInvoke.SHEmptyRecycleBin(new(), string.Empty, 0);
if (result != HRESULT.S_OK && result != HRESULT.E_UNEXPECTED)
{
- _context.API.ShowMsgBox("Failed to empty the recycle bin. This might happen if:\n" +
- "- A file in the recycle bin is in use\n" +
- "- You don't have permission to delete some items\n" +
- "Please close any applications that might be using these files and try again.",
- "Error",
+ _context.API.ShowMsgBox(
+ string.Format(_context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_empty_recycle_bin_failed"), Environment.NewLine),
+ _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtitle_error"),
MessageBoxButton.OK, MessageBoxImage.Error);
}
@@ -404,6 +402,8 @@ namespace Flow.Launcher.Plugin.Sys
IcoPath = "Images\\app.png",
Action = c =>
{
+ // Hide the window first then open setting dialog because main window can be topmost window which will still display on top of the setting dialog for a while
+ _context.API.HideMainWindow();
_context.API.OpenSettingDialog();
return true;
}
@@ -445,11 +445,11 @@ namespace Flow.Launcher.Plugin.Sys
Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xf12b"),
Title = "Open Log Location",
IcoPath = "Images\\app.png",
- CopyText = DataLocation.VersionLogDirectory,
- AutoCompleteText = DataLocation.VersionLogDirectory,
+ CopyText = _context.API.GetLogDirectory(),
+ AutoCompleteText = _context.API.GetLogDirectory(),
Action = c =>
{
- _context.API.OpenDirectory(DataLocation.VersionLogDirectory);
+ _context.API.OpenDirectory(_context.API.GetLogDirectory());
return true;
}
},
@@ -458,11 +458,11 @@ namespace Flow.Launcher.Plugin.Sys
Title = "Flow Launcher Tips",
Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe897"),
IcoPath = "Images\\app.png",
- CopyText = Constant.Documentation,
- AutoCompleteText = Constant.Documentation,
+ CopyText = Documentation,
+ AutoCompleteText = Documentation,
Action = c =>
{
- _context.API.OpenUrl(Constant.Documentation);
+ _context.API.OpenUrl(Documentation);
return true;
}
},
@@ -471,11 +471,11 @@ namespace Flow.Launcher.Plugin.Sys
Title = "Flow Launcher UserData Folder",
Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xf12b"),
IcoPath = "Images\\app.png",
- CopyText = DataLocation.DataDirectory(),
- AutoCompleteText = DataLocation.DataDirectory(),
+ CopyText = _context.API.GetDataDirectory(),
+ AutoCompleteText = _context.API.GetDataDirectory(),
Action = c =>
{
- _context.API.OpenDirectory(DataLocation.DataDirectory());
+ _context.API.OpenDirectory(_context.API.GetDataDirectory());
return true;
}
},