Skip to content

Commit d5d99b6

Browse files
ButchersBoyButchersBoy
committed
merge from master
2 parents 6fc0d12 + 167b2cf commit d5d99b6

File tree

166 files changed

+6694
-1650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+6694
-1650
lines changed

‎MahMaterialDragablzMashUp/Buttons.xaml

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/Cards.xaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/MahMaterialDragablzMashUp.csproj renamed to ‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}</ProjectGuid>
88
<OutputType>WinExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>MahMaterialDragablzMashUp</RootNamespace>
11-
<AssemblyName>MahMaterialDragablzMashUp</AssemblyName>
10+
<RootNamespace>MahAppsDragablzDemo</RootNamespace>
11+
<AssemblyName>MahAppsDragablzDemo</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -50,18 +50,18 @@
5050
<Prefer32Bit>true</Prefer32Bit>
5151
</PropertyGroup>
5252
<ItemGroup>
53-
<Reference Include="Dragablz, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\packages\Dragablz.0.0.1.109\lib\net45\Dragablz.dll</HintPath>
53+
<Reference Include="Dragablz, Version=0.0.3.151, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Dragablz.0.0.3.151\lib\net45\Dragablz.dll</HintPath>
55+
<Private>True</Private>
5656
</Reference>
57-
<Reference Include="MahApps.Metro, Version=1.1.3.157, Culture=neutral, processorArchitecture=MSIL">
58-
<HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA157\lib\net45\MahApps.Metro.dll</HintPath>
57+
<Reference Include="MahApps.Metro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
58+
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\MahApps.Metro.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="System" />
6262
<Reference Include="System.Data" />
6363
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA157\lib\net45\System.Windows.Interactivity.dll</HintPath>
64+
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="System.Xml" />
@@ -81,14 +81,6 @@
8181
<Generator>MSBuild:Compile</Generator>
8282
<SubType>Designer</SubType>
8383
</ApplicationDefinition>
84-
<Page Include="Buttons.xaml">
85-
<SubType>Designer</SubType>
86-
<Generator>MSBuild:Compile</Generator>
87-
</Page>
88-
<Page Include="Cards.xaml">
89-
<SubType>Designer</SubType>
90-
<Generator>MSBuild:Compile</Generator>
91-
</Page>
9284
<Page Include="Dialogs.xaml">
9385
<SubType>Designer</SubType>
9486
<Generator>MSBuild:Compile</Generator>
@@ -97,10 +89,6 @@
9789
<SubType>Designer</SubType>
9890
<Generator>MSBuild:Compile</Generator>
9991
</Page>
100-
<Page Include="TextFields.xaml">
101-
<SubType>Designer</SubType>
102-
<Generator>MSBuild:Compile</Generator>
103-
</Page>
10492
<Page Include="Mah.xaml">
10593
<SubType>Designer</SubType>
10694
<Generator>MSBuild:Compile</Generator>
@@ -114,12 +102,6 @@
114102
<DependentUpon>App.xaml</DependentUpon>
115103
<SubType>Code</SubType>
116104
</Compile>
117-
<Compile Include="Buttons.xaml.cs">
118-
<DependentUpon>Buttons.xaml</DependentUpon>
119-
</Compile>
120-
<Compile Include="Cards.xaml.cs">
121-
<DependentUpon>Cards.xaml</DependentUpon>
122-
</Compile>
123105
<Compile Include="Dialogs.xaml.cs">
124106
<DependentUpon>Dialogs.xaml</DependentUpon>
125107
</Compile>
@@ -128,9 +110,6 @@
128110
<DependentUpon>FlyoutContent.xaml</DependentUpon>
129111
</Compile>
130112
<Compile Include="PaletteSelectorViewModel.cs" />
131-
<Compile Include="TextFields.xaml.cs">
132-
<DependentUpon>TextFields.xaml</DependentUpon>
133-
</Compile>
134113
<Compile Include="Mah.xaml.cs">
135114
<DependentUpon>Mah.xaml</DependentUpon>
136115
</Compile>

