diff --git a/src/Files.App/BaseLayout.cs b/src/Files.App/BaseLayout.cs index 571972a9c01e..837c365c529f 100644 --- a/src/Files.App/BaseLayout.cs +++ b/src/Files.App/BaseLayout.cs @@ -705,7 +705,10 @@ private void AddNewFileTagsToMenu(CommandBarFlyout contextMenu) contextMenu.SecondaryCommands.Insert(index + 1, new AppBarButton() { Label = "SettingsEditFileTagsExpander/Title".GetLocalizedResource(), - Icon = new FontIcon() { Glyph = "\uE1CB" }, + Content = new OpacityIcon() + { + Style = (Style)Application.Current.Resources["ColorIconTag"], + }, Flyout = fileTagsContextMenu }); } diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs index de017f7b2204..717006790736 100644 --- a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs +++ b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs @@ -676,10 +676,6 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "OpenInNewPane".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconRightPane" - }, Command = commandsViewModel.OpenDirectoryInNewPaneCommand, ShowItem = itemsSelected && userSettingsService.PreferencesSettingsService.ShowOpenInNewPane && areAllItemsFolders, SingleItemOnly = true, @@ -724,25 +720,23 @@ public static List GetBaseItemMenuItems( }, new ContextMenuFlyoutItemViewModel { - Text = "RotateRight".GetLocalizedResource(), - ColoredIcon = new ColoredIconModel + Text = "RotateLeft".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() { - BaseLayerGlyph = "\uF045", - OverlayLayerGlyph = "\uF046", + OpacityIconStyle = "ColorIconRotateLeft" }, - Command = commandsViewModel.RotateImageRightCommand, + Command = commandsViewModel.RotateImageLeftCommand, ShowInSearchPage = true, ShowItem = selectedItemsPropertiesViewModel?.IsSelectedItemImage ?? false }, new ContextMenuFlyoutItemViewModel { - Text = "RotateLeft".GetLocalizedResource(), - ColoredIcon = new ColoredIconModel + Text = "RotateRight".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() { - BaseLayerGlyph = "\uF043", - OverlayLayerGlyph = "\uF044", + OpacityIconStyle = "ColorIconRotateRight" }, - Command = commandsViewModel.RotateImageLeftCommand, + Command = commandsViewModel.RotateImageRightCommand, ShowInSearchPage = true, ShowItem = selectedItemsPropertiesViewModel?.IsSelectedItemImage ?? false }, @@ -815,10 +809,9 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "CopyLocation".GetLocalizedResource(), - ColoredIcon = new ColoredIconModel() + OpacityIcon = new OpacityIconModel() { - BaseLayerGlyph = "\uF04F", - OverlayLayerGlyph = "\uF050" + OpacityIconStyle = "ColorIconCopyLocation", }, Command = commandsViewModel.CopyPathOfSelectedItemCommand, SingleItemOnly = true, @@ -852,10 +845,9 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutCreateFolderWithSelection/Text".GetLocalizedResource(), - ColoredIcon = new ColoredIconModel() + OpacityIcon = new OpacityIconModel() { - BaseLayerGlyph = "\uF033", - OverlayLayerGlyph = "\uF034" + OpacityIconStyle = "ColorIconNewFolder", }, Command = commandsViewModel.CreateFolderWithSelection, ShowItem = itemsSelected, @@ -863,10 +855,9 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutShortcut/Text".GetLocalizedResource(), - ColoredIcon = new ColoredIconModel() + OpacityIcon = new OpacityIconModel() { - BaseLayerGlyph = "\uF04B", - OverlayLayerGlyph = "\uF04C" + OpacityIconStyle = "ColorIconShortcut", }, Command = commandsViewModel.CreateShortcutCommand, ShowItem = itemsSelected && (!selectedItems.FirstOrDefault()?.IsShortcut ?? false), @@ -950,7 +941,10 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(), - Glyph = "\uE840", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, Command = commandsViewModel.SidebarPinItemCommand, ShowItem = userSettingsService.PreferencesSettingsService.ShowFavoritesSection && selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && !x.IsPinned), ShowInSearchPage = true, @@ -959,7 +953,10 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "UnpinFromFavorites".GetLocalizedResource(), - Glyph = "\uE77A", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, Command = commandsViewModel.SidebarUnpinItemCommand, ShowItem = userSettingsService.PreferencesSettingsService.ShowFavoritesSection && selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && x.IsPinned), ShowInSearchPage = true, @@ -968,7 +965,10 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "PinItemToStart/Text".GetLocalizedResource(), - Glyph = "\uE840", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, Command = commandsViewModel.PinItemToStartCommand, ShowOnShift = true, ShowItem = selectedItems.All(x => !x.IsShortcut && (x.PrimaryItemAttribute == StorageItemTypes.Folder || x.IsExecutable) && !x.IsArchive && !x.IsItemPinnedToStart), @@ -979,7 +979,10 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel() { Text = "UnpinItemFromStart/Text".GetLocalizedResource(), - Glyph = "\uE77A", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, Command = commandsViewModel.UnpinItemFromStartCommand, ShowOnShift = true, ShowItem = selectedItems.All(x => !x.IsShortcut && (x.PrimaryItemAttribute == StorageItemTypes.Folder || x.IsExecutable) && !x.IsArchive && x.IsItemPinnedToStart), @@ -991,13 +994,15 @@ public static List GetBaseItemMenuItems( { Text = "Archive".GetLocalizedResource(), ShowInSearchPage = true, + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconZip", + }, Items = new List { new ContextMenuFlyoutItemViewModel { Text = "ExtractFiles".GetLocalizedResource(), - Glyph = "\xF11A", - GlyphFontFamilyName = "CustomGlyph", Command = commandsViewModel.DecompressArchiveCommand, ShowItem = canDecompress, ShowInSearchPage = true, @@ -1005,8 +1010,6 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel { Text = "ExtractHere".GetLocalizedResource(), - Glyph = "\xF11A", - GlyphFontFamilyName = "CustomGlyph", Command = commandsViewModel.DecompressArchiveHereCommand, ShowItem = canDecompress, ShowInSearchPage = true, @@ -1017,8 +1020,6 @@ public static List GetBaseItemMenuItems( ? string.Format("BaseLayoutItemContextFlyoutExtractToChildFolder".GetLocalizedResource(), "*") : string.Format("BaseLayoutItemContextFlyoutExtractToChildFolder".GetLocalizedResource(), Path.GetFileNameWithoutExtension(selectedItems.First().Name)), - Glyph = "\xF11A", - GlyphFontFamilyName = "CustomGlyph", Command = commandsViewModel.DecompressArchiveToChildFolderCommand, ShowInSearchPage = true, ShowItem = canDecompress, @@ -1031,7 +1032,6 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel { Text = "CreateArchive".GetLocalizedResource(), - Glyph = "\uE8DE", Command = commandsViewModel.CompressIntoArchiveCommand, ShowItem = canCompress, ShowInSearchPage = true, @@ -1039,7 +1039,6 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel { Text = string.Format("CreateNamedArchive".GetLocalizedResource(), $"{newArchiveName}.zip"), - Glyph = "\uE8DE", Command = commandsViewModel.CompressIntoZipCommand, ShowItem = canCompress, ShowInSearchPage = true, @@ -1047,7 +1046,6 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModel { Text = string.Format("CreateNamedArchive".GetLocalizedResource(), $"{newArchiveName}.7z"), - Glyph = "\uE8DE", Command = commandsViewModel.CompressIntoSevenZipCommand, ShowItem = canCompress, ShowInSearchPage = true, diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml index 52b92f8c707f..7716e1ee2a17 100644 --- a/src/Files.App/ResourceDictionaries/PathIcons.xaml +++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml @@ -131,8 +131,11 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index 6eadbdeeab6b..9f6e98a520d6 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -245,9 +245,8 @@ Label="{helpers:ResourceString Name=Extract}" LabelPosition="Default" Style="{StaticResource ToolBarAppBarButtonFlyoutStyle}"> - - - + + - - - + + - - - + + - + diff --git a/src/Files.App/UserControls/SidebarControl.xaml.cs b/src/Files.App/UserControls/SidebarControl.xaml.cs index 0d6e3c2a84ce..96f202d1033a 100644 --- a/src/Files.App/UserControls/SidebarControl.xaml.cs +++ b/src/Files.App/UserControls/SidebarControl.xaml.cs @@ -233,24 +233,26 @@ private List GetLocationItemMenuItems(INavigatio new ContextMenuFlyoutItemViewModel() { Text = "OpenInNewPane".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconRightPane", - }, Command = OpenInNewPaneCommand, ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewPane }, new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(), - Glyph = "\uE840", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, Command = PinItemCommand, ShowItem = isDriveItem && !isDriveItemPinned }, new ContextMenuFlyoutItemViewModel() { Text = "UnpinFromFavorites".GetLocalizedResource(), - Glyph = "\uE77A", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, Command = UnpinItemCommand, ShowItem = options.ShowUnpinItem || isDriveItemPinned }, diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs index 3504076f0462..d62c9e590230 100644 --- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs +++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs @@ -174,10 +174,6 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "OpenInNewPane".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconRightPane", - }, Command = OpenInNewPaneCommand, CommandParameter = item, ShowItem = userSettingsService.PreferencesSettingsService.ShowOpenInNewPane @@ -185,7 +181,10 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(), - Glyph = "\uE840", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, Command = PinToFavoritesCommand, CommandParameter = item, ShowItem = !isPinned @@ -193,7 +192,10 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "UnpinFromFavorites".GetLocalizedResource(), - Glyph = "\uE77A", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, Command = UnpinFromFavoritesCommand, CommandParameter = item, ShowItem = isPinned diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs index b7f3f4f8f7f3..d2ae3e84e404 100644 --- a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs +++ b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs @@ -189,10 +189,6 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "OpenInNewPane".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconRightPane", - }, Command = OpenInNewPaneCommand, CommandParameter = item, ShowItem = userSettingsService.PreferencesSettingsService.ShowOpenInNewPane && isFolder @@ -200,7 +196,10 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(), - Glyph = "\uE840", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, Command = PinToFavoritesCommand, CommandParameter = item, ShowItem = !isPinned && isFolder @@ -208,7 +207,10 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "SideBarUnpinFromFavorites/Text".GetLocalizedResource(), - Glyph = "\uE77A", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, Command = UnpinFromFavoritesCommand, CommandParameter = item, ShowItem = isPinned && isFolder diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs index bb34acab94e8..1121537990b2 100644 --- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs +++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs @@ -177,10 +177,6 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "OpenInNewPane".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconRightPane", - }, Command = OpenInNewPaneCommand, CommandParameter = item, ShowItem = userSettingsService.PreferencesSettingsService.ShowOpenInNewPane @@ -188,7 +184,10 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(), - Glyph = "\uE840", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, Command = PinToFavoritesCommand, CommandParameter = item, ShowItem = !isPinned @@ -196,7 +195,10 @@ public override List GetItemMenuItems(WidgetCard new ContextMenuFlyoutItemViewModel() { Text = "UnpinFromFavorites".GetLocalizedResource(), - Glyph = "\uE77A", + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, Command = UnpinFromFavoritesCommand, CommandParameter = item, ShowItem = isPinned