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

+3-2
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

+10-8
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

+1-1
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

+4-2
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

+1
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

+5-5
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

+5-5
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

-1
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>

‎Files/MultilingualResources/Files.tr-TR.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@
960960
<trans-unit id="JumpListRecentGroupHeader" translate="yes" xml:space="preserve">
961961
<source>Recent</source>
962962
<target state="new">Recent</target>
963-
</trans-unit>
963+
</trans-unit>
964964
<trans-unit id="SettingsPreferencesAppLanguage.Text" translate="yes" xml:space="preserve">
965965
<source>App Language</source>
966966
<target state="new">App Language</target>

‎Files/MultilingualResources/Files.uk-UA.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@
957957
<trans-unit id="JumpListRecentGroupHeader" translate="yes" xml:space="preserve">
958958
<source>Recent</source>
959959
<target state="new">Recent</target>
960-
</trans-unit>
960+
</trans-unit>
961961
<trans-unit id="SettingsPreferencesAppLanguage.Text" translate="yes" xml:space="preserve">
962962
<source>App Language</source>
963963
<target state="new">App Language</target>

‎Files/Strings/pt-BR/Resources.resw

+6
Original file line numberDiff line numberDiff line change
@@ -723,4 +723,10 @@
723723
<data name="PropertiesDriveFileSystem.Text" xml:space="preserve">
724724
<value>Sistema de arquivos:</value>
725725
</data>
726+
<data name="SettingsPreferencesAppLanguage.Text" xml:space="preserve">
727+
<value>Idioma</value>
728+
</data>
729+
<data name="SettingsPreferencesAppLanguageRestartRequired.Text" xml:space="preserve">
730+
<value>Necessário reiniciar o Aplicativo</value>
731+
</data>
726732
</root>

‎Files/UserControls/ModernNavigationToolbar.xaml

+34-25
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,10 @@
496496
FontSize="16"
497497
FontWeight="Normal"
498498
Text="{Binding Title}" />
499-
<FontIcon FontSize="10" Glyph="&#xE76C;" />
500-
</StackPanel>
501-
</Grid>
502-
</DataTemplate>
499+
<FontIcon FontSize="10" FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE9A8;" />
500+
</StackPanel>
501+
</Grid>
502+
</DataTemplate>
503503

