From 9b1782e8f34533d3cfed86ff003331121432d427 Mon Sep 17 00:00:00 2001 From: Smurf-IV Date: Thu, 12 Dec 2019 20:08:30 +0000 Subject: [PATCH] - #64: Remove mentions and images of the scheduler - Update installer license file - Add Krypton License file --- .../Elucidate Windows Installer.wixproj | 1 + .../Elucidate Windows Installer/Elucidate.wxs | 6 ++-- .../Elucidate Windows Installer/GPLv2.rtf | 19 +++++----- .../KryptonLicense.txt | 29 +++++++++++++++ Elucidate/Elucidate.sln | 11 +++--- Elucidate/Elucidate/Elucidate.csproj | 4 +-- .../Elucidate/Properties/AssemblyInfo.cs | 4 +-- .../Elucidate/TabPages/CommonTab.Designer.cs | 36 +++++++++---------- .../Elucidate/TabPages/Schedule.Designer.cs | 3 +- docs/Testing.md | 4 +-- 10 files changed, 71 insertions(+), 46 deletions(-) create mode 100644 Elucidate/Elucidate Windows Installer/KryptonLicense.txt diff --git a/Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj b/Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj index 56885cb..2f9146d 100644 --- a/Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj +++ b/Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj @@ -38,6 +38,7 @@ + diff --git a/Elucidate/Elucidate Windows Installer/Elucidate.wxs b/Elucidate/Elucidate Windows Installer/Elucidate.wxs index 339a686..856d90c 100644 --- a/Elucidate/Elucidate Windows Installer/Elucidate.wxs +++ b/Elucidate/Elucidate Windows Installer/Elucidate.wxs @@ -99,9 +99,9 @@ - + + + diff --git a/Elucidate/Elucidate Windows Installer/GPLv2.rtf b/Elucidate/Elucidate Windows Installer/GPLv2.rtf index 7a69e2f..fd02e2c 100644 --- a/Elucidate/Elucidate Windows Installer/GPLv2.rtf +++ b/Elucidate/Elucidate Windows Installer/GPLv2.rtf @@ -1,15 +1,18 @@ -{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fcharset0 Tahoma;}{\f1\fswiss\fprq2\fcharset128 Tahoma;}{\f2\fswiss\fprq2\fcharset0 Tahoma;}{\f3\fnil\fcharset0 Tahoma;}} +{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fswiss\fcharset0 Tahoma;}{\f1\fswiss\fprq2\fcharset0 Tahoma;}{\f2\fnil\fcharset0 Courier New;}{\f3\fswiss\fprq2\fcharset128 Tahoma;}{\f4\fnil\fcharset0 Tahoma;}} {\colortbl ;\red0\green0\blue128;\red0\green0\blue255;\red192\green192\blue192;} -{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sl240\slmult1\lang1033\f0\fs20 Elucidate is distributed under the terms of the GNU General Public License (GPL), version 2. \par +{\*\generator Riched20 6.3.9600}\viewkind4\uc1 +\pard\sl240\slmult1\f0\fs20\lang1033 Elucidate also uses other libraries that are released under these terms:\par + +\pard\f1\lang2057 Krypton uses the "\f2 BSD 3-Clause License\f1 "\f3\par +{\cf1\ul\f0\lang255{\field{\*\fldinst{HYPERLINK "\f3 http://wix.codeplex.com/license" }}{\fldrslt{WIX}}}}\cf1\ul\f1\fs20 \cf0\ulnone\f2 Common Public License 1.0\f3\fs24\par + +\pard\sl240\slmult1\f0\fs20\lang1033\par +Elucidate is distributed under the terms of the GNU General Public License (GPL), version 2. \par The full text of this license is below, unmodified. \par \par -This also uses other libraries that are released under similar terms:\par -\pard\lang2057\f1\par -\pard\sl240\slmult1\f2 T\lang255\f1 ask\lang2057\f2 S\lang255\f1 cheduler\lang1033 MIT License (MIT)\lang2057\par -\pard\cf1\lang255\ul\f0{\field{\*\fldinst{HYPERLINK "\f1 http://wix.codeplex.com/license" }}{\fldrslt{WIX}}}\lang2057\f2\fs20 \cf0\ulnone\f1 Common Public License 1.0\fs24\par -\fs20\par -\pard\sl240\slmult1\highlight3\lang1033\f3 License: GNU General Public License version 2 (GPLv2)\par +\highlight3\f4 License: GNU General Public License version 2 (GPLv2)\par \highlight0\par + \pard\sa200\sl240\slmult1 Copyright (C) 1989, 1991 Free Software Foundation, Inc.\line 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\par Everyone is permitted to copy and distribute verbatim copies\line of this license document, but changing it is not allowed.\par Preamble\par diff --git a/Elucidate/Elucidate Windows Installer/KryptonLicense.txt b/Elucidate/Elucidate Windows Installer/KryptonLicense.txt new file mode 100644 index 0000000..f9ffd6e --- /dev/null +++ b/Elucidate/Elucidate Windows Installer/KryptonLicense.txt @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2018 - 2019, Peter Wagner & Simon Coghlan +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/Elucidate/Elucidate.sln b/Elucidate/Elucidate.sln index da37337..c5afa6e 100644 --- a/Elucidate/Elucidate.sln +++ b/Elucidate/Elucidate.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29609.76 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elucidate", "Elucidate\Elucidate.csproj", "{C45A0899-34D4-4CB0-B5FF-9DFADBC5E70E}" EndProject @@ -30,15 +30,12 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{95AFED29-C452-4F6F-9FB1-6E6E072EA4F4}" ProjectSection(SolutionItems) = preProject ..\Images\Coverage_Tab.PNG = ..\Images\Coverage_Tab.PNG - ..\Images\Documentation_Layout With Scheduling.png = ..\Images\Documentation_Layout With Scheduling.png ..\Images\Documentation_Real Time Log.png = ..\Images\Documentation_Real Time Log.png ..\Images\Documentation_Speed of 1.7 x64.png = ..\Images\Documentation_Speed of 1.7 x64.png ..\Images\Home_Layout With Scheduling.png = ..\Images\Home_Layout With Scheduling.png ..\Images\Pictures_Fragmentation.png = ..\Images\Pictures_Fragmentation.png - ..\Images\Pictures_Mono Version.png = ..\Images\Pictures_Mono Version.png ..\Images\Pictures_Space In Path.png = ..\Images\Pictures_Space In Path.png ..\Images\Pictures_Speed of 1.7 x64.png = ..\Images\Pictures_Speed of 1.7 x64.png - ..\Images\schedule_view.png = ..\Images\schedule_view.png ..\Images\Settings_ErrorProviders.png = ..\Images\Settings_ErrorProviders.png ..\Images\Settings_ExcludedPatterns.png = ..\Images\Settings_ExcludedPatterns.png ..\Images\Settings_Form.png = ..\Images\Settings_Form.png @@ -77,8 +74,8 @@ Global {95AFED29-C452-4F6F-9FB1-6E6E072EA4F4} = {4387A76F-EC87-446D-A4A7-E7D96F8DD9A3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_UseGlobalSettings = False - BuildVersion_StartDate = 2000/1/1 SolutionGuid = {39E6A612-AC12-4D63-BE2A-60EA16940A8A} + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UseGlobalSettings = False EndGlobalSection EndGlobal diff --git a/Elucidate/Elucidate/Elucidate.csproj b/Elucidate/Elucidate/Elucidate.csproj index fc73927..416f5aa 100644 --- a/Elucidate/Elucidate/Elucidate.csproj +++ b/Elucidate/Elucidate/Elucidate.csproj @@ -30,7 +30,7 @@ AssemblyVersionAttribute Properties\AssemblyInfo.cs - 2019.12.997.12 + 2019.12.998.12 False SettingsVersion None @@ -315,7 +315,7 @@ - +