holger/ModernWpfPlayground
1
0
Fork 0
mirror of https://github.com/holgerb83/ModernWpfPlayground.git synced 2025-04-08 02:10:01 +02:00
Code Issues 1 Projects 1 Releases Wiki Activity

Reorganization of files

Browse Source
This commit is contained in:
Holger Börchers 2020-04-21 20:52:55 +02:00
parent 441d1d2010
commit a21110fba9
28 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
App.xaml → App/App.xaml
View File

0
App.xaml.cs → App/App.xaml.cs
View File

0
AssemblyInfo.cs → App/AssemblyInfo.cs
View File

0
ContentDialogExample.xaml → App/ContentDialogExample.xaml
View File

0
ContentDialogExample.xaml.cs → App/ContentDialogExample.xaml.cs
View File

0
IntellisenseResourceDictionary.cs → App/IntellisenseResourceDictionary.cs
View File

25
MainWindow.xaml → App/MainWindow.xaml
View File

@ -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 @@
</Grid.ColumnDefinitions>
<Border
Grid.Column="0"
Panel.ZIndex="1"
Background="#2C2C2C"
BorderThickness="0">
<ui:SimpleStackPanel HorizontalAlignment="Center" Spacing="10">
@ -178,7 +179,10 @@
</Setter>
</Style>
</ui:SimpleStackPanel.Resources>
<ui:ToggleSwitch Margin="0,5,0,0" IsOn="{Binding IsPaneOpen}" />
<ui:ToggleSwitch
Margin="0,5,0,0"
IsOn="{Binding IsPaneOpen}"
ToolTip="Show/hide element tree" />
<TextBlock
Cursor="Hand"
FontSize="20"
@ -193,6 +197,7 @@
</Border>
<ui:SplitView
Grid.Column="1"
Panel.ZIndex="0"
BorderThickness="0"
DisplayMode="Inline"
IsPaneOpen="{Binding IsPaneOpen}"
@ -230,23 +235,23 @@
</TabItem>
<TabItem Header="General" IsSelected="True">
<ui:SimpleStackPanel Margin="5" Spacing="10">
<propertyPresenter:PropertyPresenter Label="Theme Mode" Value="{Binding ThemeMode}" />
<propertyPresenter:PropertyPresenter
<controls:PropertyPresenter Label="Theme Mode" Value="{Binding ThemeMode}" />
<controls:PropertyPresenter
Command="{Binding ShowDialogCommand}"
Label="Hello"
Symbol="x³"
Value="{Binding WelcomeMessage}" />
<propertyPresenter:PropertyPresenter
<controls:PropertyPresenter
IsReadOnly="True"
Label="Hallo"
Symbol="x²"
Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" />
<propertyPresenter:PropertyPresenter
<controls:PropertyPresenter
Label="Good bye"
Symbol="x²"
Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" />
<propertyPresenter:PropertyPresenter Label="Hello" Value="{Binding BooleanValue}" />
<propertyPresenter:PropertyPresenter Label="Hello">
<controls:PropertyPresenter Label="Hello" Value="{Binding BooleanValue}" />
<controls:PropertyPresenter Label="Hello">
<Slider
AutoToolTipPlacement="TopLeft"
Interval="1"
@ -256,13 +261,13 @@
TickFrequency="10"
TickPlacement="BottomRight"
Value="{Binding SliderTest}" />
</propertyPresenter:PropertyPresenter>
</controls:PropertyPresenter>
<ui:ProgressRing
Width="{Binding SliderTest}"
Height="{Binding SliderTest}"
IsActive="{Binding BooleanValue}"
Visibility="{Binding VisibilityEnumTest}" />
<propertyPresenter:PropertyPresenter Label="Visi" Value="{Binding VisibilityEnumTest}" />
<controls:PropertyPresenter Label="Visi" Value="{Binding VisibilityEnumTest}" />
</ui:SimpleStackPanel>
</TabItem>
</TabControl>

0
MainWindow.xaml.cs → App/MainWindow.xaml.cs
View File

0
MainWindowViewModel.cs → App/MainWindowViewModel.cs
View File

4
ModernWpfPlayground.csproj → App/ModernWpfPlayground.csproj
View File

@ -16,4 +16,8 @@
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Controls\Controls.csproj" />
</ItemGroup>
</Project>

0
MvvmStuff/BaseViewModel.cs → App/MvvmStuff/BaseViewModel.cs
View File

0
MvvmStuff/DeserializationExtension.cs → App/MvvmStuff/DeserializationExtension.cs
View File

0
PixelsToGridLengthConverter.cs → App/PixelsToGridLengthConverter.cs
View File

0
ThemeMode.cs → App/ThemeMode.cs
View File

13
Controls/Controls.csproj Normal file
View File

@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
</ItemGroup>
</Project>

9
Controls/Properties/AssemblyInfo.cs Normal file
View File

@ -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")]

2
PropertyPresenter/EnumToKeyValueListConverter.cs → Controls/PropertyPresenter/EnumToKeyValueListConverter.cs
View File

