Skip to content

Commit

Permalink
- #64: Remove mentions and images of the scheduler
Browse files Browse the repository at this point in the history
- Update installer license file
- Add Krypton License file
  • Loading branch information
Smurf-IV committed Dec 12, 2019
1 parent f3e653b commit 9b1782e
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<Content Include="Banner.bmp" />
<Content Include="GPLv2.rtf" />
<Content Include="LGPLv3.0.rtf" />
<Content Include="KryptonLicense.txt" />
<Content Include="WixUIDialogBmp.bmp" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Elucidate/Elucidate Windows Installer/Elucidate.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
<Component>
<File Source="$(sys.SOURCEFILEDIR)GPLv2.rtf" KeyPath="yes" />
</Component>
<!--<Component>
<File Source="$(sys.SOURCEFILEDIR) TODO" KeyPath="yes" /> --><!--Used for the Krypton--><!--
</Component>-->
<Component>
<File Source="$(sys.SOURCEFILEDIR)KryptonLicense.txt" KeyPath="yes" />
</Component>
<Component>
<File Source="$(var.MgtSource)\wyDay.Controls\License.txt" KeyPath="yes" />
</Component>
Expand Down
19 changes: 11 additions & 8 deletions Elucidate/Elucidate Windows Installer/GPLv2.rtf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 29 additions & 0 deletions Elucidate/Elucidate Windows Installer/KryptonLicense.txt
Original file line number Diff line number Diff line change
@@ -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.
11 changes: 4 additions & 7 deletions Elucidate/Elucidate.sln
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions Elucidate/Elucidate/Elucidate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</AssemblyInfoVersionSettings>
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
<AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
<AssemblyVersion>2019.12.997.12</AssemblyVersion>
<AssemblyVersion>2019.12.998.12</AssemblyVersion>
<UpdatePackageVersion>False</UpdatePackageVersion>
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
Expand Down Expand Up @@ -315,7 +315,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UseUniversalClock="False" />
<UserProperties BuildVersion_UseUniversalClock="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
4 changes: 2 additions & 2 deletions Elucidate/Elucidate/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
// Build Number - Increment
// Revision - Day
//
[assembly: AssemblyVersion("2019.12.997.12")]
[assembly: AssemblyFileVersion("19.12.997.12")]
[assembly: AssemblyVersion("2019.12.998.12")]
[assembly: AssemblyFileVersion("19.12.998.12")]
[assembly: NeutralResourcesLanguage("en-US")]
// TODO: Add more relevant hints here
[assembly: Dependency("System", LoadHint.Always)]
Expand Down
36 changes: 17 additions & 19 deletions Elucidate/Elucidate/TabPages/CommonTab.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Elucidate/Elucidate/TabPages/Schedule.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions docs/Testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
- Try to add a directory which is already part of the protected list
- Drag A directory that is already a root element
- Drag a directory which is a child of an existing
- Drag a direcotyr which is on the same drive but not currently protected
- Drag a directory which is on the same drive but not currently protected
- Should cope with directory redirects (i.e. mount points)
- Parity location changes
- Make sure that Multiple Parity locations can be added per Parity line
Expand Down Expand Up @@ -77,8 +77,6 @@
- Select "Only with Errors"
- observe that the available files are reduced

- Select Scheduled
- ??


### Coverage Tab
Expand Down

0 comments on commit 9b1782e

Please sign in to comment.