aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-04 11:58:10 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-04 11:58:10 +0300
commit0b804fd5df94b66c6be119660581ab3978d31d59 (patch)
tree54aa895584710e980f5f0c0701824586f1aaf3d1 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
parent3e11b6594d73eb3e7eda93920ecef942f4c301c4 (diff)
downloadTango-0b804fd5df94b66c6be119660581ab3978d31d59.tar.gz
Tango-0b804fd5df94b66c6be119660581ab3978d31d59.zip
Fixed issue with machine studio update service version sorting.
Added about dialog to machine studio with version information. Fixed issue with Stubs UI installer. Stubs UI v3.1 Machine Studio v1.0.0.10
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs20
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs15
2 files changed, 35 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs
new file mode 100644
index 000000000..5fe3b06b8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.MachineStudio.Common.StudioApplication;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.UI.ViewModels
+{
+ public class AboutViewVM : DialogViewVM
+ {
+ public IStudioApplicationManager ApplicationManager { get; set; }
+
+ public AboutViewVM(IStudioApplicationManager applicationManager)
+ {
+ ApplicationManager = applicationManager;
+ }
+ }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 45ae68cc5..8eaa1f360 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -159,6 +159,11 @@ namespace Tango.MachineStudio.UI.ViewModels
/// </summary>
public RelayCommand OpenDeveloperConsoleCommand { get; set; }
+ /// <summary>
+ /// Gets or sets the about command.
+ /// </summary>
+ public RelayCommand AboutCommand { get; set; }
+
private IAuthenticationProvider _authenticationProvider;
/// <summary>
/// Gets or sets the authentication provider.
@@ -319,6 +324,8 @@ namespace Tango.MachineStudio.UI.ViewModels
OpenDeveloperConsoleCommand = new RelayCommand(OpenDeveloperConsole);
TangoMessenger.Default.Register<Messages.ForcedUpdateMessage>((x) => DisableCheckForUpdates = true);
+
+ AboutCommand = new RelayCommand(ShowAboutDialog);
}
private void MachineEventsStateProvider_EventsResolved(object sender, IEnumerable<MachinesEvent> e)
@@ -683,6 +690,14 @@ namespace Tango.MachineStudio.UI.ViewModels
}
}
+ /// <summary>
+ /// Shows the about dialog.
+ /// </summary>
+ private void ShowAboutDialog()
+ {
+ NotificationProvider.ShowModalDialog<AboutViewVM>((x) => { });
+ }
+
private void ReportIssue()
{
_notificationProvider.ShowModalDialog<ReportIssueViewVM, ReportIssueView>(new ReportIssueViewVM(TFSClient.Project, TFSClient.CreateBug()), async (vm) =>