A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
added command to Open In a new window menu, but not implemented yet
Etienne Baudoux546bbe4ed76d
diff --git a/src/dev/def/DevTools.Core/ILaunchProtocolService.cs b/src/dev/def/DevTools.Core/ILaunchProtocolService.csnew file mode 100644index 000000000..d509dbdfd--- /dev/null+++ b/src/dev/def/DevTools.Core/ILaunchProtocolService.cs@@ -0,0 +1,16 @@+using System.Threading.Tasks;++namespace DevTools.Core+{+ /// <summary>+ /// Provides a service allowing to start new instance of the app.+ /// </summary>+ public interface ILaunchProtocolService+ {+ /// <summary>+ /// Starts a new instance of the app with an argument.+ /// </summary>+ /// <returns>Returns <code>True</code> if it succeeded.</returns>+ Task<bool> LaunchNewAppInstance(string? arguments = null);+ }+}diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.csindex 324f866a8..2bdee9d6a 100644--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs@@ -1,19 +1,24 @@#nullable enable+using DevTools.Core;+using DevTools.Core.Injection;using DevTools.Impl.Models;+using DevTools.Impl.Views;using DevTools.Localization;using DevTools.Providers;using Microsoft.Toolkit.Mvvm.ComponentModel;using Microsoft.Toolkit.Mvvm.Input;+using System;using System.Collections.ObjectModel;using System.Composition;+using System.Threading.Tasks;namespace DevTools.Impl.ViewModels{[Export(typeof(MainPageViewModel))]- [Shared]public sealed class MainPageViewModel : ObservableRecipient{+ private readonly IMefProvider _mefProvider;private readonly IToolProviderFactory _toolProviderFactory;internal MainPageStrings Strings = LanguageManager.Instance.MainPage;@@ -34,11 +39,15 @@ namespace DevTools.Impl.ViewModelsinternal string? SearchQuery { get; set; }[ImportingConstructor]- public MainPageViewModel(IToolProviderFactory toolProviderFactory)+ public MainPageViewModel(+ IMefProvider mefProvider,+ IToolProviderFactory toolProviderFactory){+ _mefProvider = mefProvider;_toolProviderFactory = toolProviderFactory;SearchBoxTextChangedCommand = new RelayCommand(ExecuteSearchBoxTextChangedCommand);+ OpenToolInNewWindowCommand = new AsyncRelayCommand<IToolProvider>(ExecuteOpenToolInNewWindowCommandAsync);SetFooterMenuItems();SearchTools(searchQuery: string.Empty);@@ -55,6 +64,19 @@ namespace DevTools.Impl.ViewModels#endregion+ #region OpenToolInNewWindowCommand++ public IRelayCommand<IToolProvider> OpenToolInNewWindowCommand { get; }++ private async Task ExecuteOpenToolInNewWindowCommandAsync(IToolProvider? toolProvider)+ {+ Arguments.NotNull(toolProvider, nameof(toolProvider));++ // await _windowManager.OpenNewWindowAsync(typeof(MainPage), toolProvider);+ }++ #endregion+private void SearchTools(string? searchQuery){ToolsMenuItems.Clear();diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xamlindex 998bb302b..2dc2b384c 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml@@ -1,5 +1,6 @@<Pagex:Class="DevTools.Impl.Views.MainPage"+ x:Name="Page"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"@@ -74,7 +75,10 @@<muxc:NavigationViewItem Icon="{x:Bind Icon}"><muxc:NavigationViewItem.ContextFlyout><MenuFlyout>- <MenuFlyoutItem Text="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}">+ <MenuFlyoutItem+ Text="{Binding Instance.MainPage.OpenInNewWindow, Source={StaticResource LanguageManager}}"+ Command="{Binding OpenToolInNewWindowCommand}"+ CommandParameter="{x:Bind ToolProvider}"><MenuFlyoutItem.Icon><FontIcon FontFamily="{StaticResource FluentSystemIcons}" Glyph="ø" /></MenuFlyoutItem.Icon>diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.csindex 1085add38..2e0a3ad88 100644--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs@@ -1,7 +1,10 @@#nullable enable+using DevTools.Core;using DevTools.Core.Navigation;+using DevTools.Core.Threading;using DevTools.Impl.ViewModels;+using Windows.ApplicationModel.Core;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;using Windows.UI.Xaml.Navigation;@@ -10,10 +13,21 @@ namespace DevTools.Impl.Views{public sealed partial class MainPage : Page{+ public static readonly DependencyProperty ViewModelProperty =+ DependencyProperty.Register(+ nameof(ViewModel),+ typeof(MainPageViewModel),+ typeof(MainPage),+ new PropertyMetadata(null));+/// <summary>/// Gets the page's view model./// </summary>- internal MainPageViewModel ViewModel => (MainPageViewModel)DataContext;+ public MainPageViewModel ViewModel+ {+ get => (MainPageViewModel)GetValue(ViewModelProperty);+ set => SetValue(ViewModelProperty, value);+ }public MainPage(){@@ -26,7 +40,13 @@ namespace DevTools.Impl.Viewsprotected override void OnNavigatedTo(NavigationEventArgs e){var parameters = (NavigationParameter)e.Parameter;- DataContext = parameters.ExportProvider.Import<MainPageViewModel>();++ // Setup the title bar.+ parameters.ExportProvider.Import<ITitleBar>().SetupTitleBarAsync().Forget();++ // Set the view model+ ViewModel = parameters.ExportProvider.Import<MainPageViewModel>();+ DataContext = ViewModel;base.OnNavigatedTo(e);}diff --git a/src/dev/impl/DevTools.Localization/Strings/en/MainPage.resw b/src/dev/impl/DevTools.Localization/Strings/en/MainPage.reswindex ed0cce862..c3251e422 100644--- a/src/dev/impl/DevTools.Localization/Strings/en/MainPage.resw+++ b/src/dev/impl/DevTools.Localization/Strings/en/MainPage.resw@@ -118,7 +118,7 @@<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader><data name="OpenInNewWindow" xml:space="preserve">- <value>Open in new window</value>+ <value>Open in a new window</value></data><data name="Search" xml:space="preserve"><value>Search</value>diff --git a/src/dev/startup/DevTools.Startup/Assets/Logo/Square512.png b/src/dev/startup/DevTools.Startup/Assets/Logo/Square512.pngnew file mode 100644index 000000000..783c60cdcBinary files /dev/null and b/src/dev/startup/DevTools.Startup/Assets/Logo/Square512.png differdiff --git a/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj b/src/dev/startup/DevTools.Startup/DevTools.Startup.wapprojindex 52c9e0fa1..0818eb2fb 100644--- a/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj+++ b/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj@@ -64,6 +64,7 @@<Content Include="Assets\Logo\Square150x150Logo.scale-200.png" /><Content Include="Assets\Logo\Square44x44Logo.scale-200.png" /><Content Include="Assets\Logo\Square44x44Logo.targetsize-24_altform-unplated.png" />+ <Content Include="Assets\Logo\Square512.png" /><Content Include="Assets\Logo\StoreLogo.png" /><Content Include="Assets\Logo\Wide310x150Logo.scale-200.png" /></ItemGroup>diff --git a/src/dev/startup/DevTools.Startup/Package.appxmanifest b/src/dev/startup/DevTools.Startup/Package.appxmanifestindex e56ce558a..e49b71914 100644--- a/src/dev/startup/DevTools.Startup/Package.appxmanifest+++ b/src/dev/startup/DevTools.Startup/Package.appxmanifest@@ -50,6 +50,14 @@<uap:Rotation Preference="portraitFlipped"/></uap:InitialRotationPreference></uap:VisualElements>+ <Extensions>+ <uap:Extension Category="windows.protocol">+ <uap:Protocol Name="devtools">+ <uap:DisplayName>DevTools URI Scheme</uap:DisplayName>+ <uap:Logo>Assets\Logo\Square512.png</uap:Logo>+ </uap:Protocol>+ </uap:Extension>+ </Extensions></Application></Applications>diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.csindex 63ac79994..00900b1dc 100644--- a/src/dev/startup/DevTools/App.xaml.cs+++ b/src/dev/startup/DevTools/App.xaml.cs@@ -1,24 +1,22 @@#nullable enable-using DevTools.Core;-using DevTools.Core.Threading;using DevTools.Core.Impl.Injection;+using DevTools.Core.Injection;+using DevTools.Core.Navigation;+using DevTools.Core.Settings;+using DevTools.Core.Theme;using DevTools.Impl.Views;using DevTools.Localization;+using DevTools.Providers;using System;using System.Globalization;using Windows.ApplicationModel;using Windows.ApplicationModel.Activation;+using Windows.ApplicationModel.Core;using Windows.UI.ViewManagement;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;using Windows.UI.Xaml.Navigation;-using Windows.ApplicationModel.Core;-using DevTools.Core.Theme;-using DevTools.Core.Settings;-using DevTools.Core.Navigation;-using DevTools.Core.Injection;-using DevTools.Providers;namespace DevTools{@@ -174,8 +172,6 @@ namespace DevTools{frameworkElement.RequestedTheme = theme == AppTheme.Light ? ElementTheme.Light : ElementTheme.Dark;}-- _mefComposer.ExportProvider.GetExport<ITitleBar>().SetupTitleBarAsync().Forget();}}}\ No newline at end of file