From 63579cee4493c4a8e3d64348d644fd2eecaca055 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 21 Jan 2019 13:53:00 +0200 Subject: PPC v1.0.0 --- .../Tango.PPC.Events/Properties/AssemblyInfo.cs | 2 +- .../AppButtons/StartPrintingButton.cs | 2 +- .../Tango.PPC.Jobs/Properties/AssemblyInfo.cs | 2 +- .../Tango.PPC.Logging/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.PPC.Power/Properties/AssemblyInfo.cs | 2 +- .../Tango.PPC.Power/ViewModels/MainViewVM.cs | 25 ++++++++++++++++++++++ .../Modules/Tango.PPC.Power/Views/MainView.xaml | 2 +- .../Tango.PPC.Storage/Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- 10 files changed, 34 insertions(+), 9 deletions(-) (limited to 'Software/Visual_Studio/PPC/Modules') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Properties/AssemblyInfo.cs index 62cabff0f..96fc79687 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Events Module")] -[assembly: AssemblyVersion("2.0.1.1407")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs index 8efd46e18..001888c92 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs @@ -11,7 +11,7 @@ namespace Tango.PPC.Jobs.AppButtons { public class StartPrintingButton : AppButton { - public StartPrintingButton(RelayCommand command, IMachineOperator op) : base("START DYEING", command) + public StartPrintingButton(RelayCommand command, IMachineOperator op) : base("DYE", command) { op.StatusChanged += Op_StatusChanged; diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs index 095f10d3b..3f8126e3f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Jobs Module")] -[assembly: AssemblyVersion("2.0.7.1119")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/AssemblyInfo.cs index 612af80ce..a834fd095 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Logging Module")] -[assembly: AssemblyVersion("2.0.4.1119")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs index d07b99ec8..36ac78345 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Settings Module")] -[assembly: AssemblyVersion("2.0.4.1119")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs index a88d39005..def518165 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango Power Module")] -[assembly: AssemblyVersion("2.0.1.1407")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs index b92a43489..bd8fe65f9 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/ViewModels/MainViewVM.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.Commands; using Tango.PPC.Common; namespace Tango.PPC.Power.ViewModels @@ -13,6 +14,19 @@ namespace Tango.PPC.Power.ViewModels /// public class MainViewVM : PPCViewModel { + /// + /// Gets or sets the restart command. + /// + public RelayCommand RestartCommand { get; set; } + + /// + /// Initializes a new instance of the class. + /// + public MainViewVM() + { + RestartCommand = new RelayCommand(RestartApplication); + } + /// /// Called when the application has been started /// @@ -20,5 +34,16 @@ namespace Tango.PPC.Power.ViewModels { //Start initializing here rather then in the constructor. } + + /// + /// Restarts the application. + /// + private async void RestartApplication() + { + if (await NotificationProvider.ShowQuestion("Are you sure you want to restart the application?")) + { + ApplicationManager.Restart(); + } + } } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml index 42c43eb32..4add8e94c 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Power/Views/MainView.xaml @@ -42,7 +42,7 @@ - RESTART + RESTART diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Properties/AssemblyInfo.cs index 201341ef7..804d83e9d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Storage Module")] -[assembly: AssemblyVersion("2.0.2.1119")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs index 0f2c9f8c4..41efbaf89 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango Module")] -[assembly: AssemblyVersion("2.0.2.1119")] +[assembly: AssemblyVersion("1.0.0.0")] [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located -- cgit v1.3.1