diff --git a/DesktopClock/DesktopClock.csproj b/DesktopClock/DesktopClock.csproj index 4381fe2..d333bbb 100644 --- a/DesktopClock/DesktopClock.csproj +++ b/DesktopClock/DesktopClock.csproj @@ -33,6 +33,9 @@ prompt 4 + + DesktopClock.ico + @@ -104,6 +107,9 @@ 2.5.8 + + 1.2.0 + 2.0.0 @@ -111,5 +117,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DesktopClock/DesktopClock.ico b/DesktopClock/DesktopClock.ico new file mode 100644 index 0000000..8956281 Binary files /dev/null and b/DesktopClock/DesktopClock.ico differ diff --git a/DesktopClock/MainWindow.xaml b/DesktopClock/MainWindow.xaml index 10a16c6..a40a58e 100644 --- a/DesktopClock/MainWindow.xaml +++ b/DesktopClock/MainWindow.xaml @@ -81,6 +81,9 @@ + + diff --git a/DesktopClock/MainWindow.xaml.cs b/DesktopClock/MainWindow.xaml.cs index 07118f0..a5bb386 100644 --- a/DesktopClock/MainWindow.xaml.cs +++ b/DesktopClock/MainWindow.xaml.cs @@ -1,5 +1,8 @@ -using System.Windows; +using System; +using System.Collections.ObjectModel; +using System.Windows; using System.Windows.Input; +using WpfAboutView; namespace DesktopClock { @@ -21,6 +24,64 @@ private void Window_MouseDown(object sender, MouseButtonEventArgs e) } } + private void MenuItemAbout_OnClick(object sender, RoutedEventArgs e) + { + new AboutDialog + { + Owner = this, + WindowStartupLocation = WindowStartupLocation.CenterOwner, + AboutView = new AboutView + { + AppIconSource = new Uri("pack://application:,,,/DesktopClock.ico"), + CreditColumns = 3, + Credits = new ObservableCollection { + new Credit { + Name = "DesktopClock", + Author = "Daniel Chalmers", + Website = new Uri("https://github.com/danielchalmers/DesktopClock"), + LicenseText = Properties.Resources.DesktopClock_License + }, + new Credit { + Name = "Costura.Fody", + Author = "Simon Cropp", + Website = new Uri("https://github.com/Fody/Costura"), + LicenseText = Properties.Resources.Costura_Fody_License + }, + new Credit { + Name = "MVVM Light", + Author = "Laurent Bugnion", + Website = new Uri("http://mvvmlight.net"), + LicenseText = Properties.Resources.MVVM_Light_License + }, + new Credit { + Name = "Json.NET", + Author = "James Newton-King", + Website = new Uri("https://newtonsoft.com/json"), + LicenseText = Properties.Resources.Json_NET_License + }, + new Credit { + Name = "PropertyChanged.Fody", + Author = "Simon Cropp", + Website = new Uri("https://github.com/Fody/PropertyChanged"), + LicenseText = Properties.Resources.PropertyChanged_Fody_License + }, + new Credit { + Name = "WpfAboutView", + Author = "Daniel Chalmers", + Website = new Uri("https://github.com/danielchalmers/WpfAboutView"), + LicenseText = Properties.Resources.WpfAboutView_License + }, + new Credit { + Name = "WpfWindowPlacement", + Author = "Daniel Chalmers", + Website = new Uri("https://github.com/danielchalmers/WpfWindowPlacement"), + LicenseText = Properties.Resources.WpfWindowPlacement_License + }, + } + } + }.ShowDialog(); + } + private void MenuItemExit_OnClick(object sender, RoutedEventArgs e) { Close(); diff --git a/DesktopClock/Properties/Resources.Designer.cs b/DesktopClock/Properties/Resources.Designer.cs index f81a4f0..0896797 100644 --- a/DesktopClock/Properties/Resources.Designer.cs +++ b/DesktopClock/Properties/Resources.Designer.cs @@ -59,5 +59,110 @@ internal Resources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2012 Simon Cropp and contributors + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above [rest of string was truncated]";. + /// + public static string Costura_Fody_License { + get { + return ResourceManager.GetString("Costura_Fody_License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2018 Daniel Chalmers + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above copyright not [rest of string was truncated]";. + /// + public static string DesktopClock_License { + get { + return ResourceManager.GetString("DesktopClock_License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2007 James Newton-King + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above copyright n [rest of string was truncated]";. + /// + public static string Json_NET_License { + get { + return ResourceManager.GetString("Json_NET_License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2009 - 2014 Laurent Bugnion + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above copyri [rest of string was truncated]";. + /// + public static string MVVM_Light_License { + get { + return ResourceManager.GetString("MVVM_Light_License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2012 Simon Cropp and contributors + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above [rest of string was truncated]";. + /// + public static string PropertyChanged_Fody_License { + get { + return ResourceManager.GetString("PropertyChanged_Fody_License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2017 Daniel Chalmers + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above copyright not [rest of string was truncated]";. + /// + public static string WpfAboutView_License { + get { + return ResourceManager.GetString("WpfAboutView_License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MIT License + /// + ///Copyright (c) 2017 Daniel Chalmers + /// + ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + /// + ///The above copyright not [rest of string was truncated]";. + /// + public static string WpfWindowPlacement_License { + get { + return ResourceManager.GetString("WpfWindowPlacement_License", resourceCulture); + } + } } } diff --git a/DesktopClock/Properties/Resources.resx b/DesktopClock/Properties/Resources.resx index af7dbeb..d576c8e 100644 --- a/DesktopClock/Properties/Resources.resx +++ b/DesktopClock/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,31 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Costura.Fody License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\DesktopClock License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\Json.NET License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\Resources\MVVM Light License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\Resources\PropertyChanged.Fody License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\WpfAboutView License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\WpfWindowPlacement License.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + \ No newline at end of file diff --git a/DesktopClock/Resources/Costura.Fody License.txt b/DesktopClock/Resources/Costura.Fody License.txt new file mode 100644 index 0000000..2266a74 --- /dev/null +++ b/DesktopClock/Resources/Costura.Fody License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2012 Simon Cropp and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DesktopClock/Resources/DesktopClock License.txt b/DesktopClock/Resources/DesktopClock License.txt new file mode 100644 index 0000000..58a4b95 --- /dev/null +++ b/DesktopClock/Resources/DesktopClock License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2018 Daniel Chalmers + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DesktopClock/Resources/Json.NET License.txt b/DesktopClock/Resources/Json.NET License.txt new file mode 100644 index 0000000..1b01df9 --- /dev/null +++ b/DesktopClock/Resources/Json.NET License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DesktopClock/Resources/MVVM Light License.txt b/DesktopClock/Resources/MVVM Light License.txt new file mode 100644 index 0000000..4608cac --- /dev/null +++ b/DesktopClock/Resources/MVVM Light License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2009 - 2014 Laurent Bugnion + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DesktopClock/Resources/PropertyChanged.Fody License.txt b/DesktopClock/Resources/PropertyChanged.Fody License.txt new file mode 100644 index 0000000..2266a74 --- /dev/null +++ b/DesktopClock/Resources/PropertyChanged.Fody License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2012 Simon Cropp and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DesktopClock/Resources/WpfAboutView License.txt b/DesktopClock/Resources/WpfAboutView License.txt new file mode 100644 index 0000000..85ad027 --- /dev/null +++ b/DesktopClock/Resources/WpfAboutView License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2017 Daniel Chalmers + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DesktopClock/Resources/WpfWindowPlacement License.txt b/DesktopClock/Resources/WpfWindowPlacement License.txt new file mode 100644 index 0000000..85ad027 --- /dev/null +++ b/DesktopClock/Resources/WpfWindowPlacement License.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2017 Daniel Chalmers + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file