Updated FontAwesome5 Library (#14156)

* Updated FontAwesome5 Library * Fixed merged errors * Replaced Assembly by URL * Fixed merge conflict * Fixed merge conflict from master * Fixed FontAwesome License * Move to legacy * Update License.rtf * update * Update License.rtf --------- Co-authored-by: marbelarrietaGlobant <[email protected]> Co-authored-by: pinzart <[email protected]>
DynamoDS · Aug 4, 2023 · 863d891 · 863d891
1 parent f8fe2e8
commit 863d891
Show file tree

Hide file tree

Showing 30 changed files with 4,178 additions and 725 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -73,18 +73,25 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Fontawesome v.4.7.0.37774:
-https://www.nuget.org/packages/FontAwesome.WPF/
-https://github.com/charri/Font-Awesome-WPF/blob/master/LICENSE
-The MIT License (MIT)
-Copyright (c) 2014-2016 charri
+FontAwesome5 v.2.1.11:
+https://www.nuget.org/packages/FontAwesome5/
+https://github.com/MartinTopfstedt/FontAwesome5/blob/master/LICENSE
+MIT License
+Copyright (c) 2018 MartinTopfstedt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+FontAwesome v.5.15.4:
+https://github.com/FortAwesome/Font-Awesome/blob/5.x/LICENSE.txt
+CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+Copyright (c) 2022 Fonticons, Inc. (https://fontawesome.com)
+
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons packaged as SVG and JS file types.
+
 Cyotek.Drawing.BitmapFont v.1.3.4:
 https://github.com/cyotek/Cyotek.Drawing.BitmapFont
 https://github.com/cyotek/Cyotek.Drawing.BitmapFont/blob/master/LICENSE.txt
@@ -342,17 +349,6 @@ DiffPlex.wpf v.1.1.1:
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-FontAwesome v.4.0.7:
-https://www.nuget.org/packages/FontAwesome.WPF/
-https://github.com/charri/Font-Awesome-WPF/blob/master/LICENSE
-Copyright (c) 2014-2016 charri
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 AngleSharp v.0.14.0: Copyright (c) 2013 - 2019 AngleSharp
 AngleSharp.CSS v.0.14.2: Copyright © 2013-2020 AngleSharp
 The MIT License (MIT)

diff --git a/doc/distrib/License.rtf b/doc/distrib/License.rtf
diff --git a/extern/legacy_remove_me/bin/FontAwesome.WPF.dll b/extern/legacy_remove_me/bin/FontAwesome.WPF.dll
diff --git a/extern/legacy_remove_me/bin/FontAwesome.WPF.xml b/extern/legacy_remove_me/bin/FontAwesome.WPF.xml
diff --git a/src/DynamoCoreWpf/Controls/ClassInformationView.xaml b/src/DynamoCoreWpf/Controls/ClassInformationView.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="Dynamo.UI.Controls.ClassInformationView"
+<UserControl x:Class="Dynamo.UI.Controls.ClassInformationView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:controls="clr-namespace:Dynamo.Controls"
              xmlns:uicontrols="clr-namespace:Dynamo.UI.Controls"
-             xmlns:fa="http://schemas.fontawesome.io/icons/"
+             xmlns:fa="http://schemas.fontawesome.com/icons/"
              xmlns:ui="clr-namespace:Dynamo.UI"
              xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
              mc:Ignorable="d"
@@ -109,7 +109,7 @@
                     <ToolTip Content="{x:Static p:Resources.CreateMember}" Style="{StaticResource GenericToolTipLight}"/>
                 </Grid.ToolTip>
                 <Rectangle Fill="Transparent" />
-                <fa:ImageAwesome Icon="plus"
+                <fa:ImageAwesome Icon="Solid_Plus"
                                  Foreground="{StaticResource CreateMembersColor}"
                                  VerticalAlignment="Top"
                                  HorizontalAlignment="Center" />
@@ -145,7 +145,7 @@
                         <ToolTip Content="{x:Static p:Resources.ActionMember}" Style="{StaticResource GenericToolTipLight}"/>
                     </Grid.ToolTip>
                     <Rectangle Fill="Transparent" />
-                    <fa:ImageAwesome Icon="LightningBolt"
+                    <fa:ImageAwesome Icon="Solid_Bolt"
                                      Foreground="{StaticResource ActionMembersColor}"
                                      VerticalAlignment="Top"
                                      HorizontalAlignment="Center" />
@@ -187,7 +187,7 @@
                         <ToolTip Content="{x:Static p:Resources.QueryMember}" Style="{StaticResource GenericToolTipLight}"/>
                     </Grid.ToolTip>
                     <Rectangle Fill="Transparent" />
-                    <fa:ImageAwesome Icon="Question"
+                    <fa:ImageAwesome Icon="Solid_Question"
                                      Foreground="{StaticResource QueryMembersColor}"
                                      VerticalAlignment="Top"
                                      HorizontalAlignment="Center" />

diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:ui="clr-namespace:Dynamo.UI"
              xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
-             xmlns:fa="http://schemas.fontawesome.io/icons/"
+             xmlns:fa="http://schemas.fontawesome.com/icons/"
              mc:Ignorable="d"
              Height="Auto"
              Width="Auto"

diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -131,12 +131,12 @@
   </ItemGroup>
   <ItemGroup> 
     <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.1400" />
+    <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
     <PackageReference Include="Greg" Version="2.5.0.5076" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="106.12.0" />
-	<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" CopyXML="true" />
 	<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
     <PackageReference Include="HelixToolkit" Version="2.17.0" />
     <PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" />

diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
@@ -25,6 +25,7 @@
 using Dynamo.Wpf.Properties;
 using Dynamo.Wpf.ViewModels;
 using DynamoUnits;
+using FontAwesome5;
 using Color = System.Windows.Media.Color;
 using FlowDirection = System.Windows.FlowDirection;
 using HorizontalAlignment = System.Windows.HorizontalAlignment;
@@ -1332,8 +1333,8 @@ public class BoolToFAIconNameConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             if ((bool)value)
-                return nameof(FontAwesome.WPF.FontAwesomeIcon.BellOutline);
-            return nameof(FontAwesome.WPF.FontAwesomeIcon.BellSlashOutline);
+                return nameof(EFontAwesomeIcon.Solid_Bell);
+            return nameof(EFontAwesomeIcon.Solid_BellSlash);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -5,7 +5,7 @@
                     xmlns:controls="clr-namespace:Dynamo.Views;assembly=DynamoCoreWpf"
                     xmlns:nodes="clr-namespace:Dynamo.Nodes;assembly=DynamoCoreWpf"
                     xmlns:dynui="clr-namespace:Dynamo.UI.Controls;assembly=DynamoCoreWpf"
-                    xmlns:fa="clr-namespace:FontAwesome.WPF;assembly=FontAwesome.WPF"
+                    xmlns:fa="clr-namespace:FontAwesome5;assembly=FontAwesome5.Net"
                     xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
                     xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf">
 

diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/LiveChartsStyle.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/LiveChartsStyle.xaml
@@ -5,7 +5,7 @@
                     xmlns:controls="clr-namespace:Dynamo.Views;assembly=DynamoCoreWpf"
                     xmlns:nodes="clr-namespace:Dynamo.Nodes;assembly=DynamoCoreWpf"
                     xmlns:dynui="clr-namespace:Dynamo.UI.Controls;assembly=DynamoCoreWpf"
-                    xmlns:fa="clr-namespace:FontAwesome.WPF;assembly=FontAwesome.WPF"
+                    xmlns:fa="http://schemas.fontawesome.com/icons/"
                     xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
                     xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"

diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs
@@ -12,7 +12,7 @@
 using Dynamo.Search.SearchElements;
 using Dynamo.Selection;
 using Dynamo.ViewModels;
-using FontAwesome.WPF;
+using FontAwesome5;
 #if NETFRAMEWORK
 using Microsoft.Practices.Prism.Commands;
 #else
@@ -23,7 +23,7 @@ namespace Dynamo.Wpf.ViewModels
 {
     public class NodeSearchElementViewModel : ViewModelBase, ISearchEntryViewModel
     {
-        private Dictionary<SearchElementGroup, FontAwesomeIcon> FontAwesomeDict;
+        private Dictionary<SearchElementGroup, EFontAwesomeIcon> FontAwesomeDict;
 
         private bool isSelected;
         private SearchViewModel searchViewModel;
@@ -172,21 +172,21 @@ public SearchElementGroup Group
         /// </summary>
         private void LoadFonts()
         {
-            FontAwesomeDict = new Dictionary<SearchElementGroup, FontAwesomeIcon>();
+            FontAwesomeDict = new Dictionary<SearchElementGroup, EFontAwesomeIcon>();
 
-            FontAwesomeDict.Add(SearchElementGroup.Create, FontAwesomeIcon.Plus);
-            FontAwesomeDict.Add(SearchElementGroup.Action, FontAwesomeIcon.Bolt);
-            FontAwesomeDict.Add(SearchElementGroup.Query, FontAwesomeIcon.Question);
+            FontAwesomeDict.Add(SearchElementGroup.Create, EFontAwesomeIcon.Solid_Plus);
+            FontAwesomeDict.Add(SearchElementGroup.Action, EFontAwesomeIcon.Solid_Bolt);
+            FontAwesomeDict.Add(SearchElementGroup.Query, EFontAwesomeIcon.Solid_Question);
         }
 
         /// <summary>
         /// Indicates group icon, e.g. create - plus icon.
         /// </summary>
-        public FontAwesomeIcon GroupIconName
+        public EFontAwesomeIcon GroupIconName
         {
             get
             {
-                return FontAwesomeDict.ContainsKey(Group) ? FontAwesomeDict[Group] : FontAwesomeIcon.None;
+                return FontAwesomeDict.ContainsKey(Group) ? FontAwesomeDict[Group] : EFontAwesomeIcon.None;
             }
         }
 

diff --git a/src/DynamoCoreWpf/Views/Core/GeometryScalingPopup.xaml b/src/DynamoCoreWpf/Views/Core/GeometryScalingPopup.xaml
@@ -7,8 +7,8 @@
         xmlns:ui="clr-namespace:Dynamo.UI"            
         xmlns:controls="clr-namespace:Dynamo.Controls"
         xmlns:viewModels="clr-namespace:Dynamo.ViewModels"
-       xmlns:fa="http://schemas.fontawesome.io/icons/"
-        mc:Ignorable="d"
+       xmlns:fa="clr-namespace:FontAwesome5;assembly=FontAwesome5.Net"
+       mc:Ignorable="d"
         PopupAnimation="Fade"
         AllowsTransparency="True"
        StaysOpen="False"
@@ -45,7 +45,7 @@
                                                  Foreground="{Binding ScaleSize, Converter={StaticResource ScaleSizeBackgroundConverter}, ConverterParameter={x:Static viewModels:GeometryScaleSize.Small}}"
                                                  VerticalAlignment="Center" 
                                                  HorizontalAlignment="Center" 
-                                                 Icon="Check"/>
+                                                 Icon="Solid_Check"/>
                                 <TextBlock x:Name="RadioSmallDesc"
                                            Margin="10,5,0,0"
                                            VerticalAlignment="Center" 
@@ -71,7 +71,7 @@
                                                  Margin="10,0,0,0"
                                                  VerticalAlignment="Center" 
                                                  HorizontalAlignment="Center" 
-                                                 Icon="Check"/>
+                                                 Icon="Solid_Check"/>
                                 <TextBlock  x:Name="RadioMediumDesc"
                                             Margin="10,0,0,0"
                                             HorizontalAlignment="Center"
@@ -96,7 +96,7 @@
                                                  Foreground="{Binding ScaleSize, Converter={StaticResource ScaleSizeBackgroundConverter}, ConverterParameter={x:Static viewModels:GeometryScaleSize.Large}}"
                                                  VerticalAlignment="Center" 
                                                  HorizontalAlignment="Center"  
-                                                 Icon="Check"/>
+                                                 Icon="Solid_Check"/>
                                 <TextBlock  x:Name="RadioLargeDesc"
                                             Margin="10,0,0,0"
                                             VerticalAlignment="Center" 
@@ -121,7 +121,7 @@
                                                 Foreground="{Binding ScaleSize, Converter={StaticResource ScaleSizeBackgroundConverter}, ConverterParameter={x:Static viewModels:GeometryScaleSize.ExtraLarge}}"
                                                 VerticalAlignment="Center" 
                                                 HorizontalAlignment="Center" 
-                                                Icon="Check"/>
+                                                Icon="Solid_Check"/>
 
                                 <TextBlock  x:Name="RadioExtraLargeDesc"
                                             Width="Auto"

diff --git a/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml b/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml
@@ -1,4 +1,4 @@
-<Popup x:Class="Dynamo.Wpf.Views.FileTrust.FileTrustWarning"
+<Popup x:Class="Dynamo.Wpf.Views.FileTrust.FileTrustWarning"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,7 +7,7 @@
        xmlns:ui="clr-namespace:Dynamo.UI"
        xmlns:controls="clr-namespace:Dynamo.Controls"
        xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf" 
-       xmlns:fa="http://schemas.fontawesome.io/icons/" 
+       xmlns:fa="clr-namespace:FontAwesome5;assembly=FontAwesome5.Net"
        mc:Ignorable="d" 
        AllowsTransparency="True"
        Opacity="0.5"
@@ -111,7 +111,7 @@
                                                 Foreground="#FAA21B"
                                                 VerticalAlignment="Bottom" 
                                                 HorizontalAlignment="Left" 
-                                                Icon="ExclamationTriangle"/>
+                                                Icon="Solid_ExclamationTriangle"/>
                             </Label.Content>
                         </Label>
                         <Label x:Name="TitleLabel"
@@ -137,7 +137,7 @@
                                                  Height="15" 
                                                  VerticalAlignment="Bottom" 
                                                  HorizontalAlignment="Left" 
-                                                 Icon="QuestionCircle"                                               
+                                                 Icon="Solid_QuestionCircle"                                               
                                                  Foreground="#808080"/>
                             </Label.Content>
                         </Label>
@@ -184,7 +184,7 @@
                                                  Height="15" 
                                                  VerticalAlignment="Bottom" 
                                                  HorizontalAlignment="Left" 
-                                                 Icon="QuestionCircle"                                               
+                                                 Icon="Solid_QuestionCircle"                                               
                                                  Foreground="#808080"/>
                             </Label.Content>
                         </Label>

diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -11,7 +11,7 @@
         xmlns:ui="clr-namespace:Dynamo.UI"
         xmlns:viewModels="clr-namespace:Dynamo.ViewModels"
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
-        xmlns:fa="http://schemas.fontawesome.io/icons/" 
+        xmlns:fa="clr-namespace:FontAwesome5;assembly=FontAwesome5.Net" 
         xmlns:packagemanager="clr-namespace:Dynamo.Wpf.Views.PackageManager"
         xmlns:trustedpaths="clr-namespace:Dynamo.Wpf.Views"
         xmlns:wpfControls="clr-namespace:Dynamo.Wpf.Controls"
@@ -105,7 +105,7 @@
                                     Width="20"
                                     Height="30"
 									Grid.Row="0">
-                                    <fa:ImageAwesome Icon="Trash"          
+                                    <fa:ImageAwesome Icon="Solid_Trash"          
                                                  Width="15"
                                                  Height="25"
                                                  IsHitTestVisible="False"