Skip to content

Commit 13037bc

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'master' into release
2 parents 4322401 + 99fcc79 commit 13037bc

File tree

266 files changed

+4552
-2195
lines changed

Some content is hidden

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

266 files changed

+4552
-2195
lines changed

‎.paket/paket.bootstrapper.exe

14 KB
Binary file not shown.

‎.paket/paket.exe

1.21 MB
Binary file not shown.

‎.paket/paket.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
1717
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
1818
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19-
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
20-
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
19+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
2121
<!-- Commands -->
2222
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
23+
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
2324
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
2425
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
2526
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
@@ -35,6 +36,6 @@
3536
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
3637
</Target>
3738
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
38-
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
39+
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
3940
</Target>
4041
</Project>

‎MahMaterialDragablzMashUp/DialogsViewModel.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private void InputDialog()
4444
DialogCoordinator.Instance.ShowInputAsync(this, "MahApps Dialog", "Using Material Design Themes", metroDialogSettings);
4545
}
4646

47-
private void ProgressDialog()
47+
private async void ProgressDialog()
4848
{
4949
var metroDialogSettings = new MetroDialogSettings
5050
{
@@ -53,12 +53,15 @@ private void ProgressDialog()
5353
SuppressDefaultResources = true
5454
};
5555

56-
DialogCoordinator.Instance.ShowProgressAsync(this, "MahApps Dialog", "Using Material Design Themes (WORK IN PROGRESS)", true, metroDialogSettings);
56+
var controller = await DialogCoordinator.Instance.ShowProgressAsync(this, "MahApps Dialog", "Using Material Design Themes (WORK IN PROGRESS)", true, metroDialogSettings);
57+
controller.SetIndeterminate();
58+
await Task.Delay(3000);
59+
await controller.CloseAsync();
5760
}
5861

5962
private void ShowLeftFlyout()
6063
{
61-
((MainWindow)Application.Current.MainWindow).LeftFlyout.IsOpen = true;
64+
((MainWindow)Application.Current.MainWindow).LeftFlyout.IsOpen = !((MainWindow)Application.Current.MainWindow).LeftFlyout.IsOpen;
6265
}
6366
}
6467
}

‎MahMaterialDragablzMashUp/FlyoutContent.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ResourceDictionary>
1616
</UserControl.Resources>
1717
<StackPanel Margin="24">
18-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" FontSize="18" wpf:TextFieldAssist.Hint="Your Name" MinWidth="120" />
19-
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" wpf:TextFieldAssist.Hint="Location" MinWidth="120" Margin="0 8 0 0" />
18+
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" FontSize="18" MinWidth="120" />
19+
<TextBox Style="{StaticResource MaterialDesignFloatingHintTextBox}" MinWidth="120" Margin="0 8 0 0" />
2020
</StackPanel>
2121
</UserControl>

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17-
<RestorePackages>true</RestorePackages>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,20 +49,8 @@
5049
<Prefer32Bit>true</Prefer32Bit>
5150
</PropertyGroup>
5251
<ItemGroup>
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>
56-
</Reference>
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>
59-
<Private>True</Private>
60-
</Reference>
6152
<Reference Include="System" />
6253
<Reference Include="System.Data" />
63-
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
6754
<Reference Include="System.Xml" />
6855
<Reference Include="Microsoft.CSharp" />
6956
<Reference Include="System.Core" />
@@ -144,7 +131,7 @@
144131
<Generator>ResXFileCodeGenerator</Generator>
145132
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
146133
</EmbeddedResource>
147-
<None Include="packages.config" />
134+
<None Include="paket.references" />
148135
<None Include="Properties\Settings.settings">
149136
<Generator>SettingsSingleFileGenerator</Generator>
150137
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -172,18 +159,39 @@
172159
<Resource Include="Resources\ProfilePic.jpg" />
173160
</ItemGroup>
174161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
175-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
176-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
177-
<PropertyGroup>
178-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
179-
</PropertyGroup>
180-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
181-
</Target>
182162
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
183163
Other similar extension points exist, see Microsoft.Common.targets.
184164
<Target Name="BeforeBuild">
185165
</Target>
186166
<Target Name="AfterBuild">
187167
</Target>
188168
-->
169+
<Choose>
170+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
171+
<ItemGroup>
172+
<Reference Include="Dragablz">
173+
<HintPath>..\packages\Dragablz\lib\net45\Dragablz.dll</HintPath>
174+
<Private>True</Private>
175+
<Paket>True</Paket>
176+
</Reference>
177+
</ItemGroup>
178+
</When>
179+
</Choose>
180+
<Choose>
181+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
182+
<ItemGroup>
183+
<Reference Include="MahApps.Metro">
184+
<HintPath>..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>
185+
<Private>True</Private>
186+
<Paket>True</Paket>
187+
</Reference>
188+
<Reference Include="System.Windows.Interactivity">
189+
<HintPath>..\packages\MahApps.Metro\lib\net45\System.Windows.Interactivity.dll</HintPath>
190+
<Private>True</Private>
191+
<Paket>True</Paket>
192+
</Reference>
193+
</ItemGroup>
194+
</When>
195+
</Choose>
196+
<Import Project="..\.paket\paket.targets" />
189197
</Project>

‎MahMaterialDragablzMashUp/MainWindow.xaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
66
xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
77
xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
8+
xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"
89
WindowTransitionsEnabled="False"
910
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
1011
Background="{DynamicResource MaterialDesignPaper}"
@@ -18,7 +19,18 @@
1819
</controls:Flyout>
1920
</controls:FlyoutsControl>
2021
</controls:MetroWindow.Flyouts>
21-
<dockablz:Layout>
22+
<controls:MetroWindow.LeftWindowCommands>
23+
<controls:WindowCommands>
24+
<wpf:PopupBox Style="{StaticResource WindowCommandsPopupBoxStyle}">
25+
<StackPanel>
26+
<Button Content="Hello World"/>
27+
<Button Content="Nice Popup"/>
28+
<Button Content="Goodbye"/>
29+
</StackPanel>
30+
</wpf:PopupBox>
31+
</controls:WindowCommands>
32+
</controls:MetroWindow.LeftWindowCommands>
33+
<dockablz:Layout>
2234
<dragablz:TabablzControl BorderThickness="0"
2335
Margin="0,-1,0,1">
2436
<dragablz:TabablzControl.InterTabController>

‎MahMaterialDragablzMashUp/packages.config

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

‎MahMaterialDragablzMashUp/paket.references

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MahApps.Metro
2+
Dragablz

0 commit comments

Comments
 (0)