Dialog added, TreeView added and so on...
This commit is contained in:
Holger Boerchers
parent
ffbdb06fa5
commit
12b3d0c7fb
@ -4,6 +4,13 @@
|
|||||||
xmlns:local="clr-namespace:MaterialModernWPF"
|
xmlns:local="clr-namespace:MaterialModernWPF"
|
||||||
StartupUri="MainWindow.xaml">
|
StartupUri="MainWindow.xaml">
|
||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
|
<ResourceDictionary>
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Indigo.xaml" />
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
</Application.Resources>
|
</Application.Resources>
|
||||||
</Application>
|
</Application>
|
||||||
|
|||||||
@ -5,40 +5,58 @@
|
|||||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:modern="http://modernwpf"
|
xmlns:modern="http://modernwpf"
|
||||||
x:Name="theWindow"
|
xmlns:system="clr-namespace:System;assembly=mscorlib"
|
||||||
Title="Chrome With 3rd Party Material Theme"
|
x:Name="Window"
|
||||||
|
Title="Material Design In XAML Toolkit"
|
||||||
Width="920"
|
Width="920"
|
||||||
Height="600"
|
Height="600"
|
||||||
modern:UIHooks.AutoDpiScale="True"
|
modern:UIHooks.AutoDpiScale="True"
|
||||||
Background="{DynamicResource MaterialDesignPaper}"
|
Background="{DynamicResource MaterialDesignPaper}"
|
||||||
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
|
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
|
||||||
|
Icon="airballoon.ico"
|
||||||
ResizeMode="CanResizeWithGrip"
|
ResizeMode="CanResizeWithGrip"
|
||||||
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
|
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Window.Resources>
|
|
||||||
<ResourceDictionary>
|
|
||||||
<ResourceDictionary.MergedDictionaries>
|
|
||||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
|
|
||||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
|
|
||||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Indigo.xaml" />
|
|
||||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
|
|
||||||
</ResourceDictionary.MergedDictionaries>
|
|
||||||
</ResourceDictionary>
|
|
||||||
|
|
||||||
</Window.Resources>
|
|
||||||
<modern:Chrome.Chrome>
|
<modern:Chrome.Chrome>
|
||||||
<modern:Chrome ActiveBorderBrush="{StaticResource PrimaryHueDarkBrush}" />
|
<modern:Chrome ActiveBorderBrush="{StaticResource PrimaryHueDarkBrush}" />
|
||||||
</modern:Chrome.Chrome>
|
</modern:Chrome.Chrome>
|
||||||
<materialDesign:DialogHost Identifier="RootDialog">
|
<Grid>
|
||||||
<Grid>
|
<Grid.RowDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="*" />
|
</Grid.RowDefinitions>
|
||||||
</Grid.RowDefinitions>
|
<modern:TitleBar Grid.Row="0"
|
||||||
<modern:TitleBar x:Name="titleBar"
|
Background="{StaticResource PrimaryHueDarkBrush}"
|
||||||
Grid.Row="0"
|
ShowTitle="False" />
|
||||||
Background="{StaticResource PrimaryHueDarkBrush}"
|
<materialDesign:DialogHost Grid.Row="1" Identifier="RootDialog">
|
||||||
ShowIcon="False" />
|
<materialDesign:DialogHost.DialogContent>
|
||||||
|
<StackPanel Margin="16">
|
||||||
|
<TextBlock>Tell me your name:</TextBlock>
|
||||||
|
<TextBox x:Name="FruitTextBox"
|
||||||
|
Margin="0 8 0 0"
|
||||||
|
HorizontalAlignment="Stretch" />
|
||||||
|
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
|
||||||
|
<Button Margin="0 8 8 0"
|
||||||
|
Command="materialDesign:DialogHost.CloseDialogCommand"
|
||||||
|
IsDefault="True"
|
||||||
|
Style="{StaticResource MaterialDesignFlatButton}">
|
||||||
|
<Button.CommandParameter>
|
||||||
|
<system:Boolean>True</system:Boolean>
|
||||||
|
</Button.CommandParameter>
|
||||||
|
ACCEPT
|
||||||
|
</Button>
|
||||||
|
<Button Margin="0 8 8 0"
|
||||||
|
Command="materialDesign:DialogHost.CloseDialogCommand"
|
||||||
|
IsCancel="True"
|
||||||
|
Style="{StaticResource MaterialDesignFlatButton}">
|
||||||
|
<Button.CommandParameter>
|
||||||
|
<system:Boolean>False</system:Boolean>
|
||||||
|
</Button.CommandParameter>
|
||||||
|
CANCEL
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</materialDesign:DialogHost.DialogContent>
|
||||||
<materialDesign:DrawerHost Grid.Row="1" IsLeftDrawerOpen="{Binding ElementName=MenuToggleButton, Path=IsChecked}">
|
<materialDesign:DrawerHost Grid.Row="1" IsLeftDrawerOpen="{Binding ElementName=MenuToggleButton, Path=IsChecked}">
|
||||||
<materialDesign:DrawerHost.LeftDrawerContent>
|
<materialDesign:DrawerHost.LeftDrawerContent>
|
||||||
<DockPanel MinWidth="212">
|
<DockPanel MinWidth="212">
|
||||||
@ -49,21 +67,23 @@
|
|||||||
Path=IsChecked,
|
Path=IsChecked,
|
||||||
Mode=TwoWay}"
|
Mode=TwoWay}"
|
||||||
Style="{StaticResource MaterialDesignHamburgerToggleButton}" />
|
Style="{StaticResource MaterialDesignHamburgerToggleButton}" />
|
||||||
<Grid>
|
<TreeView>
|
||||||
<Button>Hello World</Button>
|
<TreeViewItem Header="Item1" IsExpanded="True">
|
||||||
</Grid>
|
<TreeViewItem Header="Item1" />
|
||||||
|
<TreeViewItem Header="Item2" />
|
||||||
|
<TreeViewItem Header="Item3" />
|
||||||
|
</TreeViewItem>
|
||||||
|
<TreeViewItem Header="Item2" />
|
||||||
|
<TreeViewItem Header="Item3" />
|
||||||
|
<TreeViewItem Header="Item4" />
|
||||||
|
</TreeView>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</materialDesign:DrawerHost.LeftDrawerContent>
|
</materialDesign:DrawerHost.LeftDrawerContent>
|
||||||
<DockPanel>
|
<DockPanel>
|
||||||
|
|
||||||
|
|
||||||
<materialDesign:ColorZone materialDesign:ShadowAssist.ShadowDepth="Depth2"
|
<materialDesign:ColorZone materialDesign:ShadowAssist.ShadowDepth="Depth2"
|
||||||
DockPanel.Dock="Top"
|
DockPanel.Dock="Top"
|
||||||
Mode="PrimaryMid"
|
Mode="PrimaryMid"
|
||||||
Padding="16">
|
Padding="16">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<DockPanel>
|
<DockPanel>
|
||||||
<ToggleButton x:Name="MenuToggleButton"
|
<ToggleButton x:Name="MenuToggleButton"
|
||||||
IsChecked="False"
|
IsChecked="False"
|
||||||
@ -72,20 +92,17 @@
|
|||||||
PlacementMode="BottomAndAlignRightEdges"
|
PlacementMode="BottomAndAlignRightEdges"
|
||||||
StaysOpen="False">
|
StaysOpen="False">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<Button Content="Hello World" />
|
<Button Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}" Content="Info" />
|
||||||
<Button Content="Nice Popup" />
|
|
||||||
<Button Content="Goodbye" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</materialDesign:PopupBox>
|
</materialDesign:PopupBox>
|
||||||
<TextBlock HorizontalAlignment="Center"
|
<TextBlock HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontSize="22">
|
FontSize="22"
|
||||||
Material Design In XAML Toolkit
|
Text="{Binding Title,
|
||||||
</TextBlock>
|
ElementName=Window}" />
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
</materialDesign:ColorZone>
|
</materialDesign:ColorZone>
|
||||||
<StackPanel Grid.Row="1" Margin="8">
|
<StackPanel Margin="8">
|
||||||
<TextBlock Text="This window demonstrates using core Chrome + external theming lib (ButchersBoy)." TextWrapping="Wrap" />
|
<TextBlock Text="This window demonstrates using core Chrome + external theming lib (ButchersBoy)." TextWrapping="Wrap" />
|
||||||
<Button Content="Hello Button" />
|
<Button Content="Hello Button" />
|
||||||
<ComboBox>
|
<ComboBox>
|
||||||
@ -98,6 +115,6 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</materialDesign:DrawerHost>
|
</materialDesign:DrawerHost>
|
||||||
</Grid>
|
</materialDesign:DialogHost>
|
||||||
</materialDesign:DialogHost>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@ -34,9 +34,12 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<ApplicationIcon>airballoon.ico</ApplicationIcon>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
|
<HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="MaterialDesignThemes.Wpf, Version=2.0.0.638, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="MaterialDesignThemes.Wpf, Version=2.0.0.638, Culture=neutral, processorArchitecture=MSIL">
|
||||||
@ -108,6 +111,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Resource Include="airballoon.ico" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
|||||||
BIN
MaterialModernWPF/airballoon.ico
Normal file
BIN
MaterialModernWPF/airballoon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="MaterialDesignColors" version="1.1.2" targetFramework="net452" />
|
<package id="MaterialDesignColors" version="1.1.3" targetFramework="net452" />
|
||||||
<package id="MaterialDesignThemes" version="2.0.0.638" targetFramework="net452" />
|
<package id="MaterialDesignThemes" version="2.0.0.638" targetFramework="net452" />
|
||||||
<package id="ModernWpf.Core" version="2.0.0-alpha94" targetFramework="net452" />
|
<package id="ModernWpf.Core" version="2.0.0-alpha94" targetFramework="net452" />
|
||||||
</packages>
|
</packages>
|
||||||
Loading…
x
Reference in New Issue
Block a user