From d33c19b3ac6803de4b5c8d475832efef131c1a45 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 30 Dec 2020 15:11:34 +0000 Subject: Revert "Hope it is fine" --- .../Views/MachineSettingsView.xaml | 184 ++++++++++++--------- 1 file changed, 106 insertions(+), 78 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml') 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 40ce9ea08..76517ec37 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 @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views" xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL" xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL" xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" @@ -13,6 +14,11 @@ xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + + + + + @@ -27,84 +33,106 @@ - - - - - - - - - Serial Number - - - Name - - - Machine Version - - - Organization - - - Default RML - - - Loaded RML - - - Default Color Space - - - Default Segment Length - - - Default Spool Type - - - OS Key - - - Device COM Port - - - - - Auto Login - - - Auto Check For Updates - - - Setup Activation - - - Setup Remote Assistance - - - Setup UWF - - - Setup Firmware - - - Setup FPGA - - - Is Demo Machine - - - Suspend Version Update - - - Force Version Update - - - Update Schema on Update - - - - + + + + + + + + + + + + Serial Number + + + Name + + + Head Type + + + Machine Version + + + Organization + + + Site + + + OS Key + + + Device COM Port + + + + + + + + + Auto Login + + + + + Setup Activation + + + Setup Remote Assistance + + + Setup UWF + + + Setup Firmware + + + Setup FPGA + + + Is Demo Machine + + + Suspend Version Update + + + Force Version Update + + + Update Schema on Update + + + + + + + + + Device Registration + + Device ID: + + + + Device Name: + + + + + + + + -- cgit v1.3.1