diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-12-13 13:02:08 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-12-13 13:02:08 +0200 |
| commit | f1ef8138154ade048b7e2ff0aac31db5594d26b9 (patch) | |
| tree | f40bf7fe6f9d1f35a9edc579e97c40ae13c1c77a /Software | |
| parent | 417462adb19c4489999087d8bb96e91ffeae3e65 (diff) | |
| download | Tango-f1ef8138154ade048b7e2ff0aac31db5594d26b9.tar.gz Tango-f1ef8138154ade048b7e2ff0aac31db5594d26b9.zip | |
Modified DIalogVieVM to allow OK with CanClose = false.
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/DB/PPC/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/PPC/Tango_log.ldf | bin | 53673984 -> 53673984 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs | 5 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.SharedUI/DialogViewVM.cs | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex a24738a12..35dde42f3 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex d548ec168..60f6da390 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs index e45c29f73..365c1db49 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs @@ -207,6 +207,11 @@ namespace Tango.MachineStudio.UI.ViewModels } } + protected override bool CanOK() + { + return base.CanOK() && CanClose; + } + private async void AbortUpgrade() { CanClose = true; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs index c0ef85bcc..22e489ffa 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs @@ -84,6 +84,7 @@ namespace Tango.PPC.UI.Dialogs public PowerUpViewVM() { RemainingSeconds = 20; + CanClose = false; IsMinimalTemperature = true; IsTimeoutEnabled = true; _timer = new Timer(); diff --git a/Software/Visual_Studio/Tango.SharedUI/DialogViewVM.cs b/Software/Visual_Studio/Tango.SharedUI/DialogViewVM.cs index f740eab84..bf75fd6ef 100644 --- a/Software/Visual_Studio/Tango.SharedUI/DialogViewVM.cs +++ b/Software/Visual_Studio/Tango.SharedUI/DialogViewVM.cs @@ -24,7 +24,7 @@ namespace Tango.SharedUI { CanClose = true; CloseCommand = new RelayCommand(Cancel, (x) => CanClose); - OKCommand = new RelayCommand(Accept, (x) => CanClose && CanOK()); + OKCommand = new RelayCommand(Accept, (x) => CanOK()); } private bool _canClose; |