DynamoDS
diff --git a/‎src/DynamoCore/BuiltInAndOperators/BuiltInImages.resx
Copy file name to clipboard
+175-28Lines changed: 175 additions & 28 deletions b/‎src/DynamoCore/BuiltInAndOperators/BuiltInImages.resx
Copy file name to clipboard
+175-28Lines changed: 175 additions & 28 deletions
diff --git a/‎src/DynamoCore/BuiltInAndOperators/OperatorsImages.resx
Copy file name to clipboard
+4,900-400Lines changed: 4900 additions & 400 deletions b/‎src/DynamoCore/BuiltInAndOperators/OperatorsImages.resx
Copy file name to clipboard
+4,900-400Lines changed: 4900 additions & 400 deletions
diff --git a/‎src/DynamoCore/DynamoCoreImages.resx
Copy file name to clipboard
+557-52Lines changed: 557 additions & 52 deletions b/‎src/DynamoCore/DynamoCoreImages.resx
Copy file name to clipboard
+557-52Lines changed: 557 additions & 52 deletions
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+9-1Lines changed: 9 additions & 1 deletion b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+9-1Lines changed: 9 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Services/IconServices.cs
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎src/DynamoCoreWpf/Services/IconServices.cs
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
@@ -27,7 +27,7 @@
       <Exec Command="npm pack @dynamods/splash-screen@latest" />
   </Target>
 
-    <Target Name="ExtractTGZFile" DependsOnTargets="NpmRunBuild" BeforeTargets="BeforeBuild">        
+    <Target Name="ExtractTGZFile" DependsOnTargets="NpmRunBuild" BeforeTargets="BeforeBuild">      
         <!--Locates the .tgz files-->
         <ItemGroup>
             <TGZFiles Include="./dynamods-splash-screen-*.tgz" />
@@ -71,6 +71,7 @@
     <None Remove="Views\Core\CustomColorPicker.xaml" />
     <None Remove="Views\Core\GeometryScalingPopup.xaml" />
     <None Remove="UI\Images\question-hover-blue-16px.png" />
+    <None Remove="Views\Core\UpdateIconWindow.xaml" />
     <None Remove="Views\PackageManager\Controls\ControlColorsAndBrushes.xaml" />      
     <None Remove="Views\PackageManager\Controls\LoadingAnimationStripeControl.xaml" />
     <None Remove="Views\PackageManager\Controls\NumericUpDownControl.xaml" />
@@ -411,6 +412,9 @@
       <DependentUpon>ConnectorContextMenuView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Core\CustomColorPicker.xaml.cs" />
+    <Compile Include="Views\Debug\UpdateNodeIconsWindow.xaml.cs">
+      <DependentUpon>UpdateNodeIconsWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Core\DynamoOpenFileDialog.cs" />
     <Compile Include="Views\Core\ConnectorPinView.xaml.cs">
       <DependentUpon>ConnectorPinView.xaml</DependentUpon>
@@ -594,6 +598,10 @@
       <CopyToOutputDirectory></CopyToOutputDirectory>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Debug\UpdateNodeIconsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Core\GeometryScalingPopup.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
 
@@ -3915,6 +3915,9 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="PublishPackageRetainFolderStructureToggleButtonText" xml:space="preserve">
     <value>Retain folder structure</value>
   </data>
+  <data name="UpdateNodeIconsDebugMenu" xml:space="preserve">
+    <value>Update Node Icons</value>
+  </data>
   <data name="PreferencesViewEnablePanelingNodes" xml:space="preserve">
     <value>Enable Paneling nodes</value>
     <comment>Preferences | Features | Experimental | Enable Paneling nodes</comment>
 
@@ -3902,6 +3902,9 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="PublishPackageRetainFolderStructureToggleButtonText" xml:space="preserve">
     <value>Retain folder structure</value>
   </data>
+  <data name="UpdateNodeIconsDebugMenu" xml:space="preserve">
+    <value>Update Node Icons</value>
+  </data>
   <data name="PreferencesViewEnablePanelingNodes" xml:space="preserve">
     <value>Enable Paneling nodes</value>
     <comment>Preferences | Features | Experimental | Enable Paneling nodes</comment>
 
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -67,8 +67,9 @@ internal IconWarehouse(Assembly resAssembly)
 
         internal ImageSource LoadIconInternal(string iconKey)
         {
-            if (cachedIcons.ContainsKey(iconKey))
-                return cachedIcons[iconKey];
+            ImageSource icon;
+            if (cachedIcons.TryGetValue(iconKey, out icon))
+                return icon;
 
             if (resourceAssembly == null)
             {
 
@@ -10,6 +10,8 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Xml.Linq;
 using Dynamo.Configuration;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Workspaces;
@@ -3370,6 +3372,35 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
         }
     }
 
+    public class Base64ToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (value == null) return null;
+
+            string s = string.Empty;
+            if (value is string)
+            {
+                s = value as string;
+            }
+
+            if (string.IsNullOrEmpty(s)) return null;
+
+            BitmapImage bi = new BitmapImage();
+
+            bi.BeginInit();
+            bi.StreamSource = new MemoryStream(System.Convert.FromBase64String(s));
+            bi.EndInit();
+
+            return bi;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     /// <summary>
     /// Converter is used in WatchTree.xaml 
     /// It converts the boolean value of WatchViewModel.IsCollection to determine the margin of the listnode textblock
 
@@ -716,6 +716,10 @@
                                   Header="{x:Static p:Resources.DynamoShowFileTrustWarning}"
                                   Click="FileTrustWarning_Click"
                                   IsCheckable="False" />
+                        <MenuItem Name="UpdateNodeIcons"
+                                  Header="{x:Static p:Resources.UpdateNodeIconsDebugMenu}"
+                                  Click="UpdateNodeIcons_Click"
+                                  IsCheckable="False" />
                     </MenuItem>
                 </Menu>