Merge pull request #27 from EverseDevelopment/develop

dimeverse · web-flow · commit e423f3949e0f · 2023-03-13T16:56:14.000+01:00
Develop
diff --git a/e-verse.Navisworks.SelectByRevitId.Common/Images/RID_Head.png b/e-verse.Navisworks.SelectByRevitId.Common/Images/RID_Head.png
diff --git a/e-verse.Navisworks.SelectByRevitId.Common/Images/SelectByRevitId.png b/e-verse.Navisworks.SelectByRevitId.Common/Images/SelectByRevitId.png
diff --git a/e-verse.Navisworks.SelectByRevitId.Common/e-verse.Navisworks.SelectByRevitId.Common.shproj b/e-verse.Navisworks.SelectByRevitId.Common/e-verse.Navisworks.SelectByRevitId.Common.shproj
@@ -23,7 +23,7 @@
   <ItemGroup>
     <Content Include="Images\Heart.jpg" />
     <Content Include="Images\RID_32.jpg" />
-    <Content Include="Images\RID_Head.png" />
+    <Content Include="Images\SelectByRevitId.png" />
     <Content Include="PackageContents.xml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/e-verse.Navisworks.SelectByRevitId.Common/e-verse.Navisworks.SelectByRevitId.addin b/e-verse.Navisworks.SelectByRevitId.Common/e-verse.Navisworks.SelectByRevitId.addin
@@ -1,11 +1,11 @@
 ﻿<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <NavisworksAddIns>
 	<AddIn Type="Application">
-		<Name>e-verse.Navisworks.CreateSelectionSet</Name>
-		<Assembly>e-verse.Navisworks.CreateSelectionSet\e-verse.Navisworks.CreateSelectionSet.dll</Assembly>
-		<FullClassName>e-verse.Navisworks.CreateSelectionSet.Plugin.CreateSelectionSetPlugin</FullClassName>
-		<Text>e-verse.Navisworks.CreateSelectionSet</Text>
-		<Description>e-verse.Navisworks.CreateSelectionSet</Description>
+		<Name>e-verse.Navisworks.SelectByRevitId</Name>
+		<Assembly>e-verse.Navisworks.SelectByRevitId\e-verse.Navisworks.SelectByRevitId.dll</Assembly>
+		<FullClassName>e-verse.Navisworks.CreateSelectionSet.Plugin.SelectByIdPlugin</FullClassName>
+		<Text>e-verse.Navisworks.SelectByRevitId</Text>
+		<Description>e-verse.Navisworks.SelectByRevitId</Description>
 		<VisibilityMode>AlwaysVisible</VisibilityMode>
 		<AddInId>
 			F2AB0B9E-0879-4085-8E8B-9A4083FC620A
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ExitDialog.xaml b/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ExitDialog.xaml
@@ -16,7 +16,7 @@
             Background="{DynamicResource BackgroundColor}"
             BorderBrush="Transparent"
             BorderThickness="1" 
-            CornerRadius="8,8,8,8"
+            CornerRadius="15,15,15,15"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
         <!--<Border.Effect>
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/LicenseAgreementDialog.xaml b/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/LicenseAgreementDialog.xaml
@@ -15,7 +15,7 @@
             Background="{DynamicResource BackgroundColor}"
             BorderBrush="Transparent"
             BorderThickness="1" 
-            CornerRadius="8,8,8,8" HorizontalAlignment="Left" Width="497" Height="409" VerticalAlignment="Bottom">
+            CornerRadius="15,15,15,15" HorizontalAlignment="Left" Width="497" Height="409" VerticalAlignment="Bottom">
 
         <Grid x:Name="Root">
 
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/MaintenanceTypeDialog.xaml b/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/MaintenanceTypeDialog.xaml
@@ -15,7 +15,7 @@
             Background="#e8e3df"
             BorderBrush="Transparent"
             BorderThickness="1" 
-            CornerRadius="8,8,8,8"
+            CornerRadius="15,15,15,15"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
 
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ProgressDialog.xaml b/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ProgressDialog.xaml
@@ -15,7 +15,7 @@
             Background="{DynamicResource BackgroundColor}"
             BorderBrush="Transparent"
             BorderThickness="1" 
