Ui Update

Dev/OHV/OHV.Module.Interactivity/NotificatioinView.xaml

@@ -66,7 +66,8 @@
             <Rectangle Fill="#FFBABABA" Height="2" VerticalAlignment="Top" Margin="20,0" Grid.Row="2" Visibility="Hidden"/>
             <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,5,0,0">
 
-                <Button x:Name="btnSend" HorizontalAlignment="Left" VerticalAlignment="Top" Width="100" Height="25" Content="OK" AutomationProperties.AutomationId="CustomPopupCloseButton" Command="{Binding CloseDialogCommand}" Style="{DynamicResource btn_Send}"/>
+                <Button x:Name="btnSend" HorizontalAlignment="Left" VerticalAlignment="Top" Width="100" Height="25" Content="OK" AutomationProperties.AutomationId="CustomPopupCloseButton" Command="{Binding CloseDialogCommand}" Style="{StaticResource MaterialDesignRaisedButton}" Background="#FF1368BD"/>
+                <!--Style="{DynamicResource btn_Send}-->
             </StackPanel>
 
         </Grid>

Dev/OHV/OHV.Module.Interactivity/OHV.Module.Interactivity.csproj

@@ -76,15 +76,6 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\GSG\GSG\GSG.NET.WPF\GSG.NET.WPF.csproj">
-      <Project>{6b91fca2-0a26-41d5-8959-a6f27645dacd}</Project>
-      <Name>GSG.NET.WPF</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Page Include="ConfirmationPopupView.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -95,5 +86,8 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Dev/OHV/OHV.Module.MainViews/OHV.Module.MainViews.csproj

@@ -91,15 +91,15 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OHV.Common\OHV.Common.csproj">
       <Project>{0d1f7fbc-bfb0-4ee4-852d-e2a8d62c5708}</Project>
       <Name>OHV.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Dev/OHV/OHV.Module.MainViews/Views/DeviceView.xaml

@@ -3,6 +3,7 @@
              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:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:local="clr-namespace:OHV.Module.MainViews.Views"
                           xmlns:prism="http://prismlibrary.com/"
              prism:ViewModelLocator.AutoWireViewModel="True"
@@ -10,12 +11,192 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
 
-        <ContentControl Grid.Column="1" prism:RegionManager.RegionName="IOView"/>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="38*"/>
+                <RowDefinition Height="7*"/>
+            </Grid.RowDefinitions>
 
