From e9ab4638c54565d47d393edc27b4699397f57784 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 23 Jul 2018 17:08:05 +0300 Subject: Working on PPC. --- .../Tango.PPC.Jobs/Properties/AssemblyInfo.cs | 2 +- .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs | 143 ++++++++++++++----- .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml | 154 +++++++++++++++------ .../Tango.PPC.Common/Properties/AssemblyInfo.cs | 2 +- .../PPC/Tango.PPC.UI/Views/LayoutView.xaml | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.AnimatedGif/Properties/AssemblyInfo.cs | 2 +- .../Tango.BL/Properties/AssemblyInfo.cs | 2 +- .../Tango.Core/Properties/AssemblyInfo.cs | 2 +- .../Tango.DAL.Remote/Properties/AssemblyInfo.cs | 2 +- .../Tango.DragAndDrop/Properties/AssemblyInfo.cs | 2 +- .../Tango.Hive/Properties/AssemblyInfo.cs | 2 +- .../Tango.Integration/Properties/AssemblyInfo.cs | 2 +- .../Tango.Logging/Properties/AssemblyInfo.cs | 2 +- .../Tango.PMR/Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf/Properties/AssemblyInfo.cs | 2 +- .../Tango.Scripting/Properties/AssemblyInfo.cs | 2 +- .../Tango.Serialization/Properties/AssemblyInfo.cs | 2 +- .../Tango.Settings/Properties/AssemblyInfo.cs | 2 +- .../Tango.SharedUI/Properties/AssemblyInfo.cs | 2 +- .../Tango.Touch/Controls/TouchHamburgerButton.xaml | 5 +- .../Tango.Touch/Properties/AssemblyInfo.cs | 2 +- .../Tango.Transport/Properties/AssemblyInfo.cs | 2 +- .../Tango.Protobuf.CLI/Properties/AssemblyInfo.cs | 2 +- 24 files changed, 243 insertions(+), 103 deletions(-) (limited to 'Software/Visual_Studio') 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 2a68344fb..ff46f9c9f 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 Panel PC Jobs Module")] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.3.1536")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index 7cc76bdcc..f3e7711f9 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -42,6 +42,16 @@ namespace Tango.PPC.Jobs.ViewModels #region Properties + private BL.Enumerations.JobStatuses _jobStatus; + /// + /// Gets or sets the temporary job status. + /// + public BL.Enumerations.JobStatuses JobStatus + { + get { return _jobStatus; } + set { _jobStatus = value; RaisePropertyChangedAuto(); } + } + private Job _job; /// /// Gets or sets the selected job. @@ -190,6 +200,20 @@ namespace Tango.PPC.Jobs.ViewModels /// public RelayCommand DyeCommand { get; set; } + /// + /// Gets or sets the approve sample command. + /// + public RelayCommand ApproveSampleCommand { get; set; } + + /// + /// Gets or sets the repeat sample dye command. + /// + public RelayCommand RepeatSampleDyeCommand { get; set; } + + /// + /// Gets or sets another sample command. + /// + public RelayCommand AnotherSampleCommand { get; set; } #endregion #region Constructors @@ -220,7 +244,7 @@ namespace Tango.PPC.Jobs.ViewModels RemoveSegmentCommand = new RelayCommand(RemoveSegment); RemoveBrushStopCommand = new RelayCommand(RemoveBrushStop); RemoveJobCommand = new RelayCommand(RemoveJob); - SaveJobCommand = new RelayCommand(SaveJob); + SaveJobCommand = new RelayCommand(() => SaveJob()); ReplaceBrushStopCommand = new RelayCommand(InvokeColorAdjustmentForBrushStop); TwineCatalogFieldTapCommand = new RelayCommand(InvokeTwineCatalogForBrushStop); IncreaseDecreaseSamplesToDyeCommand = new RelayCommand((x) => @@ -240,6 +264,10 @@ namespace Tango.PPC.Jobs.ViewModels StartSampleDyeCommand = new RelayCommand(StartSampleDye); DyeCommand = new RelayCommand(StartJob, CanStartJob); + + ApproveSampleCommand = new RelayCommand(ApproveSampleDye); + RepeatSampleDyeCommand = new RelayCommand(RepeatSampleDye); + AnotherSampleCommand = new RelayCommand(DyeAnotherSample); } #endregion @@ -249,13 +277,22 @@ namespace Tango.PPC.Jobs.ViewModels /// /// Saves the job. /// - private async void SaveJob() + private async void SaveJob(bool displayNotification = true) { + if (JobStatus != BL.Enumerations.JobStatuses.Draft) + { + Job.JobStatus = JobStatus; + } + if (Job.Validate(_db)) { await _db.SaveChangesAsync(); RaiseMessage(new JobSavedMessage() { Job = Job }); - await NotificationProvider.ShowInfo(String.Format("Job '{0}' saved successfully.", Job.Name)); + + if (displayNotification) + { + await NotificationProvider.ShowInfo(String.Format("Job '{0}' saved successfully.", Job.Name)); + } } } @@ -468,11 +505,48 @@ namespace Tango.PPC.Jobs.ViewModels } } - MachineProvider.MachineOperator.Print(sampleDyeJob); + SaveJob(false); + + var thisJob = Job; + + MachineProvider.MachineOperator.Print(sampleDyeJob).Completed += (x, e) => + { + thisJob.JobStatus = BL.Enumerations.JobStatuses.PendingApproval; + + if (Job != null && Job.Guid == thisJob.Guid) + { + JobStatus = BL.Enumerations.JobStatuses.PendingApproval; + } + }; NavigationManager.NavigateTo(nameof(JobProgressView)); } + /// + /// Sets the job status back to not approved. + /// + private void RepeatSampleDye() + { + JobStatus = BL.Enumerations.JobStatuses.Draft; + } + + /// + /// Approves the sample dye. + /// + private void ApproveSampleDye() + { + JobStatus = BL.Enumerations.JobStatuses.Approved; + SaveJob(false); + } + + /// + /// Dyes another sample. + /// + private void DyeAnotherSample() + { + JobStatus = BL.Enumerations.JobStatuses.Draft; + } + #endregion #region Out Of Gamut Check Thread @@ -521,51 +595,46 @@ namespace Tango.PPC.Jobs.ViewModels /// public async override void OnNavigatedTo() { - if (_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid)) + if (!(_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid))) { - if (_job_to_load_intent == JobNavigationIntent.SampleDye) + NotificationProvider.SetGlobalBusyMessage("Loading job details..."); + + _can_navigate_back = false; + base.OnNavigatedTo(); + + if (_db != null) { - View.DisplaySampleDye(); + _db.Dispose(); } - return; - } - NotificationProvider.SetGlobalBusyMessage("Loading job details..."); + _db = ObservablesContext.CreateDefault(); + var a = _db.Jobs.ToList(); + Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid); + Job.ValidateOnPropertyChanged = true; + Rmls = await _db.Rmls.ToListAsync(); + ColorSpaces = await _db.ColorSpaces.ToListAsync(); + SpoolTypes = await _db.SpoolTypes.ToListAsync(); + Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync(); - _can_navigate_back = false; - base.OnNavigatedTo(); + if (!_check_gamut_thread.IsAlive) + { + _check_gamut_thread.Start(); + } - if (_db != null) - { - _db.Dispose(); - } + SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments); + SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending)); - _db = ObservablesContext.CreateDefault(); - var a = _db.Jobs.ToList(); - Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid); - Job.ValidateOnPropertyChanged = true; - Rmls = await _db.Rmls.ToListAsync(); - ColorSpaces = await _db.ColorSpaces.ToListAsync(); - SpoolTypes = await _db.SpoolTypes.ToListAsync(); - Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync(); + InvokeUIOnIdle(() => + { + NotificationProvider.ReleaseGlobalBusyMessage(); + }); - if (!_check_gamut_thread.IsAlive) - { - _check_gamut_thread.Start(); + _job_to_load = null; } - SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments); - SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending)); - - InvokeUIOnIdle(() => - { - NotificationProvider.ReleaseGlobalBusyMessage(); - }); - - _job_to_load = null; - if (_job_to_load_intent == JobNavigationIntent.SampleDye) { + JobStatus = Job.JobStatus; View.DisplaySampleDye(); } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml index ec68377a7..bfd571db0 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml @@ -574,55 +574,129 @@ - + + + + + + START + + + - - + + - - - - Dye several meters per segment in order to get approval. - - Once approved, you can dye the entire job. - + + How to continue? + + + + + + + DONE + + + + The sample is approved + + + + + + + REPEAT + + + + Dye more samples + + + + + + + - - Meters per segment - - - - - - - - - + + + + + + + Sample Approved: + + + + + + ANOTHER SAMPLE + + + + @@ -630,10 +704,6 @@ - - - START - diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs index 0e632a2ee..254e25c85 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/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 Panel PC Common Library")] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.3.1536")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index 7f1c1a115..9900a5b27 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -99,8 +99,8 @@ - - + + diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs index 8322212d9..2eb4047d6 100644 --- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs @@ -20,7 +20,7 @@ using System.Windows.Markup; [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] [assembly: AssemblyCopyright("2000-2013 AlphaSierraPapa for the SharpDevelop Team")] -[assembly: AssemblyVersion("1.0.7.1321")] +[assembly: AssemblyVersion("1.0.11.1536")] [assembly: NeutralResourcesLanguage("en-US")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly", diff --git a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs index 87e64731d..e548e7917 100644 --- a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs @@ -6,6 +6,6 @@ using System.Windows.Markup; [assembly: AssemblyTitle("Tango - GIF Animation Library")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.4.1536")] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs index e602c9b09..a44f2a3af 100644 --- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Business logic components")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.7.1321")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.12.1536")] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs index 89293f32d..a2d51cf05 100644 --- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Core Components")] -[assembly: AssemblyVersion("2.0.8.1341")] +[assembly: AssemblyVersion("2.0.13.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs index 71fcb7189..08934c967 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Remote Data Access Layer")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.12.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs index 65acf8597..8b7968bf4 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Drag & Drop Components")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.11.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs index 702681d55..0a2d10a13 100644 --- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Hive UI Components")] -[assembly: AssemblyVersion("2.0.5.1321")] +[assembly: AssemblyVersion("2.0.8.1536")] [assembly:ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs index 1a301baad..7ec6dd065 100644 --- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.10.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs index 35ad3b6c7..7058d26a2 100644 --- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Logging Library")] -[assembly: AssemblyVersion("2.0.11.1321")] +[assembly: AssemblyVersion("2.0.16.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs index 4946d0146..774bcdb36 100644 --- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Message Repository")] -[assembly: AssemblyVersion("2.0.8.1321")] +[assembly: AssemblyVersion("2.0.13.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs index 71fe010f7..50f0b2612 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Components")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.12.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs index 621428c91..c675c1cc5 100644 --- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.11.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs index bfb3a6f10..ac3317beb 100644 --- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Serialization Components")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.12.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs index 045739629..c52479659 100644 --- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Global Settings")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.12.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs index 2647565d8..6d98d4c35 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Shared UI Components")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.11.1536")] [assembly: ComVisible(false)] diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml index de43234a3..b993776ca 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml @@ -9,9 +9,10 @@ + - + @@ -139,7 +140,7 @@ - + diff --git a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs index 323667fbd..00cdb87dd 100644 --- a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows; [assembly: AssemblyTitle("Tango - Touch Components")] -[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyVersion("2.0.4.1536")] [assembly: ComVisible(false)] [assembly:ThemeInfo( diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs index a7c0a8fd2..1347f62e4 100644 --- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Transport Components")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.10.1536")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs index ff7092647..87212ed31 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs @@ -3,5 +3,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")] -[assembly: AssemblyVersion("2.0.7.1321")] +[assembly: AssemblyVersion("2.0.12.1536")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1