Adjust options form. Add license form. Modify license file.

Author: JetStream96

LICENSE.txt

@@ -1,8 +1,34 @@
-The navigation data shipped with this program is Aerosoft's property and shall not be copied, modified, or distributed without Aerosoft's permission. 
+The navigation data (all files in `/QSimPlanner/[Version]/NavData` folder) 
+shipped with this program is Aerosoft's property and is under Aerosoft's 
+NavDataPro license.
 
-The rest of this software is under MIT License.
+All source code of this software is under MIT License.
 
-******************************************************************************
+*********************************************************************
+
+Aerosoft's NavDataPro license:
+
+Aerosoft NavDataPro
+
+Diese Navigationsdaten dürfen ausschließlich für die Flugsimulation verwendet werden und weichen von den aktuellen Navigationsdaten ab!
+Benutzen Sie diese Navigationsdaten in keinem Fall für die Navigation in der realen Luftfahrt!
+These navdata are intended for flight simulation use only and will vary from current aeronautical navdata!
+Do not use for real navigation!
+
+Diese Navigationsdaten, die Software und sonstiges zugehöriges Material sind durch Urheberrechtsgesetze geschützt. Die Navigationsdaten und die Software werden lizenziert, nicht verkauft.
+Sie dürfen eine Kopie der Navigationsdaten und der Software auf einem Computer für Ihre persönliche, nicht kommerzielle Nutzung installieren und verwenden.
+Die Navigationsdaten, die Software und alle anderen zugehörigen Materialien dürfen ohne vorherige, schriftliche Erlaubnis der Aerosoft GmbH weder kopiert, fotokopiert, übersetzt, zurückentwickelt, dekompiliert, diassembliert oder in anderer Form für elektronische Maschinen lesbar gemacht werden.
+
+These navdata, the software and all the related materials are protected by copyright laws. The navdata and the software is licensed, not sold.
+You may install and run one copy of the navdata and the software on one computer for your personal, non-commercial use.
+The navdata, the software and all related materials must not be copied, photocopied, translated, reverse engineered, decompiled or reduced to any electronic medium or machine legible form, neither completely nor in part, without the previous written permission of AEROSOFT GmbH. 
+
+© Copyright Aerosoft GmbH, alle Rechte vorbehalten, all rights reserved. 
+
+website: www.aerosoft.com
+support: http://forum.aerosoft.com/
+
+*********************************************************************
 
 The MIT License (MIT)
 
@@ -26,9 +52,8 @@ 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.
 
-*******************************************************************************
+*********************************************************************
+
+Licenses of third-party packages (included in /third-party folder)
 
-This application uses third-party packages. Their licenses are included in 
-\third-party folder.
 
-*******************************************************************************

README.md

@@ -21,7 +21,7 @@ A tool for fuel planning and take-off/landing performance calculations.
 - Landing calculation with custom flaps, autobrakes setting, and runway surface conditions.
 
 ### Nav Data
-Aerosoft kindly provided an AIRAC cycle to be bundled with this program. The NavData can be updated with [Aerosoft's NavDataPro](http://www.aerosoft.com/cgi-local/us/iboshop.cgi?showd,7411699320,D11688) service. If you are using other sources such as Navigraph, use the version for Aerosoft Airbus A318/A319/A320/A321.
+This program comes with the NavDataPro dataset by Aerosoft. The NavData can be updated with [Aerosoft's NavDataPro](https://www.aerosoft.com/en/fsxp3d/flight-simulator-2004/tools-missions/1750/navdatapro-one-year-subscription-13-datasets) service. If you are using other sources such as Navigraph, use the version for Aerosoft Airbus A318/A319/A320/A321.
 
 ### Project Status
 Currently the aircrafts available are
@@ -37,8 +37,3 @@ You are welcomed to submit pull requests to this repository. Feel free to leave
 
 ### Special thanks
 To Aerosoft for providing an AIRAC cycle for this program.
-
-### License
-The navigation data (all files in `/QSimPlanner/[Version]/NavData` folder) shipped with this program is Aerosoft's property and shall not be copied, modified, or distributed without Aerosoft's permission. 
-
-The rest of this software is under MIT License.

src/Installer/.gitignore

@@ -1,4 +1,3 @@
 # Build results
 [Oo]utput
 [Rr]esults
-/navdata

src/Installer/InstallerBuilder/AiracFile.cs

@@ -22,21 +22,12 @@ private static void GetAirac()
                 throw new NotImplementedException();
             }
         }
