Skip to content

Commit c92c67c

Browse files
wongjiahauwongjiahau
committed
Added project CodeDisplayer to Demo
1 parent b67d08a commit c92c67c

File tree

6 files changed

+206
-163
lines changed

6 files changed

+206
-163
lines changed

‎MainDemo.Wpf/Cards.xaml

Lines changed: 145 additions & 154 deletions
Large diffs are not rendered by default.

‎MainDemo.Wpf/Cards.xaml.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.IO;
34
using System.Linq;
45
using System.Text;
56
using System.Threading.Tasks;
@@ -12,6 +13,7 @@
1213
using System.Windows.Media.Imaging;
1314
using System.Windows.Navigation;
1415
using System.Windows.Shapes;
16+
using System.Xml;
1517

1618
namespace MaterialDesignColors.WpfExample
1719
{
@@ -22,9 +24,20 @@ public partial class Cards : UserControl
2224
{
2325
public Cards()
2426
{
25-
InitializeComponent();
27+
InitializeComponent();
28+
var xmlDoc = new XmlDocument();
29+
string source = File.ReadAllText(@"..\..\Cards.xaml");
30+
xmlDoc.LoadXml(source);
31+
//XmlDocument xmlDoc=
32+
// new MaterialDesignInXamlToolkitGitHubFile(
33+
// ownerName: "wongjiahau",
34+
// branchName: "New-Demo-2",
35+
// fileName: "Cards.xaml")
36+
// .GetXmlDocument();
37+
XamlDisplayerPanel.Initialize(xmlDoc);
2638
}
2739

40+
2841
private void Flipper_OnIsFlippedChanged(object sender, RoutedPropertyChangedEventArgs<bool> e)
2942
{
3043
System.Diagnostics.Debug.WriteLine("Card is flipped = " + e.NewValue);

‎MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
<Paket>True</Paket>
5252
<Link>VirtualCollection/VirtualizingWrapPanel.cs</Link>
5353
</Compile>
54-
<Reference Include="CodeDisplayer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\..\Source\Repos\Displaying-XAML\WpfApplication1\CodeDisplayer\bin\Release\CodeDisplayer.dll</HintPath>
57-
</Reference>
5854
<Reference Include="PresentationFramework.Aero2" />
5955
<Reference Include="System" />
6056
<Reference Include="System.Configuration" />
@@ -414,6 +410,10 @@
414410
<None Include="App.config" />
415411
</ItemGroup>
416412
<ItemGroup>
413+
<ProjectReference Include="..\..\..\..\Source\Repos\Displaying-XAML\WpfApplication1\CodeDisplayer\CodeDisplayer.csproj">
414+
<Project>{ab0aca42-1c9f-4823-a8c9-4594c5b70f4e}</Project>
415+
<Name>CodeDisplayer</Name>
416+
</ProjectReference>
417417
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj">
418418
<Project>{90b53209-c60c-4655-b28d-a1b3e1044ba3}</Project>
419419
<Name>MaterialDesignColors.Wpf</Name>

‎MainDemo.Wpf/Sliders.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
2121
<TextBlock VerticalAlignment="Center" Margin="10">Display code</TextBlock>
2222
<ToggleButton x:Name="ToggleButton" IsChecked="True"></ToggleButton>
23+
<ToggleButton Click="ButtonBase_OnClick"></ToggleButton>
2324
</StackPanel>
24-
<codeDisplayer:XamlDisplayerPanel IsCodeDisplayed="{Binding Path=IsChecked, ElementName=ToggleButton}" x:Name="XamlDisplayerPanel" VerticalAlignment="Center">
25+
<codeDisplayer:XamlDisplayerPanel DisplayMode="LeftRight" IsCodeDisplayed="{Binding Path=IsChecked, ElementName=ToggleButton}" x:Name="XamlDisplayerPanel" VerticalAlignment="Center">
2526
<Slider TickFrequency="5" Orientation="Horizontal" Minimum="1" Maximum="50" Value="25" />
26-
<Slider TickFrequency="5" TickPlacement="BottomRight" Orientation="Vertical" Minimum="1" Maximum="50" />
27+
<Slider TickFrequency="5" TickPlacement="BottomRight" Height="50" Orientation="Vertical" Minimum="1" Maximum="50" />
2728
<Slider TickFrequency="25" TickPlacement="TopLeft" Orientation="Vertical" Minimum="1" Maximum="50" IsEnabled="False" Margin="24 8 0 8" />
2829
<Slider TickFrequency="5" Orientation="Horizontal" TickPlacement="BottomRight" Minimum="1" Maximum="50" Value="25" IsSelectionRangeEnabled="True"
2930
Margin="0 36 0 0" />

‎MainDemo.Wpf/Sliders.xaml.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Threading.Tasks;
66
using System.Windows;
77
using System.Windows.Controls;
8+
using System.Windows.Controls.Primitives;
89
using System.Windows.Data;
910
using System.Windows.Documents;
1011
using System.Windows.Input;
@@ -35,5 +36,15 @@ public Sliders()
3536
// .GetXmlDocument();
3637
XamlDisplayerPanel.Initialize(xmlDoc);
3738
}
39+
40+
private void ButtonBase_OnClick(object sender, RoutedEventArgs e) {
41+
var b = sender as ToggleButton;
42+
if (b.IsChecked.Value) {
43+
XamlDisplayerPanel.DisplayMode = XamlDisplayer.DisplayModeEnum.LeftRight;
44+
}
45+
else {
46+
XamlDisplayerPanel.DisplayMode = XamlDisplayer.DisplayModeEnum.TopBottom;
47+
}
48+
}
3849
}
3950
}

