merge

1 files changed, 0 insertions, 76 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml
deleted file mode 100644
index 437003a8a..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml
+++ /dev/null
@@ -1,76 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.Sites.Views.SitesView"
-             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:local="clr-namespace:Tango.MachineStudio.Sites.Views"
-             xmlns:vm="clr-namespace:Tango.MachineStudio.Sites.ViewModels"
-             xmlns:global="clr-namespace:Tango.MachineStudio.Sites"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-    <UserControl.Resources>
-        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
-    </UserControl.Resources>
-
-    <Grid>
-        <DockPanel Margin="100" MaxWidth="1200">
-            <Grid DockPanel.Dock="Top">
-                <StackPanel Orientation="Horizontal">
-                    <Image  Source="../Images/machine_site.png" Width="350" RenderOptions.BitmapScalingMode="Fant" Margin="10" />
-
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 0 0 10">
-                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="Magnify" Width="32" Height="32" />
-                        <TextBox Width="400" FontSize="20" Margin="10 0 0 0" materialDesign:HintAssist.Hint="Name, Organization" Text="{Binding Filter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-                    </StackPanel>
-                </StackPanel>
-            </Grid>
-            <Grid DockPanel.Dock="Bottom" IsEnabled="{Binding IsFree}">
-                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveSiteCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
-                            <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
-                        </StackPanel>
-                    </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddSiteCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
-                            <TextBlock Margin="5 0 0 0" FontSize="16">NEW SITE</TextBlock>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageSiteCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
-                            <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
-            </Grid>
-            <Grid IsEnabled="{Binding IsFree}">
-                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding ManageSiteCommand}" Margin="0 0 0 10" BorderBrush="{StaticResource borderBrush}" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Sites}" SelectedItem="{Binding SelectedSite}">
-                    <DataGrid.CellStyle>
-                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-                            <Setter Property="BorderThickness" Value="0"/>
-                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-                        </Style>
-                    </DataGrid.CellStyle>
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
-                        <DataGridTextColumn Header="DESCRIPTION" Binding="{Binding Description}" Width="Auto" />
-                        <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization}" Width="Auto" />
-                        <DataGridTextColumn Header="MACHINES" Binding="{Binding MachineCount}" Width="Auto" />
-                        <DataGridTextColumn Header="THREADS" Binding="{Binding ThreadCount}" Width="Auto" />
-                        <DataGridTextColumn Header="CATALOGS" Binding="{Binding CatalogCount}" Width="Auto" />
-                        <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
-                    </DataGrid.Columns>
-                </controls:DoubleClickDataGrid>
-            </Grid>
-        </DockPanel>
-    </Grid>
-</UserControl>