-
-        private static void WriteReadmeFile()
-        {
-            var content = "All files in this folder is provided by Aerosoft and should not be " +
-                "distributed without permission.";
-            var path = Path.Combine(FileOutputGenerator.TmpOutputFolder, "NavData/readme.txt");
-            File.WriteAllText(path, content);
-        }
-
+        
         public static void CopyNavData()
         {
             GetAirac();
             var dest = Path.Combine(FileOutputGenerator.TmpOutputFolder, "NavData");
             ZipFile.ExtractToDirectory(NavDataFilePath, dest);
-            WriteReadmeFile();
         }
     }
 }

src/Installer/InstallerBuilder/FileOutputGenerator.cs

@@ -33,7 +33,7 @@ public void Build()
             Directory.Move(TmpOutputFolder, folder);
 
             WriteLicenseText(folder);
-            CopyDirectory(Path.Combine(RepositoryRoot(), "manual"),
+            CopyDirectory(Path.Combine(RepositoryRoot, "manual"),
                 Path.Combine(folder, "manual"));
 
             CompileLauncher();
@@ -68,7 +68,7 @@ private static void GenerateVersionConfig(string version)
             File.WriteAllText(path, new XDocument(elem).ToString());
         }
 
-        private static string RepositoryRoot() => Path.Combine(OutputFolder, "../../..");
+        public static string RepositoryRoot => Path.Combine(OutputFolder, "../../..");
 
         private static string ProjectFolder()
         {
@@ -80,8 +80,7 @@ private static string ProjectFolder()
 
         private static void WriteLicenseText(string folder)
         {
-            var gen = new LicenseTextGenerator(RepositoryRoot());
-
+            var gen = new LicenseTextGenerator(RepositoryRoot);
             File.WriteAllText(Path.Combine(folder, "LICENSE.txt"), gen.Generate());
         }
 
@@ -99,7 +98,7 @@ private static void CompileApp(string folder)
 
         private static void CompileLauncher()
         {
-            var projFile = Path.Combine(RepositoryRoot(), "src/Launcher/Launcher.csproj");
+            var projFile = Path.Combine(RepositoryRoot, "src/Launcher/Launcher.csproj");
             Compile(projFile, OutputFolder);
         }
 

src/Installer/InstallerBuilder/LicenseTextGenerator.cs

@@ -1,14 +1,11 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 
 namespace InstallerBuilder
 {
     public class LicenseTextGenerator
     {
-        private static readonly string target = "******************";
-
         private string license, thirdParty;
 
         public LicenseTextGenerator(string rootFolder)
@@ -19,7 +16,7 @@ public LicenseTextGenerator(string rootFolder)
 
         public string Generate()
         {
-            var output = new StringBuilder(ModifiedMainLicense());
+            var output = new StringBuilder(File.ReadAllText(license));
             var files = Directory.GetFiles(thirdParty);
 
             foreach (var i in files)
@@ -35,27 +32,5 @@ public string Generate()
 
             return output.ToString();
         }
-
-        private string ModifiedMainLicense()
-        {
-            var output = new StringBuilder();
-            var mainTxt = File.ReadAllText(license);
-            int index = mainTxt.IndexOf(target);
-
-            if (index == -1)
-            {
-                throw new ArgumentException("Wrong LICENSE.txt format.");
-            }
-
-            output.Append(mainTxt.Substring(0, index));
-            output.Append(
-                @"*******************************************************************************
-
-This application uses third-party packages. Their licenses are included below:
-
-*******************************************************************************");
-            output.Append("\n\n");
-            return output.ToString();
-        }
     }
 }

src/Installer/navdata/.gitignore

@@ -0,0 +1 @@
+AerosoftAirbusX_1705.zip

src/QSP/ChangeLog.txt

@@ -1,4 +1,7 @@
-version 0.3.6
+version 0.4.0
+* Add Airac cycle from Aerosoft.
+
+version 0.3.6
 * Fix a bug where click on 'show map' without finding a route first results in NullReferenceException.
 * Fix a bug where saving new aircraft causes NullReferenceException.
 

src/QSP/Common/Options/AppOptions.cs

@@ -1,9 +1,10 @@
+using QSP.LibraryExtension.XmlSerialization;
 using QSP.RouteFinding.FileExport;
 using System;
 using System.Collections.Generic;
-using System.Xml.Linq;
+using System.IO;
 using System.Linq;
-using QSP.LibraryExtension.XmlSerialization;
+using System.Xml.Linq;
 using static QSP.LibraryExtension.XmlSerialization.SerializationHelper;
 using static QSP.Utilities.ExceptionHelpers;
 
@@ -44,7 +45,7 @@ public AppOptions(
         }
 
         public static AppOptions Default => new AppOptions(
-            "",
+            Path.GetFullPath("NavData"),
             true,
             true,
             true,

src/QSP/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.6.0")]
+[assembly: AssemblyVersion("0.4.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]