‎MahMaterialDragablzMashUp/MainWindow.xaml

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,44 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
55
xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
6-
xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
6+
xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
7+
xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
78
WindowTransitionsEnabled="False"
89
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
910
Background="{DynamicResource MaterialDesignPaper}"
1011
GlowBrush="{DynamicResource AccentColorBrush}"
1112
FontFamily="{StaticResource DefaultFont}"
12-
Title="Material-MahApps-Dragablz Mash Up" Height="350" Width="525">
13+
Title="Material-MahApps-Dragablz Mash Up" Height="640" Width="800">
1314
<controls:MetroWindow.Flyouts>
1415
<controls:FlyoutsControl>
1516
<controls:Flyout x:Name="LeftFlyout" Position="Left" Header="Settings">
1617
<mahMaterialDragablzMashUp:FlyoutContent />
1718
</controls:Flyout>
1819
</controls:FlyoutsControl>
1920
</controls:MetroWindow.Flyouts>
20-
<dragablz:TabablzControl TextElement.Foreground="{DynamicResource MaterialDesignBody}" BorderThickness="0"
21-
Background="{DynamicResource MaterialDesignPaper}" Margin="0,-1,0,1">
22-
<dragablz:TabablzControl.InterTabController>
23-
<dragablz:InterTabController />
24-
</dragablz:TabablzControl.InterTabController>
25-
<TabItem Header="CARDS">
26-
<mahMaterialDragablzMashUp:Cards Margin="8" />
27-
</TabItem>
28-
<TabItem Header="BUTTONS">
29-
<mahMaterialDragablzMashUp:Buttons Margin="8" />
30-
</TabItem>
31-
<TabItem Header="FIELDS">
32-
<mahMaterialDragablzMashUp:TextFields Margin="8" />
33-
</TabItem>
34-
<TabItem Header="PALETTE">
35-
<mahMaterialDragablzMashUp:PaletteSelector Margin="16">
36-
<mahMaterialDragablzMashUp:PaletteSelector.DataContext>
37-
<mahMaterialDragablzMashUp:PaletteSelectorViewModel />
38-
</mahMaterialDragablzMashUp:PaletteSelector.DataContext>
39-
</mahMaterialDragablzMashUp:PaletteSelector>
40-
</TabItem>
41-
<TabItem Header="DIALOGS">
42-
<mahMaterialDragablzMashUp:Dialogs Margin="8">
43-
<mahMaterialDragablzMashUp:Dialogs.DataContext>
44-
<mahMaterialDragablzMashUp:DialogsViewModel />
45-
</mahMaterialDragablzMashUp:Dialogs.DataContext>
46-
</mahMaterialDragablzMashUp:Dialogs>
47-
</TabItem>
48-
<TabItem Header="MAHAPPS">
49-
<mahMaterialDragablzMashUp:Mah Margin="8" />
50-
</TabItem>
51-
</dragablz:TabablzControl>
21+
<dockablz:Layout>
22+
<dragablz:TabablzControl BorderThickness="0"
23+
Margin="0,-1,0,1">
24+
<dragablz:TabablzControl.InterTabController>
25+
<dragablz:InterTabController />
26+
</dragablz:TabablzControl.InterTabController>
27+
<TabItem Header="DIALOGS">
28+
<mahMaterialDragablzMashUp:Dialogs Margin="8">
29+
<mahMaterialDragablzMashUp:Dialogs.DataContext>
30+
<mahMaterialDragablzMashUp:DialogsViewModel />
31+
</mahMaterialDragablzMashUp:Dialogs.DataContext>
32+
</mahMaterialDragablzMashUp:Dialogs>
33+
</TabItem>
34+
<TabItem Header="MAHAPPS">
35+
<mahMaterialDragablzMashUp:Mah Margin="16" />
36+
</TabItem>
37+
<TabItem Header="PALETTE">
38+
<mahMaterialDragablzMashUp:PaletteSelector Margin="16">
39+
<mahMaterialDragablzMashUp:PaletteSelector.DataContext>
40+
<mahMaterialDragablzMashUp:PaletteSelectorViewModel />
41+
</mahMaterialDragablzMashUp:PaletteSelector.DataContext>
42+
</mahMaterialDragablzMashUp:PaletteSelector>
43+
</TabItem>
44+
</dragablz:TabablzControl>
45+
</dockablz:Layout>
5246
</controls:MetroWindow>

0 commit comments

Comments
 (0)