MultiSelectComboBox . Added template selectors. Not completed yet.

2 files changed, 37 insertions, 12 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
index 99c5f3259..e65961a64 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
@@ -5,9 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
         mc:Ignorable="d"
-        Title="MainWindow" Height="700" Width="800" DataContext="{Binding RelativeSource={RelativeSource Self}}">
+        Title="MainWindow" Height="700" Width="800" DataContext="{Binding RelativeSource={RelativeSource Self}}" >
 
     <Grid>
-        <controls:MultiSelectComboBox Width="250" Height="60"  x:Name="MSCombobox" BorderBrush="Gainsboro" BorderThickness="0.5"/>
+        <Border>
+            <controls:MultiSelectComboBox  Width="250" Height="60"  
+                                          x:Name="MSCombobox" 
+                                          BorderBrush="Gainsboro" BorderThickness="0.5" 
+                                          Items="{Binding Items}" 
+                                          SelectedItemsList ="{Binding SelectedItems}"/>
+        </Border>
     </Grid>
 </Window>
diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml.cs
index fcca7e205..cc0c04a42 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml.cs
@@ -38,6 +38,7 @@ using TableDependency.SqlClient.Base.EventArgs;
 using TableDependency.SqlClient.Base.Abstracts;
 using Tango.Core.Components;
 using System.Text.RegularExpressions;
+using Tango.SharedUI.Controls;
 
 namespace Tango.UITests
 {
@@ -46,26 +47,44 @@ namespace Tango.UITests
     /// </summary>
     public partial class MainWindow : Window
     {
+        private ObservableCollection<object> _selectedItems;
+
+        public ObservableCollection<object> SelectedItems
+        {
+            get { return _selectedItems; }
+            set { _selectedItems = value; }
+        }
+
+        private ObservableCollection<string> _items;
+
+        public ObservableCollection<string> Items
+        {
+            get { return _items; }
+            set { _items = value; }
+        }
+
         public MainWindow()
         {
-            InitializeComponent();
-            MSCombobox.Items = new ObservableCollection<string>
+            SelectedItems = new ObservableCollection<object>
             {
-                "item1",
-                "item2",
-                "item3"
+                new MultiSelectComboBoxItem("item1"),
+                new MultiSelectComboBoxItem("item2"),
+                new MultiSelectComboBoxItem("item3"),
+                new MultiSelectComboBoxItem("item4"),
+                new MultiSelectComboBoxItem("item5")
 
             };
-            MSCombobox.SelectedItemsList = new ObservableCollection<string>
+            Items = new ObservableCollection<string>
             {
                 "item1",
-               "item2",
-                "item3",
-                "item4",
-                "item5"
+                "item2",
+                "item3"
 
             };
 
+            InitializeComponent();
+            
+            //MSCombobox.SelectedItemsList = 
         }
     }
 }