‎MaterialDesignToolkit.Wpf.sln

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.Wpf", "MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj", "{F079FB0A-A8ED-4216-B6A5-345756751A04}"
77
EndProject
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.MahApp
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.Wpf.Tests", "MaterialDesignThemes.Wpf.Tests\MaterialDesignThemes.Wpf.Tests.csproj", "{A361C80E-F6CD-4C57-A96C-002DB159C1F4}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeDisplayer", "..\..\..\Source\Repos\Displaying-XAML\WpfApplication1\CodeDisplayer\CodeDisplayer.csproj", "{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}"
30+
EndProject
2931
Global
3032
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3133
AppVeyor|Any CPU = AppVeyor|Any CPU
@@ -210,12 +212,37 @@ Global
210212
{A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x64.Build.0 = Release|Any CPU
211213
{A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x86.ActiveCfg = Release|Any CPU
212214
{A361C80E-F6CD-4C57-A96C-002DB159C1F4}.Release|x86.Build.0 = Release|Any CPU
215+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
216+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
217+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
218+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|ARM.Build.0 = Release|Any CPU
219+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|x64.ActiveCfg = Release|Any CPU
220+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|x64.Build.0 = Release|Any CPU
221+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|x86.ActiveCfg = Release|Any CPU
222+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.AppVeyor|x86.Build.0 = Release|Any CPU
223+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
224+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
225+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|ARM.ActiveCfg = Debug|Any CPU
226+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|ARM.Build.0 = Debug|Any CPU
227+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|x64.ActiveCfg = Debug|Any CPU
228+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|x64.Build.0 = Debug|Any CPU
229+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|x86.ActiveCfg = Debug|Any CPU
230+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Debug|x86.Build.0 = Debug|Any CPU
231+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
232+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|Any CPU.Build.0 = Release|Any CPU
233+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|ARM.ActiveCfg = Release|Any CPU
234+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|ARM.Build.0 = Release|Any CPU
235+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|x64.ActiveCfg = Release|Any CPU
236+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|x64.Build.0 = Release|Any CPU
237+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|x86.ActiveCfg = Release|Any CPU
238+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E}.Release|x86.Build.0 = Release|Any CPU
213239
EndGlobalSection
214240
GlobalSection(SolutionProperties) = preSolution
215241
HideSolutionNode = FALSE
216242
EndGlobalSection
217243
GlobalSection(NestedProjects) = preSolution
218244
{CF0A27A8-EF82-44E5-B673-ECCC150C48ED} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
219245
{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
246+
{AB0ACA42-1C9F-4823-A8C9-4594C5B70F4E} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
220247
EndGlobalSection
221248
EndGlobal

0 commit comments

Comments
 (0)