Skip to content

Commit 9b1782e

Browse files
committed
- #64: Remove mentions and images of the scheduler
- Update installer license file - Add Krypton License file
1 parent f3e653b commit 9b1782e

10 files changed

Lines changed: 71 additions & 46 deletions

File tree

Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<Content Include="Banner.bmp" />
3939
<Content Include="GPLv2.rtf" />
4040
<Content Include="LGPLv3.0.rtf" />
41+
<Content Include="KryptonLicense.txt" />
4142
<Content Include="WixUIDialogBmp.bmp" />
4243
</ItemGroup>
4344
<ItemGroup>

Elucidate/Elucidate Windows Installer/Elucidate.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
<Component>
100100
<File Source="$(sys.SOURCEFILEDIR)GPLv2.rtf" KeyPath="yes" />
101101
</Component>
102-
<!--<Component>
103-
<File Source="$(sys.SOURCEFILEDIR) TODO" KeyPath="yes" /> --><!--Used for the Krypton--><!--
104-
</Component>-->
102+
<Component>
103+
<File Source="$(sys.SOURCEFILEDIR)KryptonLicense.txt" KeyPath="yes" />
104+
</Component>
105105
<Component>
106106
<File Source="$(var.MgtSource)\wyDay.Controls\License.txt" KeyPath="yes" />
107107
</Component>

