diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-02-20 02:28:15 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-02-20 02:28:15 +0200 |
| commit | 795f3ab6ea36551281ec6442aa16b9547af96adc (patch) | |
| tree | 4b1af0d700014054ff7d0ac01e381bbd25699e59 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | ba39c2e2a012953f2f9633fa7df59b49cf3fd4c7 (diff) | |
| download | Tango-795f3ab6ea36551281ec6442aa16b9547af96adc.tar.gz Tango-795f3ab6ea36551281ec6442aa16b9547af96adc.zip | |
Incorporated machine type into machine creation and management + job runs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png | bin | 0 -> 1038958 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png | bin | 0 -> 33703 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png | bin | 0 -> 394373 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml | 3 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj | 7 |
5 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png Binary files differnew file mode 100644 index 000000000..484bb2ac1 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png Binary files differnew file mode 100644 index 000000000..c9da4ae29 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png Binary files differnew file mode 100644 index 000000000..788d1e67b --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml index d8e2017ec..bd35677d2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml @@ -73,6 +73,9 @@ <ResourceDictionary> <BitmapImage x:Key="MachineBig" UriSource="../Images/machine_new.png"></BitmapImage> <BitmapImage x:Key="MachineSmall" UriSource="../Images/machine_new_small.png"></BitmapImage> + <BitmapImage x:Key="MachineEurekaSmall" UriSource="../Images/eureka_small.png"></BitmapImage> + <BitmapImage x:Key="MachineEurekaFull" UriSource="../Images/eureka_full.png"></BitmapImage> + <BitmapImage x:Key="Machines" UriSource="../Images/machines.png"></BitmapImage> </ResourceDictionary> <!--Styles--> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index 91a8b5930..af0d6aab8 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -448,10 +448,15 @@ <Resource Include="Images\Connections\ts1800.png" /> <Resource Include="Images\Connections\wifi.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\eureka_full.png" /> + <Resource Include="Images\eureka_small.png" /> + <Resource Include="Images\machines.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> <PropertyGroup> |
