From 230f73f478a6428a975a51789b6f43ca7a8a5ef8 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 23 Jun 2021 09:05:29 +0300
Subject: Implemented FSE "Application Restart" on remote desktop. Fixed issue
 with insufficient liquid quantities dialog on MS. Added "Display Name" to MS
 RMLs list. Implemented sorting to all rmls lists on PPC. Implemented "Display
 Name" on all PPC rmls lists.

---
 .../PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs      | 2 +-
 .../PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 1565cda5a..374269522 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -395,7 +395,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                Rmls = await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync();
+                Rmls = (await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection();
             }
         }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index b3056c36e..a13a1a470 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -152,7 +152,7 @@
                                             </ItemsControl>
 
                                             <TextBlock VerticalAlignment="Bottom">Default Thread</TextBlock>
-                                            <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Rmls}" SelectedItem="{Binding DefaultRML}" DisplayMemberPath="Name"></touch:TouchComboBox>
+                                            <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Rmls}" SelectedItem="{Binding DefaultRML}" DisplayMemberPath="FinalName"></touch:TouchComboBox>
 
                                             <TextBlock VerticalAlignment="Bottom">Default Spool</TextBlock>
                                             <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Adapter.SpoolTypes}" SelectedItem="{Binding DefaultSpoolType}" DisplayMemberPath="Name"></touch:TouchComboBox>
-- 
cgit v1.3.1