Elucidate/Elucidate Windows Installer/GPLv2.rtf

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fcharset0 Tahoma;}{\f1\fswiss\fprq2\fcharset128 Tahoma;}{\f2\fswiss\fprq2\fcharset0 Tahoma;}{\f3\fnil\fcharset0 Tahoma;}}
1+
{\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;}}
22
{\colortbl ;\red0\green0\blue128;\red0\green0\blue255;\red192\green192\blue192;}
3-
{\*\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
3+
{\*\generator Riched20 6.3.9600}\viewkind4\uc1
4+
\pard\sl240\slmult1\f0\fs20\lang1033 Elucidate also uses other libraries that are released under these terms:\par
5+
6+
\pard\f1\lang2057 Krypton uses the "\f2 BSD 3-Clause License\f1 "\f3\par
7+
{\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
8+
9+
\pard\sl240\slmult1\f0\fs20\lang1033\par
10+
Elucidate is distributed under the terms of the GNU General Public License (GPL), version 2. \par
411
The full text of this license is below, unmodified. \par
512
\par
6-
This also uses other libraries that are released under similar terms:\par
7-
\pard\lang2057\f1\par
8-
\pard\sl240\slmult1\f2 T\lang255\f1 ask\lang2057\f2 S\lang255\f1 cheduler\lang1033 MIT License (MIT)\lang2057\par
9-
\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
10-
\fs20\par
11-
\pard\sl240\slmult1\highlight3\lang1033\f3 License: GNU General Public License version 2 (GPLv2)\par
13+
\highlight3\f4 License: GNU General Public License version 2 (GPLv2)\par
1214
\highlight0\par
15+
1316
\pard\sa200\sl240\slmult1 Copyright (C) 1989, 1991 Free Software Foundation, Inc.\line 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\par
1417
Everyone is permitted to copy and distribute verbatim copies\line of this license document, but changing it is not allowed.\par
1518
Preamble\par
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
BSD 3-Clause License
2+
3+
Copyright (c) 2018 - 2019, Peter Wagner & Simon Coghlan
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
16+
* Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Elucidate/Elucidate.sln

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.16
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29609.76
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elucidate", "Elucidate\Elucidate.csproj", "{C45A0899-34D4-4CB0-B5FF-9DFADBC5E70E}"
77
EndProject
@@ -30,15 +30,12 @@ EndProject
3030
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{95AFED29-C452-4F6F-9FB1-6E6E072EA4F4}"
3131
ProjectSection(SolutionItems) = preProject
3232
..\Images\Coverage_Tab.PNG = ..\Images\Coverage_Tab.PNG
33-
..\Images\Documentation_Layout With Scheduling.png = ..\Images\Documentation_Layout With Scheduling.png
3433
..\Images\Documentation_Real Time Log.png = ..\Images\Documentation_Real Time Log.png
3534
..\Images\Documentation_Speed of 1.7 x64.png = ..\Images\Documentation_Speed of 1.7 x64.png
3635
..\Images\Home_Layout With Scheduling.png = ..\Images\Home_Layout With Scheduling.png
3736
..\Images\Pictures_Fragmentation.png = ..\Images\Pictures_Fragmentation.png
38-
..\Images\Pictures_Mono Version.png = ..\Images\Pictures_Mono Version.png
3937
..\Images\Pictures_Space In Path.png = ..\Images\Pictures_Space In Path.png
4038
..\Images\Pictures_Speed of 1.7 x64.png = ..\Images\Pictures_Speed of 1.7 x64.png
41-
..\Images\schedule_view.png = ..\Images\schedule_view.png
4239
..\Images\Settings_ErrorProviders.png = ..\Images\Settings_ErrorProviders.png
4340
..\Images\Settings_ExcludedPatterns.png = ..\Images\Settings_ExcludedPatterns.png
4441
..\Images\Settings_Form.png = ..\Images\Settings_Form.png
@@ -77,8 +74,8 @@ Global
7774
{95AFED29-C452-4F6F-9FB1-6E6E072EA4F4} = {4387A76F-EC87-446D-A4A7-E7D96F8DD9A3}
7875
EndGlobalSection
7976
GlobalSection(ExtensibilityGlobals) = postSolution
80-
BuildVersion_UseGlobalSettings = False
81-
BuildVersion_StartDate = 2000/1/1
8277
SolutionGuid = {39E6A612-AC12-4D63-BE2A-60EA16940A8A}
78+
BuildVersion_StartDate = 2000/1/1
79+
BuildVersion_UseGlobalSettings = False
8380
EndGlobalSection
8481
EndGlobal

Elucidate/Elucidate/Elucidate.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</AssemblyInfoVersionSettings>
3131
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
3232
<AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
33-
<AssemblyVersion>2019.12.997.12</AssemblyVersion>
33+
<AssemblyVersion>2019.12.998.12</AssemblyVersion>
3434
<UpdatePackageVersion>False</UpdatePackageVersion>
3535
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
3636
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
@@ -315,7 +315,7 @@
315315
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
316316
<ProjectExtensions>
317317
<VisualStudio>
318-
<UserProperties BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UseUniversalClock="False" />
318+
<UserProperties BuildVersion_UseUniversalClock="False" BuildVersion_UpdateFileVersion="False" BuildVersion_UpdateAssemblyVersion="False" BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" />
319319
</VisualStudio>
320320
</ProjectExtensions>
321321
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Elucidate/Elucidate/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
// Build Number - Increment
5959
// Revision - Day
6060
//
61-
[assembly: AssemblyVersion("2019.12.997.12")]
62-
[assembly: AssemblyFileVersion("19.12.997.12")]
61+
[assembly: AssemblyVersion("2019.12.998.12")]
62+
[assembly: AssemblyFileVersion("19.12.998.12")]
6363
[assembly: NeutralResourcesLanguage("en-US")]
6464
// TODO: Add more relevant hints here
6565
[assembly: Dependency("System", LoadHint.Always)]

Elucidate/Elucidate/TabPages/CommonTab.Designer.cs

Lines changed: 17 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Elucidate/Elucidate/TabPages/Schedule.Designer.cs

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/Testing.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
- Try to add a directory which is already part of the protected list
4040
- Drag A directory that is already a root element
4141
- Drag a directory which is a child of an existing
42-
- Drag a direcotyr which is on the same drive but not currently protected
42+
- Drag a directory which is on the same drive but not currently protected
4343
- Should cope with directory redirects (i.e. mount points)
4444
- Parity location changes
4545
- Make sure that Multiple Parity locations can be added per Parity line
@@ -77,8 +77,6 @@
7777
- Select "Only with Errors"
7878
- observe that the available files are reduced
7979

80-
- Select Scheduled
81-
- ??
8280

8381

8482
### Coverage Tab

0 commit comments

Comments
 (0)