Properties: Replace "combined files" icon (#1214)

Richard · web-flow · commit 5740aea56add · 2020-06-24T00:12:07.000-04:00
diff --git a/Files/App.xaml b/Files/App.xaml
@@ -4,8 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
-            <FontFamily x:Key="CustomLayoutModeIcon">/Assets/Custom Glyphs/layout-mode-custom-icon.ttf#layout-mode-custom-icon</FontFamily>
-            <FontFamily x:Key="CustomNewTabIcon">/Assets/Custom Glyphs/newtab-icon.ttf#newtab-icon</FontFamily>
+            <FontFamily x:Key="CustomGlyph">/Assets/Custom Glyphs/Custom-Glyphs.ttf#Custom-Glyphs</FontFamily>
             <FontFamily x:Key="RecycleBinIcons">/Assets/Custom Glyphs/recyclebin-fabric-glyph.ttf#Fabric MDL2 Assets</FontFamily>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
diff --git a/Files/Assets/Custom Glyphs/Custom-Glyphs.ttf b/Files/Assets/Custom Glyphs/Custom-Glyphs.ttf
diff --git a/Files/Assets/Custom Glyphs/layout-mode-custom-icon.ttf b/Files/Assets/Custom Glyphs/layout-mode-custom-icon.ttf
diff --git a/Files/Assets/Custom Glyphs/newtab-icon.ttf b/Files/Assets/Custom Glyphs/newtab-icon.ttf
diff --git a/Files/Files.csproj b/Files/Files.csproj
@@ -287,13 +287,10 @@
     <Content Include="Assets\LargeTile.scale-200.png" />
     <Content Include="Assets\LargeTile.scale-400.png" />
     <Content Include="Assets\logo.bmp" />
-    <Content Include="Assets\Custom Glyphs\layout-mode-custom-icon.ttf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Assets\Custom Glyphs\recyclebin-fabric-glyph.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Assets\Custom Glyphs\newtab-icon.ttf">
+    <Content Include="Assets\Custom Glyphs\Custom-Glyphs.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="Assets\terminal\terminal.json">
diff --git a/Files/UserControls/ModernNavigationToolbar.xaml b/Files/UserControls/ModernNavigationToolbar.xaml
@@ -787,7 +787,7 @@
                             Click="{x:Bind local1:App.CurrentInstance.InteractionOperations.OpenNewTab}"
                             Text="New Tab">
                             <MenuFlyoutItem.Icon>
-                                <FontIcon FontFamily="{StaticResource CustomNewTabIcon}" Glyph="&#xF400;" />
+                                <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF400;" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
                         <MenuFlyoutItem
diff --git a/Files/UserControls/SidebarControl.xaml b/Files/UserControls/SidebarControl.xaml
@@ -153,7 +153,7 @@
                                 Click="OpenInNewTab_Click"
                                 Text="Open in new tab">
                                 <MenuFlyoutItem.Icon>
-                                    <FontIcon FontFamily="{StaticResource CustomNewTabIcon}" Glyph="&#xF500;" />
+                                    <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF500;" />
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
                             <MenuFlyoutItem
diff --git a/Files/Views/LayoutModes/GenericFileBrowser.xaml b/Files/Views/LayoutModes/GenericFileBrowser.xaml
@@ -200,7 +200,7 @@
                 Tag="OpenTab_FlyoutItem"
                 Text="Open in new tab">
                 <MenuFlyoutItem.Icon>
-                    <FontIcon FontFamily="{StaticResource CustomNewTabIcon}" Glyph="&#xF500;" />
+                    <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF500;" />
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
             <MenuFlyoutItem
diff --git a/Files/Views/LayoutModes/GridViewBrowser.xaml b/Files/Views/LayoutModes/GridViewBrowser.xaml
@@ -196,7 +196,7 @@
                 Tag="OpenTab_FlyoutItem"
                 Text="Open in new tab">
                 <MenuFlyoutItem.Icon>
-                    <FontIcon FontFamily="{StaticResource CustomNewTabIcon}" Glyph="&#xF500;" />
+                    <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF500;" />
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
             <MenuFlyoutItem
diff --git a/Files/Views/Pages/Properties.xaml b/Files/Views/Pages/Properties.xaml
@@ -97,9 +97,9 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Stretch"
                         x:Load="{x:Bind ViewModel.LoadCombinedItemsGlyph, Mode=OneWay}"
-                        FontFamily="Segoe MDL2 Assets"
-                        FontSize="70"
-                        Glyph="&#xE81E;" />
+                        FontFamily="{StaticResource CustomGlyph}"
+                        FontSize="72"
+                        Glyph="&#xF600;" />
                     <FontIcon
                         x:Name="DriveItemIcon"
                         HorizontalAlignment="Center"
