diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmarks.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmarks.png new file mode 100644 index 0000000000..2ae9b72712 Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmarks.png differ diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmarks.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmarks.svg new file mode 100644 index 0000000000..7cb507d290 --- /dev/null +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmarks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs index df926129fb..d24adcdb78 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs @@ -54,7 +54,7 @@ public sealed partial class BookmarksCommandProvider : CommandProvider Id = "Bookmarks"; DisplayName = Resources.bookmarks_display_name; - Icon = Icons.PinIcon; + Icon = Icons.BookmarksExtensionIcon; var addBookmarkPage = new AddBookmarkPage(null); addBookmarkPage.AddedCommand += (_, e) => _bookmarksManager.Add(e.Name, e.Bookmark); diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs index 6e7d955606..5ee694c6c4 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs @@ -6,7 +6,9 @@ namespace Microsoft.CmdPal.Ext.Bookmarks; internal static class Icons { - internal static IconInfo BookmarkIcon { get; } = IconHelpers.FromRelativePath("Assets\\Bookmark.svg"); + internal static IconInfo BookmarksExtensionIcon { get; } = IconHelpers.FromRelativePath("Assets\\Bookmarks.svg"); + + internal static IconInfo AddBookmarkIcon { get; } = IconHelpers.FromRelativePath("Assets\\Bookmark.svg"); internal static IconInfo DeleteIcon { get; } = new("\uE74D"); // Delete diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs index 927044e77c..7d40d5c3cc 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs @@ -23,7 +23,7 @@ internal sealed partial class AddBookmarkPage : ContentPage var name = bookmark?.Name ?? string.Empty; var url = bookmark?.Bookmark ?? string.Empty; - Icon = Icons.BookmarkIcon; + Icon = Icons.AddBookmarkIcon; var isAdd = string.IsNullOrEmpty(name) && string.IsNullOrEmpty(url); Title = isAdd ? Resources.bookmarks_add_title : Resources.bookmarks_edit_name; Name = isAdd ? Resources.bookmarks_add_name : Resources.bookmarks_edit_name; diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Assets/PerformanceMonitorExtension.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Assets/PerformanceMonitorExtension.png new file mode 100644 index 0000000000..af6ebf0977 Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Assets/PerformanceMonitorExtension.png differ diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Assets/PerformanceMonitorExtension.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Assets/PerformanceMonitorExtension.svg new file mode 100644 index 0000000000..1f50e8cc4d --- /dev/null +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Assets/PerformanceMonitorExtension.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Icons.cs index 3d2fe49e70..0101db7ee2 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Icons.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Icons.cs @@ -6,8 +6,10 @@ using Microsoft.CommandPalette.Extensions.Toolkit; namespace Microsoft.CmdPal.Ext.PerformanceMonitor; -internal sealed class Icons +internal static class Icons { + internal static IconInfo PerformanceMonitorIcon => IconHelpers.FromRelativePath("Assets\\PerformanceMonitorExtension.svg"); + internal static IconInfo CpuIcon => new("\uE9D9"); // CPU icon internal static IconInfo MemoryIcon => new("\uE964"); // Memory icon @@ -26,6 +28,3 @@ internal sealed class Icons internal static IconInfo NavigateForwardIcon => new("\uE72A"); // Next icon } - - -#pragma warning restore SA1402 // File may only contain a single type diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Microsoft.CmdPal.Ext.PerformanceMonitor.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Microsoft.CmdPal.Ext.PerformanceMonitor.csproj index f80630c792..89221d48d8 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Microsoft.CmdPal.Ext.PerformanceMonitor.csproj +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Microsoft.CmdPal.Ext.PerformanceMonitor.csproj @@ -54,5 +54,10 @@ PreserveNewest + + + PreserveNewest + + diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceMonitorCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceMonitorCommandsProvider.cs index 24bf99ac77..6e7c66cdc8 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceMonitorCommandsProvider.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceMonitorCommandsProvider.cs @@ -17,7 +17,7 @@ public partial class PerformanceMonitorCommandsProvider : CommandProvider { DisplayName = Resources.GetResource("Performance_Monitor_Title"); Id = "PerformanceMonitor"; - Icon = Icons.StackedAreaIcon; + Icon = Icons.PerformanceMonitorIcon; var page = new PerformanceWidgetsPage(false); var band = new PerformanceWidgetsPage(true); diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceWidgetsPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceWidgetsPage.cs index 07c6851cb6..e1250acc82 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceWidgetsPage.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/PerformanceWidgetsPage.cs @@ -32,7 +32,7 @@ internal sealed partial class PerformanceWidgetsPage : OnLoadStaticListPage, IDi public override string Title => Resources.GetResource("Performance_Monitor_Title"); - public override IconInfo Icon => Icons.StackedAreaIcon; + public override IconInfo Icon => Icons.PerformanceMonitorIcon; private readonly bool _isBandPage;