Merge pull request #799 from architecture-building-systems/776-new-icons

Icons for Hive Conduit Components
architecture-building-systems · Dec 10, 2022 · 89b3a11 · 89b3a11
2 parents c287a36 + 141a66e
commit 89b3a11
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 3 deletions.
diff --git a/GrasshopperExamples/Templates/Hive_FullTemplate.gh b/GrasshopperExamples/Templates/Hive_FullTemplate.gh
diff --git a/GrasshopperExamples/Templates/Hive_TreePrototype.gh b/GrasshopperExamples/Templates/Hive_TreePrototype.gh
diff --git a/setup/Hive.ProvingGround.Conduit.gha b/setup/Hive.ProvingGround.Conduit.gha
diff --git a/setup/Setup_Hive.exe b/setup/Setup_Hive.exe
diff --git a/src/Graphics/PNG/IOCore_DistConduit.png b/src/Graphics/PNG/IOCore_DistConduit.png
diff --git a/src/Hive.IO/Hive.IO/GhDistributors/GhDistConduit.cs b/src/Hive.IO/Hive.IO/GhDistributors/GhDistConduit.cs
@@ -69,7 +69,7 @@ protected override void SolveInstance(IGH_DataAccess DA)
             DA.SetData(2, title2);
         }
 
-        //protected override System.Drawing.Bitmap Icon => Properties.Resources.IOCore_Distconvtech;
+        protected override System.Drawing.Bitmap Icon => Properties.Resources.IOCore_DistConduit;
 
         public override Guid ComponentGuid => new Guid("d4c71228-b0bd-4c8b-b24e-a73164189fcd");
     }

diff --git a/src/Hive.IO/Hive.IO/Hive.IO.csproj b/src/Hive.IO/Hive.IO/Hive.IO.csproj
@@ -352,6 +352,7 @@
     <None Include="Resources\Icons\IOCore_DistEmitter.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\IOCore_DistConduit.png" />
     <None Include="Resources\demand_SIAroomreader.png" />
     <Content Include="Resources\EnergySystems\flat_plate.jpg" />
     <Content Include="Resources\EnergySystems\vacuum_tube.jpg" />

diff --git a/src/Hive.IO/Hive.IO/Properties/AssemblyInfo.cs b/src/Hive.IO/Hive.IO/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.16.x")]
+[assembly: AssemblyInformationalVersion("1.17")]
diff --git a/src/Hive.IO/Hive.IO/Properties/Resources.Designer.cs b/src/Hive.IO/Hive.IO/Properties/Resources.Designer.cs
diff --git a/src/Hive.IO/Hive.IO/Properties/Resources.resx b/src/Hive.IO/Hive.IO/Properties/Resources.resx
@@ -337,4 +337,7 @@
   <data name="Solar_PerformanceRatio" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\solar_PerformanceRatio.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="IOCore_DistConduit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\IOCore_DistConduit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/src/Hive.IO/Hive.IO/Resources/IOCore_DistConduit.png b/src/Hive.IO/Hive.IO/Resources/IOCore_DistConduit.png