Skip to content

Commit 21cffbb

Browse files
committed
New icons
1 parent 3fd5bb1 commit 21cffbb

File tree

4 files changed

+32
-22
lines changed

4 files changed

+32
-22
lines changed

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,9 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
218218
new ContextMenuFlyoutItemViewModel()
219219
{
220220
Text = "SortBy".GetLocalizedResource(),
221-
ColoredIcon = new ColoredIconModel()
221+
OpacityIcon = new OpacityIconModel()
222222
{
223-
BaseLayerGlyph = "\uF029",
224-
OverlayLayerGlyph = "\uF02A",
223+
OpacityIconStyle = "ColorIconSort",
225224
},
226225
ShowInRecycleBin = true,
227226
ShowInSearchPage = true,

src/Files.App/Helpers/ShellContextMenuHelper.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,9 @@ public static async Task LoadShellMenuItems(
272272
var openWithItem = shellMenuItems.Where(x => (x.Tag as Win32ContextMenuItem)?.CommandString == "openas").ToList().FirstOrDefault();
273273
if (openWithItem is not null)
274274
{
275-
openWithItem.ColoredIcon = new ColoredIconModel()
275+
openWithItem.OpacityIcon = new OpacityIconModel()
276276
{
277-
BaseLayerGlyph = "\uF049",
278-
OverlayLayerGlyph = "\uF04A",
277+
OpacityIconStyle = "ColorIconOpenWith",
279278
};
280279
var (_, openWithItems) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(new List<ContextMenuFlyoutItemViewModel>() { openWithItem });
281280
var placeholder = itemContextMenuFlyout.SecondaryCommands.Where(x => Equals((x as AppBarButton)?.Tag, "OpenWithPlaceholder")).FirstOrDefault() as AppBarButton;

src/Files.App/UserControls/SidebarControl.xaml.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,26 +213,29 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
213213
new ContextMenuFlyoutItemViewModel()
214214
{
215215
Text = "OpenInNewTab".GetLocalizedResource(),
216-
Glyph = "\uF113",
217-
GlyphFontFamilyName = "CustomGlyph",
216+
OpacityIcon = new OpacityIconModel()
217+
{
218+
OpacityIconStyle = "ColorIconOpenInNewTab",
219+
},
218220
Command = OpenInNewTabCommand,
219221
ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewTab
220222
},
221223
new ContextMenuFlyoutItemViewModel()
222224
{
223225
Text = "OpenInNewWindow".GetLocalizedResource(),
224-
Glyph = "\uE737",
226+
OpacityIcon = new OpacityIconModel()
227+
{
228+
OpacityIconStyle = "ColorIconOpenInNewWindow",
229+
},
225230
Command = OpenInNewWindowCommand,
226231
ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewTab
227232
},
228233
new ContextMenuFlyoutItemViewModel()
229234
{
230235
Text = "OpenInNewPane".GetLocalizedResource(),
231-
ColoredIcon = new ColoredIconModel()
236+
OpacityIcon = new OpacityIconModel()
232237
{
233-
BaseBackdropGlyph = "\uF056",
234-
BaseLayerGlyph = "\uF03B",
235-
OverlayLayerGlyph = "\uF03C",
238+
OpacityIconStyle = "ColorIconRightPane",
236239
},
237240
Command = OpenInNewPaneCommand,
238241
ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewPane
@@ -276,7 +279,10 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
276279
new ContextMenuFlyoutItemViewModel()
277280
{
278281
Text = "Properties".GetLocalizedResource(),
279-
Glyph = "\uE946",
282+
OpacityIcon = new OpacityIconModel()
283+
{
284+
OpacityIconStyle = "ColorIconProperties",
285+
},
280286
Command = OpenPropertiesCommand,
281287
CommandParameter = menu,
282288
ShowItem = options.ShowProperties

src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,10 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
141141
new ContextMenuFlyoutItemViewModel()
142142
{
143143
Text = "OpenItemsWithCaptionText".GetLocalizedResource(),
144-
Glyph = "\uE17D",
144+
OpacityIcon = new OpacityIconModel()
145+
{
146+
OpacityIconStyle = "ColorIconOpenWith",
147+
},
145148
Tag = "OpenWithPlaceholder",
146149
IsEnabled = false,
147150
ShowItem = !isFolder
@@ -156,16 +159,21 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
156159
new ContextMenuFlyoutItemViewModel()
157160
{
158161
Text = "SideBarOpenInNewTab/Text".GetLocalizedResource(),
159-
Glyph = "\uF113",
160-
GlyphFontFamilyName = "CustomGlyph",
162+
OpacityIcon = new OpacityIconModel()
163+
{
164+
OpacityIconStyle = "ColorIconOpenInNewTab",
165+
},
161166
Command = OpenInNewTabCommand,
162167
CommandParameter = item,
163168
ShowItem = isFolder
164169
},
165170
new ContextMenuFlyoutItemViewModel()
166171
{
167172
Text = "SideBarOpenInNewWindow/Text".GetLocalizedResource(),
168-
Glyph = "\uE737",
173+
OpacityIcon = new OpacityIconModel()
174+
{
175+
OpacityIconStyle = "ColorIconOpenInNewWindow",
176+
},
169177
Command = OpenInNewWindowCommand,
170178
CommandParameter = item,
171179
ShowItem = isFolder
@@ -181,11 +189,9 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
181189
new ContextMenuFlyoutItemViewModel()
182190
{
183191
Text = "OpenInNewPane".GetLocalizedResource(),
184-
ColoredIcon = new ColoredIconModel()
192+
OpacityIcon = new OpacityIconModel()
185193
{
186-
BaseBackdropGlyph = "\uF056",
187-
BaseLayerGlyph = "\uF03B",
188-
OverlayLayerGlyph = "\uF03C",
194+
OpacityIconStyle = "ColorIconRightPane",
189195
},
190196
Command = OpenInNewPaneCommand,
191197
CommandParameter = item,

0 commit comments

Comments
 (0)