Skip to content

Commit 7405323

Browse files
author
Mostey
committed
Updated licenses, copyright notices and added the localization extension to the acknowledgments notice
1 parent 04628b8 commit 7405323

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

acknowledgements.txt

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
============= Libraries ============
2-
31
Caliburn.Micro
42
https://github.com/Caliburn-Micro/Caliburn.Micro/blob/master/License.txt
53

@@ -149,8 +147,14 @@ The views and conclusions contained in the software and documentation are those
149147
authors and should not be interpreted as representing official policies, either expressed
150148
or implied, of OpenHome.
151149

150+
===================================
151+
152+
WPF Localization Using RESX Files
153+
http://www.codeproject.com/Articles/35159/WPF-Localization-Using-RESX-Files
152154

153-
========= Icons and Images =========
155+
Licensed under the CodeProject Open License (http://www.codeproject.com/info/cpol10.aspx)
156+
157+
====================================
154158

155159
Creative Commons (Attribution 3.0 Unported)
156160
http://creativecommons.org/licenses/by/3.0/
@@ -178,4 +182,4 @@ https://www.iconfinder.com/icons/308459/minus_negative_remove_icon#size=128
178182

179183

180184

181-
====================================
185+
====================================

src/loadify/Properties/AssemblyInfo.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("loadify")]
13-
[assembly: AssemblyCopyright("Copyright © 2014")]
13+
[assembly: AssemblyCopyright("Copyright © 2014-2015")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -49,6 +49,6 @@
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("1.0.0.0")]
53-
[assembly: AssemblyFileVersion("1.0.0.0")]
54-
[assembly: AssemblyInformationalVersion("1.0 - Final")]
52+
[assembly: AssemblyVersion("1.1.0.0")]
53+
[assembly: AssemblyFileVersion("1.1.0.0")]
54+
[assembly: AssemblyInformationalVersion("1.1")]

src/loadify/View/AboutView.xaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
55
WindowStartupLocation="CenterScreen"
66
GlowBrush="{DynamicResource AccentColorBrush}" ResizeMode="CanMinimize"
7-
Title="Loadify" Height="210" Width="370"
7+
Title="Loadify" Height="210" Width="380"
88
ResxExtension.DefaultResxName="loadify.Localization.About" Language="{UICulture}">
99
<Grid>
1010
<Grid.RowDefinitions>
@@ -14,9 +14,9 @@
1414
</Grid.RowDefinitions>
1515
<Label Grid.Column="0" Content="LOADIFY " HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
1616
FontFamily="MV Boli" FontSize="46"/>
17-
<Grid Grid.Row="1" Margin="20 5">
17+
<Grid Grid.Row="1" Margin="15 5">
1818
<Grid.ColumnDefinitions>
19-
<ColumnDefinition Width="40*"/>
19+
<ColumnDefinition Width="Auto"/>
2020
<ColumnDefinition Width="100*"/>
2121
</Grid.ColumnDefinitions>
2222
<Grid.RowDefinitions>
@@ -25,9 +25,9 @@
2525
<RowDefinition Height="33*"/>
2626
</Grid.RowDefinitions>
2727
<Label Content="Version" FontSize="12" Grid.ColumnSpan="2"/>
28-
<Label Content="{Resx Contributors}" FontSize="12" Grid.Row="1" Grid.ColumnSpan="2"/>
28+
<Label Content="{Resx Contributors}" FontSize="12" Grid.Row="1"/>
2929
<Label Content="{Resx License}" FontSize="12" Grid.Row="2"/>
30-
<Label x:Name="License" FontSize="12" Foreground="Gray" Grid.Row="2" Grid.Column="1"/>
30+
<Label x:Name="License" FontSize="12" Foreground="Gray" HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="1"/>
3131
<Label x:Name="Version" FontSize="12" Foreground="Gray" Grid.Column="1" HorizontalContentAlignment="Right" Grid.Row="0"/>
3232
<Label x:Name="Contributors" FontSize="12" Foreground="Gray" Grid.Column="1" HorizontalContentAlignment="Right" Grid.Row="1"/>
3333
</Grid>

src/loadify/ViewModel/AboutViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class AboutViewModel : ViewModelBase
99
{
1010
public string License
1111
{
12-
get { return "The MIT License (MIT) - Copyright (c) 2014"; }
12+
get { return "The MIT License (MIT) - Copyright (c) 2014-2015"; }
1313
}
1414

1515
public string Contributors

0 commit comments

Comments
 (0)