+            <DockPanel Grid.Row="0">
+                <!--<TextBlock Text="Teaching Pos View" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Red" FontSize="30"/>-->
+                <ListView x:Name="LV_PositionView" ItemsSource="{Binding PosData}">
+                    <ListView.View>
+                        <GridView>
+                            <GridViewColumn DisplayMemberBinding="{Binding No}" Header="No"/>
+                            <GridViewColumn DisplayMemberBinding="{Binding Name}" Header="Name"/>
+                            <GridViewColumn DisplayMemberBinding="{Binding Positioin}" Header="Position"/>
+                            <GridViewColumn DisplayMemberBinding="{Binding Tag}" Header="Tag"/>
+                        </GridView>
+                    </ListView.View>
+                </ListView>
+            </DockPanel>
+            
+            
+
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+
+                <DockPanel Grid.Row="1" Grid.Column="0">
+                    <Button HorizontalAlignment="Stretch" Height="Auto">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="FileUpload" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Others" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Row="1" Grid.Column="1">
+                    <Button HorizontalAlignment="Stretch" Height="Auto">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="FileUpload" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Others" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Row="1" Grid.Column="2">
+                    <Button HorizontalAlignment="Stretch" Height="Auto">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="MapMarkerCircle" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Map" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Row="1" Grid.Column="3">
+                    <Button HorizontalAlignment="Stretch" Height="Auto">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="FileUpload" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Load" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Row="1" Grid.Column="4">
+                    <Button HorizontalAlignment="Stretch" Height="Auto">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="ContentSaveOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Save" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+            </Grid>
+        </Grid>
+
+        <Grid Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="44*"/>
+                <RowDefinition Height="31*"/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <DockPanel Grid.Row="0">
+                    <ContentControl Grid.Column="1" prism:RegionManager.RegionName="IOView"/>
+                </DockPanel>
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="60*"/>
+                    <RowDefinition Height="37*"/>
+                    <RowDefinition Height="60*"/>
+                </Grid.RowDefinitions>
+
+                <DockPanel Grid.Column="0" Grid.Row="0">
+                    <Button HorizontalAlignment="Stretch" Height="Auto" BorderBrush="Gray" BorderThickness="2">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="PowerSettings" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Servo On" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Column="0" Grid.Row="1">
+                    <Border BorderBrush="Gray" BorderThickness="2">
+                        <TextBlock Text="Nagative Sensor" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    </Border>
+                </DockPanel>
+
+                <DockPanel Grid.Column="1" Grid.Row="1">
+                    <Border BorderBrush="Gray" BorderThickness="2">
+                        <TextBlock Text="Home Sensor" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    </Border>
+                </DockPanel>
+
+                <DockPanel Grid.Column="2" Grid.Row="1">
+                    <Border BorderBrush="Gray" BorderThickness="2">
+                        <TextBlock Text="Positive Sensor" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    </Border>
+                </DockPanel>
+
+                <DockPanel Grid.Column="1" Grid.Row="0">
+                    <!--<TextBlock Text="Servo On" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
+                    <Button HorizontalAlignment="Stretch" Height="Auto" BorderBrush="Gray" BorderThickness="2">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="PowerPlugOff" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Servo Off" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Column="2" Grid.Row="0">
+                    <!--<TextBlock Text="Configs" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
+                    <Button HorizontalAlignment="Stretch" Height="Auto" BorderBrush="Gray" BorderThickness="2">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="SettingsTransferOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Servo Config" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Column="0" Grid.Row="2">
+                    <Button HorizontalAlignment="Stretch" Height="Auto" BorderBrush="Gray" BorderThickness="2">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="ArrowLeftBoldBoxOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Jog -" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+                <DockPanel Grid.Column="1" Grid.Row="2">
+                    <Border BorderBrush="Gray" BorderThickness="2">
+                        <StackPanel >
+                            <TextBlock Text="Pos" FontSize="25" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                            <TextBlock Text="0.0mm" FontSize="25" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="20,0"/>
+                        </StackPanel>
+                    </Border>
+                </DockPanel>
+
+                <DockPanel Grid.Column="2" Grid.Row="2">
+                    <Button HorizontalAlignment="Stretch" Height="Auto" BorderBrush="Gray" BorderThickness="2">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="ArrowRightBoldBoxOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="42" Width="auto"/>
+                            <TextBlock Text="Jog +" VerticalAlignment="Stretch" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </DockPanel>
+
+            </Grid>
+        </Grid>
     </Grid>
 </UserControl>

Dev/OHV/OHV.Module.MainViews/Views/ModuleAutoView.xaml

@@ -193,7 +193,7 @@
                 <Grid Grid.Row="1" Background="#FF292929" Margin="2,0,2,2">
                     <StackPanel>
                         <CheckBox x:Name="MaterialDesignOutlinedTextFieldTextBoxEnabledComboBox" IsChecked="True" Margin="339,0,0,8" Content="Enabled"/>
-                        <TextBox Style="{StaticResource MaterialDesignOutlinedTextFieldTextBox}" VerticalAlignment="Top" Height="59" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" materialDesign:HintAssist.Hint="Command Area" IsEnabled="{Binding IsChecked, ElementName=MaterialDesignOutlinedTextFieldTextBoxEnabledComboBox}" Margin="339,0,2,0" />
+                        <TextBox Style="{StaticResource MaterialDesignOutlinedTextFieldTextBox}" VerticalAlignment="Top" Height="59" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" materialDesign:HintAssist.Hint="Command Area" IsEnabled="{Binding IsChecked, ElementName=MaterialDesignOutlinedTextFieldTextBoxEnabledComboBox}" Margin="339,0,2,0" Foreground="White" />
                     </StackPanel>
                 </Grid>
 
