From e352c4e5f742585e4feeb2ca3183bd4d0282a567 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 14 Dec 2017 14:43:25 +0200
Subject: Implemented new MDI Container Control !

---
 .../Tango.MachineStudio.DB/Managers/RegisteredView.cs        | 12 ++++++++----
 .../Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml     |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs
index 00c7d341a..fc9051edb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Managers/RegisteredView.cs
@@ -1,21 +1,25 @@
-using System;
+using MaterialDesignThemes.Wpf;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Controls;
 
 namespace Tango.MachineStudio.DB.Managers
 {
-    public class RegisteredView
+    public class RegisteredView : MdiChild
     {
-        public String Header { get; set; }
-        public FrameworkElement View { get; set; }
+        private static Random rnd = new Random();
+
         public RelayCommand AddCommand { get; set; }
 
         public RegisteredView(String header, FrameworkElement view, Action action)
         {
+            Location = new Point(rnd.Next(30, 200), rnd.Next(30, 200));
+            Icon = PackIconKind.Table;
             Header = header;
             View = view;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml
index 5ba51fea8..c7c636d53 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/MainDBView.xaml
@@ -9,6 +9,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              xmlns:managers="clr-namespace:Tango.MachineStudio.DB.Managers"
+             xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
              xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1270" Background="White" DataContext="{Binding MainViewVM, Source={StaticResource Locator}}">
@@ -44,9 +45,8 @@
                 <Grid.Background>
                     <ImageBrush ImageSource="../Images/seamless-grid.jpg" Stretch="None" TileMode="Tile" ViewportUnits="Absolute" Viewport="0,0,32,32"></ImageBrush>
                 </Grid.Background>
-                <dockablz:Layout ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" FloatingItemsSource="{x:Static managers:ViewsManager.DisplayedViews}" FloatingItemDisplayMemberPath="View" FloatingItemHeaderMemberPath="Header">
 
-                </dockablz:Layout>
+                <commonControls:MdiContainerControl ItemsSource="{x:Static managers:ViewsManager.DisplayedViews}"></commonControls:MdiContainerControl>
             </Grid>
         </Grid>
     </Grid>
-- 
cgit v1.3.1