diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-02-16 22:30:33 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-02-16 22:30:33 +0200 |
| commit | dc31b68a5403ed108e61dd15cef52f0d0683cb09 (patch) | |
| tree | 17e4b6cdb6f10669d5f0ced9a7913d2dce966462 /Software/Visual_Studio/MachineStudio | |
| parent | 5f8a6184e8c0b6de2e61fd9845378eb4324c50a6 (diff) | |
| parent | 62692376bc573b56c30b9d61e47753ff7c113871 (diff) | |
| download | Tango-dc31b68a5403ed108e61dd15cef52f0d0683cb09.tar.gz Tango-dc31b68a5403ed108e61dd15cef52f0d0683cb09.zip | |
Merged updated software branch.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
3 files changed, 12 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 66489e131..4217d9712 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -762,7 +762,7 @@ <DataTemplate> <DockPanel> <StackPanel DockPanel.Dock="Left"> - <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock> + <TextBlock Text="{Binding FinalName}" FontWeight="Bold" FontStyle="Italic"></TextBlock> <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock> </StackPanel> <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Right"> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 110772b2d..c87abde49 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.9.5.0")] +[assembly: AssemblyVersion("4.9.6.0")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index 165841905..c7c8335f0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -38,7 +38,16 @@ namespace Tango.MachineStudio.UI.ViewModels public IExternalBridgeClient SelectedMachine { get { return _selectedMachine; } - set { _selectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(RequiresAuthentication)); InvalidateRelayCommands(); } + set + { + if (value != null) + { + _selectedMachine = value; + RaisePropertyChangedAuto(); + RaisePropertyChanged(nameof(RequiresAuthentication)); + InvalidateRelayCommands(); + } + } } /// <summary> |