merge

2 files changed, 1 insertions, 23 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
index e76d933fb..0d9d6b667 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
@@ -46,7 +46,7 @@
                         <ComboBox Width="200" Margin="0 10 0 0" HorizontalAlignment="Left" ItemsSource="{Binding Source={x:Type web:DeploymentSlot},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding DeploymentSlot}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
                         
 
-                        <StackPanel Margin="0 20 0 0" Orientation="Horizontal" >
+                        <StackPanel Margin="0 20 0 0" Orientation="Horizontal">
                             <TextBlock FontSize="16">Email:</TextBlock>
                             <TextBox Margin="5 0 0 0" Width="230" BorderThickness="0 0 0 1" Text="{Binding Email,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                         </StackPanel>
@@ -59,10 +59,6 @@
                         <TextBlock FontSize="16" Margin="0 20 0 0">Comments</TextBlock>
                         <TextBox Height="70" Margin="0 5 0 0" Width="500" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
-                        <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
-                            <CheckBox IsChecked="{Binding ForcedUpdate}">Forced Update</CheckBox>
-                            <CheckBox Margin="10 0 0 0" IsChecked="{Binding IsStable}">Stable Release</CheckBox>
-                        </StackPanel>
                     </StackPanel>
 
                     <Grid DockPanel.Dock="Bottom">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 6cfa96a18..206a2d31b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -54,22 +54,6 @@ namespace Tango.MachineStudio.Publisher
             set { _comments = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _forcesUpdate;
-
-        public bool ForcedUpdate
-        {
-            get { return _forcesUpdate; }
-            set { _forcesUpdate = value; RaisePropertyChangedAuto(); }
-        }
-
-        private bool _isStable;
-
-        public bool IsStable
-        {
-            get { return _isStable; }
-            set { _isStable = value; RaisePropertyChangedAuto(); }
-        }
-
         private DeploymentSlot _deploymentSlot;
         public DeploymentSlot DeploymentSlot
         {
@@ -176,8 +160,6 @@ namespace Tango.MachineStudio.Publisher
                         Password = _hashGenerator.Encrypt(Password),
                         Version = CurrentVersion.ToString(),
                         Comments = Comments,
-                        ForcedUpdate = ForcedUpdate,
-                        IsStable = IsStable,
                     }).Result;
 
                     using (ZipFile zip = new ZipFile())