-            CornerRadius="8,8,8,8"
+            CornerRadius="15,15,15,15"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
 
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/WelcomeDialog.xaml b/e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/WelcomeDialog.xaml
@@ -15,7 +15,7 @@
             Background="{DynamicResource BackgroundColor}"
             BorderBrush="Transparent"
             BorderThickness="1" 
-            CornerRadius="8,8,8,8"
+            CornerRadius="15,15,15,15"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
 
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/Resources/SelectByRevitId.png b/e-verse.Navisworks.SelectByRevitId.Installer/Resources/SelectByRevitId.png
diff --git a/e-verse.Navisworks.SelectByRevitId.Installer/wix/e-verse.Navisworks.SelectByRevitId.Installer.g.wxs b/e-verse.Navisworks.SelectByRevitId.Installer/wix/e-verse.Navisworks.SelectByRevitId.Installer.g.wxs
@@ -6,7 +6,7 @@
 </auto-generated>
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="5e02b8c2-2d91-472f-98b8-559237e47b2d" Name="e-verse.Navisworks.SelectByRevitId" Language="1033" Codepage="Windows-1252" Version="1.0.7" UpgradeCode="5e02b8c2-2d91-472f-98b8-559227e4fb2d" Manufacturer="e-verse">
+  <Product Id="5e02b8c2-2d91-472f-98b8-559237e48b2d" Name="e-verse.Navisworks.SelectByRevitId" Language="1033" Codepage="Windows-1252" Version="1.0.8" UpgradeCode="5e02b8c2-2d91-472f-98b8-559227e4fb2d" Manufacturer="e-verse">
     <Package InstallerVersion="200" Compressed="yes" SummaryCodepage="Windows-1252" Languages="1033" />
     <Media Id="1" Cabinet="_...rse.Navisworks.SelectByRevitId.cab" EmbedCab="yes" />
 
@@ -78,8 +78,8 @@
                         </RegistryKey>
                       </Component>
 
-                      <Component Id="Component.RID_Head.png_410285891" Guid="5e02b8c2-2d91-472f-98b8-55921d3e407d">
-                        <File Id="RID_Head.png_410285891" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png" />
+                      <Component Id="Component.SelectByRevitId.png_3727819196" Guid="5e02b8c2-2d91-472f-98b8-5592dce0ccf8">
+                        <File Id="SelectByRevitId.png_3727819196" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png" />
 
                         <RegistryKey Root="HKCU" Key="Software\WixSharp\Used">
                           <RegistryValue Value="0" Type="string" KeyPath="yes" />
@@ -140,8 +140,8 @@
                         </RegistryKey>
                       </Component>
 
-                      <Component Id="Component.RID_Head.png_3832072210" Guid="5e02b8c2-2d91-472f-98b8-5592204ab2b7">
-                        <File Id="RID_Head.png_3832072210" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png" />
+                      <Component Id="Component.SelectByRevitId.png_4184347831" Guid="5e02b8c2-2d91-472f-98b8-55921cb11d7c">
+                        <File Id="SelectByRevitId.png_4184347831" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png" />
 
                         <RegistryKey Root="HKCU" Key="Software\WixSharp\Used">
                           <RegistryValue Value="0" Type="string" KeyPath="yes" />
@@ -202,8 +202,8 @@
                         </RegistryKey>
                       </Component>
 
-                      <Component Id="Component.RID_Head.png_2083964010" Guid="5e02b8c2-2d91-472f-98b8-5592d87b1541">
-                        <File Id="RID_Head.png_2083964010" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png" />
+                      <Component Id="Component.SelectByRevitId.png_1841441508" Guid="5e02b8c2-2d91-472f-98b8-5592b988eb31">
+                        <File Id="SelectByRevitId.png_1841441508" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png" />
 
                         <RegistryKey Root="HKCU" Key="Software\WixSharp\Used">
                           <RegistryValue Value="0" Type="string" KeyPath="yes" />
@@ -264,8 +264,8 @@
                         </RegistryKey>
                       </Component>
 
