diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-05 11:20:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-05 11:20:36 +0300 |
| commit | 898213e7a5380bea18e5b45ef48b4d2d990b4832 (patch) | |
| tree | c0067b6a26ad3853681c9151e1fe9fc5ac5503c6 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels | |
| parent | 3f78570409abd79e46dcb0bfe8f8e2127cc7f67c (diff) | |
| parent | 9cdd202a86fec153935637fc43eef428fced2fd6 (diff) | |
| download | Tango-898213e7a5380bea18e5b45ef48b4d2d990b4832.tar.gz Tango-898213e7a5380bea18e5b45ef48b4d2d990b4832.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
3 files changed, 15 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs index a7750b39c..a468dc2e7 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs @@ -98,7 +98,7 @@ namespace Tango.MachineStudio.UI.ViewModels { Email = "ForceUpdate", Password = "ForceUpdate", - Version = ApplicationManager.Version, + Version = ApplicationManager.Version.ToString(), }); if (response.IsUpdateAvailable && response.ForcedUpdate) 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 df1ea5f7e..f8320e1f2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -235,7 +235,6 @@ namespace Tango.MachineStudio.UI.ViewModels set { _latestVersion = value; RaisePropertyChangedAuto(); } } - private bool _disableCheckForUpdates; /// <summary> /// Gets or sets a value indicating whether [disable check for updates]. @@ -359,7 +358,7 @@ namespace Tango.MachineStudio.UI.ViewModels { Email = _authenticationProvider.CurrentUser.Email, Password = _authenticationProvider.CurrentUser.Password, - Version = _applicationManager.Version, + Version = _applicationManager.Version.ToString(), }); IsUpdateAvailable = response.IsUpdateAvailable; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs index d7ce29b2e..f2550c598 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -70,6 +70,16 @@ namespace Tango.MachineStudio.UI.ViewModels set { _latestVersion = value; RaisePropertyChangedAuto(); } } + private String _updateComments; + /// <summary> + /// Gets or sets the latest version comments. + /// </summary> + public String UpdateComments + { + get { return _updateComments; } + set { _updateComments = value; RaisePropertyChangedAuto(); } + } + private double _downloadProgress; public double DownloadProgress @@ -127,6 +137,7 @@ namespace Tango.MachineStudio.UI.ViewModels _updateInfo = msg.UpdateResponse; Status = UpdateStatus.UpdateAvailable; LatestVersion = _updateInfo.Version; + UpdateComments = _updateInfo.Comments; StartUpdate(); } @@ -157,7 +168,7 @@ namespace Tango.MachineStudio.UI.ViewModels { Email = _authentication.CurrentUser.Email, Password = _authentication.CurrentUser.Password, - Version = _application.Version, + Version = _application.Version.ToString(), }); if (response.IsUpdateAvailable) @@ -165,6 +176,7 @@ namespace Tango.MachineStudio.UI.ViewModels _updateInfo = response; Status = UpdateStatus.UpdateAvailable; LatestVersion = response.Version; + UpdateComments = response.Comments; } else { |