504504
<DataTemplate x:Name="CurrentItem">
505505
<Grid
@@ -512,10 +512,10 @@
512512
FontSize="16"
513513
FontWeight="Medium"
514514
Text="{Binding Title}" />
515-
<FontIcon FontSize="10" Glyph="&#xE76C;" />
516-
</StackPanel>
517-
</Grid>
518-
</DataTemplate>
515+
<FontIcon FontSize="10" FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE9A8;" />
516+
</StackPanel>
517+
</Grid>
518+
</DataTemplate>
519519
</ResourceDictionary>
520520
</ResourceDictionary.MergedDictionaries>
521521
</ResourceDictionary>
@@ -538,17 +538,19 @@
538538
x:Uid="NavBackButton"
539539
Width="34"
540540
Height="30"
541+
FontSize="18"
542+
Padding="0"
541543
Margin="4,0,2,0"
542544
x:FieldModifier="public"
543545
Background="Transparent"
544546
Click="{x:Bind local1:NavigationActions.Back_Click}"
545547
CornerRadius="2"
546-
FontFamily="Segoe MDL2 Assets"
548+
FontFamily="{StaticResource FluentUIGlyphs}"
547549
IsEnabled="{x:Bind local1:App.CurrentInstance.NavigationToolbar.CanGoBack}"
548550
Style="{StaticResource ToolBarButtonStyle}"
549551
ToolTipService.ToolTip="Back (Alt + Left Arrow)">
550552
<Button.Content>
551-
&#xE72B;
553+
&#xe921;
552554
</Button.Content>
553555
<Button.KeyboardAccelerators>
554556
<KeyboardAccelerator Key="XButton1" />
@@ -561,17 +563,19 @@
561563
x:Uid="NavForwardButton"
562564
Width="34"
563565
Height="30"
566+
FontSize="18"
567+
Padding="0"
564568
Margin="2,0,2,0"
565569
x:FieldModifier="public"
566570
Background="Transparent"
567571
Click="{x:Bind local1:NavigationActions.Forward_Click}"
568572
CornerRadius="2"
569-
FontFamily="Segoe MDL2 Assets"
573+
FontFamily="{StaticResource FluentUIGlyphs}"
570574
IsEnabled="{x:Bind local1:App.CurrentInstance.NavigationToolbar.CanGoForward}"
571575
Style="{StaticResource ToolBarButtonStyle}"
572576
ToolTipService.ToolTip="Forward (Alt + Right Arrow)">
573577
<Button.Content>
574-
&#xE72A;
578+
&#xe92b;
575579
</Button.Content>
576580
<Button.KeyboardAccelerators>
577581
<KeyboardAccelerator Key="XButton2" />
@@ -588,12 +592,14 @@
588592
Background="Transparent"
589593
Click="{x:Bind local1:NavigationActions.Up_Click}"
590594
CornerRadius="2"
591-
FontFamily="Segoe MDL2 Assets"
595+
Padding="0"
596+
FontSize="18"
597+
FontFamily="{StaticResource FluentUIGlyphs}"
592598
Style="{StaticResource ToolBarButtonStyle}"
593599
ToolTipService.ToolTip="Up (Alt + Up Arrow)"
594600
Visibility="Visible">
595601
<Button.Content>
596-
&#xE74A;
602+
&#xe936;
597603
</Button.Content>
598604
<Button.KeyboardAccelerators>
599605
<KeyboardAccelerator Key="Up" Modifiers="Menu" />
@@ -610,11 +616,13 @@
610616
Background="Transparent"
611617
Click="{x:Bind local1:NavigationActions.Refresh_Click}"
612618
CornerRadius="2"
613-
FontFamily="Segoe MDL2 Assets"
619+
Padding="0"
620+
FontSize="18"
621+
FontFamily="{StaticResource FluentUIGlyphs}"
614622
Style="{StaticResource ToolBarButtonStyle}"
615623
ToolTipService.ToolTip="Refresh (F5)">
616624
<Button.Content>
617-
&#xE72C;
625+
&#xe916;
618626
</Button.Content>
619627
<Button.KeyboardAccelerators>
620628
<KeyboardAccelerator Key="F5" />
@@ -700,6 +708,7 @@
700708
Grid.Row="3"
701709
Width="34"
702710
Height="30"
711+
Padding="0"
703712
Margin="0,0,4,0"
704713
HorizontalAlignment="Right"
705714
x:Load="{x:Bind local1:App.CurrentInstance.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
@@ -711,7 +720,7 @@
711720
ToolTipService.ToolTip="Create a new item (Ctrl + Shift + N)"
712721
Visibility="Visible">
713722
<Button.Content>
714-
<FontIcon FontSize="14" Glyph="&#xE710;" />
723+
<FontIcon FontSize="18" FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE903;" />
715724
</Button.Content>
716725
<Button.Flyout>
717726
<MenuFlyout Placement="BottomEdgeAlignedRight">
@@ -720,7 +729,7 @@
720729
Click="{x:Bind local1:App.CurrentInstance.InteractionOperations.NewFolder_Click}"
721730
Text="Folder">
722731
<MenuFlyoutItem.Icon>
723-
<FontIcon Glyph="&#xE8B7;" />
732+
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEA55;" />
724733
</MenuFlyoutItem.Icon>
725734
</MenuFlyoutItem>
726735
<MenuFlyoutSeparator />
@@ -730,7 +739,7 @@
730739
IsEnabled="{x:Bind local1:App.CurrentInstance.InstanceViewModel.CanCreateFileInPage, Mode=OneWay}"
731740
Text="Bitmap Image">
732741
<MenuFlyoutItem.Icon>
733-
<FontIcon Glyph="&#xEB9F;" />
742+
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEA83;" />
734743
</MenuFlyoutItem.Icon>
735744
</MenuFlyoutItem>
736745
<MenuFlyoutItem
@@ -739,7 +748,7 @@
739748
IsEnabled="{x:Bind local1:App.CurrentInstance.InstanceViewModel.CanCreateFileInPage, Mode=OneWay}"
740749
Text="Text Document">
741750
<MenuFlyoutItem.Icon>
742-
<FontIcon Glyph="&#xE8A5;" />
751+
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEA00;" />
743752
</MenuFlyoutItem.Icon>
744753
</MenuFlyoutItem>
745754
</MenuFlyout>
@@ -760,7 +769,7 @@
760769
ToolTipService.ToolTip="Search"
761770
Visibility="Visible">
762771
<Button.Content>
763-
<FontIcon FontSize="14" Glyph="&#xE721;" />
772+
<FontIcon FontSize="18" FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEB51;" />
764773
</Button.Content>
765774
</Button>
766775

@@ -799,15 +808,15 @@
799808
Click="{x:Bind local1:App.CurrentInstance.InteractionOperations.OpenNewTab}"
800809
Text="New Tab">
801810
<MenuFlyoutItem.Icon>
802-
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF400;" />
811+
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF104;" />
803812
</MenuFlyoutItem.Icon>
804813
</MenuFlyoutItem>
805814
<MenuFlyoutItem
806815
x:Uid="NavigationToolbarNewWindow"
807816
Click="{x:Bind local1:App.CurrentInstance.InteractionOperations.LaunchNewWindow}"
808817
Text="New Window">
809818
<MenuFlyoutItem.Icon>
810-
<FontIcon Glyph="&#xE737;" />
819+
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE973;" />
811820
</MenuFlyoutItem.Icon>
812821
</MenuFlyoutItem>
813822
<MenuFlyoutItem
@@ -817,7 +826,7 @@
817826
Click="{x:Bind local1:App.CurrentInstance.InteractionOperations.GetPath_Click}"
818827
Text="Copy Path">
819828
<MenuFlyoutItem.Icon>
820-
<FontIcon Glyph="&#xE8C8;" />
829+
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE9B1;" />
821830
</MenuFlyoutItem.Icon>
822831
</MenuFlyoutItem>
823832
<MenuFlyoutSeparator x:Name="SeparatorBar" x:Load="{x:Bind local1:App.CurrentInstance.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}" />
@@ -829,7 +838,7 @@
829838
IsEnabled="{x:Bind local1:App.InteractionViewModel.IsPasteEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
830839
Text="Paste">
831840
<MenuFlyoutItem.Icon>
832-
<FontIcon Glyph="&#xE77F;" />
841+
<FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE9B2;" />
833842
</MenuFlyoutItem.Icon>
834843
</MenuFlyoutItem>
835844
<MenuFlyoutItem

0 commit comments

Comments
 (0)