-                      <Component Id="Component.RID_Head.png_3050514862" Guid="5e02b8c2-2d91-472f-98b8-5592cff3c5fb">
-                        <File Id="RID_Head.png_3050514862" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png" />
+                      <Component Id="Component.SelectByRevitId.png_2335385000" Guid="5e02b8c2-2d91-472f-98b8-5592f8c6b4ba">
+                        <File Id="SelectByRevitId.png_2335385000" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png" />
 
                         <RegistryKey Root="HKCU" Key="Software\WixSharp\Used">
                           <RegistryValue Value="0" Type="string" KeyPath="yes" />
@@ -326,8 +326,8 @@
                         </RegistryKey>
                       </Component>
 
-                      <Component Id="Component.RID_Head.png_3189491256" Guid="5e02b8c2-2d91-472f-98b8-5592ba4b61f5">
-                        <File Id="RID_Head.png_3189491256" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png" />
+                      <Component Id="Component.SelectByRevitId.png_3415513413" Guid="5e02b8c2-2d91-472f-98b8-5592f9458d4c">
+                        <File Id="SelectByRevitId.png_3415513413" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png" />
 
                         <RegistryKey Root="HKCU" Key="Software\WixSharp\Used">
                           <RegistryValue Value="0" Type="string" KeyPath="yes" />
@@ -388,8 +388,8 @@
                         </RegistryKey>
                       </Component>
 
-                      <Component Id="Component.RID_Head.png_369994906" Guid="5e02b8c2-2d91-472f-98b8-5592ea9725d3">
-                        <File Id="RID_Head.png_369994906" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png" />
+                      <Component Id="Component.SelectByRevitId.png_4236291537" Guid="5e02b8c2-2d91-472f-98b8-5592293881e8">
+                        <File Id="SelectByRevitId.png_4236291537" Source="..\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png" />
 
                         <RegistryKey Root="HKCU" Key="Software\WixSharp\Used">
                           <RegistryValue Value="0" Type="string" KeyPath="yes" />
@@ -473,37 +473,37 @@
       <ComponentRef Id="Component.PluginRibbon.xaml_471056500" />
       <ComponentRef Id="Component.Heart.jpg_3100705638" />
       <ComponentRef Id="Component.RID_32.jpg_1810031807" />
-      <ComponentRef Id="Component.RID_Head.png_410285891" />
+      <ComponentRef Id="Component.SelectByRevitId.png_3727819196" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.dll_2332390294" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.addin_1751168204" />
       <ComponentRef Id="Component.PluginRibbon.xaml_2882117005" />
       <ComponentRef Id="Component.Heart.jpg_2944075371" />
       <ComponentRef Id="Component.RID_32.jpg_1652090666" />
-      <ComponentRef Id="Component.RID_Head.png_3832072210" />
+      <ComponentRef Id="Component.SelectByRevitId.png_4184347831" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.dll_3296492610" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.addin_343185237" />
       <ComponentRef Id="Component.PluginRibbon.xaml_2358655851" />
       <ComponentRef Id="Component.Heart.jpg_3007226208" />
       <ComponentRef Id="Component.RID_32.jpg_1730054755" />
-      <ComponentRef Id="Component.RID_Head.png_2083964010" />
+      <ComponentRef Id="Component.SelectByRevitId.png_1841441508" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.dll_2088300034" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.addin_4192599401" />
       <ComponentRef Id="Component.PluginRibbon.xaml_670966172" />
       <ComponentRef Id="Component.Heart.jpg_1881433983" />
       <ComponentRef Id="Component.RID_32.jpg_588402558" />
-      <ComponentRef Id="Component.RID_Head.png_3050514862" />
+      <ComponentRef Id="Component.SelectByRevitId.png_2335385000" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.dll_322707994" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.addin_1775745561" />
       <ComponentRef Id="Component.PluginRibbon.xaml_538398885" />
       <ComponentRef Id="Component.Heart.jpg_470381156" />
       <ComponentRef Id="Component.RID_32.jpg_3324730365" />
-      <ComponentRef Id="Component.RID_Head.png_3189491256" />
+      <ComponentRef Id="Component.SelectByRevitId.png_3415513413" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.dll_1349021799" />
       <ComponentRef Id="Component.e2dverse.Navisworks.SelectByRevitId.addin_1883411259" />
       <ComponentRef Id="Component.PluginRibbon.xaml_1903313765" />
       <ComponentRef Id="Component.Heart.jpg_724136483" />
       <ComponentRef Id="Component.RID_32.jpg_3759889058" />
