aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-02-08 14:26:17 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-02-08 14:26:17 +0200
commita1432b11d087a4b2f4530504e18434225b36bf48 (patch)
treef3cd718c99872544f3c7a69eadcd27d5aa77911c /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
parent4cf9cd72047bbb5a1c83255721870d29bbdb03f7 (diff)
downloadTango-a1432b11d087a4b2f4530504e18434225b36bf48.tar.gz
Tango-a1432b11d087a4b2f4530504e18434225b36bf48.zip
Moved all tech work to Technician module.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml62
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml.cs28
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj9
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModelLocator.cs33
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModels/MachineTechViewVM.cs13
5 files changed, 0 insertions, 145 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml
deleted file mode 100644
index 192122a30..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.Common.MachineTech.MachineTechView"
- 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:vm="clr-namespace:Tango.MachineStudio.Common.ViewModels"
- xmlns:global="clr-namespace:Tango.MachineStudio.Common"
- xmlns:editors="clr-namespace:Tango.Editors;assembly=Tango.Editors"
- xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
- xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
- xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:Tango.MachineStudio.Common.MachineTech"
- mc:Ignorable="d"
- d:DesignHeight="720" d:DesignWidth="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineTechViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineTechViewVM}">
-
- <UserControl.Resources>
- <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml"></ResourceDictionary>
- </UserControl.Resources>
-
- <Grid>
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="150"/>
- <RowDefinition Height="199*"/>
- </Grid.RowDefinitions>
-
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto"/>
- <RowDefinition Height="1*"/>
- </Grid.RowDefinitions>
-
- <Menu Padding="5">
- <MenuItem Header="File"></MenuItem>
- <MenuItem Header="Edit"></MenuItem>
- <MenuItem Header="View"></MenuItem>
- </Menu>
-
- <Grid Grid.Row="1">
-
- </Grid>
- </Grid>
-
- <Grid Grid.Row="1" Margin="5">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="1*"/>
- <ColumnDefinition Width="220"/>
- </Grid.ColumnDefinitions>
-
- <Grid>
- <editors:ElementsEditor Margin="0 0 5 0" RulerHeight="32" FontSize="10" Background="White" EditorBackground="White" RulerBackground="White" Foreground="{StaticResource AccentColorBrush}" SelectionFillBrush="#338D8D8D" SelectionStrokeBrush="{StaticResource AccentColorBrush}" BorderBrush="{StaticResource AccentColorBrush}" BorderThickness="1" />
- </Grid>
-
- <Grid Grid.Column="1">
- <GroupBox Header="PROPERTIES">
-
- </GroupBox>
- </Grid>
- </Grid>
- </Grid>
- </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml.cs
deleted file mode 100644
index 6546fd09e..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineTech/MachineTechView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.Common.MachineTech
-{
- /// <summary>
- /// Interaction logic for MachineTechView.xaml
- /// </summary>
- public partial class MachineTechView : UserControl
- {
- public MachineTechView()
- {
- InitializeComponent();
- }
- }
-}
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 d0ddd7267..7def48cb5 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
@@ -92,11 +92,6 @@
<Compile Include="Messages\IStudioMessage.cs" />
<Compile Include="Notifications\TaskItem.cs" />
<Compile Include="ValidationRules\Required.cs" />
- <Compile Include="ViewModelLocator.cs" />
- <Compile Include="ViewModels\MachineTechViewVM.cs" />
- <Compile Include="MachineTech\MachineTechView.xaml.cs">
- <DependentUpon>MachineTechView.xaml</DependentUpon>
- </Compile>
<Page Include="Controls\HiveColorPickerControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -131,10 +126,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="MachineTech\MachineTechView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModelLocator.cs
deleted file mode 100644
index 6dcf23289..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModelLocator.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Ioc;
-using Microsoft.Practices.ServiceLocation;
-using Tango.MachineStudio.Common.ViewModels;
-using Tango.MachineStudio.Common.MachineTech;
-
-namespace Tango.MachineStudio.Common
-{
- /// <summary>
- /// This class contains static references to all the view models in the
- /// application and provides an entry point for the bindings.
- /// </summary>
- public static class ViewModelLocator
- {
- /// <summary>
- /// Initializes a new instance of the ViewModelLocator class.
- /// </summary>
- static ViewModelLocator()
- {
- ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
- SimpleIoc.Default.Register<MachineTechViewVM>();
- }
-
- public static MachineTechViewVM MachineTechViewVM
- {
- get
- {
- return ServiceLocator.Current.GetInstance<MachineTechViewVM>();
- }
- }
- }
-} \ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModels/MachineTechViewVM.cs
deleted file mode 100644
index eeb490d99..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/ViewModels/MachineTechViewVM.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.SharedUI;
-
-namespace Tango.MachineStudio.Common.ViewModels
-{
- public class MachineTechViewVM : ViewModel
- {
- }
-}