Skip to content

A Swiss Army knife for developers.

Added support of Pin To Start + Disable Compact Overlay mode for certain tools. (#114)

Etienne Baudoux3c22f0c63587
diff --git a/src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs b/src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs
index f2a99996a..d4b09168c 100644
--- a/src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs
+++ b/src/dev/impl/DevToys/Api/Core/IUriActivationProtocolService.cs
@@ -1,6 +1,7 @@
#nullable enable
using System.Threading.Tasks;
+using DevToys.Api.Tools;
namespace DevToys.Api.Core
{
@@ -14,5 +15,12 @@ namespace DevToys.Api.Core
/// </summary>
/// <returns>Returns <code>True</code> if it succeeded.</returns>
Task<bool> LaunchNewAppInstance(string? arguments = null);
+
+ /// <summary>
+ /// Creates a tile on the Windows start menu that points to a given tool.
+ /// </summary>
+ /// <param name="toolProvider">The tool to pin</param>
+ /// <returns>Returns <code>True</code> if it succeeded.</returns>
+ Task<bool> PinToolToStart(MatchedToolProvider toolProvider);
}
}
diff --git a/src/dev/impl/DevToys/Api/Tools/NoCompactOverlaySupportAttribute.cs b/src/dev/impl/DevToys/Api/Tools/NoCompactOverlaySupportAttribute.cs
new file mode 100644
index 000000000..d3c44b8b7
--- /dev/null
+++ b/src/dev/impl/DevToys/Api/Tools/NoCompactOverlaySupportAttribute.cs
@@ -0,0 +1,18 @@
+#nullable enable
+
+using System;
+using System.Composition;
+
+namespace DevToys.Api.Tools
+{
+ /// <summary>
+ /// Indicates that the tool does not support Compact Overlay mode.
+ /// </summary>
+ [MetadataAttribute]
+ [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+ public sealed class NoCompactOverlaySupportAttribute : Attribute
+ {
+ public bool NoCompactOverlaySupport { get; } = true;
+ }
+}
+
diff --git a/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs b/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
index e0fd3faa5..e90a36c11 100644
--- a/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
+++ b/src/dev/impl/DevToys/Api/Tools/ToolProviderMetadata.cs
@@ -65,5 +65,11 @@ namespace DevToys.Api.Tools
/// </summary>
[DefaultValue(false)]
public bool NotSearchable { get; set; }
+
+ /// <summary>
+ /// Gets or sets whether the tool can supports Compact Overlay mode.
+ /// </summary>
+ [DefaultValue(false)]
+ public bool NoCompactOverlaySupport { get; set; }
}
}
diff --git a/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs b/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
index 7809f9287..9b19de5ac 100644
--- a/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
+++ b/src/dev/impl/DevToys/Core/UriActivationProtocolService.cs
@@ -1,13 +1,17 @@
#nullable enable
using System;
+using System.Collections.Generic;
using System.Composition;
using System.Globalization;
using System.Threading.Tasks;
using DevToys.Api.Core;
+using DevToys.Api.Tools;
using DevToys.Core.Threading;
+using DevToys.Shared.Core;
using Windows.ApplicationModel;
using Windows.System;
+using Windows.UI.StartScreen;
namespace DevToys.Core
{
@@ -19,16 +23,10 @@ namespace DevToys.Core
{
return await ThreadHelper.RunOnUIThreadAsync(async () =>
{
- string? uriToLaunch = Constants.UriActivationProtocolName;
+ string? uriToLaunch = GenerateLaunchUri(arguments);
try
{
-
- if (!string.IsNullOrWhiteSpace(arguments))
- {
- uriToLaunch += $"?{Constants.UriActivationProtocolToolArgument}={arguments}";
- }
-
var launchOptions
= new LauncherOptions
{
@@ -48,5 +46,52 @@ namespace DevToys.Core
return false;
});
}
+
+ public async Task<bool> PinToolToStart(MatchedToolProvider toolProvider)
+ {
+ try
+ {
+ var tile
+ = new SecondaryTile(
+ tileId: toolProvider.Metadata.ProtocolName,
+ displayName: toolProvider.ToolProvider.SearchDisplayName,
+ arguments: GenerateLaunchArguments(toolProvider.Metadata.ProtocolName),
+ new Uri("ms-appx:///Assets/Logo/Square150x150Logo.png"),
+ TileSize.Default);
+
+ return await tile.RequestCreateAsync();
+ }
+ catch (Exception ex)
+ {
+ Logger.LogFault("Pin to start", ex);
+ }
+
+ return false;
+ }
+
+ private string GenerateLaunchArguments(string? toolProtocol)
+ {
+ string arguments = string.Empty;
+
+ if (!string.IsNullOrWhiteSpace(toolProtocol))
+ {
+ arguments += $"{Constants.UriActivationProtocolToolArgument}={toolProtocol}";
+ }
+
+ return arguments;
+ }
+
+ private string GenerateLaunchUri(string? toolProtocol)
+ {
+ string? uriToLaunch = Constants.UriActivationProtocolName;
+
+ string arguments = GenerateLaunchArguments(toolProtocol);
+ if (!string.IsNullOrEmpty(arguments))
+ {
+ uriToLaunch += "?" + arguments;
+ }
+
+ return uriToLaunch;
+ }
}
}
diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csproj
index 5e6bee518..10cbab4e5 100644
--- a/src/dev/impl/DevToys/DevToys.csproj
+++ b/src/dev/impl/DevToys/DevToys.csproj
@@ -23,11 +23,13 @@
</Compile>
<Compile Include="Api\Core\OOP\IAppService.cs" />
<Compile Include="Api\Tools\MenuPlacement.cs" />
+ <Compile Include="Api\Tools\NoCompactOverlaySupportAttribute.cs" />
<Compile Include="Api\Tools\NotSearchableAttribute.cs" />
<Compile Include="Api\Tools\ParentAttribute.cs" />
<Compile Include="Core\OOP\AppService.cs" />
<Compile Include="Core\Threading\AsyncLazy.cs" />
<Compile Include="Helpers\NumberBaseHelper.cs" />
+ <Compile Include="Messages\PinToolToStartMessage.cs" />
<Compile Include="Messages\OpenToolInNewWindowMessage.cs" />
<Compile Include="Messages\ChangeSelectedMenuItemMessage.cs" />
<Compile Include="Models\NoResultFoundMockToolProvider.cs" />
@@ -317,7 +319,6 @@
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
- <Compile Include="UI\Controls\CustomPathIcon.cs" />
<Compile Include="UI\Controls\CustomTextBox.xaml.cs">
<DependentUpon>CustomTextBox.xaml</DependentUpon>
</Compile>
diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
index db85859d2..b41016a92 100644
--- a/src/dev/impl/DevToys/LanguageManager.cs
+++ b/src/dev/impl/DevToys/LanguageManager.cs
@@ -884,6 +884,11 @@ namespace DevToys
/// </summary>
public string OpenInNewWindow => _resources.GetString("OpenInNewWindow");
+ /// <summary>
+ /// Gets the resource PinToolToStart.
+ /// </summary>
+ public string PinToolToStart => _resources.GetString("PinToolToStart");
+
/// <summary>
/// Gets the resource Search.
/// </summary>
diff --git a/src/dev/impl/DevToys/Messages/PinToolToStartMessage.cs b/src/dev/impl/DevToys/Messages/PinToolToStartMessage.cs
new file mode 100644
index 000000000..f7c9e215b
--- /dev/null
+++ b/src/dev/impl/DevToys/Messages/PinToolToStartMessage.cs
@@ -0,0 +1,17 @@
+#nullable enable
+
+using DevToys.Api.Tools;
+using DevToys.Shared.Core;
+
+namespace DevToys.Messages
+{
+ public sealed class PinToolToStartMessage
+ {
+ internal IToolProvider ToolProvider { get; }
+
+ public PinToolToStartMessage(IToolProvider toolProvider)
+ {
+ ToolProvider = Arguments.NotNull(toolProvider, nameof(toolProvider));
+ }
+ }
+}
diff --git a/src/dev/impl/DevToys/Strings/cs-CZ/MainPage.resw b/src/dev/impl/DevToys/Strings/cs-CZ/MainPage.resw
index d82ad6178..6fe66fd8c 100644
--- a/src/dev/impl/DevToys/Strings/cs-CZ/MainPage.resw
+++ b/src/dev/impl/DevToys/Strings/cs-CZ/MainPage.resw
@@ -148,6 +148,9 @@
<data name="OpenInNewWindow" xml:space="preserve">
<value>Otevřít v novém okně</value>
</data>
+ <data name="PinToolToStart" xml:space="preserve">
+ <value>Pin tool to Start</value>
+ </data>
<data name="Search" xml:space="preserve">
<value>Hledat nástroje...</value>
</data>
diff --git a/src/dev/impl/DevToys/Strings/en-US/MainPage.resw b/src/dev/impl/DevToys/Strings/en-US/MainPage.resw
index 3c76d9643..b33f4d116 100644
--- a/src/dev/impl/DevToys/Strings/en-US/MainPage.resw
+++ b/src/dev/impl/DevToys/Strings/en-US/MainPage.resw
@@ -148,6 +148,9 @@
<data name="OpenInNewWindow" xml:space="preserve">
<value>Open in a new window</value>
</data>
+ <data name="PinToolToStart" xml:space="preserve">
+ <value>Pin tool to Start</value>
+ </data>
<data name="Search" xml:space="preserve">
<value>Type to search for tools...</value>
</data>
diff --git a/src/dev/impl/DevToys/Strings/fr-FR/MainPage.resw b/src/dev/impl/DevToys/Strings/fr-FR/MainPage.resw
index d71baa785..a26a28bb1 100644
--- a/src/dev/impl/DevToys/Strings/fr-FR/MainPage.resw
+++ b/src/dev/impl/DevToys/Strings/fr-FR/MainPage.resw
@@ -148,6 +148,9 @@
<data name="OpenInNewWindow" xml:space="preserve">
<value>Ouvrir dans une nouvelle fenêtre</value>
</data>
+ <data name="PinToolToStart" xml:space="preserve">
+ <value>Épingler à l'écran de démarrage</value>
+ </data>
<data name="Search" xml:space="preserve">
<value>Taper pour recherche un outil...</value>
</data>
diff --git a/src/dev/impl/DevToys/Strings/pl-PL/MainPage.resw b/src/dev/impl/DevToys/Strings/pl-PL/MainPage.resw
index 5854ac174..65a54d9dc 100644
--- a/src/dev/impl/DevToys/Strings/pl-PL/MainPage.resw
+++ b/src/dev/impl/DevToys/Strings/pl-PL/MainPage.resw
@@ -148,6 +148,9 @@
<data name="OpenInNewWindow" xml:space="preserve">
<value>Otwórz w nowym oknie</value>
</data>
+ <data name="PinToolToStart" xml:space="preserve">
+ <value>Pin tool to Start</value>
+ </data>
<data name="Search" xml:space="preserve">
<value>Wpisz, aby wyszukać narzędzia...</value>
</data>
diff --git a/src/dev/impl/DevToys/Strings/ru-RU/MainPage.resw b/src/dev/impl/DevToys/Strings/ru-RU/MainPage.resw
index 35f5a48ea..976140d08 100644
--- a/src/dev/impl/DevToys/Strings/ru-RU/MainPage.resw
+++ b/src/dev/impl/DevToys/Strings/ru-RU/MainPage.resw
@@ -148,6 +148,9 @@
<data name="OpenInNewWindow" xml:space="preserve">
<value>Открыть в новом окне</value>
</data>
+ <data name="PinToolToStart" xml:space="preserve">
+ <value>Pin tool to Start</value>
+ </data>
<data name="Search" xml:space="preserve">
<value>Найти инструмент</value>
</data>
diff --git a/src/dev/impl/DevToys/Strings/zh-CN/MainPage.resw b/src/dev/impl/DevToys/Strings/zh-CN/MainPage.resw
index 876aab660..7d52693b0 100644
--- a/src/dev/impl/DevToys/Strings/zh-CN/MainPage.resw
+++ b/src/dev/impl/DevToys/Strings/zh-CN/MainPage.resw
@@ -148,6 +148,9 @@
<data name="OpenInNewWindow" xml:space="preserve">
<value>在新窗口中打开</value>
</data>
+ <data name="PinToolToStart" xml:space="preserve">
+ <value>Pin tool to Start</value>
+ </data>
<data name="Search" xml:space="preserve">
<value>搜索工具…</value>
</data>
diff --git a/src/dev/impl/DevToys/Themes/Generic.xaml b/src/dev/impl/DevToys/Themes/Generic.xaml
index 66aa717e2..49018e8e2 100644
--- a/src/dev/impl/DevToys/Themes/Generic.xaml
+++ b/src/dev/impl/DevToys/Themes/Generic.xaml
@@ -27,13 +27,6 @@
<DevToys:LanguageManager x:Key="LanguageManager"/>
- <Style TargetType="controls:CustomPathIcon">
- <Setter Property="Stretch" Value="Uniform"/>
- <Setter Property="Height" Value="16"/>
- <Setter Property="Width" Value="16"/>
- <Setter Property="Fill" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
- </Style>
-
<Style TargetType="ContentControl">
<Setter Property="HighContrastAdjustment" Value="None"/>
</Style>
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomPathIcon.cs b/src/dev/impl/DevToys/UI/Controls/CustomPathIcon.cs
deleted file mode 100644
index 4b0b961cc..000000000
--- a/src/dev/impl/DevToys/UI/Controls/CustomPathIcon.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#nullable enable
-
-using Windows.UI.Xaml.Shapes;
-
-namespace DevToys.UI.Controls
-{
- public sealed class CustomPathIcon : Path
- {
- public CustomPathIcon()
- {
- }
- }
-}
diff --git a/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml b/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml
index b1b703176..78805fed6 100644
--- a/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml
+++ b/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml
@@ -100,15 +100,16 @@
Click="OpenInNewWindowButton_Click">
<FontIcon FontFamily="{StaticResource FluentSystemIcons}" FontSize="16" Glyph="&#xF8B5;"/>
</Button>
- <!--<Button
+ <Button
Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}"
Height="32"
Width="32"
Padding="4"
- AutomationProperties.Name="Share"
- ToolTipService.ToolTip="Share">
- <FontIcon FontFamily="{StaticResource FluentSystemIcons}" FontSize="16" Glyph="&#xF6AF;"/>
- </Button>-->
+ AutomationProperties.Name="{Binding Instance.MainPage.PinToolToStart, Source={StaticResource LanguageManager}}"
+ ToolTipService.ToolTip="{Binding Instance.MainPage.PinToolToStart, Source={StaticResource LanguageManager}}"
+ Click="PinToolToStartCommandButton_Click">
+ <FontIcon FontFamily="{StaticResource FluentSystemIcons}" FontSize="16" Glyph="&#xF601;"/>
+ </Button>
</StackPanel>
</Grid>
</DataTemplate>
diff --git a/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml.cs b/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml.cs
index b08cb8ec0..edb0ae93c 100644
--- a/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/ToolProvidersGridView.xaml.cs
@@ -50,6 +50,19 @@ namespace DevToys.UI.Controls
set => SetValue(OpenToolInNewWindowClickCommandProperty, value);
}
+ public static readonly DependencyProperty PinToolToStartClickCommandProperty
+ = DependencyProperty.Register(
+ nameof(PinToolToStartClickCommand),
+ typeof(IRelayCommand<IToolProvider>),
+ typeof(ToolProvidersGridView),
+ new PropertyMetadata(null));
+
+ public IRelayCommand<IToolProvider>? PinToolToStartClickCommand
+ {
+ get => (IRelayCommand<IToolProvider>?)GetValue(PinToolToStartClickCommandProperty);
+ set => SetValue(PinToolToStartClickCommandProperty, value);
+ }
+
public ToolProvidersGridView()
{
InitializeComponent();
@@ -64,5 +77,10 @@ namespace DevToys.UI.Controls
{
OpenToolInNewWindowClickCommand?.Execute(((FrameworkElement)sender).DataContext);
}
+
+ private void PinToolToStartCommandButton_Click(object sender, RoutedEventArgs e)
+ {
+ PinToolToStartClickCommand?.Execute(((FrameworkElement)sender).DataContext);
+ }
}
}
diff --git a/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
index 0965bf525..0495f8300 100644
--- a/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
@@ -28,6 +28,7 @@ using Microsoft.Toolkit.Mvvm.Messaging;
using Microsoft.UI.Xaml.Controls;
using Windows.ApplicationModel;
using Windows.Foundation;
+using Windows.UI.StartScreen;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
using ThreadPriority = DevToys.Core.Threading.ThreadPriority;
@@ -35,7 +36,11 @@ using ThreadPriority = DevToys.Core.Threading.ThreadPriority;
namespace DevToys.ViewModels
{
[Export(typeof(MainPageViewModel))]
- public sealed class MainPageViewModel : ObservableRecipient, IRecipient<ChangeSelectedMenuItemMessage>, IRecipient<OpenToolInNewWindowMessage>
+ public sealed class MainPageViewModel
+ : ObservableRecipient,
+ IRecipient<ChangeSelectedMenuItemMessage>,
+ IRecipient<OpenToolInNewWindowMessage>,
+ IRecipient<PinToolToStartMessage>
{
private readonly IClipboard _clipboard;
private readonly IToolProviderFactory _toolProviderFactory;
@@ -184,6 +189,7 @@ namespace DevToys.ViewModels
TitleBar = titleBar;
OpenToolInNewWindowCommand = new AsyncRelayCommand<ToolProviderMetadata>(ExecuteOpenToolInNewWindowCommandAsync);
+ PinToolToStartCommand = new AsyncRelayCommand<ToolProviderMetadata>(ExecutePinToolToStartCommandAsync);
ChangeViewModeCommand = new AsyncRelayCommand<ApplicationViewMode>(ExecuteChangeViewModeCommandAsync);
SearchBoxTextChangedCommand = new AsyncRelayCommand<Windows.UI.Xaml.Controls.AutoSuggestBoxTextChangedEventArgs>(ExecuteSearchBoxTextChangedCommandAsync);
SearchBoxQuerySubmittedCommand = new AsyncRelayCommand<Windows.UI.Xaml.Controls.AutoSuggestBoxQuerySubmittedEventArgs>(ExecuteSearchBoxQuerySubmittedCommandAsync);
@@ -209,6 +215,35 @@ namespace DevToys.ViewModels
#endregion
+ #region PinToolToStartCommand
+
+ public IAsyncRelayCommand<ToolProviderMetadata> PinToolToStartCommand { get; }
+
+ private async Task ExecutePinToolToStartCommandAsync(ToolProviderMetadata? metadata)
+ {
+ try
+ {
+ ThreadHelper.ThrowIfNotOnUIThread();
+ Arguments.NotNull(metadata, nameof(metadata));
+
+ if (SecondaryTile.Exists(metadata!.Name))
+ {
+ return;
+ }
+
+ IEnumerable<MatchedToolProvider> toolProviders = _toolProviderFactory.GetAllTools();
+ MatchedToolProvider toolProvider = toolProviders.First(tool => tool.Metadata == metadata);
+
+ await _launchProtocolService.PinToolToStart(toolProvider);
+ }
+ catch (Exception ex)
+ {
+ Logger.LogFault("Pin to start command", ex);
+ }
+ }
+
+ #endregion
+
#region ChangeViewModeCommand
public IAsyncRelayCommand<ApplicationViewMode> ChangeViewModeCommand { get; }
@@ -337,6 +372,13 @@ namespace DevToys.ViewModels
OpenToolInNewWindowCommand.Execute(toolProvider.Metadata);
}
+ public void Receive(PinToolToStartMessage message)
+ {
+ IEnumerable<MatchedToolProvider> toolProviders = _toolProviderFactory.GetAllTools();
+ MatchedToolProvider toolProvider = toolProviders.First(tool => tool.ToolProvider == message.ToolProvider);
+ PinToolToStartCommand.Execute(toolProvider.Metadata);
+ }
+
/// <summary>
/// Invoked when the Page is loaded and becomes the current source of a parent Frame.
/// </summary>
@@ -378,7 +420,7 @@ namespace DevToys.ViewModels
() =>
{
SetSelectedMenuItem(
- toolProviderViewDataToSelect
+ toolProviderViewDataToSelect
?? ToolsMenuItems.FirstOrDefault(item => item is MatchedToolProvider) as MatchedToolProvider
?? FooterMenuItems.FirstOrDefault(),
null);
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs
index 5a9f3c250..ddb88c52c 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/AllTools/AllToolsToolProvider.cs
@@ -15,6 +15,7 @@ namespace DevToys.ViewModels.AllTools
[Order(0)]
[MenuPlacement(MenuPlacement.Header)]
[NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class AllToolsToolProvider : ToolProviderBase, IToolProvider
{
private readonly IMefProvider _mefProvider;
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/ConvertersGroupToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/ConvertersGroupToolProvider.cs
index bfac9cb36..5422588ab 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Converters/ConvertersGroupToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/ConvertersGroupToolProvider.cs
@@ -12,6 +12,8 @@ namespace DevToys.ViewModels.Tools
[Name(InternalName)]
[ProtocolName("converters")]
[Order(0)]
+ [NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class ConvertersGroupToolProvider : GroupToolProviderBase
{
internal const string InternalName = "ConvertersGroup";
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/EncodersDecodersGroupToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/EncodersDecodersGroupToolProvider.cs
index c3534ad46..9aab15e7d 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/EncodersDecodersGroupToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/EncodersDecodersGroupToolProvider.cs
@@ -12,6 +12,8 @@ namespace DevToys.ViewModels.Tools
[Name(InternalName)]
[ProtocolName("encodersdecoders")]
[Order(1)]
+ [NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class EncodersDecodersGroupToolProvider : GroupToolProviderBase
{
internal const string InternalName = "EncodersDecodersGroup";
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Formatters/FormattersGroupToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Formatters/FormattersGroupToolProvider.cs
index 04e06a80e..9c48fa7aa 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Formatters/FormattersGroupToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Formatters/FormattersGroupToolProvider.cs
@@ -12,6 +12,8 @@ namespace DevToys.ViewModels.Tools
[Name(InternalName)]
[ProtocolName("formatters")]
[Order(2)]
+ [NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class FormattersGroupToolProvider : GroupToolProviderBase
{
internal const string InternalName = "FormattersGroup";
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Generators/GeneratorsGroupToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Generators/GeneratorsGroupToolProvider.cs
index 9fc60fb8d..18219a9ea 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Generators/GeneratorsGroupToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Generators/GeneratorsGroupToolProvider.cs
@@ -12,6 +12,8 @@ namespace DevToys.ViewModels.Tools
[Name(InternalName)]
[ProtocolName("generators")]
[Order(3)]
+ [NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class GeneratorsGroupToolProvider : GroupToolProviderBase
{
internal const string InternalName = "GeneratorsGroup";
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Graphic/GraphicGroupToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Graphic/GraphicGroupToolProvider.cs
index ecc13d043..ef63933ce 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Graphic/GraphicGroupToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Graphic/GraphicGroupToolProvider.cs
@@ -12,6 +12,8 @@ namespace DevToys.ViewModels.Tools
[Name(InternalName)]
[ProtocolName("graphic")]
[Order(5)]
+ [NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class GraphicGroupToolProvider : GroupToolProviderBase
{
internal const string InternalName = "GraphicGroup";
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs
index bb4632669..da4e8c7ab 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/GroupToolViewModelBase.cs
@@ -18,6 +18,7 @@ namespace DevToys.ViewModels.Tools
{
NavigateToToolCommand = new RelayCommand<IToolProvider>(ExecuteNavigateToToolCommand);
OpenToolInNewWindowClickCommand = new RelayCommand<IToolProvider>(ExecuteOpenToolInNewWindowClickCommand);
+ PinToolToStartClickCommand = new RelayCommand<IToolProvider>(ExecutePinToolToStartClickCommand);
// Activate the view model's messenger.
IsActive = true;
@@ -46,5 +47,17 @@ namespace DevToys.ViewModels.Tools
}
#endregion
+
+ #region PinToolToStartClickCommand
+
+ public IRelayCommand<IToolProvider> PinToolToStartClickCommand { get; }
+
+ private void ExecutePinToolToStartClickCommand(IToolProvider? metadata)
+ {
+ Arguments.NotNull(metadata, nameof(metadata));
+ Messenger.Send(new PinToolToStartMessage(metadata!));
+ }
+
+ #endregion
}
}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/SearchResult/SearchResultToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/SearchResult/SearchResultToolProvider.cs
index f77380694..48764c765 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/SearchResult/SearchResultToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/SearchResult/SearchResultToolProvider.cs
@@ -17,7 +17,8 @@ namespace DevToys.ViewModels.Tools
return new MatchedToolProvider(
new ToolProviderMetadata
{
- Name = "SearchResult"
+ Name = "SearchResult",
+ NoCompactOverlaySupport = true,
},
new SearchResultToolProvider(
searchQuery,
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/TextGroupToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/TextGroupToolProvider.cs
index bf9be576b..698a90624 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/TextGroupToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/TextGroupToolProvider.cs
@@ -12,6 +12,8 @@ namespace DevToys.ViewModels.Tools
[Name(InternalName)]
[ProtocolName("text")]
[Order(4)]
+ [NotSearchable]
+ [NoCompactOverlaySupport]
internal sealed class TextGroupToolProvider : GroupToolProviderBase
{
internal const string InternalName = "TextGroup";
diff --git a/src/dev/impl/DevToys/Views/MainPage.xaml b/src/dev/impl/DevToys/Views/MainPage.xaml
index b5ae99c30..cb0db11be 100644
--- a/src/dev/impl/DevToys/Views/MainPage.xaml
+++ b/src/dev/impl/DevToys/Views/MainPage.xaml
@@ -21,6 +21,7 @@
<converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter"/>
<converters:BooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" IsInverted="True"/>
<converters:BooleanToScrollModeConverter x:Key="BooleanToScrollModeConverter" ScrollModeOnTrue="Auto" ScrollModeOnFalse="Enabled"/>
+ <converters:InvertedBooleanConverter x:Key="InvertedBooleanConverter"/>
<!--This top margin is the height of the custom TitleBar-->
<Thickness x:Key="NavigationViewContentMargin">0,46,0,0</Thickness>
@@ -37,7 +38,7 @@
<Setter Target="NonCompactOverlayButton.Visibility" Value="Visible" />
<Setter Target="NavigationView.AlwaysShowHeader" Value="False" />
<Setter Target="NavigationView.IsPaneVisible" Value="False" />
- <Setter Target="ContentScrollViewer.Padding" Value="12,0,12,0"/>
+ <Setter Target="ScrollViewerContent.Margin" Value="12,0,12,0"/>
<Setter Target="ContentFrame.Padding" Value="0,0,0,0"/>
<Setter Target="HeaderTextBlock.Visibility" Value="Collapsed" />
<Setter Target="AppTitleLeftBorder.Width" Value="16" />
@@ -49,13 +50,13 @@
</VisualState>
<VisualState x:Name="NavigationViewCompact">
<VisualState.Setters>
+ <Setter Target="ScrollViewerContent.Margin" Value="24,48,24,0"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="NavigationViewMinimal">
<VisualState.Setters>
- <Setter Target="ContentScrollViewer.Padding" Value="12,12,12,0"/>
- <Setter Target="ContentFrame.Padding" Value="0,0,0,0"/>
- <Setter Target="HeaderTextBlock.Margin" Value="12,12,0,0" />
+ <Setter Target="ScrollViewerContent.Margin" Value="12,12,12,0"/>
+ <Setter Target="ContentFrame.Padding" Value="0,12,0,0"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
@@ -110,13 +111,13 @@
<Button
Name="CompactOverlayButton"
Grid.Column="2"
+ Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Width="46"
Height="32"
Padding="0"
- Background="Transparent"
- BorderBrush="Transparent"
+ IsEnabled="{x:Bind ViewModel.SelectedMenuItem.Metadata.NoCompactOverlaySupport, Mode=OneWay, Converter={StaticResource InvertedBooleanConverter}}"
ToolTipService.ToolTip="{x:Bind ViewModel.Strings.EnterCompactOverlayTooltip}"
AutomationProperties.Name="{x:Bind ViewModel.Strings.EnterCompactOverlayTooltip}"
Command="{x:Bind ViewModel.ChangeViewModeCommand}">
@@ -126,24 +127,27 @@
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Up" Modifiers="Control"/>
</Button.KeyboardAccelerators>
- <controls:CustomPathIcon
+ <Viewbox
+ Height="16"
+ Width="16">
+ <PathIcon
Data="{StaticResource EnterCompactOverlayPathIconData}"
RenderTransformOrigin="0.5,0.5">
- <controls:CustomPathIcon.RenderTransform>
- <CompositeTransform Rotation="180"/>
- </controls:CustomPathIcon.RenderTransform>
- </controls:CustomPathIcon>
+ <PathIcon.RenderTransform>
+ <CompositeTransform Rotation="180"/>
+ </PathIcon.RenderTransform>
+ </PathIcon>
+ </Viewbox>
</Button>
<Button
Name="NonCompactOverlayButton"
Grid.Column="2"
+ Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Width="46"
Height="32"
Padding="0"
- Background="Transparent"
- BorderBrush="Transparent"
Visibility="Collapsed"
ToolTipService.ToolTip="{x:Bind ViewModel.Strings.ExitCompactOverlayTooltip}"
AutomationProperties.Name="{x:Bind ViewModel.Strings.ExitCompactOverlayTooltip}"
@@ -154,13 +158,17 @@
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Down" Modifiers="Control"/>
</Button.KeyboardAccelerators>
- <controls:CustomPathIcon
+ <Viewbox
+ Height="16"
+ Width="16">
+ <PathIcon
Data="{StaticResource ExitCompactOverlayPathIconData}"
RenderTransformOrigin="0.5,0.5">
- <controls:CustomPathIcon.RenderTransform>
- <CompositeTransform Rotation="-90"/>
- </controls:CustomPathIcon.RenderTransform>
- </controls:CustomPathIcon>
+ <PathIcon.RenderTransform>
+ <CompositeTransform Rotation="-90"/>
+ </PathIcon.RenderTransform>
+ </PathIcon>
+ </Viewbox>
</Button>
</Grid>
@@ -244,6 +252,14 @@
<FontIcon Glyph="&#xF8B5;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
+ <MenuFlyoutItem
+ Text="{Binding Instance.MainPage.PinToolToStart, Source={StaticResource LanguageManager}}"
+ Command="{Binding PinToolToStartCommand}"
+ CommandParameter="{x:Bind Metadata}">
+ <MenuFlyoutItem.Icon>
+ <FontIcon Glyph="&#xF70F;" />
+ </MenuFlyoutItem.Icon>
+ </MenuFlyoutItem>
</MenuFlyout>
</muxc:NavigationViewItem.ContextFlyout>
<muxc:NavigationViewItem.Content>
@@ -278,28 +294,27 @@
</ui:MainMenuNavigationViewMenuItemSelector>
</muxc:NavigationView.MenuItemTemplateSelector>
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto"/>
- <RowDefinition Height="*"/>
- </Grid.RowDefinitions>
- <TextBlock
- Name="HeaderTextBlock"
- Grid.Row="0"
- Margin="56,48,0,0"
- Text="{x:Bind ViewModel.HeaderText, Mode=OneWay}"
- FontSize="24"/>
- <ScrollViewer
- Name="ContentScrollViewer"
- Grid.Row="1"
- Padding="56,12,56,0"
- HorizontalScrollMode="Disabled"
- VerticalScrollMode="{x:Bind ViewModel.SelectedMenuItem.Metadata.NotScrollable, Mode=OneWay, Converter={StaticResource BooleanToScrollModeConverter}}">
+ <ScrollViewer
+ HorizontalScrollMode="Disabled"
+ VerticalScrollMode="{x:Bind ViewModel.SelectedMenuItem.Metadata.NotScrollable, Mode=OneWay, Converter={StaticResource BooleanToScrollModeConverter}}">
+ <Grid
+ Name="ScrollViewerContent"
+ Margin="56,48,56,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="*"/>
+ </Grid.RowDefinitions>
+ <TextBlock
+ Name="HeaderTextBlock"
+ Grid.Row="0"
+ Text="{x:Bind ViewModel.HeaderText, Mode=OneWay}"
+ FontSize="24"/>
<Frame
+ Grid.Row="1"
Name="ContentFrame"
- Padding="0,0,0,24"/>
- </ScrollViewer>
- </Grid>
+ Padding="0,12,0,24"/>
+ </Grid>
+ </ScrollViewer>
</muxc:NavigationView>
<controls:Notification x:Name="NotificationControl"/>
diff --git a/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml
index c2b6bc348..297ff1b5a 100644
--- a/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/AllTools/AllToolsToolPage.xaml
@@ -20,6 +20,7 @@
TabIndex="0"
Tools="{x:Bind ViewModel.ToolProviders, Mode=OneWay}"
ToolClickCommand="{x:Bind ViewModel.NavigateToToolCommand}"
- OpenToolInNewWindowClickCommand="{x:Bind ViewModel.OpenToolInNewWindowClickCommand}"/>
+ OpenToolInNewWindowClickCommand="{x:Bind ViewModel.OpenToolInNewWindowClickCommand}"
+ PinToolToStartClickCommand="{x:Bind ViewModel.PinToolToStartClickCommand}"/>
</Grid>
</Page>
diff --git a/src/dev/impl/DevToys/Views/Tools/GroupToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/GroupToolPage.xaml
index 35c397a04..8fe568360 100644
--- a/src/dev/impl/DevToys/Views/Tools/GroupToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/GroupToolPage.xaml
@@ -19,6 +19,7 @@
TabIndex="0"
Tools="{x:Bind ViewModel.ToolProviders, Mode=OneWay}"
ToolClickCommand="{x:Bind ViewModel.NavigateToToolCommand}"
- OpenToolInNewWindowClickCommand="{x:Bind ViewModel.OpenToolInNewWindowClickCommand}"/>
+ OpenToolInNewWindowClickCommand="{x:Bind ViewModel.OpenToolInNewWindowClickCommand}"
+ PinToolToStartClickCommand="{x:Bind ViewModel.PinToolToStartClickCommand}"/>
</Grid>
</Page>