diff --git a/App.xaml b/App/App.xaml similarity index 100% rename from App.xaml rename to App/App.xaml diff --git a/App.xaml.cs b/App/App.xaml.cs similarity index 100% rename from App.xaml.cs rename to App/App.xaml.cs diff --git a/AssemblyInfo.cs b/App/AssemblyInfo.cs similarity index 100% rename from AssemblyInfo.cs rename to App/AssemblyInfo.cs diff --git a/ContentDialogExample.xaml b/App/ContentDialogExample.xaml similarity index 100% rename from ContentDialogExample.xaml rename to App/ContentDialogExample.xaml diff --git a/ContentDialogExample.xaml.cs b/App/ContentDialogExample.xaml.cs similarity index 100% rename from ContentDialogExample.xaml.cs rename to App/ContentDialogExample.xaml.cs diff --git a/IntellisenseResourceDictionary.cs b/App/IntellisenseResourceDictionary.cs similarity index 100% rename from IntellisenseResourceDictionary.cs rename to App/IntellisenseResourceDictionary.cs diff --git a/MainWindow.xaml b/App/MainWindow.xaml similarity index 92% rename from MainWindow.xaml rename to App/MainWindow.xaml index bc803cf..3e4fc5d 100644 --- a/MainWindow.xaml +++ b/App/MainWindow.xaml @@ -2,11 +2,11 @@ x:Class="ModernWpfPlayground.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:controls="http://wpflib.de/" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ModernWpfPlayground" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:prism="http://prismlibrary.com/" - xmlns:propertyPresenter="clr-namespace:ModernWpfPlayground.PropertyPresenter" xmlns:ui="http://schemas.modernwpf.com/2019" x:Name="Window" Title="{Binding Title}" @@ -159,6 +159,7 @@ @@ -178,7 +179,10 @@ - + - - + - - - - + + - + - + diff --git a/MainWindow.xaml.cs b/App/MainWindow.xaml.cs similarity index 100% rename from MainWindow.xaml.cs rename to App/MainWindow.xaml.cs diff --git a/MainWindowViewModel.cs b/App/MainWindowViewModel.cs similarity index 100% rename from MainWindowViewModel.cs rename to App/MainWindowViewModel.cs diff --git a/ModernWpfPlayground.csproj b/App/ModernWpfPlayground.csproj similarity index 87% rename from ModernWpfPlayground.csproj rename to App/ModernWpfPlayground.csproj index f035bd3..136d159 100644 --- a/ModernWpfPlayground.csproj +++ b/App/ModernWpfPlayground.csproj @@ -16,4 +16,8 @@ + + + + \ No newline at end of file diff --git a/MvvmStuff/BaseViewModel.cs b/App/MvvmStuff/BaseViewModel.cs similarity index 100% rename from MvvmStuff/BaseViewModel.cs rename to App/MvvmStuff/BaseViewModel.cs diff --git a/MvvmStuff/DeserializationExtension.cs b/App/MvvmStuff/DeserializationExtension.cs similarity index 100% rename from MvvmStuff/DeserializationExtension.cs rename to App/MvvmStuff/DeserializationExtension.cs diff --git a/PixelsToGridLengthConverter.cs b/App/PixelsToGridLengthConverter.cs similarity index 100% rename from PixelsToGridLengthConverter.cs rename to App/PixelsToGridLengthConverter.cs diff --git a/ThemeMode.cs b/App/ThemeMode.cs similarity index 100% rename from ThemeMode.cs rename to App/ThemeMode.cs diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj new file mode 100644 index 0000000..3d8b68e --- /dev/null +++ b/Controls/Controls.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.1 + true + enable + + + + + + + diff --git a/Controls/Properties/AssemblyInfo.cs b/Controls/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..95e266e --- /dev/null +++ b/Controls/Properties/AssemblyInfo.cs @@ -0,0 +1,9 @@ +using System; +using System.Runtime.InteropServices; +using System.Windows.Markup; + +[assembly: ComVisible(false)] + +[assembly: CLSCompliant(true)] + +[assembly: XmlnsDefinition("http://wpflib.de/", "Controls")] \ No newline at end of file diff --git a/PropertyPresenter/EnumToKeyValueListConverter.cs b/Controls/PropertyPresenter/EnumToKeyValueListConverter.cs similarity index 96% rename from PropertyPresenter/EnumToKeyValueListConverter.cs rename to Controls/PropertyPresenter/EnumToKeyValueListConverter.cs index 815b3c4..cdd0a8f 100644 --- a/PropertyPresenter/EnumToKeyValueListConverter.cs +++ b/Controls/PropertyPresenter/EnumToKeyValueListConverter.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Linq; using System.Windows.Data; -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// Converts enums to a List with KeyValuePairs. diff --git a/PropertyPresenter/MagicSymbolControl.cs b/Controls/PropertyPresenter/MagicSymbolControl.cs similarity index 96% rename from PropertyPresenter/MagicSymbolControl.cs rename to Controls/PropertyPresenter/MagicSymbolControl.cs index eb9a130..fde52df 100644 --- a/PropertyPresenter/MagicSymbolControl.cs +++ b/Controls/PropertyPresenter/MagicSymbolControl.cs @@ -2,7 +2,7 @@ using System.Windows.Controls; using System.Windows.Markup; -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// Interaction logic for diff --git a/PropertyPresenter/MagicSymbolConverter.cs b/Controls/PropertyPresenter/MagicSymbolConverter.cs similarity index 99% rename from PropertyPresenter/MagicSymbolConverter.cs rename to Controls/PropertyPresenter/MagicSymbolConverter.cs index b0307be..345444f 100644 --- a/PropertyPresenter/MagicSymbolConverter.cs +++ b/Controls/PropertyPresenter/MagicSymbolConverter.cs @@ -7,8 +7,7 @@ using System.Windows.Controls; using System.Windows.Data; using System.Windows.Documents; using System.Windows.Media; - -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// Magically converts a text to diff --git a/PropertyPresenter/PropertyDataTemplateSelector.cs b/Controls/PropertyPresenter/PropertyDataTemplateSelector.cs similarity index 95% rename from PropertyPresenter/PropertyDataTemplateSelector.cs rename to Controls/PropertyPresenter/PropertyDataTemplateSelector.cs index e1fbb48..c68352f 100644 --- a/PropertyPresenter/PropertyDataTemplateSelector.cs +++ b/Controls/PropertyPresenter/PropertyDataTemplateSelector.cs @@ -2,7 +2,7 @@ using System.Windows; using System.Windows.Controls; -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// Selects the right template on base of value-type. diff --git a/PropertyPresenter/PropertyPresenter.xaml b/Controls/PropertyPresenter/PropertyPresenter.xaml similarity index 95% rename from PropertyPresenter/PropertyPresenter.xaml rename to Controls/PropertyPresenter/PropertyPresenter.xaml index 3c6c07f..3d88785 100644 --- a/PropertyPresenter/PropertyPresenter.xaml +++ b/Controls/PropertyPresenter/PropertyPresenter.xaml @@ -1,10 +1,10 @@  - - - + - + - - /// diff --git a/PropertyPresenter/TextBoxEx.cs b/Controls/PropertyPresenter/TextBoxEx.cs similarity index 97% rename from PropertyPresenter/TextBoxEx.cs rename to Controls/PropertyPresenter/TextBoxEx.cs index e89e8d8..9570875 100644 --- a/PropertyPresenter/TextBoxEx.cs +++ b/Controls/PropertyPresenter/TextBoxEx.cs @@ -2,7 +2,7 @@ using System.Windows.Controls; using System.Windows.Input; -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// @@ -38,7 +38,7 @@ namespace ModernWpfPlayground.PropertyPresenter2 /// /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public TextBoxEx() { diff --git a/PropertyPresenter/TextComponent.cs b/Controls/PropertyPresenter/TextComponent.cs similarity index 93% rename from PropertyPresenter/TextComponent.cs rename to Controls/PropertyPresenter/TextComponent.cs index 0e9616c..7a42ffd 100644 --- a/PropertyPresenter/TextComponent.cs +++ b/Controls/PropertyPresenter/TextComponent.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// A component of the symbol diff --git a/PropertyPresenter/ValueConverter.cs b/Controls/PropertyPresenter/ValueConverter.cs similarity index 98% rename from PropertyPresenter/ValueConverter.cs rename to Controls/PropertyPresenter/ValueConverter.cs index 68b7bbd..7701a90 100644 --- a/PropertyPresenter/ValueConverter.cs +++ b/Controls/PropertyPresenter/ValueConverter.cs @@ -11,7 +11,7 @@ using Brushes = System.Windows.Media.Brushes; using FontFamily = System.Windows.Media.FontFamily; using Point = System.Windows.Point; -namespace ModernWpfPlayground.PropertyPresenter2 +namespace Controls { /// /// Makes an Bitmap from every Imageformat. diff --git a/Controls/controls.csproj.DotSettings b/Controls/controls.csproj.DotSettings new file mode 100644 index 0000000..2985ba5 --- /dev/null +++ b/Controls/controls.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/ModernWpfPlayground.csproj.DotSettings b/ModernWpfPlayground.csproj.DotSettings new file mode 100644 index 0000000..d686511 --- /dev/null +++ b/ModernWpfPlayground.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/ModernWpfPlayground.sln b/ModernWpfPlayground.sln index 07a398f..b2dd46c 100644 --- a/ModernWpfPlayground.sln +++ b/ModernWpfPlayground.sln @@ -1,34 +1,31 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30002.166 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernWpfPlayground", "ModernWpfPlayground.csproj", "{A3B7B9FC-947D-4FFD-9793-6779086F550D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModernWpfPlayground", "App\ModernWpfPlayground.csproj", "{E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls", "Controls\Controls.csproj", "{3884FD41-5A46-4A67-A147-57C36F0059DC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E090F4BD-69CD-4D8B-A3A2-620DCE22AE29}.Release|Any CPU.Build.0 = Release|Any CPU + {3884FD41-5A46-4A67-A147-57C36F0059DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3884FD41-5A46-4A67-A147-57C36F0059DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3884FD41-5A46-4A67-A147-57C36F0059DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3884FD41-5A46-4A67-A147-57C36F0059DC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Debug|x64.ActiveCfg = Debug|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Debug|x64.Build.0 = Debug|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Debug|x86.ActiveCfg = Debug|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Debug|x86.Build.0 = Debug|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Release|Any CPU.Build.0 = Release|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Release|x64.ActiveCfg = Release|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Release|x64.Build.0 = Release|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Release|x86.ActiveCfg = Release|Any CPU - {A3B7B9FC-947D-4FFD-9793-6779086F550D}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {21075E5E-39D9-4681-91A0-D9E7E0BDBB85} EndGlobalSection EndGlobal