Replace package filter icon with text (#10181) (#10185)

* Replace Filter By icon with text * remove fa reference * Update Button Separation
DynamoDS · Dec 2, 2019 · 00640a1 · 00640a1
1 parent eb77e1d
commit 00640a1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2231,4 +2231,7 @@ Uninstall the following packages: {0}?</value>
   <data name="PublishPackageViewPackageHostDependencyTooltip" xml:space="preserve">
     <value>An indication of what applications outside of Dynamo your package depends on, such as Revit, Civil 3D or Photoshop. Users of your package will need to install these applications to fully utilize your package.</value>
   </data>
+  <data name="PackageSearchViewFilterByButton" xml:space="preserve">
+    <value>Filter by</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2234,4 +2234,7 @@ Uninstall the following packages: {0}?</value>
   <data name="PublishPackageViewPackageHostDependencyTooltip" xml:space="preserve">
     <value>An indication of what applications outside of Dynamo your package depends on, such as Revit, Civil 3D or Photoshop. Users of your package will need to install these applications to fully utilize your package.</value>
   </data>
+  <data name="PackageSearchViewFilterByButton" xml:space="preserve">
+    <value>Filter by</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -4,7 +4,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:ui="clr-namespace:Dynamo.UI"
-        xmlns:fa="http://schemas.fontawesome.io/icons/"
         xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
         xmlns:controls="clr-namespace:Dynamo.Controls"
         xmlns:viewModels="clr-namespace:Dynamo.PackageManager.ViewModels"
@@ -140,7 +139,7 @@
                            Grid.Column="0" FontSize ="13" Padding="20,10,5,10" Margin ="0" Background="Transparent" Foreground="#666" IsHitTestVisible="False">
                 </TextBlock>
 
-                <Button Width="auto" MinWidth="100" Grid.Column="1" Click="OnSortButtonClicked"
+                <Button Width="auto" MinWidth="50" Grid.Column="1" Click="OnSortButtonClicked"
                         Style="{DynamicResource ResourceKey=STextButton}" Content="{x:Static p:Resources.PackageSearchViewSortByButton}">
 
                     <Button.ContextMenu>
@@ -176,11 +175,12 @@
                 </Button>
 
                 <Button Width="Auto" 
+                        MinWidth="50"
                         Grid.Column="2" 
-                        Click="OnFilterButtonClicked" 
-                        fa:Awesome.Content="Filter"
-                        TextElement.FontFamily="pack://application:,,,/FontAwesome.WPF;component/#FontAwesome"
+                        Click="OnFilterButtonClicked"
+                        Margin="2 0 0 0"
                         Style="{DynamicResource ResourceKey=STextButton}"
+                        Content="{x:Static p:Resources.PackageSearchViewFilterByButton}"
                         ToolTip="{x:Static p:Resources.PackageHostDependencyFilter}">
                     <Button.ContextMenu>
                         <ContextMenu Name="HostFilter"