Merge pull request #50 from Dirkster99/LoadLayoutAsync

Load layout async

source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

source/MLibTest/MLibTest/App.xaml.cs

@@ -10,6 +10,7 @@
     using System.Diagnostics;
     using System.Globalization;
     using System.Threading;
+    using System.Threading.Tasks;
     using System.Windows;
 
     /// <summary>
@@ -28,11 +29,20 @@ static App()
             // Create service model to ensure available services
             ServiceInjector.InjectServices();
         }
+
+        public App()
+        {
+            LayoutLoaded = new LayoutLoader(@".\AvalonDock.Layout.config");
+        }
         #endregion constructors
 
+        internal LayoutLoader LayoutLoaded { get; }
+
         #region methods
         private void Application_Startup(object sender, StartupEventArgs e)
         {
+            LayoutLoaded.LoadLayout();
+
             try
             {
                 // Set shutdown mode here (and reset further below) to enable showing custom dialogs (messageboxes)
@@ -141,7 +151,8 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
                 Debug.WriteLine(exp);
             }
 
-            _mainWindow.OnLoadLayout();
+            // Load and layout AvalonDock elements when MainWindow has loaded
+            _mainWindow.OnLoadLayoutAsync();
 
         /***
             try
@@ -266,6 +277,29 @@ private void OnClosed(AppViewModel appVM, IViewSize win)
             }
         }
 
+        private LayoutLoaderResult LoadAvalonDockLayoutToString()
+        {
+            string path = System.IO.Path.GetFullPath(@".\AvalonDock.Layout.config");
+
+            if (System.IO.File.Exists(path) == false)
+                return null;
+
+            try
+            {
+                //Thread.Sleep(2000);
+                return new LayoutLoaderResult(System.IO.File.ReadAllText(path), true, null);
+            }
+            catch (Exception exc)
+            {
+                return new LayoutLoaderResult(null, false, exc);
+            }
+        }
+
+        internal async Task<LayoutLoaderResult> GetLayoutString(EventHandler<LayoutLoadedEventArgs> loadEventHandler)
+        {
+            return await LayoutLoaded.GetLayoutString(loadEventHandler);
+        }
+
         /// <summary>
         /// This method gets the service locator instance
         /// that is  used in turn to get an application specific service instance.

source/MLibTest/MLibTest/Demos/ViewModels/AD/FileViewModel.cs

@@ -8,9 +8,25 @@
 
     internal class FileViewModel : PaneViewModel
     {
+        #region fields
         private static ImageSourceConverter ISC = new ImageSourceConverter();
         private IWorkSpaceViewModel _workSpaceViewModel = null;
 
+        private string _textContent = string.Empty;
+        private string _filePath = null;
+        private bool _isDirty = false;
+
+        ICommand _closeCommand = null;
+        ICommand _saveAsCommand = null;
+        ICommand _saveCommand = null;
+        #endregion fields
+
+        #region ctors
+        /// <summary>
+        /// Class constructor
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="workSpaceViewModel"></param>
         public FileViewModel(string filePath, IWorkSpaceViewModel workSpaceViewModel)
             : this(workSpaceViewModel)
         {
@@ -21,15 +37,19 @@ public FileViewModel(string filePath, IWorkSpaceViewModel workSpaceViewModel)
             IconSource = ISC.ConvertFromInvariantString(@"pack://application:,,/Demos/Images/document.png") as ImageSource;
         }
 
+        /// <summary>
+        /// class constructor
+        /// </summary>
+        /// <param name="workSpaceViewModel"></param>
         public FileViewModel(IWorkSpaceViewModel workSpaceViewModel)
         {
             _workSpaceViewModel = workSpaceViewModel;
-            IsDirty = true;
+            IsDirty = false;
             Title = FileName;
         }
+        #endregion ctors
 
-        #region FilePath
-        private string _filePath = null;
+        #region Properties
         public string FilePath
         {
             get { return _filePath; }
@@ -50,23 +70,19 @@ public string FilePath
                 }
             }
         }
-        #endregion
-
 
         public string FileName
         {
-            get 
+            get
             {
                 if (FilePath == null)
                     return "Noname" + (IsDirty ? "*" : "");
 
-                return System.IO.Path.GetFileName(FilePath) + (IsDirty ? "*" : ""); 
+                return System.IO.Path.GetFileName(FilePath) + (IsDirty ? "*" : "");
             }
         }
 
         #region TextContent
-
-        private string _textContent = string.Empty;
         public string TextContent
         {
             get { return _textContent; }
@@ -83,9 +99,6 @@ public string TextContent
 
         #endregion
 
-        #region IsDirty
-
-        private bool _isDirty = false;
         public bool IsDirty
         {
             get { return _isDirty; }
@@ -100,10 +113,6 @@ public bool IsDirty
             }
         }
 
-        #endregion
-
-        #region SaveCommand
-        ICommand _saveCommand = null;
         public ICommand SaveCommand
         {
             get
@@ -117,20 +126,6 @@ public ICommand SaveCommand
             }
         }
 
-        private bool CanSave(object parameter)
-        {
-            return IsDirty;
-        }
-
-        private void OnSave(object parameter)
-        {
-            _workSpaceViewModel.Save(this, false);
-        }
-
-        #endregion
-
-        #region SaveAsCommand
-        ICommand _saveAsCommand = null;
         public ICommand SaveAsCommand
         {
             get
@@ -144,20 +139,7 @@ public ICommand SaveAsCommand
             }
         }
 
-        private bool CanSaveAs(object parameter)
-        {
-            return IsDirty;
-        }
-
-        private void OnSaveAs(object parameter)
-        {
-            _workSpaceViewModel.Save(this, true);
-        }
-
-        #endregion
-
         #region CloseCommand
-        ICommand _closeCommand = null;
         public ICommand CloseCommand
         {
             get
@@ -170,7 +152,10 @@ public ICommand CloseCommand
                 return _closeCommand;
             }
         }
+        #endregion
+        #endregion Properties
 
+        #region methods
         private bool CanClose()
         {
             return true;
@@ -180,6 +165,26 @@ private void OnClose()
         {
             _workSpaceViewModel.Close(this);
         }
-        #endregion
+
+        private bool CanSave(object parameter)
+        {
+            return IsDirty;
+        }
+
+        private void OnSave(object parameter)
+        {
+            _workSpaceViewModel.Save(this, false);
+        }
+
+        private bool CanSaveAs(object parameter)
+        {
+            return IsDirty;
+        }
+
+        private void OnSaveAs(object parameter)
+        {
+            _workSpaceViewModel.Save(this, true);
+        }
+        #endregion methods
     }
 }

source/MLibTest/MLibTest/Demos/ViewModels/Interfaces/IWorkSpaceViewModel.cs

@@ -39,6 +39,13 @@ internal interface IWorkSpaceViewModel
         /// <param name="fileToSave"></param>
         /// <param name="saveAsFlag"></param>
         void Save(FileViewModel fileToSave, bool saveAsFlag = false);
+
+        /// <summary>
+        /// Open a file and return its content in a viewmodel.
+        /// </summary>
+        /// <param name="filepath"></param>
+        /// <returns></returns>
+        FileViewModel Open(string filepath);
         #endregion methods
     }
 }

source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs

@@ -338,6 +338,11 @@ private void OnOpen(object parameter)
             }
         }
 
+        /// <summary>
+        /// Open a file and return its content in a viewmodel.
+        /// </summary>
+        /// <param name="filepath"></param>
+        /// <returns></returns>
         public FileViewModel Open(string filepath)
         {
             var fileViewModel = _files.FirstOrDefault(fm => fm.FilePath == filepath);
@@ -346,6 +351,7 @@ public FileViewModel Open(string filepath)
 
             fileViewModel = new FileViewModel(filepath, this as IWorkSpaceViewModel);
             _files.Add(fileViewModel);
+
             return fileViewModel;
         }
         #endregion  OpenCommand

source/MLibTest/MLibTest/MLibTest.csproj

@@ -95,6 +95,9 @@
       <DependentUpon>ColorSelectionView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Models\AppCore.cs" />
+    <Compile Include="Models\LayoutLoadedEventArgs.cs" />
+    <Compile Include="Models\LayoutLoader.cs" />
+    <Compile Include="Models\LayoutLoaderResult.cs" />
     <Compile Include="Models\SettingDefaults.cs" />
     <Compile Include="ServiceInjector.cs" />
     <Compile Include="ViewModels\AppLifeCycleViewModel.cs" />

source/MLibTest/MLibTest/MainWindow.xaml

@@ -78,16 +78,23 @@
                                    AnchorablesSource="{Binding Tools}" 
                                    DocumentsSource="{Binding Files}"
                                    ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}"
-                                   Grid.Row="1">
+                                   Grid.Row="1"
+                                   Visibility="Hidden"
+                                   >
             <!-- avalonDock:DockingManager.Theme>
                 <avalonDock:Vs2013LightTheme/>
             </avalonDock:DockingManager.Theme -->
             <avalonDock:DockingManager.LayoutItemTemplateSelector>
                 <demos:PanesTemplateSelector>
                     <demos:PanesTemplateSelector.FileViewTemplate>
                         <DataTemplate>
-                            <TextBox Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}"
-                                     BorderThickness="0" />
+                            <Grid>
+                                <TextBox
+                                    Text="{Binding TextContent, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap"
+                                    AcceptsReturn="True"
+                                    BorderThickness="0" />
+                            </Grid>
                         </DataTemplate>
                     </demos:PanesTemplateSelector.FileViewTemplate>
                     <demos:PanesTemplateSelector.FileStatsViewTemplate>