Added firmware package generator in machine studio.

3 files changed, 25 insertions, 10 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml
index d1935474f..a3bb0ec23 100644
--- a/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml
@@ -28,9 +28,9 @@
             </StackPanel>
 
             <Grid>
-                <DataGrid Margin="0 20" SelectionMode="Single" SelectionUnit="FullRow" HorizontalScrollBarVisibility="Disabled" AutoGenerateColumns="False" ItemsSource="{Binding VersionFiles}" CanUserAddRows="True" CanUserReorderColumns="False" CanUserDeleteRows="True" CanUserSortColumns="False" AddingNewItem="DataGrid_AddingNewItem">
+                <DataGrid x:Name="grid" Margin="0 20" SelectionMode="Single" SelectionUnit="FullRow" HorizontalScrollBarVisibility="Disabled" AutoGenerateColumns="False" ItemsSource="{Binding VersionFiles}" CanUserAddRows="True" CanUserReorderColumns="False" CanUserDeleteRows="True" CanUserSortColumns="False" AddingNewItem="DataGrid_AddingNewItem" PreviewMouseDoubleClick="DataGrid_MouseDoubleClick">
                     <DataGrid.Columns>
-                        <DataGridTextColumn IsReadOnly="True" Width="1*" Header="File Name" Binding="{Binding FileName}" />
+                        <DataGridTextColumn Width="1*" Header="File Name" Binding="{Binding FileName,Mode=OneWay}" />
                         <DataGridComboBoxColumn Width="100" Header="DESTINATION" ItemsSource="{Binding Source={x:Type pmr:VersionFileDestination},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValueBinding="{Binding Destination}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" />
                         <DataGridTextColumn Width="70" Header="VERSION" Binding="{Binding Version}" />
                     </DataGrid.Columns>
diff --git a/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml.cs
index 9aa79f469..4822a2b3b 100644
--- a/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindow.xaml.cs
@@ -30,13 +30,28 @@ namespace Tango.FirmwarePackageGenerator
 
         private void DataGrid_AddingNewItem(object sender, AddingNewItemEventArgs e)
         {
-            OpenFileDialog dlg = new OpenFileDialog();
-            dlg.Filter = "Firmware Package Files|*.bin;*.fpga";
-            if (dlg.ShowDialog().Value)
+            //OpenFileDialog dlg = new OpenFileDialog();
+            //dlg.Filter = "Firmware Package Files|*.bin;*.fpga";
+            //if (dlg.ShowDialog().Value)
+            //{
+            //    VersionFileModel item = new VersionFileModel();
+            //    item.Path = dlg.FileName;
+            //    e.NewItem = item;
+            //}
+        }
+
+        private void DataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (grid.SelectedItem == null || grid.SelectedItem.ToString() == "{NewItemPlaceholder}")
             {
-                VersionFileModel item = new VersionFileModel();
-                item.Path = dlg.FileName;
-                e.NewItem = item;
+                OpenFileDialog dlg = new OpenFileDialog();
+                dlg.Filter = "Firmware Package Files|*.*";
+                if (dlg.ShowDialog().Value)
+                {
+                    VersionFileModel item = new VersionFileModel();
+                    item.Path = dlg.FileName;
+                    (DataContext as MainWindowVM).VersionFiles.Add(item);
+                }
             }
         }
     }
diff --git a/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindowVM.cs b/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindowVM.cs
index f5621e55b..62cef8b36 100644
--- a/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindowVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.FirmwarePackageGenerator/MainWindowVM.cs
@@ -93,12 +93,12 @@ namespace Tango.FirmwarePackageGenerator
 
         private void ShowError(String error)
         {
-            MessageBox.Show(error, "PPC Publisher", MessageBoxButton.OK, MessageBoxImage.Error);
+            MessageBox.Show(error, "Firmware Package Generator", MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         private void ShowInfo(String message)
         {
-            MessageBox.Show(message, "PPC Publisher", MessageBoxButton.OK, MessageBoxImage.Information);
+            MessageBox.Show(message, "Firmware Package Generator", MessageBoxButton.OK, MessageBoxImage.Information);
         }
     }
 }