A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added support of Open In New Window (#1053)
Etienne BAUDOUX7c6ce1728452
diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.csindex 4d81c4742..aa32cb982 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/ExtensionsManager/ExtensionsManagerGuiTool.cs@@ -1,5 +1,6 @@using System.Collections.Immutable;using DevToys.Blazor.BuiltInTools.Settings;+using DevToys.Core;using NuGet.Packaging;using NuGet.Packaging.Core;@@ -131,13 +132,13 @@ internal sealed class ExtensionsManagerGuiTool : IGuiToolprivate void OnFindMoreExtensionsOnlineButtonClick(){// TODO: Open documentation online- Shell.OpenFileInShell("http://url");+ OSHelper.OpenFileInShell("http://url");}private void OnLearnDevelopExtensionButtonClick(){// TODO: Open documentation online- Shell.OpenFileInShell("http://url");+ OSHelper.OpenFileInShell("http://url");}private async ValueTask OnInstallExtensionButtonClickAsync()@@ -275,7 +276,7 @@ internal sealed class ExtensionsManagerGuiTool : IGuiToolstatic void NavigateToUrl(string url){- Shell.OpenFileInShell(url);+ OSHelper.OpenFileInShell(url);}}@@ -318,7 +319,7 @@ internal sealed class ExtensionsManagerGuiTool : IGuiToolvoid OnTermsConditionsDialogButtonClick(){// TODO: Open the terms and conditions page.- Shell.OpenFileInShell("https://url");+ OSHelper.OpenFileInShell("https://url");}void OnIUnderstandDialogButtonClick()diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.csindex ae015a9aa..1b11bf33f 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/SettingsGuiTool.cs@@ -1,5 +1,6 @@using System.Reflection;using DevToys.Blazor.Core.Languages;+using DevToys.Core;using DevToys.Core.Settings;namespace DevToys.Blazor.BuiltInTools.Settings;@@ -224,7 +225,7 @@ internal sealed class SettingsGuiTool : IGuiToolprivate void OnHelpTranslatingButtonClick(){- Shell.OpenFileInShell("https://crowdin.com/project/devtoys");+ OSHelper.OpenFileInShell("https://crowdin.com/project/devtoys");}private void OnLanguageSelected(IUIDropDownListItem? selectedItem)diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razorindex c48731d2d..2ed29e465 100644--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor@@ -2,12 +2,16 @@@inherits StyledComponentBase<CascadingValue Name="ParentIsEnabled" Value="@IsActuallyEnabled">- <li class="list-box-item @(FinalCssClasses)"- style="@(Style)"- role="listitem"- @ref=Element- @attributes="AdditionalAttributes"- @onclick="OnClickAsync">- @ChildContent- </li>+ <ContextMenu IsEnabled="IsActuallyEnabled"+ Items="_contextMenuItems"+ OnContextMenuOpening=@OnContextMenuOpeningAsync>+ <li class="list-box-item @(FinalCssClasses)"+ style="@(Style)"+ role="listitem"+ @ref=Element+ @attributes="AdditionalAttributes"+ @onclick="OnClickAsync">+ @ChildContent+ </li>+ </ContextMenu></CascadingValue>\ No newline at end of filediff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.cs b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.csindex 07b0b4302..27de72192 100644--- a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItem.razor.cs@@ -1,7 +1,11 @@-namespace DevToys.Blazor.Components;+using System.Collections.ObjectModel;++namespace DevToys.Blazor.Components;public partial class ListBoxItem : StyledComponentBase{+ private readonly ICollection<ContextMenuItem> _contextMenuItems = new ObservableCollection<ContextMenuItem>();+[Parameter]public object Item { get; set; } = default!;@@ -17,6 +21,9 @@ public partial class ListBoxItem : StyledComponentBase[Parameter]public RenderFragment? ChildContent { get; set; }+ [Parameter]+ public EventCallback<ListBoxItemBuildingContextMenuEventArgs> OnBuildingContextMenu { get; set; }+protected override void OnParametersSet(){if (IsSelected)@@ -44,4 +51,9 @@ public partial class ListBoxItem : StyledComponentBase{return OnSelected.InvokeAsync(Item);}++ private Task OnContextMenuOpeningAsync()+ {+ return OnBuildingContextMenu.InvokeAsync(new ListBoxItemBuildingContextMenuEventArgs(Item, _contextMenuItems));+ }}diff --git a/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItemBuildingContextMenuEventArgs.cs b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItemBuildingContextMenuEventArgs.csnew file mode 100644index 000000000..99318319d--- /dev/null+++ b/src/app/dev/DevToys.Blazor/Components/Collections/ListBox/ListBoxItemBuildingContextMenuEventArgs.cs@@ -0,0 +1,15 @@+namespace DevToys.Blazor.Components;++public sealed class ListBoxItemBuildingContextMenuEventArgs : EventArgs+{+ internal ListBoxItemBuildingContextMenuEventArgs(object? item, ICollection<ContextMenuItem> items)+ {+ Guard.IsNotNull(items);+ ItemValue = item;+ ContextMenuItems = items;+ }++ internal object? ItemValue { get; }++ internal ICollection<ContextMenuItem> ContextMenuItems { get; }+}diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.cs b/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.csindex 0553f211c..ce689ef4d 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Menu/ContextMenu/ContextMenu.razor.cs@@ -66,7 +66,10 @@ public partial class ContextMenu : StyledComponentBaseif (IsActuallyEnabled){// This may update the item list.- await OnContextMenuOpening.InvokeAsync();+ if (OnContextMenuOpening.HasDelegate)+ {+ await OnContextMenuOpening.InvokeAsync();+ }if (Items?.Count == 0){@@ -83,7 +86,10 @@ public partial class ContextMenu : StyledComponentBase_isOpen = true;StateHasChanged();- await OnContextMenuOpened.InvokeAsync();+ if (OnContextMenuOpened.HasDelegate)+ {+ await OnContextMenuOpened.InvokeAsync();+ }}}}@@ -95,7 +101,10 @@ public partial class ContextMenu : StyledComponentBase_isOpen = false;StateHasChanged();- await OnContextMenuClosed.InvokeAsync();+ if (OnContextMenuClosed.HasDelegate)+ {+ await OnContextMenuClosed.InvokeAsync();+ }}private async Task OnEscapeKeyPressedAsync()@@ -119,7 +128,10 @@ public partial class ContextMenu : StyledComponentBaseif (_listBox is not null && _listBox.SelectedItem is not null && _listBox.SelectedItem.IsEnabled){CloseMenuAsync(null).Forget();- _listBox.SelectedItem.OnClick.InvokeAsync(_listBox.SelectedItem).Forget();+ if (_listBox.SelectedItem.OnClick.HasDelegate)+ {+ _listBox.SelectedItem.OnClick.InvokeAsync(_listBox.SelectedItem).Forget();+ }}}}diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razorindex 286a95653..8f7d67297 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor@@ -131,7 +131,8 @@TitleTemplate="NavBarItemTitleTemplate"IconTemplate="NavBarItemIconTemplate"Children="item is IGroup itemGroup ? itemGroup.ChildrenItems : null"- OnSelected="OnItemSelectedAsync" />+ OnSelected="OnItemSelectedAsync"+ OnBuildingContextMenu="OnBuildingContextMenuAsync" />}}</ul>@@ -153,7 +154,8 @@TitleTemplate="NavBarItemTitleTemplate"IconTemplate="NavBarItemIconTemplate"Children="item is IGroup itemGroup ? itemGroup.ChildrenItems : null"- OnSelected="OnItemSelectedAsync" />+ OnSelected="OnItemSelectedAsync"+ OnBuildingContextMenu="OnBuildingContextMenuAsync" />}}</ul>diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.csindex 792eb8e6e..bcbec403d 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.cs@@ -46,6 +46,9 @@ public partial class NavBar<TElement, TSearchElement>[Parameter]public EventCallback<TElement> SelectedItemChanged { get; set; }+ [Parameter]+ public EventCallback<ListBoxItemBuildingContextMenuEventArgs> OnBuildingContextMenu { get; set; }+[Parameter]public bool CanGoBack { get; set; }@@ -204,6 +207,12 @@ public partial class NavBar<TElement, TSearchElement>return SelectedItemChanged.InvokeAsync(item);}+ private Task OnBuildingContextMenuAsync(ListBoxItemBuildingContextMenuEventArgs args)+ {+ Guard.IsAssignableToType<TElement>(args.ItemValue);+ return OnBuildingContextMenu.InvokeAsync(args);+ }+private void SidebarState_IsHiddenChanged(object? sender, EventArgs e){if (OnHiddenStateChanged.HasDelegate)diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razorindex 7b6ccb12c..ccc6ce121 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor@@ -20,6 +20,7 @@IsSelected="Item == OwnerNavBar.SelectedItem"Class="@FinalCssClasses"Style="margin: 3px 5px;"+ OnBuildingContextMenu=@OnBuildingContextMenuAsyncOnSelected=@OnItemSelectedAsync><div class="sidebar-item-icon">@IconTemplate(Item)@@ -56,7 +57,8 @@IconTemplate="IconTemplate"Children="childItem is IGroup childItemGroup ? childItemGroup.ChildrenItems : null"Class="sidebar-child-item"- OnSelected="OnItemSelectedAsync" />+ OnSelected="OnItemSelectedAsync"+ OnBuildingContextMenu="OnBuildingContextMenuAsync"/>}</ul>}diff --git a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.cs b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.csindex e4b797fcf..befee31ab 100644--- a/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBarItem.razor.cs@@ -28,6 +28,9 @@ public partial class NavBarItem<TElement, TSearchElement>[Parameter]public EventCallback<TElement> OnSelected { get; set; }+ [Parameter]+ public EventCallback<ListBoxItemBuildingContextMenuEventArgs> OnBuildingContextMenu { get; set; }+public bool IsExpanded{get@@ -82,6 +85,15 @@ public partial class NavBarItem<TElement, TSearchElement>return OnSelected.InvokeAsync(strongItem);}+ private Task OnBuildingContextMenuAsync(ListBoxItemBuildingContextMenuEventArgs args)+ {+ if (args.ItemValue is not null)+ {+ Guard.IsAssignableToType<TElement>(args.ItemValue);+ }+ return OnBuildingContextMenu.InvokeAsync(args);+ }+private void OnToggleExpandClick(){if (IsExpanded)diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs b/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.csindex 48af6c43b..769eda943 100644--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIImageViewerPresenter.razor.cs@@ -1,4 +1,5 @@// TODO: Add logs.+using DevToys.Core;using SixLabors.ImageSharp;using SixLabors.ImageSharp.Formats.Png;@@ -66,7 +67,7 @@ public partial class UIImageViewerPresenter : MefComponentBasereturn UIImageViewer.ImageSource.Value.Match((FileInfo imageFileInfo) =>{- Shell.OpenFileInShell(imageFileInfo.FullName);+ OSHelper.OpenFileInShell(imageFileInfo.FullName);return Task.CompletedTask;},async (Image image) =>@@ -74,7 +75,7 @@ public partial class UIImageViewerPresenter : MefComponentBasestring? fileExtension = image.Metadata.DecodedImageFormat?.FileExtensions.FirstOrDefault() ?? "png";FileInfo tempFile = _fileStorage.CreateSelfDestroyingTempFile(fileExtension);await image.SaveAsync(tempFile.FullName);- Shell.OpenFileInShell(tempFile.FullName);+ OSHelper.OpenFileInShell(tempFile.FullName);},async (SandboxedFileReader imagePickedFile) =>{@@ -83,7 +84,7 @@ public partial class UIImageViewerPresenter : MefComponentBase{await imagePickedFile.CopyFileContentToAsync(tempFileStream, CancellationToken.None);}- Shell.OpenFileInShell(tempFile.FullName);+ OSHelper.OpenFileInShell(tempFile.FullName);});}diff --git a/src/app/dev/DevToys.Blazor/Core/Helpers/Shell.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/Shell.csdeleted file mode 100644index 270ff57eb..000000000--- a/src/app/dev/DevToys.Blazor/Core/Helpers/Shell.cs+++ /dev/null@@ -1,39 +0,0 @@-using System.Runtime.InteropServices;--namespace DevToys.Blazor.Core.Helpers;--internal static class Shell-{- internal static void OpenFileInShell(string url)- {- Guard.IsNotNullOrWhiteSpace(url);-- try- {- var startInfo = new ProcessStartInfo(url);- startInfo.UseShellExecute = true;- Process.Start(startInfo);- }- catch- {- // hack because of this: https://github.com/dotnet/corefx/issues/10361- if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))- {- url = url.Replace("&", "^&");- Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });- }- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))- {- Process.Start("xdg-open", url);- }- else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))- {- Process.Start("open", url);- }- else- {- throw;- }- }- }-}diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razorindex f15a26b24..02dde5c15 100644--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor@@ -40,6 +40,7 @@@bind-SelectedItem="ViewModel.SelectedMenuItem"OnBackButtonClicked="OnBackButtonClicked"OnHiddenStateChanged="OnHiddenStateChanged"+ OnBuildingContextMenu="OnBuildingContextMenuAsync"SearchBarPlaceholder="@MainWindow.Search"SearchQueryChanged="OnSearchQueryChanged"SearchQuerySubmitted="OnSearchQuerySubmitted"diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs b/src/app/dev/DevToys.Blazor/Pages/Index.razor.csindex c8b5074b3..c584f39f1 100644--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs@@ -1,9 +1,11 @@using DevToys.Blazor.Components;using DevToys.Blazor.Core.Services;+using DevToys.Business.Services;using DevToys.Business.ViewModels;using DevToys.Core;using DevToys.Core.Tools;using DevToys.Core.Tools.ViewItems;+using DevToys.Localization.Strings.ToolGroupPage;using Microsoft.AspNetCore.Components.Web;namespace DevToys.Blazor.Pages;@@ -28,6 +30,9 @@ public partial class Index : MefComponentBase[Import]internal IThemeListener ThemeListener { get; set; } = default!;+ [Import]+ internal CommandLineLauncherService CommandLineLauncherService { get; set; } = default!;+[Inject]internal ContextMenuService ContextMenuService { get; set; } = default!;@@ -142,6 +147,34 @@ public partial class Index : MefComponentBase// TODO: If succeeded, move the focus to the ToolPage.}+ private Task OnBuildingContextMenuAsync(ListBoxItemBuildingContextMenuEventArgs args)+ {+ Guard.IsNotNull(args.ItemValue);++ // Create the context menu for the items in the NavBar.+ if (args.ContextMenuItems.Count == 0)+ {+ // Open in new window+ if (args.ItemValue is GuiToolViewItem item)+ {+ args.ContextMenuItems.Add(+ new ContextMenuItem+ {+ IconGlyph = '\uEE7A',+ Text = ToolGroupPage.OpenInNewWindow,+ OnClick = EventCallback.Factory.Create<DropDownListItem>(this, OnOpenInNewWindowContextMenuItemClick)+ });++ void OnOpenInNewWindowContextMenuItemClick()+ {+ CommandLineLauncherService.LaunchTool(item.ToolInstance.InternalComponentName);+ }+ }+ }++ return Task.CompletedTask;+ }+private void OnMouseUp(MouseEventArgs ev){if (ev.Button == 3)diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razorindex 96f1f6386..7a81130fa 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor@@ -49,11 +49,10 @@<TextBlock Appearance="@TextBlockAppearance.Caption" Text="@item.Description" /></div><div class="buttons" @onclick:stopPropagation="true">- <!-- TODO: Localize --><Button HorizontalAlignment="UIHorizontalAlignment.Right"Class="button"Appearance="@ButtonAppearance.Neutral"- ToolTip="Open in a new window"+ ToolTip="@ToolGroupPage.OpenInNewWindow"@onclick="() => OnOpenInNewWindow(item)"><FontIcon Class="fonticon" Glyph="@('\uEE7A')" /></Button>diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.cs b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.csindex 04afa7ca6..1382d2c5b 100644--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.cs+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.cs@@ -3,6 +3,8 @@ using DevToys.Core.Tools;using DevToys.Core.Tools.ViewItems;using DevToys.Blazor.Components;using System.Reflection;+using DevToys.Business.Services;+using DevToys.Core;namespace DevToys.Blazor.Pages.SubPages;@@ -27,6 +29,9 @@ public partial class ToolGroup : MefComponentBase[Import]internal ToolGroupPageViewModel ViewModel { get; set; } = default!;+ [Import]+ internal CommandLineLauncherService CommandLineLauncherService { get; set; } = default!;+[Parameter]public GroupViewItem? GroupViewItem { get; set; }@@ -62,11 +67,11 @@ public partial class ToolGroup : MefComponentBaseprivate void OnOpenInNewWindow(GuiToolInstance item){- // TODO+ CommandLineLauncherService.LaunchTool(item.InternalComponentName);}private void OnSuggestToolIdeaClick(){- Shell.OpenFileInShell("https://github.com/veler/DevToys/issues/new/choose");+ OSHelper.OpenFileInShell("https://github.com/veler/DevToys/issues/new/choose");}}diff --git a/src/app/dev/DevToys.Business/Services/CommandLineLauncherService.cs b/src/app/dev/DevToys.Business/Services/CommandLineLauncherService.csnew file mode 100644index 000000000..3f6f1ab77--- /dev/null+++ b/src/app/dev/DevToys.Business/Services/CommandLineLauncherService.cs@@ -0,0 +1,50 @@+using CommunityToolkit.Mvvm.ComponentModel;+using CommunityToolkit.Mvvm.Messaging;+using DevToys.Api;+using DevToys.Business.ViewModels;+using DevToys.Core;+using DevToys.Core.Models;+using DevToys.Core.Tools;++namespace DevToys.Business.Services;++[Export]+internal sealed class CommandLineLauncherService : ObservableRecipient+{+ internal const string ToolArgument = "--tool:";++ private readonly GuiToolProvider _guiToolProvider;+ private readonly IMefProvider _mefProvider;++ [ImportingConstructor]+ public CommandLineLauncherService(GuiToolProvider guiToolProvider, IMefProvider mefProvider)+ {+ _mefProvider = mefProvider;+ _guiToolProvider = guiToolProvider;+ }++ internal void HandleCommandLineArguments()+ {+ if (Environment.CommandLine.Contains(ToolArgument))+ {+ string toolName = Environment.CommandLine.Substring(Environment.CommandLine.IndexOf(ToolArgument) + ToolArgument.Length);+ GuiToolInstance? tool = _guiToolProvider.GetToolFromInternalName(toolName);+ if (tool is not null)+ {+ // Make sure MainWindowViewModel is initialized.+ _mefProvider.Import<MainWindowViewModel>();+ Messenger.Send(new ChangeSelectedMenuItemMessage(tool));+ }+ }+ }++ internal void LaunchTool(string toolInternalName)+ {+ GuiToolInstance? tool = _guiToolProvider.GetToolFromInternalName(toolInternalName);+ if (tool is not null)+ {+ string appStartExe = Process.GetCurrentProcess().MainModule!.FileName;+ OSHelper.OpenFileInShell(appStartExe, $"{ToolArgument}{toolInternalName}");+ }+ }+}diff --git a/src/app/dev/DevToys.Core/OSHelper.cs b/src/app/dev/DevToys.Core/OSHelper.csindex 79a066739..2b63d4d56 100644--- a/src/app/dev/DevToys.Core/OSHelper.cs+++ b/src/app/dev/DevToys.Core/OSHelper.cs@@ -37,4 +37,37 @@ public static class OSHelperreturn true;}++ public static void OpenFileInShell(string fileOrUrl, string? arguments = null)+ {+ Guard.IsNotNullOrWhiteSpace(fileOrUrl);++ try+ {+ var startInfo = new ProcessStartInfo(fileOrUrl, arguments!);+ startInfo.UseShellExecute = true;+ Process.Start(startInfo);+ }+ catch+ {+ // hack because of this: https://github.com/dotnet/corefx/issues/10361+ if (OperatingSystem.IsWindows())+ {+ fileOrUrl = fileOrUrl.Replace("&", "^&");+ Process.Start(new ProcessStartInfo(fileOrUrl, arguments!) { UseShellExecute = true });+ }+ else if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())+ {+ Process.Start("xdg-open", new[] { fileOrUrl, arguments! });+ }+ else if (OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst())+ {+ Process.Start("open", new[] { fileOrUrl, arguments! });+ }+ else+ {+ throw;+ }+ }+ }}diff --git a/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.cs b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.csindex c8b118e4d..a0c7b191a 100644--- a/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.cs+++ b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.Designer.cs@@ -87,6 +87,15 @@ namespace DevToys.Localization.Strings.ToolGroupPage {}}+ /// <summary>+ /// Looks up a localized string similar to Open in a new window.+ /// </summary>+ public static string OpenInNewWindow {+ get {+ return ResourceManager.GetString("OpenInNewWindow", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Welcome to./// </summary>diff --git a/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resx b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resxindex 59468f1e1..734522aa9 100644--- a/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resx+++ b/src/app/dev/DevToys.Localization/Strings/ToolGroupPage/ToolGroupPage.resx@@ -126,6 +126,9 @@<data name="NotFindingToolSuggestIdea" xml:space="preserve"><value>Suggest an idea</value></data>+ <data name="OpenInNewWindow" xml:space="preserve">+ <value>Open in a new window</value>+ </data><data name="WelcomeTo" xml:space="preserve"><value>Welcome to</value></data>diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebView.cs b/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebView.csindex 20a76b6c6..5cc34d28b 100644--- a/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebView.cs+++ b/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebView.cs@@ -27,6 +27,14 @@ internal sealed class BlazorWebView : WebViewserviceProvider,options,contentRootDir,- hostPageRelativePath);+ hostPageRelativePath,+ OnBlazorInitialized);+ }++ internal event EventHandler? BlazorWebViewInitialized;++ private void OnBlazorInitialized()+ {+ BlazorWebViewInitialized?.Invoke(this, EventArgs.Empty);}}diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebViewBridge.cs b/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebViewBridge.csindex 73b95aced..55e7c051f 100644--- a/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebViewBridge.cs+++ b/src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebViewBridge.cs@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Components.Web;using Microsoft.AspNetCore.Components.WebView;using Microsoft.Extensions.FileProviders;using WebKit;+using Action = System.Action;namespace DevToys.Linux.Components;@@ -22,7 +23,8 @@ internal sealed class BlazorWebViewBridge : WebViewManagerIServiceProvider serviceProvider,BlazorWebViewOptions options,string contentRootRelativeToAppRoot,- string hostPageRelativePath)+ string hostPageRelativePath,+ Action onBlazorInitialized): base(serviceProvider,Dispatcher.CreateDefault(),@@ -61,11 +63,11 @@ internal sealed class BlazorWebViewBridge : WebViewManagersource:"""window.__receiveMessageCallbacks = [];-+window.__dispatchMessageCallback = function(message) {window.__receiveMessageCallbacks.forEach(function(callback) { callback(message); });};-+window.external = {sendMessage: function(message) {window.webkit.messageHandlers.webview.postMessage(message);@@ -91,6 +93,12 @@ internal sealed class BlazorWebViewBridge : WebViewManager}Navigate("/");++ System.Threading.Tasks.Task.Run(async () =>+ {+ await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(CancellationToken.None);+ onBlazorInitialized.Invoke();+ });}protected override void NavigateCore(Uri absoluteUri)@@ -121,12 +129,12 @@ internal sealed class BlazorWebViewBridge : WebViewManagerbool allowFallbackOnHostPage = IsUriBaseOfPage(AppOriginUri, uri);if (TryGetResponseContent(- uri,- allowFallbackOnHostPage,- out int statusCode,- out string? statusMessage,- out Stream? content,- out IDictionary<string, string>? headers))+ uri,+ allowFallbackOnHostPage,+ out int statusCode,+ out string? statusMessage,+ out Stream? content,+ out IDictionary<string, string>? headers)){using var ms = new MemoryStream();content.CopyTo(ms);diff --git a/src/app/dev/platforms/desktop/DevToys.Linux/MainWindow.cs b/src/app/dev/platforms/desktop/DevToys.Linux/MainWindow.csindex 06ea9a384..017ec90cd 100644--- a/src/app/dev/platforms/desktop/DevToys.Linux/MainWindow.cs+++ b/src/app/dev/platforms/desktop/DevToys.Linux/MainWindow.cs@@ -1,10 +1,13 @@using DevToys.Api;using DevToys.Blazor.Core.Services;+using DevToys.Business.Services;using DevToys.Core;using DevToys.Linux.Components;using DevToys.Linux.Core;+using Gtk;using Microsoft.Extensions.DependencyInjection;using WebKit;+using Settings = WebKit.Settings;namespace DevToys.Linux;@@ -22,6 +25,9 @@ internal class MainWindow[Import]private TitleBarInfoProvider _titleBarInfoProvider = default!;++ [Import]+ private CommandLineLauncherService _commandLineLauncherService = default!;#pragma warning restore IDE0044 // Add readonly modifierprivate readonly BlazorWebView _blazorGtkWebView;@@ -35,7 +41,8 @@ internal class MainWindow_titleBarInfoProvider.PropertyChanged += TitleBarInfoProvider_PropertyChanged;_blazorGtkWebView = new BlazorWebView(serviceProvider);- _blazorGtkWebView.OnContextMenu += BlazorGtkWebViewOnOnContextMenu;+ _blazorGtkWebView.OnContextMenu += BlazorGtkWebViewOnContextMenu;+ _blazorGtkWebView.BlazorWebViewInitialized += OnBlazorWebViewInitialized;// Make web view transparent_blazorGtkWebView.SetBackgroundColor(new Gdk.RGBA(Gdk.Internal.RGBAManagedHandle.Create(new Gdk.Internal.RGBAData { Red = 0, Blue = 0, Green = 0, Alpha = 0 })));@@ -64,7 +71,7 @@ internal class MainWindow_window.Show();}- private bool BlazorGtkWebViewOnOnContextMenu(WebView sender, WebView.ContextMenuSignalArgs args)+ private bool BlazorGtkWebViewOnContextMenu(WebView sender, WebView.ContextMenuSignalArgs args){// Returning true to prevent the context menu from opening.#if DEBUG@@ -74,6 +81,11 @@ internal class MainWindow#endif}+ private void OnBlazorWebViewInitialized(object? sender, EventArgs args)+ {+ InitializeLowPriorityServices();+ }+private void TitleBarInfoProvider_PropertyChanged(object? sender, PropertyChangedEventArgs e){if (e.PropertyName == nameof(TitleBarInfoProvider.Title))@@ -81,4 +93,10 @@ internal class MainWindow_window.Title = _titleBarInfoProvider.Title ?? string.Empty;}}++ private void InitializeLowPriorityServices()+ {+ // Treat command line arguments.+ _commandLineLauncherService.HandleCommandLineArguments();+ }}diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Controls/BlazorWebView/BlazorWKWebView.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Controls/BlazorWebView/BlazorWKWebView.csindex af913bdd8..a591ee29f 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Controls/BlazorWebView/BlazorWKWebView.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Controls/BlazorWebView/BlazorWKWebView.cs@@ -92,6 +92,8 @@ internal sealed partial class BlazorWkWebView : IDisposable/// </summary>internal event EventHandler<UrlLoadingEventArgs>? UrlLoading;+ internal event EventHandler? BlazorWebViewInitialized;+public void Dispose(){if (_webViewManager is not null)@@ -247,6 +249,12 @@ internal sealed partial class BlazorWkWebView : IDisposableLogStartingInitialNavigation(StartPath);_webViewManager.Navigate(StartPath);++ Task.Run(async () =>+ {+ await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(CancellationToken.None);+ BlazorWebViewInitialized?.Invoke(this, EventArgs.Empty);+ });}private static IFileProvider CreateFileProvider(string contentRootDir)diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/Views/MainWindow.cs b/src/app/dev/platforms/desktop/DevToys.MacOS/Views/MainWindow.csindex e019e7520..759688edf 100644--- a/src/app/dev/platforms/desktop/DevToys.MacOS/Views/MainWindow.cs+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/Views/MainWindow.cs@@ -1,6 +1,7 @@using DevToys.Api;using DevToys.Blazor;using DevToys.Blazor.Core.Services;+using DevToys.Business.Services;using DevToys.Core;using DevToys.Core.Tools;using DevToys.MacOS.Controls.BlazorWebView;@@ -22,6 +23,7 @@ internal sealed class MainWindow : NSWindowprivate readonly TitleBarInfoProvider _titleBarInfoProvider;private readonly ISettingsProvider _settingsProvider;+ private readonly CommandLineLauncherService _commandLineLauncherService;private bool _isInitialized;internal static MainWindow Instance { get; } = new();@@ -36,6 +38,7 @@ internal sealed class MainWindow : NSWindow{Guard.IsNotNull(AppDelegate.MefComposer);_settingsProvider = AppDelegate.MefComposer.Provider.Import<ISettingsProvider>();+ _commandLineLauncherService = AppDelegate.MefComposer.Provider.Import<CommandLineLauncherService>();_titleBarInfoProvider = AppDelegate.MefComposer.Provider.Import<TitleBarInfoProvider>();_titleBarInfoProvider.PropertyChanged += TitleBarInfoProvider_PropertyChanged;@@ -71,6 +74,7 @@ internal sealed class MainWindow : NSWindow// Make this window the main window of the app.MakeMainWindow();+ OrderFront(null);}private void InitializeView()@@ -101,6 +105,7 @@ internal sealed class MainWindow : NSWindow// Create WebView and add it to NSVisualEffectViewGuard.IsNotNull(AppDelegate.ServiceProvider);var webView = new BlazorWkWebView(AppDelegate.ServiceProvider, EnableDeveloperTools);+ webView.BlazorWebViewInitialized+= OnBlazorWebViewInitialized;visualEffectView.AddSubview(webView.View);// Make the WKWebView resizing with the window and anchor it below the title bar, so we can still move the window with the title bar.@@ -172,6 +177,11 @@ internal sealed class MainWindow : NSWindow}}+ private void OnBlazorWebViewInitialized(object? sender, EventArgs e)+ {+ InitializeLowPriorityServices();+ }+private void TitleBarInfoProvider_PropertyChanged(object? sender, PropertyChangedEventArgs e){if (e.PropertyName == nameof(TitleBarInfoProvider.Title))@@ -179,4 +189,10 @@ internal sealed class MainWindow : NSWindowTitle = _titleBarInfoProvider.Title ?? string.Empty;}}++ private void InitializeLowPriorityServices()+ {+ // Treat command line arguments.+ _commandLineLauncherService.HandleCommandLineArguments();+ }}diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.csindex 874232fd2..4d8af14c1 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Core/TaskbarJumpListService.cs@@ -1,9 +1,7 @@using System.Windows.Shell;using CommunityToolkit.Mvvm.ComponentModel;-using CommunityToolkit.Mvvm.Messaging;using DevToys.Api;-using DevToys.Business.ViewModels;-using DevToys.Core.Models;+using DevToys.Business.Services;using DevToys.Core.Tools;using DevToys.Windows.Helpers;using DevToys.Windows.Strings.TaskBar;@@ -13,21 +11,15 @@ namespace DevToys.Windows.Core;[Export(typeof(TaskbarJumpListService))]internal class TaskbarJumpListService : ObservableRecipient{- private const string ToolArgument = "--tool:";-private readonly GuiToolProvider _guiToolProvider;- private readonly IMefProvider _mefProvider;[ImportingConstructor]- public TaskbarJumpListService(GuiToolProvider guiToolProvider, IMefProvider mefProvider)+ public TaskbarJumpListService(GuiToolProvider guiToolProvider){- _mefProvider = mefProvider;_guiToolProvider = guiToolProvider;_guiToolProvider.FavoriteToolsChanged += GuiToolProvider_FavoriteToolsChanged;RefreshJumpListAsync().Forget();-- HandleOpenWithJumpList();}private void GuiToolProvider_FavoriteToolsChanged(object? sender, EventArgs e)@@ -35,21 +27,6 @@ internal class TaskbarJumpListService : ObservableRecipientRefreshJumpListAsync().Forget();}- private void HandleOpenWithJumpList()- {- if (Environment.CommandLine.Contains(ToolArgument))- {- string toolName = Environment.CommandLine.Substring(Environment.CommandLine.IndexOf(ToolArgument) + ToolArgument.Length);- GuiToolInstance? tool = _guiToolProvider.GetToolFromInternalName(toolName);- if (tool is not null)- {- // Make sure MainWindowViewModel is initialized.- _mefProvider.Import<MainWindowViewModel>();- Messenger.Send(new ChangeSelectedMenuItemMessage(tool));- }- }- }-private Task RefreshJumpListAsync(){return ThreadHelper.RunOnUIThreadAsync(() =>@@ -92,7 +69,7 @@ internal class TaskbarJumpListService : ObservableRecipientTitle = tool.LongOrShortDisplayTitle,Description = tool.Description,CustomCategory = category,- Arguments = $"{ToolArgument}{tool.InternalComponentName}"+ Arguments = $"{CommandLineLauncherService.ToolArgument}{tool.InternalComponentName}"};jumpList.JumpItems.Add(jumpTask);diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.csindex 5dcfc5dbb..b62aad32d 100644--- a/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs+++ b/src/app/dev/platforms/desktop/DevToys.Windows/MainWindow.xaml.cs@@ -5,6 +5,7 @@ using DevToys.Blazor.BuiltInTools;using DevToys.Blazor.BuiltInTools.ExtensionsManager;using DevToys.Blazor.Core.Languages;using DevToys.Blazor.Core.Services;+using DevToys.Business.Services;using DevToys.Business.ViewModels;using DevToys.Core;using DevToys.Core.Logging;@@ -193,6 +194,9 @@ public partial class MainWindow : MicaWindowWithOverlay{// Start the Taskbar Jump List service after the web view loaded._mefComposer.Provider.Import<TaskbarJumpListService>();++ // Treat command line arguments.+ _mefComposer.Provider.Import<CommandLineLauncherService>().HandleCommandLineArguments();}private void SetPositionAndSize()