@@ -234,10 +234,11 @@
                 <DockPanel>
                     <TextBlock Text="Device Status 0.0% Monitor" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 </DockPanel>
-                <materialDesign:PackIcon Kind="ChartTimelineVariant" Height="39" Width="46" Margin="89,183,0,0" />
-                <materialDesign:PackIcon Kind="TimelineClockOutline" Height="39" Width="46" Margin="161,183,0,0" />
-                <materialDesign:PackIcon Kind="BatteryChargingWirelessWarning" Height="39" Width="46" Margin="236,183,0,0" />
-                <materialDesign:PackIcon Kind="Bullhorn" Height="39" Width="46" Margin="310,183,0,0" />
+                <materialDesign:PackIcon Kind="ChartTimelineVariant" Height="39" Width="46" Margin="64,177,0,0" />
+                <materialDesign:PackIcon Kind="TimelineClockOutline" Height="39" Width="46" Margin="136,177,0,0" />
+                <materialDesign:PackIcon Kind="BatteryChargingWirelessWarning" Height="39" Width="46" Margin="210,177,0,0" />
+                <materialDesign:PackIcon Kind="Bullhorn" Height="39" Width="46" Margin="284,177,0,0" />
+                <materialDesign:PackIcon Kind="Gamepad" Height="39" Width="46" Margin="350,177,0,0" />
             </Grid>
 
             <Grid Grid.Row="2">
@@ -248,32 +249,58 @@
                 </Grid.ColumnDefinitions>
 
                 <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition/>
+                    <RowDefinition Height="37*"/>
+                    <RowDefinition Height="60*"/>
                 </Grid.RowDefinitions>
 
                 <DockPanel Grid.Column="0" Grid.Row="1">
-                    <!--<Button HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="Auto" Margin="0,10,0,3" Width="146">
-                        <materialDesign:PackIcon Kind="ArrowLeftBoldBoxOutline" Height="86" Width="86"/>
-                    </Button>-->
-                    <materialDesign:Badged Badge="Warring" BadgeColorZoneMode="Dark">
-                        <Button HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="150" Height="142">
-                            <materialDesign:PackIcon Kind="ArrowLeftBoldBoxOutline" Height="86" Width="86"/>
+                    <DockPanel>
+                        <Button HorizontalAlignment="Stretch" Height="Auto">
+                            <StackPanel>
+                                <materialDesign:PackIcon Kind="ArrowRightDropCircle" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="86" Width="auto"/>
+                                <TextBlock Text="Start" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="30"/>
+                            </StackPanel>
                         </Button>
-                    </materialDesign:Badged>
-                </DockPanel>
-                <DockPanel Grid.Column="1" Grid.Row="1">
-                    <TextBlock Text="0.0mm" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </DockPanel>
                 </DockPanel>
+
+                <StackPanel Grid.Column="1" Grid.Row="1">
+                    <TextBlock Text="null" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <TextBlock Text="" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <TextBlock Text="null" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Bottom"/>
+                </StackPanel>
+
                 <DockPanel Grid.Column="2" Grid.Row="1">
-                    <Button HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="Auto" Margin="0,10,0,3" Width="146">
-                        <materialDesign:PackIcon Kind="ArrowRightBoldBoxOutline" Height="86" Width="86"/>
+                    <Button HorizontalAlignment="Stretch" Height="Auto">
+                        <StackPanel>
+                            <materialDesign:PackIcon Kind="StopCircleOutline" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="86" Width="auto"/>
+                            <TextBlock Text="Stop" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="30"/>
+                        </StackPanel>
                     </Button>
                 </DockPanel>
 
