Skip to content

Commit 6a48b29

Browse files
punker76punker76
authored
Merge pull request #17 from MahApps/dev
Merging v1.3.0 dev content to master
2 parents 9aa2639 + 5fcd0ee commit 6a48b29

32 files changed

+1134
-48
lines changed

‎README.md‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Some awesome icons all together...
55
The IconPacks library contains controls to use awesome icons from
66

77
- [Material](https://materialdesignicons.com/) (v1.7.22)
8-
- [Modern](http://modernuiicons.com/)
98
- [Font Awesome](http://fontawesome.io/icons/) (v4.6)
9+
- [GitHub Octicons](https://octicons.github.com/) (v4.3.0)
10+
- [Modern](http://modernuiicons.com/)
1011
- [Entypo+](http://www.entypo.com/)
1112

1213
in a simple way.
@@ -21,7 +22,7 @@ It's not necessary to install [MahApps.Metro](https://github.com/MahApps/MahApps
2122

2223
## Install
2324

24-
To install the IconPacks, you can run the following commands in the NuGet Package Manager Console (or in the NuGet Package Manager extension in VS)
25+
To install the IconPacks, run the following commands in the NuGet Package Manager Console or install it with the NuGet Package Manager extension.
2526

2627
- `MahApps.Metro.IconPacks` includes all Icons in one package [NuGet package](https://www.nuget.org/packages/MahApps.Metro.IconPacks/)
2728
```bash
@@ -35,6 +36,10 @@ To install the IconPacks, you can run the following commands in the NuGet Packag
3536
```bash
3637
PM> Install-Package MahApps.Metro.IconPacks.FontAwesome
3738
```
39+
- `MahApps.Metro.IconPacks.Octicons` separate [NuGet package](https://www.nuget.org/packages/MahApps.Metro.IconPacks.Octicons/)
40+
```bash
41+
PM> Install-Package MahApps.Metro.IconPacks.Octicons
42+
```
3843
- `MahApps.Metro.IconPacks.Modern` separate [NuGet package](https://www.nuget.org/packages/MahApps.Metro.IconPacks.Modern/)
3944
```bash
4045
PM> Install-Package MahApps.Metro.IconPacks.Modern
@@ -51,29 +56,31 @@ If you want all icons together then just install the `MahApps.Metro.IconPacks` N
5156
```xaml
5257
<iconPacks:PackIconMaterial Kind="EmoticonCool" />
5358
```
54-
![2016-07-26_02h28_22](https://cloud.githubusercontent.com/assets/658431/17122168/71270be8-52d9-11e6-89a2-d670bd72aabb.png)
5559

5660
```xaml
57-
<iconPacks:PackIconModern Kind="ThumbsUp" />
61+
<iconPacks:PackIconFontAwesome Kind="FontAwesome" />
5862
```
59-
![2016-07-26_02h28_37](https://cloud.githubusercontent.com/assets/658431/17122171/729eb156-52d9-11e6-8baf-12345ddb9262.png)
6063

6164
```xaml
62-
<iconPacks:PackIconFontAwesome Kind="FontAwesome" />
65+
<iconPacks:PackIconOcticons Kind="MarkGithub" />
66+
```
67+
68+
```xaml
69+
<iconPacks:PackIconModern Kind="ThumbsUp" />
6370
```
64-
![2016-07-26_02h29_35](https://cloud.githubusercontent.com/assets/658431/17122172/73fe79f0-52d9-11e6-821e-204d1ee99fc3.png)
6571

6672
```xaml
6773
<iconPacks:PackIconEntypo Kind="EmojiHappy" />
6874
```
69-
![2016-07-26_02h30_11](https://cloud.githubusercontent.com/assets/658431/17122173/7573d3ca-52d9-11e6-9a2e-8ecadad254e4.png)
7075

7176
The Xaml namespace for all icon packs is:
7277

7378
```xaml
7479
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
7580
```
7681

82+
![iconpacks001](https://cloud.githubusercontent.com/assets/658431/19322565/d6ec652c-90b9-11e6-8a06-00e326ca390a.gif)
83+
7784
## Sample
7885

7986
```xaml
@@ -137,10 +144,11 @@ Here is the resource dictionary content for all IconPacks in this sample (for `C
137144

138145
<ResourceDictionary.MergedDictionaries>
139146
<!-- reference all necessary original resource dictionaries -->
140-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconEntypo.xaml" />
141-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconFontAwesome.xaml" />
142147
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconMaterial.xaml" />
148+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconFontAwesome.xaml" />
149+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconOcticons.xaml" />
143150
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconModern.xaml" />
151+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks;component/Themes/PackIconEntypo.xaml" />
144152
</ResourceDictionary.MergedDictionaries>
145153

146154
<!-- now make some global changes for the icon pack controls without using new keys -->
@@ -149,13 +157,21 @@ Here is the resource dictionary content for all IconPacks in this sample (for `C
149157
<Setter Property="Width" Value="32" />
150158
<Setter Property="Height" Value="32" />
151159
</Style>
152-
<Style TargetType="{x:Type iconPacks:PackIconModern}" BasedOn="{StaticResource MahApps.Metro.Styles.PackIconModern}">
153-
<Setter Property="HorizontalAlignment" Value="Center" />
154-
</Style>
160+
155161
<Style TargetType="{x:Type iconPacks:PackIconFontAwesome}" BasedOn="{StaticResource MahApps.Metro.Styles.PackIconFontAwesome}">
156162
<Setter Property="Width" Value="24" />
157163
<Setter Property="Height" Value="24" />
158164
</Style>
165+
166+
<Style TargetType="{x:Type iconPacks:PackIconOcticons}" BasedOn="{StaticResource MahApps.Metro.Styles.PackIconOcticons}">
167+
<Setter Property="Width" Value="48" />
168+
<Setter Property="Height" Value="48" />
169+
</Style>
170+
171+
<Style TargetType="{x:Type iconPacks:PackIconModern}" BasedOn="{StaticResource MahApps.Metro.Styles.PackIconModern}">
172+
<Setter Property="HorizontalAlignment" Value="Center" />
173+
</Style>
174+
159175
<Style TargetType="{x:Type iconPacks:PackIconEntypo}" BasedOn="{StaticResource MahApps.Metro.Styles.PackIconEntypo}">
160176
<Setter Property="VerticalAlignment" Value="Center" />
161177
<Setter Property="HorizontalAlignment" Value="Center" />
@@ -171,4 +187,4 @@ If you use the IconPack with all included icons you can also use this resource d
171187

172188
## Strong naming
173189

174-
I will not do this for this packages. If you need this then you should use the [Strong Namer](https://github.com/dsplaisted/strongnamer) from @dsplaisted.
190+
If you need strong named dlls then you should use the [Strong Namer](https://github.com/dsplaisted/strongnamer) from @dsplaisted.

‎src/GlobalAssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
//------------------------------------------------------------------------------
66
using System.Reflection;
77

8-
[assembly: AssemblyProduct("MahApps.Metro.IconPacks 1.2.0.0")]
9-
[assembly: AssemblyVersion("1.2.0.0")]
10-
[assembly: AssemblyFileVersion("1.2.0.0")]
11-
[assembly: AssemblyInformationalVersion("1.2.0.0")]
8+
[assembly: AssemblyProduct("MahApps.Metro.IconPacks 1.3.0.0")]
9+
[assembly: AssemblyVersion("1.3.0.0")]
10+
[assembly: AssemblyFileVersion("1.3.0.0")]
11+
[assembly: AssemblyInformationalVersion("1.3.0.0")]
1212
[assembly: AssemblyCopyright("Copyright © MahApps.Metro 2016")]
1313

‎src/MahApps.Metro.IconPacks.Browser/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
[assembly: ComVisible(false)]
66
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
77

8-
[assembly: AssemblyVersion("1.0.1.0")]
9-
[assembly: AssemblyFileVersion("1.0.1.0")]
10-
[assembly: AssemblyInformationalVersion("1.0.1.0")]
11-
[assembly: AssemblyProduct("MahApps.Metro.IconPacks.Browser 1.0.1")]
8+
[assembly: AssemblyVersion("1.1.0.0")]
9+
[assembly: AssemblyFileVersion("1.1.0.0")]
10+
[assembly: AssemblyInformationalVersion("1.1.0.0")]
11+
[assembly: AssemblyProduct("MahApps.Metro.IconPacks.Browser 1.1.0")]
1212
[assembly: AssemblyTitle("MahApps.Metro.IconPacks.Browser")]
1313
[assembly: AssemblyDescription("Application for the awesome IconPacks.")]
1414
[assembly: AssemblyCopyright("Copyright © MahApps.Metro 2016")]

‎src/MahApps.Metro.IconPacks.Browser/Resources/CustomTabControl.xaml‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,29 @@
2626
</Setter.Value>
2727
</Setter>
2828
</DataTrigger>
29-
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconModernKind}">
29+
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconFontAwesomeKind}">
3030
<Setter TargetName="IconContent" Property="ContentTemplate">
3131
<Setter.Value>
3232
<DataTemplate DataType="{x:Type viewModels:IIconViewModel}">
33-
<iconPacks:PackIconModern Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Kind="{Binding Value, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}" SnapsToDevicePixels="True" UseLayoutRounding="True" BorderThickness="1" BorderBrush="{DynamicResource BlackBrush}" Foreground="{DynamicResource AccentColorBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
33+
<iconPacks:PackIconFontAwesome Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Kind="{Binding Value, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}" SnapsToDevicePixels="True" UseLayoutRounding="True" BorderThickness="1" BorderBrush="{DynamicResource BlackBrush}" Foreground="{DynamicResource AccentColorBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
3434
</DataTemplate>
3535
</Setter.Value>
3636
</Setter>
3737
</DataTrigger>
38-
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconFontAwesomeKind}">
38+
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconOcticonsKind}">
3939
<Setter TargetName="IconContent" Property="ContentTemplate">
4040
<Setter.Value>
4141
<DataTemplate DataType="{x:Type viewModels:IIconViewModel}">
42-
<iconPacks:PackIconFontAwesome Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Kind="{Binding Value, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}" SnapsToDevicePixels="True" UseLayoutRounding="True" BorderThickness="1" BorderBrush="{DynamicResource BlackBrush}" Foreground="{DynamicResource AccentColorBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
42+
<iconPacks:PackIconOcticons Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Kind="{Binding Value, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}" SnapsToDevicePixels="True" UseLayoutRounding="True" BorderThickness="1" BorderBrush="{DynamicResource BlackBrush}" Foreground="{DynamicResource AccentColorBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
43+
</DataTemplate>
44+
</Setter.Value>
45+
</Setter>
46+
</DataTrigger>
47+
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconModernKind}">
48+
<Setter TargetName="IconContent" Property="ContentTemplate">
49+
<Setter.Value>
50+
<DataTemplate DataType="{x:Type viewModels:IIconViewModel}">
51+
<iconPacks:PackIconModern Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Kind="{Binding Value, Mode=OneWay, Converter={converter:NullToUnsetValueConverter}}" SnapsToDevicePixels="True" UseLayoutRounding="True" BorderThickness="1" BorderBrush="{DynamicResource BlackBrush}" Foreground="{DynamicResource AccentColorBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
4352
</DataTemplate>
4453
</Setter.Value>
4554
</Setter>
@@ -199,20 +208,29 @@
199208
</Setter.Value>
200209
</Setter>
201210
</DataTrigger>
202-
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconModernKind}">
211+
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconFontAwesomeKind}">
203212
<Setter TargetName="IconContent" Property="ContentTemplate">
204213
<Setter.Value>
205214
<DataTemplate DataType="{x:Type viewModels:IIconViewModel}">
206-
<iconPacks:PackIconModern Width="32" Height="32" HorizontalAlignment="Center" VerticalAlignment="Center" Kind="{Binding Value, Mode=OneWay}" />
215+
<iconPacks:PackIconFontAwesome Width="32" Height="32" HorizontalAlignment="Center" VerticalAlignment="Center" Kind="{Binding Value, Mode=OneWay}" />
207216
</DataTemplate>
208217
</Setter.Value>
209218
</Setter>
210219
</DataTrigger>
211-
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconFontAwesomeKind}">
220+
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconOcticonsKind}">
212221
<Setter TargetName="IconContent" Property="ContentTemplate">
213222
<Setter.Value>
214223
<DataTemplate DataType="{x:Type viewModels:IIconViewModel}">
215-
<iconPacks:PackIconFontAwesome Width="32" Height="32" HorizontalAlignment="Center" VerticalAlignment="Center" Kind="{Binding Value, Mode=OneWay}" />
224+
<iconPacks:PackIconOcticons Width="32" Height="32" HorizontalAlignment="Center" VerticalAlignment="Center" Kind="{Binding Value, Mode=OneWay}" />
225+
</DataTemplate>
226+
</Setter.Value>
227+
</Setter>
228+
</DataTrigger>
229+
<DataTrigger Binding="{Binding IconType}" Value="{x:Type iconPacks:PackIconModernKind}">
230+
<Setter TargetName="IconContent" Property="ContentTemplate">
231+
<Setter.Value>
232+
<DataTemplate DataType="{x:Type viewModels:IIconViewModel}">
233+
<iconPacks:PackIconModern Width="32" Height="32" HorizontalAlignment="Center" VerticalAlignment="Center" Kind="{Binding Value, Mode=OneWay}" />
216234
</DataTemplate>
217235
</Setter.Value>
218236
</Setter>

‎src/MahApps.Metro.IconPacks.Browser/ViewModels/MainViewModel.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public MainViewModel()
2727
{
2828
new IconPackViewModel("Material", typeof(PackIconMaterialKind), typeof(PackIconMaterial)),
2929
new IconPackViewModel("FontAwesome", typeof(PackIconFontAwesomeKind), typeof(PackIconFontAwesome)),
30+
new IconPackViewModel("Octicons", typeof(PackIconOcticonsKind), typeof(PackIconOcticons)),
3031
new IconPackViewModel("Modern", typeof(PackIconModernKind), typeof(PackIconModern)),
3132
new IconPackViewModel("Entypo+", typeof(PackIconEntypoKind), typeof(PackIconEntypo))
3233
});

‎src/MahApps.Metro.IconPacks.Entypo/MahApps.Metro.IconPacks.Entypo.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27+
<NoWarn>1591</NoWarn>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

‎src/MahApps.Metro.IconPacks.FontAwesome/MahApps.Metro.IconPacks.FontAwesome.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27+
<NoWarn>1591</NoWarn>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

‎src/MahApps.Metro.IconPacks.Material/MahApps.Metro.IconPacks.Material.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27+
<NoWarn>1591</NoWarn>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

‎src/MahApps.Metro.IconPacks.Modern/MahApps.Metro.IconPacks.Modern.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27+
<NoWarn>1591</NoWarn>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

0 commit comments

Comments
 (0)