diff options
Diffstat (limited to 'Software/Visual_Studio/PPC')
3 files changed, 16 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml index e772a4b87..8918c9561 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml @@ -77,13 +77,14 @@ <TextBlock> <Run>Local Versions:</Run> <Run Text="{Binding LocalVersion}"></Run>, - <Run Text="{Binding LocalFirmwareVersion}"></Run> + <Run Text="{Binding LocalFirmwareVersion}"></Run>, + <Run Text="{Binding PackageSize}"></Run> </TextBlock> </TextBlock> <TextBlock Margin="0 20 0 0">Examiner Provision Sequence Items</TextBlock> - <DataGrid Height="170" SelectionMode="Single" SelectionUnit="FullRow" HorizontalScrollBarVisibility="Disabled" AutoGenerateColumns="False" ItemsSource="{Binding ProvisionSequenceItemsView}" CanUserAddRows="True" CanUserReorderColumns="False" CanUserDeleteRows="True" CanUserSortColumns="False" AddingNewItem="DataGrid_AddingNewItem"> + <DataGrid Height="110" SelectionMode="Single" SelectionUnit="FullRow" HorizontalScrollBarVisibility="Disabled" AutoGenerateColumns="False" ItemsSource="{Binding ProvisionSequenceItemsView}" CanUserAddRows="True" CanUserReorderColumns="False" CanUserDeleteRows="True" CanUserSortColumns="False" AddingNewItem="DataGrid_AddingNewItem"> <DataGrid.Columns> <DataGridTextColumn IsReadOnly="True" Width="100" Header="File Name" Binding="{Binding FileName}" /> <DataGridComboBoxColumn Width="75" Header="Type" ItemsSource="{Binding Source={x:Type examiner:ExaminerSequenceItemType},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValueBinding="{Binding Type}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" /> @@ -96,7 +97,7 @@ <TextBlock Margin="0 20 0 0">Examiner Update Sequence Items</TextBlock> - <DataGrid Height="170" SelectionMode="Single" SelectionUnit="FullRow" HorizontalScrollBarVisibility="Disabled" AutoGenerateColumns="False" ItemsSource="{Binding UpdateSequenceItemsView}" CanUserAddRows="True" CanUserReorderColumns="False" CanUserDeleteRows="True" CanUserSortColumns="False" AddingNewItem="DataGrid_AddingNewItem_1"> + <DataGrid Height="110" SelectionMode="Single" SelectionUnit="FullRow" HorizontalScrollBarVisibility="Disabled" AutoGenerateColumns="False" ItemsSource="{Binding UpdateSequenceItemsView}" CanUserAddRows="True" CanUserReorderColumns="False" CanUserDeleteRows="True" CanUserSortColumns="False" AddingNewItem="DataGrid_AddingNewItem_1"> <DataGrid.Columns> <DataGridTextColumn IsReadOnly="True" Width="100" Header="File Name" Binding="{Binding FileName}" /> <DataGridComboBoxColumn Width="75" Header="Type" ItemsSource="{Binding Source={x:Type examiner:ExaminerSequenceItemType},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValueBinding="{Binding Type}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs index bf4c7af30..01e34e566 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindowVM.cs @@ -110,6 +110,13 @@ namespace Tango.PPC.Publisher.UI set { _publishArgs = value; RaisePropertyChangedAuto(); } } + private String _packageSize; + public String PackageSize + { + get { return _packageSize; } + set { _packageSize = value; RaisePropertyChangedAuto(); } + } + public RelayCommand PublishCommand { get; set; } public RelayCommand CreateTupCommand { get; set; } @@ -182,6 +189,10 @@ namespace Tango.PPC.Publisher.UI IsFree = false; LocalVersion = _publisher.GetLocalVersion(); + DirectoryInfo di = new DirectoryInfo(Options.GetApplicationPath()); + long totalSize = di.GetFiles("*", SearchOption.AllDirectories).Sum(x => x.Length); + PackageSize = totalSize.FileSizeToString(); + try { LocalFirmwareVersion = _publisher.GetLocalFirmwareVersion(Options.TfpPath); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index b549576ff..f46944d59 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] |