-                <DockPanel Grid.Column="0" Grid.Row="0"></DockPanel>
-                <DockPanel Grid.Column="1" Grid.Row="0"></DockPanel>
-                <DockPanel Grid.Column="2" Grid.Row="0"></DockPanel>
+                <Grid Grid.Row="0" Grid.Column="0">
+                    <Border BorderBrush="Gray" BorderThickness="2"/>
+                </Grid>
+
+                <Grid Grid.Row="0" Grid.Column="1">
+                    <Border BorderBrush="Gray" BorderThickness="2"/>
+                </Grid>
+
+                <Grid Grid.Row="0" Grid.Column="2">
+                    <Border BorderBrush="Gray" BorderThickness="2"/>
+                </Grid>
+
+                <DockPanel Grid.Column="0" Grid.Row="0">
+                    <TextBlock Text="Mode Select Auto" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                </DockPanel>
+
+                <DockPanel Grid.Column="1" Grid.Row="0">
+                    <TextBlock Text="Mode Select IDLE" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                </DockPanel>
+                <DockPanel Grid.Column="2" Grid.Row="0">
+                    <TextBlock Text="Mode Select Manual" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                </DockPanel>
             </Grid>
         </Grid>
         <Button Style="{StaticResource MaterialDesignRaisedAccentButton}" Height="Auto" materialDesign:ButtonAssist.CornerRadius="50 50 0 0"

Dev/OHV/OHV.Module.Monitoring/Interactivity/InOutIOView.xaml

@@ -14,13 +14,13 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50" />
-            <RowDefinition Height="1*" />
-            <RowDefinition Height="60" />
+            <RowDefinition Height="40" />
+            <RowDefinition />
+            <!--<RowDefinition Height="60" />-->
         </Grid.RowDefinitions>
 
-        <Grid x:Name="gridHeader" Grid.Row="0" Background="#FF646464">
-            <StackPanel
+        <Grid x:Name="gridHeader" Grid.Row="0" Background="{x:Null}">
+            <!--<StackPanel
                 Margin="5,0,0,0"
                 HorizontalAlignment="Left"
                 IsHitTestVisible="False"
@@ -31,19 +31,22 @@
                     FontSize="22"
                     Foreground="White" Text="IN / OUT Monitoring">
                 </TextBlock>
-            </StackPanel>
-
+            </StackPanel>-->
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="350">
-                <Button Width="110" Margin="20,9" FontWeight="Bold" Command="{Binding ChangePageCommand}" CommandParameter="Pre">
+                <Button Width="110" Margin="20,0" FontWeight="Bold" Command="{Binding ChangePageCommand}" CommandParameter="Pre" Height="Auto">
                     <TextBlock><Run Text="Pre Page"/></TextBlock>
                 </Button>
-                <Label Width="50" Content="{Binding CurrentPage, FallbackValue=1 }" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold">
+                <Label Width="50" Content="{Binding CurrentPage, FallbackValue=1 }" FontSize="15" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold">
                 </Label>
-                <Button Width="110" Margin="20,9" HorizontalAlignment="Right" FontWeight="Bold" Command="{Binding ChangePageCommand}" CommandParameter="Next" >
+                <Button Width="110" Margin="20,0" HorizontalAlignment="Right" FontWeight="Bold" Command="{Binding ChangePageCommand}" CommandParameter="Next" Height="Auto" >
                     <TextBlock><Run Text="Next Page"/></TextBlock>
                 </Button>
             </StackPanel>
-
+            <!--<StackPanel HorizontalAlignment="Right" Width="350">
+                <Button Width="110" Margin="20, 1">
+                    
+                </Button>
+            </StackPanel>-->
         </Grid>
 
         <Grid x:Name="gridBody" Grid.Row="1" Background="#FFB9B7B7">
@@ -153,13 +156,15 @@
 
         </Grid>
 
-        <Grid x:Name="gridFooter" Grid.Row="2" Background="#FF646464">
-            <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5,5" Width="120">
+        <!--<Grid x:Name="gridFooter" Grid.Row="2" Background="#FF646464">
+            -->
+        <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5,5" Width="120">
                 <Button Width="89" Margin="20, 0" HorizontalAlignment="Right" Click="Button_Click"  >
                     <TextBlock><Run Text="Close"/></TextBlock>
                 </Button>
             </StackPanel>-->
-        </Grid>
+        <!--
+        </Grid>-->
 
     </Grid>
 

Dev/OHV/OHV.Module.Monitoring/OHV.Module.Monitoring.csproj

