Some more work on FSE

16 files changed, 101 insertions, 8 deletions

diff --git a/Software/Graphics/FSE/Abstracts/abstract1.png b/Software/Graphics/FSE/Abstracts/abstract1.png
new file mode 100644
index 000000000..c2811f5cd
--- /dev/null
+++ b/Software/Graphics/FSE/Abstracts/abstract1.png
diff --git a/Software/Graphics/FSE/Animations/preloader_1.gif b/Software/Graphics/FSE/Animations/preloader_1.gif
new file mode 100644
index 000000000..2c6342836
--- /dev/null
+++ b/Software/Graphics/FSE/Animations/preloader_1.gif
diff --git a/Software/Graphics/FSE/Animations/preloader_2.gif b/Software/Graphics/FSE/Animations/preloader_2.gif
new file mode 100644
index 000000000..796e1334b
--- /dev/null
+++ b/Software/Graphics/FSE/Animations/preloader_2.gif
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_big.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_big.png
new file mode 100644
index 000000000..116e1e9c7
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_big.png
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_full.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_full.png
new file mode 100644
index 000000000..b3c497546
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_full.png
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_small.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_small.png
new file mode 100644
index 000000000..378879ce1
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/machine_small.png
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/twine_logo.png b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/twine_logo.png
new file mode 100644
index 000000000..9c9eb4abf
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Images/twine_logo.png
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml
new file mode 100644
index 000000000..f72ae5675
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Images.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Tango.FSE.Common.Resources">
+
+    <BitmapImage x:Key="FSE_Machine_Big" UriSource="../Images/machine_big.png" />
+    <BitmapImage x:Key="FSE_Machine_Small" UriSource="../Images/machine_small.png" />
+    <BitmapImage x:Key="FSE_Machine_Full" UriSource="../Images/machine_full.png" />
+    <BitmapImage x:Key="FSE_Twine_Logo" UriSource="../Images/twine_logo.png" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
index 17bc35b80..2b8f0db0b 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
@@ -107,6 +107,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Images.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -193,7 +197,16 @@
       <Name>Tango.FSE.Web</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\machine_big.png" />
+    <Resource Include="Images\machine_small.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine_full.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\twine_logo.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>nswag run "$(SolutionDir)Web\Tango.MachineService.Gateway\Nswag\GatewayClient.nswag" /variables:assembly="$(SolutionDir)Web\Tango.MachineService.Gateway\bin\Tango.MachineService.Gateway.dll",output="$(ProjectDir)Gateway\GatewayClient.cs"</PreBuildEvent>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml
index ec131133e..39079d101 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Themes/Generic.xaml
@@ -7,6 +7,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Tango.FSE.Common;component/Resources/Colors.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Tango.FSE.Common;component/Resources/Fonts.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Tango.FSE.Common;component/Resources/Images.xaml" />
 
         <ResourceDictionary>
             <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Abstracts/abstract1.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Abstracts/abstract1.png
new file mode 100644
index 000000000..c2811f5cd
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Abstracts/abstract1.png
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/login.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/login.png
new file mode 100644
index 000000000..9f7d0b9ba
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/login.png
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml
index ef62d08da..202476e90 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml
@@ -14,9 +14,26 @@
         Background="{StaticResource FSE_PrimaryBackgroundBrush}"
         TextElement.FontWeight="Medium"
         TextElement.FontSize="14"
-        TitleCharacterCasing="Normal" EnableDWMDropShadow="True" BorderThickness="1" BorderBrush="Gray" FontFamily="{StaticResource flexo}">
+        TitleCharacterCasing="Normal" UseNoneWindowStyle="True" EnableDWMDropShadow="True" MinWidth="800" MinHeight="600" BorderThickness="1" BorderBrush="Gray" FontFamily="{StaticResource flexo}" WindowTitleBrush="{StaticResource PrimaryHueMidBrush}">
 
     <Grid>
         <views:MainView/>
+
+        <Grid VerticalAlignment="Top" Height="40">
+            <DockPanel>
+                <UniformGrid DockPanel.Dock="Right" Columns="3" HorizontalAlignment="Right" Width="130">
+                    <Button x:Name="btnMinimize" Style="{StaticResource MaterialDesignToolForegroundButton}">
+                        <materialDesign:PackIcon Kind="WindowMinimize" />
+                    </Button>
+                    <Button x:Name="btnMaximize" Style="{StaticResource MaterialDesignToolForegroundButton}">
+                        <materialDesign:PackIcon x:Name="btnMaximizeIcon" Kind="WindowMaximize" />
+                    </Button>
+                    <Button x:Name="btnClose" Style="{StaticResource MaterialDesignToolForegroundButton}">
+                        <materialDesign:PackIcon Kind="WindowClose" />
+                    </Button>
+                </UniformGrid>
+                <Thumb Background="Transparent" x:Name="thumbTitle"></Thumb>
+            </DockPanel>
+        </Grid>
     </Grid>
 </mahapps:MetroWindow>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml.cs