-      <ComponentRef Id="Component.RID_Head.png_369994906" />
+      <ComponentRef Id="Component.SelectByRevitId.png_4236291537" />
       <ComponentRef Id="AppDataFolder.Autodesk" />
       <ComponentRef Id="AppDataFolder.Autodesk.ApplicationPlugins" />
       <ComponentRef Id="INSTALLDIR.Contents" />
diff --git a/e-verse.Navisworks.SelectByRevitId.Plugin/Windows/SelectByIdWindow.xaml b/e-verse.Navisworks.SelectByRevitId.Plugin/Windows/SelectByIdWindow.xaml
@@ -29,7 +29,7 @@
         Background="{DynamicResource BackgroundColor}"
             BorderBrush="Transparent"
             BorderThickness="1,1,1,1"
-            CornerRadius="8,8,8,8"
+            CornerRadius="15,15,15,15"
             Margin="10,10,10,10"
             MouseDown="Border_MouseDown">
         <Border.Effect>
@@ -49,12 +49,12 @@
                 <Image x:Name="ComponentImage"
                 Visibility="Visible"
                 HorizontalAlignment="Left"
-                Width="54"
+                Width="79"
                 SnapsToDevicePixels="True"
-                       Source="C:\Users\silic\Documents\GitHub\e-verse.Navisworks.SelectByRevitId\e-verse.Navisworks.SelectByRevitId.Common\Images\RID_Head.png"
+                       Source="C:\Users\silic\Documents\GitHub\e-verse.Navisworks.SelectByRevitId\e-verse.Navisworks.SelectByRevitId.Common\Images\SelectByRevitId.png"
                 RenderOptions.BitmapScalingMode="HighQuality"
                 RenderOptions.EdgeMode="Aliased"
-                Margin="10,11,0,0" Height="46" VerticalAlignment="Top" />
+                Margin="10,15,0,0" Height="31" VerticalAlignment="Top" />
                 <Label
                 x:Name="versionLabel"
                 Style="{DynamicResource SecondaryLabel}"
@@ -85,7 +85,7 @@
                     </TransformGroup>
                 </Line.RenderTransform>
             </Line>
-            <Label Style="{DynamicResource TitleLabels}" Content="Enter Revit ID" HorizontalAlignment="Left" Margin="127,107,0,0" Width="94" Height="23" VerticalAlignment="Top" />
+            <Label Style="{DynamicResource TitleLabels}" Content="Enter Revit ID" HorizontalAlignment="Left" Margin="36,119,0,0" Width="94" Height="23" VerticalAlignment="Top" />
 
             <TextBox Style="{DynamicResource MainTextBox}" x:Name="textBox" Text="No revit model available" IsEnabled="False" Height="34" Width="297" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" MinWidth="300" MinHeight="25" VerticalAlignment="Top" Margin="0,150,0,0" PreviewMouseUp="onMouseEnter" HorizontalAlignment="Center" />
             <Button Style="{DynamicResource ApplyButtonStyle}" x:Name="applyButton" Content="Select" IsEnabled="False" HorizontalAlignment="Left" Margin="113,208,0,0" Width="122" Height="22" Click="okButton_Click" VerticalAlignment="Top"/>
diff --git a/e-verse.Navisworks.SelectByRevitId.Plugin/Windows/SelectByIdWindow.xaml.cs b/e-verse.Navisworks.SelectByRevitId.Plugin/Windows/SelectByIdWindow.xaml.cs
@@ -14,11 +14,11 @@ namespace EVerse.Navisworks.SelectByRevitId.Plugin
     /// </summary>
     public partial class SelectByIdWindow : Window
     {
-        private const string ADDIN_IMAGE_PATH = "Images\\RID_Head.png";
+        private const string ADDIN_IMAGE_PATH = "Images\\SelectByRevitId.png";
         private const string HEART_IMAGE_PATH = "Images\\Heart.jpg";
         private const string NO_REVIT_MODEL_MESSAGE = "No revit model available";
         private const string INSERT_ELEMENT_ID_MESSAGE = "Insert element revit ID";
-        public const string PRODUCT_VERSION = "1.0.7";
+        public const string PRODUCT_VERSION = "1.0.8";
 
         public SelectByIdWindow()
         {
