From a4761335999936b8e1bd0091861b3b08ad3f6343 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 20 Jan 2020 13:11:40 +0200
Subject: Fixed main menu style. Fixed issues with machine prototype creation.
 Implemented "make prototype".

---
 .../Views/MachineDetailsView.xaml                  |  2 +-
 .../Views/MachineSettingsView.xaml                 | 45 ++++++++++++++--------
 2 files changed, 29 insertions(+), 18 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
index bcca83ca5..b3cef3083 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -23,7 +23,7 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 20 0">
-                    <Button  Width="170" Height="45"  VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                    <Button Width="170" Height="45"  VerticalAlignment="Center" Command="{Binding SaveCommand}">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
                             <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index 4631ac068..499d6dc89 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -35,28 +35,39 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
-                            <controls:TableGrid RowHeight="50" Margin="10">
-                                <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
-                                <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
 
-                                <TextBlock FontWeight="SemiBold">Name</TextBlock>
-                                <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
+                            <StackPanel>
+                                <controls:TableGrid RowHeight="50" Margin="10">
+                                    <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
+                                    <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
 
-                                <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
-                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                    <TextBlock FontWeight="SemiBold">Name</TextBlock>
+                                    <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
 
-                                <TextBlock FontWeight="SemiBold">Organization</TextBlock>
-                                <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                    <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
+                                    <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
-                                <TextBlock FontWeight="SemiBold">Site</TextBlock>
-                                <ComboBox Background="Transparent" ItemsSource="{Binding Sites}" SelectedItem="{Binding SelectedSite}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                    <TextBlock FontWeight="SemiBold">Organization</TextBlock>
+                                    <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
-                                <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
-                                <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
+                                    <TextBlock FontWeight="SemiBold">Site</TextBlock>
+                                    <ComboBox Background="Transparent" ItemsSource="{Binding Sites}" SelectedItem="{Binding SelectedSite}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
+                                    <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
+                                    <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
+
+                                    <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
+                                    <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
+                                </controls:TableGrid>
+
+                                <Button Margin="0 20 0 0" Background="{StaticResource RedBrush300}" ToolTip="Make this machine configuration as a prototype for the selected machine version" BorderBrush="{StaticResource RedBrush300}"  Width="200" Height="45"  VerticalAlignment="Bottom" Command="{Binding MakePrototypeCommand}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="Copyright" Width="24" Height="24" />
+                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">MAKE PROTOTYPE</TextBlock>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                                <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
-                                <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
-                            </controls:TableGrid>
                             <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="{StaticResource borderBrush}" HorizontalAlignment="Center" Margin="50 50" />
                             <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
                                 <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
@@ -109,7 +120,7 @@
                                 </TextBlock>
                             </StackPanel>
 
-                            <Button Command="{Binding ResetDeviceRegistrationCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Padding="10" Height="Auto">RESET DEVICE REGISTRATION</Button>
+                            <Button Command="{Binding ResetDeviceRegistrationCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Padding="10" Height="45" Width="240">RESET DEVICE REGISTRATION</Button>
                         </DockPanel>
                     </Border>
                 </StackPanel>
-- 
cgit v1.3.1