index 28385d2dc..e192c8d89 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml.cs
@@ -27,6 +27,30 @@ namespace Tango.FSE.UI
         {
             Instance = this;
             InitializeComponent();
+
+            btnMinimize.Click += (_, __) => WindowState = WindowState.Minimized;
+            btnMaximize.Click += (_, __) => WindowState = WindowState == WindowState.Maximized ? WindowState = WindowState.Normal : WindowState = WindowState.Maximized;
+            btnClose.Click += (_, __) => Close();
+            thumbTitle.DragDelta += ThumbTitle_DragDelta;
+            StateChanged += MainWindow_StateChanged;
+        }
+
+        private void MainWindow_StateChanged(object sender, EventArgs e)
+        {
+            if (WindowState == WindowState.Maximized)
+            {
+                btnMaximizeIcon.Kind = MaterialDesignThemes.Wpf.PackIconKind.WindowRestore;
+            }
+            else if (WindowState == WindowState.Normal)
+            {
+                btnMaximizeIcon.Kind = MaterialDesignThemes.Wpf.PackIconKind.WindowMaximize;
+            }
+        }
+
+        private void ThumbTitle_DragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
+        {
+            Left += e.HorizontalChange;
+            Top += e.VerticalChange;
         }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
index 820d20e5d..6b1f9f317 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
@@ -207,6 +207,12 @@
       <Name>Tango.FSE.Web</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Abstracts\abstract1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\login.png" />
+  </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">
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml
index d0959e6c3..8d2a398fd 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LoginView.xaml
@@ -11,13 +11,35 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:LoginViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.LoginViewVM}">
     <Grid>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300">
-            <TextBox Text="{Binding Email,UpdateSourceTrigger=PropertyChanged}" material:HintAssist.Hint="Email" material:HintAssist.IsFloating="True"></TextBox>
-            <PasswordBox Margin="0 20 0 0" helpers:PasswordHelper.Attach="True" helpers:PasswordHelper.Password="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" material:HintAssist.Hint="Password" material:HintAssist.IsFloating="True"></PasswordBox>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="317*" MaxWidth="700" />
+            <ColumnDefinition Width="483*"/>
+        </Grid.ColumnDefinitions>
+        <Grid>
+            <Image Source="/Images/Abstracts/abstract1.png" Stretch="UniformToFill" Opacity="0.8"></Image>
 
-            <ComboBox Margin="0 20 0 0" ItemsSource="{Binding GatewayService.Environments}" SelectedItem="{Binding SelectedEnvironment}" DisplayMemberPath="Description" material:ComboBoxAssist.ShowSelectedItem="True"></ComboBox>
+            <StackPanel>
+                <TextBlock HorizontalAlignment="Center" Margin="0 30 0 0" FontSize="40" TextAlignment="Center" TextWrapping="Wrap" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">Welcome</TextBlock>
+            </StackPanel>
 
-            <Button IsDefault="True" Margin="0 20 0 0" Height="40" Command="{Binding LoginCommand}">LOGIN</Button>
-        </StackPanel>
+            <Image Source="{StaticResource FSE_Machine_Full}" VerticalAlignment="Bottom" RenderOptions.BitmapScalingMode="Fant" Margin="0 0 0 150" MaxWidth="300" MinWidth="100" />
+
+            <Rectangle HorizontalAlignment="Right" StrokeThickness="1" Stroke="{StaticResource FSE_BorderBrush}" StrokeDashArray="5" />
+        </Grid>
+
+        <Grid Grid.Column="1">
+            <Image Width="400" VerticalAlignment="Top" Margin="0 20 0 0" Canvas.Left="230" Source="{StaticResource FSE_Twine_Logo}"></Image>
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" TextElement.FontSize="16" Margin="0 130 0 0">
+
+                    <Image Source="/Images/login.png" Height="100" />
+
+                    <TextBox Margin="0 20 0 0" Text="{Binding Email,UpdateSourceTrigger=PropertyChanged}" material:HintAssist.Hint="Email" material:HintAssist.IsFloating="True"></TextBox>
+                    <PasswordBox Margin="0 20 0 0" helpers:PasswordHelper.Attach="True" helpers:PasswordHelper.Password="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" material:HintAssist.Hint="Password" material:HintAssist.IsFloating="True"></PasswordBox>
+
+                    <ComboBox Margin="0 20 0 0" material:HintAssist.Hint="Environment" material:HintAssist.IsFloating="True" ItemsSource="{Binding GatewayService.Environments}" SelectedItem="{Binding SelectedEnvironment}" DisplayMemberPath="Description"></ComboBox>
+
+                    <Button IsDefault="True" Margin="0 40 0 0" Height="50" material:ButtonAssist.CornerRadius="24" Command="{Binding LoginCommand}">LOGIN</Button>
+                </StackPanel>
+        </Grid>
     </Grid>
 </UserControl>