Merge branch 'master' into FloatingWindowGroup

Dirkster99 · May 13, 2019 · f818c88 · f818c88
2 parents dcee22e + 0996752
commit f818c88
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,7 @@
 
 Support this project with a :star: -report an issue, or even better, place a pull request :mailbox: :blush:
 
-My projects:
-- <a href="https://dirkster99.github.io/Edi/">Edi</a> and
-- <a href="https://github.com/Dirkster99/Aehnlich">Aehnlich</a>
-
-are powered by this project.
+My projects <a href="https://dirkster99.github.io/Edi/">Edi</a> and <a href="https://github.com/Dirkster99/Aehnlich">Aehnlich</a> are powered by this project.
 
 AvalonDock is a WPF Document and Tool Window layout container that is used to arrange documents
 and tool windows in similar ways than many well known IDEs, such as, Eclipse, Visual Studio,
@@ -122,6 +118,8 @@ to also theme standard elements, such as, button and textblock etc.
    - (thanx to [madenaras](https://github.com/madenaras))
    - <a href="https://github.com/Dirkster99/AvalonDock/commit/3522efc2c15d6521440e80936fcfcf4ad383fd19">@Dirkster99</a>
 
+4) Added [zh-Hant](https://github.com/Dirkster99/AvalonDock/wiki/Localization) localization (thanx to [nuthrash](https://github.com/nuthrash)
+
 ### Fixed Crash on IsSelected Document Property
 - <a href="https://github.com/xceedsoftware/wpftoolkit/issues/1481">#1481</a>
 - <a href="https://github.com/Dirkster99/AvalonDock/commit/fabbd218beaa996a3176d39b698ce1990bdd9254">@Dirkster99</a>
@@ -144,6 +142,7 @@ Also Increased to Version 3.5.2.
 - <a href="https://github.com/Dirkster99/AvalonDock/commit/6d23da0ce95236ee77e53238cf60e679a3c8fb0e">@Dirkster99</a>
 
 ### Added resource file for AvalonDock for nl-BE
+- [nl-BE](https://github.com/Dirkster99/AvalonDock/wiki/Localization)
 - <a href="https://github.com/xceedsoftware/wpftoolkit/issues/1424">#1424</a>
 - <a href="https://github.com/Dirkster99/AvalonDock/commit/70995417714f37d84659854245f0caad8e3c6d39">@Dirkster99</a>
 

diff --git a/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs b/source/MLibTest/MLibTest/Demos/PanesTemplateSelector.cs
@@ -38,6 +38,11 @@ public PanesTemplateSelector()
 
         public DataTemplate Tooln_ViewTemplate { get; set; }
 
+        /// <summary>
+        /// Gets a template for simple testing tool windows.
+        /// </summary>
+        public DataTemplate Tooln_ViewTemplate { get; set; }
+
         /// <summary>
         /// Determines the matching view for a specific given type of viewmodel.
         /// </summary>

diff --git a/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs b/source/MLibTest/MLibTest/Demos/ViewModels/WorkSpaceViewModel.cs
@@ -101,6 +101,9 @@ internal class WorkSpaceViewModel : MLibTest.ViewModels.Base.ViewModelBase, IWor
 
         private FileStatsViewModel _fileStats = null;
         private ColorPickerViewModel _ColorPicker = null;
+        private Tool1_ViewModel _Tool1;
+        private Tool2_ViewModel _Tool2;
+        private Tool3_ViewModel _Tool3;
 
         private FileViewModel _activeDocument = null;
         private Tool1_ViewModel _Tool1;
@@ -168,6 +171,7 @@ public IEnumerable<ToolViewModel> Tools
             {
                 if (_tools == null)
                     _tools = new ToolViewModel[] { FileStats, ColorPicker, _Tool1, _Tool2, _Tool3 };
+
                 return _tools;
             }
         }

diff --git a/source/MLibTest/MLibTest/MLibTest.csproj b/source/MLibTest/MLibTest/MLibTest.csproj
@@ -90,6 +90,11 @@
     <Compile Include="Demos\ViewModels\AD\ToolViewModel.cs" />
     <Compile Include="Demos\ViewModels\Tools\ColorPickerViewModel.cs" />
     <Compile Include="Demos\ViewModels\Interfaces\IWorkSpaceViewModel.cs" />
+    <Compile Include="Demos\ViewModels\Tools\ColorPickerViewModel.cs" />
+    <Compile Include="Demos\ViewModels\Tools\FileStatsViewModel.cs" />
+    <Compile Include="Demos\ViewModels\Tools\Tool1_ViewModel.cs" />
+    <Compile Include="Demos\ViewModels\Tools\Tool2_ViewModel.cs" />
+    <Compile Include="Demos\ViewModels\Tools\Tool3_ViewModel.cs" />
     <Compile Include="Demos\ViewModels\WorkSpaceViewModel.cs" />
     <Compile Include="Demos\ViewModels\Views\ColorSelectionView.xaml.cs">
       <DependentUpon>ColorSelectionView.xaml</DependentUpon>