From 0b804fd5df94b66c6be119660581ab3978d31d59 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 4 Jul 2018 11:58:10 +0300 Subject: 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 --- .../DefaultStudioApplicationManager.cs | 37 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index 48b0fdada..fdad31251 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -43,14 +43,14 @@ namespace Tango.MachineStudio.UI.StudioApplication _navigationManager = navigationManager; _openedWindows = new List(); - Task.Factory.StartNew(() => + Task.Factory.StartNew(() => { while (MainWindow.Instance == null) { Thread.Sleep(100); } - InvokeUI(() => + InvokeUI(() => { MainWindow.Instance.ContentRendered += (_, __) => { @@ -256,5 +256,38 @@ namespace Tango.MachineStudio.UI.StudioApplication window.Closed += (x, y) => { _openedWindows.Remove(window); }; } + + /// + /// Gets the core libraries version. + /// + public string CoreVersion + { + get + { + return typeof(ExtendedObject).Assembly.GetName().Version.ToString(); + } + } + + /// + /// Gets the build date. + /// + public string BuildDate + { + get + { + return Properties.Resources.BuildDate; + } + } + + /// + /// Gets the change log. + /// + public string ChangeLog + { + get + { + return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.MachineStudioChangeLog.txt") + Environment.NewLine + Environment.NewLine + Environment.NewLine + EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.CoreChangeLog.txt"); + } + } } } -- cgit v1.3.1