@ -5,7 +5,7 @@ using System.Globalization;
using System.Linq;
using System.Windows.Data;
namespace ModernWpfPlayground.PropertyPresenter2
namespace Controls
{
/// <summary>
/// Converts enums to a List with KeyValuePairs.

2
PropertyPresenter/MagicSymbolControl.cs → Controls/PropertyPresenter/MagicSymbolControl.cs
View File

@ -2,7 +2,7 @@
using System.Windows.Controls;
using System.Windows.Markup;
namespace ModernWpfPlayground.PropertyPresenter2
namespace Controls
{
/// <summary>
/// Interaction logic for <see cref="MagicSymbolControl"/>

3
PropertyPresenter/MagicSymbolConverter.cs → Controls/PropertyPresenter/MagicSymbolConverter.cs
View File

@ -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
{
/// <summary>
/// Magically converts a text to

2
PropertyPresenter/PropertyDataTemplateSelector.cs → Controls/PropertyPresenter/PropertyDataTemplateSelector.cs
View File

@ -2,7 +2,7 @@
using System.Windows;
using System.Windows.Controls;
namespace ModernWpfPlayground.PropertyPresenter2
namespace Controls
{
/// <summary>
/// Selects the right template on base of value-type.

16
PropertyPresenter/PropertyPresenter.xaml → Controls/PropertyPresenter/PropertyPresenter.xaml
View File

@ -1,10 +1,10 @@
<ContentControl
x:Class="ModernWpfPlayground.PropertyPresenter.PropertyPresenter"
x:Class="Controls.PropertyPresenter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:propertyPresenter2="clr-namespace:ModernWpfPlayground.PropertyPresenter2"
xmlns:controls="clr-namespace:Controls"
x:Name="LayoutRoot"
d:DesignHeight="300"
d:DesignWidth="300"
@ -16,13 +16,13 @@
<ContentControl.Resources>
<DataTemplate x:Key="DefaultDataTemplate">
<Grid>
<propertyPresenter2:TextBoxEx
<controls:TextBoxEx
x:Name="InputTextBox"
Text="{Binding Value, ElementName=LayoutRoot}"
Validation.ErrorTemplate="{DynamicResource ValidationErrorTemplate}"
Validation.ValidationAdornerSiteFor="{Binding ElementName=LayoutRoot}">
<TextBox.Style>
<Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type propertyPresenter2:TextBoxEx}">
<Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type controls:TextBoxEx}">
<Setter Property="IsReadOnly" Value="True" />
<Setter Property="UpdateBindingOnEnter" Value="False" />
<Style.Triggers>
@ -38,7 +38,7 @@
</Style.Triggers>
</Style>
</TextBox.Style>
</propertyPresenter2:TextBoxEx>
</controls:TextBoxEx>
<TextBlock
Margin="6,0,0,0"
Padding="2,2,2,2"
@ -86,7 +86,7 @@
</CheckBox.Style>
</CheckBox>
</DataTemplate>
<propertyPresenter2:EnumToKeyValueListConverter x:Key="EnumToKeyValuePairConverter" />
<controls:EnumToKeyValueListConverter x:Key="EnumToKeyValuePairConverter" />
<DataTemplate x:Key="EnumComboBoxDataTemplate">
<ComboBox
DisplayMemberPath="Key"
@ -112,7 +112,7 @@
</ComboBox.Style>
</ComboBox>
</DataTemplate>
<propertyPresenter2:PropertyDataTemplateSelector
<controls:PropertyDataTemplateSelector
x:Key="DataTemplateSelector"
BooleanDataTemplate="{StaticResource BooleanDataTemplate}"
DefaultDataTemplate="{StaticResource DefaultDataTemplate}"
@ -152,7 +152,7 @@
VerticalAlignment="Center"
Focusable="False"
Text="{Binding Label, ElementName=LayoutRoot}" />
<propertyPresenter2:MagicSymbolControl
<controls:MagicSymbolControl
x:Name="PartSymbol"
Grid.Column="2"
Margin="5,0"

2
PropertyPresenter/PropertyPresenter.xaml.cs → Controls/PropertyPresenter/PropertyPresenter.xaml.cs
View File

@ -3,7 +3,7 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Markup;
namespace ModernWpfPlayground.PropertyPresenter
namespace Controls
{
/// <inheritdoc cref="ContentControl" />
/// <summary>

4
PropertyPresenter/TextBoxEx.cs → Controls/PropertyPresenter/TextBoxEx.cs
View File

@ -2,7 +2,7 @@
using System.Windows.Controls;
using System.Windows.Input;
namespace ModernWpfPlayground.PropertyPresenter2
namespace Controls
{
/// <inheritdoc />
/// <summary>
@ -38,7 +38,7 @@ namespace ModernWpfPlayground.PropertyPresenter2
/// <inheritdoc />
/// <summary>
/// Initializes a new instance of the <see cref="T:ModernWpfPlayground.PropertyPresenter2.TextBoxEx" /> class.
/// Initializes a new instance of the <see cref="T:Controls.TextBoxEx" /> class.
/// </summary>
public TextBoxEx()
{

2
PropertyPresenter/TextComponent.cs → Controls/PropertyPresenter/TextComponent.cs
View File

@ -1,6 +1,6 @@
using System.Windows;
namespace ModernWpfPlayground.PropertyPresenter2
namespace Controls
{
/// <summary>
/// A component of the symbol

2
PropertyPresenter/ValueConverter.cs → Controls/PropertyPresenter/ValueConverter.cs
View File

@ -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
{
/// <summary>
/// Makes an Bitmap from every Imageformat.

2
Controls/controls.csproj.DotSettings Normal file
View File

@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=propertypresenter/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

2
ModernWpfPlayground.csproj.DotSettings Normal file
View File

@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=controls_005Cpropertypresenter/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

37
ModernWpfPlayground.sln
View File

@ -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