From 0ec56a54ca0c64a2f7ba402a1b99b3c217cd5ae5 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 8 Jan 2018 14:37:29 +0200
Subject: Implemented auto scaling of machine studio to screen resolution.
 Modified machine connection icons again. Added Embedded device name to
 settings. Added port USB and TCP to settings.

---
 .../Tango.MachineStudio.UI/MainWindow.xaml         | 43 ++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index f07e7f476..83f41b785 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -8,27 +8,32 @@
         xmlns:views="clr-namespace:Tango.MachineStudio.UI.Views"
         xmlns:sharedControls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
         mc:Ignorable="d"
-        Title="Tango" Height="720" Width="1280" WindowStartupLocation="CenterOwner" WindowState="Maximized" Foreground="#494949">
+        Title="Tango" Height="800" Width="1280" WindowStartupLocation="CenterOwner" WindowState="Maximized" Foreground="#494949" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
+
     <Grid>
-        <sharedControls:MultiTransitionControl AlwaysFade="True" TransitionType="Zoom" x:Name="TransitionControl" x:FieldModifier="public">
-            <sharedControls:MultiTransitionControl.Controls>
-                <ContentControl Tag="LoadingView">
-                    <views:LoadingView></views:LoadingView>
-                </ContentControl>
-                <ContentControl Tag="LoginView">
-                    <views:LoginView></views:LoginView>
-                </ContentControl>
-                <ContentControl Tag="MainView">
-                    <views:MainView></views:MainView>
-                </ContentControl>
-                <ContentControl Tag="ShutdownView">
-                    <views:ShutdownView></views:ShutdownView>
-                </ContentControl>
-            </sharedControls:MultiTransitionControl.Controls>
-        </sharedControls:MultiTransitionControl>
+        <Viewbox Stretch="Fill" UseLayoutRounding="True" SnapsToDevicePixels="True">
+            <Grid Width="1920" Height="1145">
+                <sharedControls:MultiTransitionControl AlwaysFade="True" TransitionType="Zoom" x:Name="TransitionControl" x:FieldModifier="public">
+                    <sharedControls:MultiTransitionControl.Controls>
+                        <ContentControl Tag="LoadingView">
+                            <views:LoadingView></views:LoadingView>
+                        </ContentControl>
+                        <ContentControl Tag="LoginView">
+                            <views:LoginView></views:LoginView>
+                        </ContentControl>
+                        <ContentControl Tag="MainView">
+                            <views:MainView></views:MainView>
+                        </ContentControl>
+                        <ContentControl Tag="ShutdownView">
+                            <views:ShutdownView></views:ShutdownView>
+                        </ContentControl>
+                    </sharedControls:MultiTransitionControl.Controls>
+                </sharedControls:MultiTransitionControl>
 
-        <Grid Background="Black" Opacity="0.7" x:Name="shadowGrid" Visibility="Hidden">
+                <Grid Background="Black" Opacity="0.7" x:Name="shadowGrid" Visibility="Hidden">
 
-        </Grid>
+                </Grid>
+            </Grid>
+        </Viewbox>
     </Grid>
 </mahapps:MetroWindow>
-- 
cgit v1.3.1