Skip to content

Commit b25fe14

Browse files
yaira2lukeblevinsRichard
authored
Replaced Segoe MDL2 Assets with Fluent UI icons (#1374)
Co-authored-by: Luke Blevins <[email protected]> Co-authored-by: Richard <[email protected]>
1 parent cefbdb5 commit b25fe14

26 files changed

+222
-180
lines changed

‎Files/App.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
55
<Application.Resources>
66
<ResourceDictionary>
7+
<FontFamily x:Key="FluentUIGlyphs">/Assets/Custom Glyphs/fluentui.ttf#fluentui</FontFamily>
8+
<FontFamily x:Key="CustomGlyph">/Assets/Custom Glyphs/Custom-Glyphs.ttf#Custom-Glyphs</FontFamily>
9+
<FontFamily x:Key="RecycleBinIcons">/Assets/Custom Glyphs/recyclebin-fabric-glyph.ttf#Fabric MDL2 Assets</FontFamily>
710
<ResourceDictionary.MergedDictionaries>
811
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
912
<ResourceDictionary>
@@ -31,8 +34,6 @@
3134
</ResourceDictionary.ThemeDictionaries>
3235
</ResourceDictionary>
3336
</ResourceDictionary.MergedDictionaries>
34-
<FontFamily x:Key="CustomGlyph">/Assets/Custom Glyphs/Custom-Glyphs.ttf#Custom-Glyphs</FontFamily>
35-
<FontFamily x:Key="RecycleBinIcons">/Assets/Custom Glyphs/recyclebin-fabric-glyph.ttf#Fabric MDL2 Assets</FontFamily>
3637
</ResourceDictionary>
3738
</Application.Resources>
3839
</Application>

‎Files/Assets/Custom Glyphs/Custom-Glyphs.ttf

3.34 KB
Binary file not shown.

‎Files/Assets/Custom Glyphs/fluentui.ttf

246 KB
Binary file not shown.

‎Files/DataModels/SidebarPinnedModel.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Linq;
99
using System.Threading.Tasks;
1010
using Windows.Storage;
11+
using Windows.UI.Xaml.Media;
1112

1213
namespace Files.DataModels
1314
{
@@ -66,6 +67,7 @@ public async Task AddItemToSidebar(string path)
6667
&& !x.Path.Equals(App.AppSettings.RecycleBinPath))) + 1;
6768
var locationItem = new LocationItem
6869
{
70+
Font = App.Current.Resources["FluentUIGlyphs"] as FontFamily,
6971
Path = path,
7072
Glyph = GetItemIcon(path),
7173
IsDefaultLocation = false,
@@ -119,35 +121,35 @@ public string GetItemIcon(string path)
119121

120122
if (path.Equals(AppSettings.DesktopPath, StringComparison.OrdinalIgnoreCase))
121123
{
122-
iconCode = "\uE8FC";
124+
iconCode = "\ue9f1";
123125
}
124126
else if (path.Equals(AppSettings.DownloadsPath, StringComparison.OrdinalIgnoreCase))
125127
{
126-
iconCode = "\uE896";
128+
iconCode = "\uE91c";
127129
}
128130
else if (path.Equals(AppSettings.DocumentsPath, StringComparison.OrdinalIgnoreCase))
129131
{
130-
iconCode = "\uE8A5";
132+
iconCode = "\uea11";
131133
}
132134
else if (path.Equals(AppSettings.PicturesPath, StringComparison.OrdinalIgnoreCase))
133135
{
134-
iconCode = "\uEB9F";
136+
iconCode = "\uea83";
135137
}
136138
else if (path.Equals(AppSettings.MusicPath, StringComparison.OrdinalIgnoreCase))
137139
{
138-
iconCode = "\uEC4F";
140+
iconCode = "\uead4";
139141
}
140142
else if (path.Equals(AppSettings.VideosPath, StringComparison.OrdinalIgnoreCase))
141143
{
142-
iconCode = "\uE8B2";
144+
iconCode = "\uec0d";
143145
}
144146
else if (Path.GetPathRoot(path).Equals(path, StringComparison.OrdinalIgnoreCase))
145147
{
146-
iconCode = "\uEDA2";
148+
iconCode = "\ueb8b";
147149
}
148150
else
149151
{
150-
iconCode = "\uE8B7";
152+
iconCode = "\uea55";
151153
}
152154

153155
return iconCode;

‎Files/Dialogs/BitlockerDialog.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Setter.Value>
2424
<DataTemplate x:DataType="Button">
2525
<StackPanel Orientation="Horizontal" Spacing="5">
26-
<FontIcon FontSize="14" Glyph="&#xEA18;" />
26+
<FontIcon FontSize="14" FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEB67;" />
2727
<TextBlock Text="{Binding PrimaryButtonText, ElementName=BitlockerDriveDialog}" />
2828
</StackPanel>
2929
</DataTemplate>

‎Files/Dialogs/ExceptionDialog.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@
3030
<FontIcon
3131
x:Name="ExpandIcon"
3232
FontSize="14"
33-
Glyph="&#xE70D;" />
33+
FontFamily="{StaticResource FluentUIGlyphs}"
34+
Glyph="&#xE9A5;" />
3435
<FontIcon
3536
x:Name="CollapseIcon"
3637
FontSize="14"
37-
Glyph="&#xE70E;"
38+
FontFamily="{StaticResource FluentUIGlyphs}"
39+
Glyph="&#xE9A9;"
3840
Visibility="Collapsed" />
3941
<TextBlock FontWeight="Bold" Text="More information" />
4042
</StackPanel>

‎Files/Files.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@
320320
<Content Include="Assets\Custom Glyphs\Custom-Glyphs.ttf">
321321
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
322322
</Content>
323+
<Content Include="Assets\Custom Glyphs\fluentui.ttf" />
323324
<None Include="Assets\terminal\terminal.json">
324325
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
325326
</None>

‎Files/Filesystem/DriveItem.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ private void SetGlyph(DriveType type)
7171
switch (type)
7272
{
7373
case DriveType.Fixed:
74-
Glyph = "\uEDA2";
74+
Glyph = "\ueb8b";
7575
break;
7676

7777
case DriveType.Removable:
78-
Glyph = "\uE88E";
78+
Glyph = "\uec0a";
7979
break;
8080

8181
case DriveType.Network:
82-
Glyph = "\uE8CE";
82+
Glyph = "\ueac2";
8383
break;
8484

8585
case DriveType.Ram:
@@ -96,11 +96,11 @@ private void SetGlyph(DriveType type)
9696
break;
9797

9898
case DriveType.VirtualDrive:
99-
Glyph = "\uE753";
99+
Glyph = "\ue9b7";
100100
break;
101101

102102
case DriveType.FloppyDisk:
103-
Glyph = "\uEDA2";
103+
Glyph = "\ueb4a";
104104
break;
105105

106106
default:

‎Files/LocationsList.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public class ItemLoader
1717

1818
public static void DisplayItems()
1919
{
20-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Blue.png", Icon = "\xE896", Text = ResourceController.GetTranslation("SidebarDownloads"), Tag = "Downloads" });
21-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Green.png", Icon = "\xE8A5", Text = ResourceController.GetTranslation("SidebarDocuments"), Tag = "Documents" });
22-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Orange.png", Icon = "\xEB9F", Text = ResourceController.GetTranslation("SidebarPictures"), Tag = "Pictures" });
23-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Pink.png", Icon = "\xEC4F", Text = ResourceController.GetTranslation("SidebarMusic"), Tag = "Music" });
24-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Red.png", Icon = "\xE8B2", Text = ResourceController.GetTranslation("SidebarVideos"), Tag = "Videos" });
20+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Blue.png", Icon = "\xe91c", Text = ResourceController.GetTranslation("SidebarDownloads"), Tag = "Downloads" });
21+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Green.png", Icon = "\xea11", Text = ResourceController.GetTranslation("SidebarDocuments"), Tag = "Documents" });
22+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Orange.png", Icon = "\xea83", Text = ResourceController.GetTranslation("SidebarPictures"), Tag = "Pictures" });
23+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Pink.png", Icon = "\xead4", Text = ResourceController.GetTranslation("SidebarMusic"), Tag = "Music" });
24+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Red.png", Icon = "\xec0d", Text = ResourceController.GetTranslation("SidebarVideos"), Tag = "Videos" });
2525
}
2626
}
2727
}

‎Files/MultilingualResources/Files.it-IT.xlf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,6 @@
962962
<source>Moving files to Recycle Bin</source>
963963
<target state="new">Moving files to Recycle Bin</target>
964964
</trans-unit>
965-
966965
<trans-unit id="JumpListRecentGroupHeader" translate="yes" xml:space="preserve">
967966
<source>Recent</source>
968967
<target state="new">Recent</target>

0 commit comments

Comments
 (0)