@@ -36,6 +36,9 @@
     <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
+    <Reference Include="GSG.NET.WPF">
+      <HintPath>..\Assambly\GSG.NET.WPF.dll</HintPath>
+    </Reference>
     <Reference Include="MaterialDesignColors, Version=1.2.2.920, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll</HintPath>
     </Reference>
@@ -68,6 +71,27 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="Telerik.Windows.Controls">
+      <HintPath>..\Assambly\Telerik.Windows.Controls.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Data">
+      <HintPath>..\Assambly\Telerik.Windows.Controls.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Docking">
+      <HintPath>..\Assambly\Telerik.Windows.Controls.Docking.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.GridView">
+      <HintPath>..\Assambly\Telerik.Windows.Controls.GridView.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Input">
+      <HintPath>..\Assambly\Telerik.Windows.Controls.Input.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Controls.Navigation">
+      <HintPath>..\Assambly\Telerik.Windows.Controls.Navigation.dll</HintPath>
+    </Reference>
+    <Reference Include="Telerik.Windows.Data">
+      <HintPath>..\Assambly\Telerik.Windows.Data.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -87,10 +111,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\GSG\GSG\GSG.NET.WPF\GSG.NET.WPF.csproj">
-      <Project>{6b91fca2-0a26-41d5-8959-a6f27645dacd}</Project>
-      <Name>GSG.NET.WPF</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OHV.Common\OHV.Common.csproj">
       <Project>{0D1F7FBC-BFB0-4EE4-852D-E2A8D62C5708}</Project>
       <Name>OHV.Common</Name>

Dev/OHV/OHV.Vehicle/App.xaml

@@ -8,11 +8,23 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/GSG.NET.WPF;component/ControlResources/ButtonResources.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
+            <!--TODO: Skin Test-->
+            <!--PRIMARY-->
+            <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#349fda"/>
+            <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="#333333"/>
+            <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#349fda"/>
+            <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="#FFFFFF"/>
+            <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#689f38"/>
+            <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="#FFFFFF"/>
+            <!--ACCENT-->
+            <SolidColorBrush x:Key="SecondaryAccentBrush" Color="#689f38"/>
+            <SolidColorBrush x:Key="SecondaryAccentForegroundBrush" Color="#FFFFFF"/>
         </ResourceDictionary>
 
     </Application.Resources>

Dev/OHV/OHV.Vehicle/MainWindow.xaml

@@ -14,6 +14,10 @@
         xmlns:OHVCommonShareds="clr-namespace:OHV.Common.Shareds;assembly=OHV.Common"
         xmlns:Behavior="clr-namespace:GSG.NET.WPF.Behavior;assembly=GSG.NET.WPF">
 
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0"/>
+    </WindowChrome.WindowChrome>
+
     <Window.Resources>
         <Storyboard x:Key="MenuOpen">
             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(FrameworkElement.Width)" Storyboard.TargetName="GridMenu" >
@@ -40,10 +44,10 @@
         </EventTrigger>
     </Window.Triggers>
 
-    <Grid Background="{x:Null}" >
+    <Grid x:Name="GridMain" Background="{x:Null}" >
         <!--<Grid x:Name="GridMain" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="540" Width="1020"/>-->
         <DockPanel LastChildFill="True">
-            <ContentControl prism:RegionManager.RegionName="{x:Static OHVCommonShareds:RegionNames.MainView}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="1212" Height="710"/>
+            <ContentControl prism:RegionManager.RegionName="{x:Static OHVCommonShareds:RegionNames.MainView}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="1212" Height="731"/>
         </DockPanel>
         <Grid Height="60" VerticalAlignment="Top" Background="#FF1368BD" x:Name="gridHead">
             <TextBlock Text="Over Head Vehicle" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="22" Foreground="White"/>

Dev/OHV/OHV.Vehicle/MainWindow.xaml.cs

@@ -70,7 +70,5 @@ namespace OHV.Vehicle
             ButtonCloseMenu.Visibility = Visibility.Collapsed;
             ButtonOpenMenu.Visibility = Visibility.Visible;
         }
-
-
     }
 }