Skip to content

Commit 39dab91

Browse files
committed
Merge pull request #2328 from MahApps/PackIcon
[WIP] PackIcon for MahApps
2 parents f5a1775 + 4ded19d commit 39dab91

34 files changed

+6908
-32
lines changed

.gitignore

Lines changed: 66 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*.userosscache
88
*.sln.docstates
99

10-
# User-specific folders
11-
*.sln.ide/
10+
# User-specific files (MonoDevelop/Xamarin Studio)
11+
*.userprefs
1212

1313
# Build results
1414
[Dd]ebug/
@@ -22,14 +22,16 @@ bld/
2222
[Bb]in/
2323
[Oo]bj/
2424

25-
# Roslyn cache directories
26-
*.ide/
25+
# Visual Studio 2015 cache/options directory
26+
.vs/
27+
# Uncomment if you have tasks that create the project's static files in wwwroot
28+
#wwwroot/
2729

2830
# MSTest test Results
2931
[Tt]est[Rr]esult*/
3032
[Bb]uild[Ll]og.*
3133

32-
#NUNIT
34+
# NUNIT
3335
*.VisualState.xml
3436
TestResult.xml
3537

@@ -38,6 +40,10 @@ TestResult.xml
3840
[Rr]eleasePS/
3941
dlldata.c
4042

43+
# DNX
44+
project.lock.json
45+
artifacts/
46+
4147
*_i.c
4248
*_p.c
4349
*_i.h
@@ -70,6 +76,7 @@ _Chutzpah*
7076
ipch/
7177
*.aps
7278
*.ncb
79+
*.opendb
7380
*.opensdf
7481
*.sdf
7582
*.cachefile
@@ -78,6 +85,7 @@ ipch/
7885
*.psess
7986
*.vsp
8087
*.vspx
88+
*.sap
8189

8290
# TFS 2012 Local Workspace
8391
$tf/
@@ -90,7 +98,7 @@ _ReSharper*/
9098
*.[Rr]e[Ss]harper
9199
*.DotSettings.user
92100

93-
# JustCode is a .NET coding addin-in
101+
# JustCode is a .NET coding add-in
94102
.JustCode
95103

96104
# TeamCity is a build add-in
@@ -102,6 +110,7 @@ _TeamCity*
102110
# NCrunch
103111
_NCrunch_*
104112
.*crunch*.local.xml
113+
nCrunchTemp_*
105114

106115
# MightyMoose
107116
*.mm.*
@@ -129,7 +138,7 @@ publish/
129138
# Publish Web Output
130139
*.[Pp]ublish.xml
131140
*.azurePubxml
132-
# TODO: Comment the next line if you want to checkin your web deploy settings
141+
# TODO: Comment the next line if you want to checkin your web deploy settings
133142
# but database connection strings (with potential passwords) will be unencrypted
134143
*.pubxml
135144
*.publishproj
@@ -140,29 +149,46 @@ publish/
140149
**/packages/*
141150
# except build/, which is used as an MSBuild target.
142151
!**/packages/build/
143-
# If using the old MSBuild-Integrated Package Restore, uncomment this:
152+
# Uncomment if necessary however generally it will be regenerated when needed
144153
#!**/packages/repositories.config
154+
# NuGet v3's project.json files produces more ignoreable files
155+
*.nuget.props
156+
*.nuget.targets
157+
158+
# scriptcs
159+
**/scriptcs_packages/*
145160

146-
# Windows Azure Build Output
161+
# Microsoft Azure Build Output
147162
csx/
148163
*.build.csdef
149164

165+
# Microsoft Azure Emulator
166+
ecf/
167+
rcf/
168+
169+
# Microsoft Azure ApplicationInsights config file
170+
ApplicationInsights.config
171+
150172
# Windows Store app package directory
151173
AppPackages/
174+
BundleArtifacts/
175+
176+
# Visual Studio cache files
177+
# files ending in .cache can be ignored
178+
*.[Cc]ache
179+
# but keep track of directories ending in .cache
180+
!*.[Cc]ache/
152181

153182
# Others
154-
sql/
155-
*.Cache
156183
ClientBin/
157-
[Ss]tyle[Cc]op.*
158184
~$*
159185
*~
160186
*.dbmdl
161187
*.dbproj.schemaview
162188
*.pfx
163189
*.publishsettings
164190
node_modules/
165-
bower_components/
191+
orleans.codegen.cs
166192

167193
# RIA/Silverlight projects
168194
Generated_Code/
@@ -185,4 +211,30 @@ UpgradeLog*.htm
185211
*.bim_*.settings
186212

187213
# Microsoft Fakes
188-
FakesAssemblies/
214+
FakesAssemblies/
215+
216+
# GhostDoc plugin setting file
217+
*.GhostDoc.xml
218+
219+
# Node.js Tools for Visual Studio
220+
.ntvs_analysis.dat
221+
222+
# Visual Studio 6 build log
223+
*.plg
224+
225+
# Visual Studio 6 workspace options file
226+
*.opt
227+
228+
# Visual Studio LightSwitch build output
229+
**/*.HTMLClient/GeneratedArtifacts
230+
**/*.DesktopClient/GeneratedArtifacts
231+
**/*.DesktopClient/ModelManifest.xml
232+
**/*.Server/GeneratedArtifacts
233+
**/*.Server/ModelManifest.xml
234+
_Pvt_Extensions
235+
236+
# Paket dependency manager
237+
#.paket/paket.exe
238+
239+
# FAKE - F# Make
240+
.fake/

.paket/paket.bootstrapper.exe

30 KB
Binary file not shown.

.paket/paket.exe

4.4 MB
Binary file not shown.

.paket/paket.targets

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
11+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<!-- Paket command -->
15+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
16+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
17+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
18+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
21+
<!-- Commands -->
22+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
23+
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
24+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
25+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
26+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
27+
<!-- We need to ensure packages are restored prior to assembly resolve -->
28+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
29+
</PropertyGroup>
30+
<Target Name="CheckPrerequisites">
31+
<!-- Raise an error if we're unable to locate paket.exe -->
32+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
33+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
34+
</Target>
35+
<Target Name="DownloadPaket">
36+
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
37+
</Target>
38+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
39+
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
40+
</Target>
41+
</Project>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Windows;
3+
using ControlzEx;
4+
5+
namespace MahApps.Metro
6+
{
7+
/// <summary>
8+
/// Icon from the Material Design Icons project, <see><cref>https://materialdesignicons.com/</cref></see>.
9+
/// </summary>
10+
public class PackIconMaterial : PackIconBase<PackIconMaterialKind>
11+
{
12+
static PackIconMaterial()
13+
{
14+
DefaultStyleKeyProperty.OverrideMetadata(typeof(PackIconMaterial), new FrameworkPropertyMetadata(typeof(PackIconMaterial)));
15+
}
16+
17+
public PackIconMaterial() : base(PackIconMaterialDataFactory.Create)
18+
{ }
19+
}
20+
}

0 commit comments

Comments
 (0)