Merge pull request #1 from num0005/license-fix

License fix, thanks num!

LICENSE.md

@@ -0,0 +1,149 @@
+Copyright (c) 2017 num0005
+Copyright (c) 2022 Osoyoos Launcher Contributors
+
+Unless otherwise noted files in this repository are licensed under the terms of the MIT license (reproduced below).
+Placeholder shader files ("default.shader", "default_odst.shader" and "defaultH2.shader") are licensed under the terms of the CC0 1.0 Universal license (also reproduced below)
+
+You can find plain language summaries of your rights and obligations at https://choosealicense.com/licenses/mit/ and https://creativecommons.org/publicdomain/zero/1.0/
+
+# MIT License
+
+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.
+
+# Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

Launcher/Credits.xaml

@@ -41,7 +41,7 @@
                     <TextBlock Grid.Row="2" Grid.ColumnSpan="2" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="Launcher:"/></TextBlock>
                     <TextBlock Grid.Row="4" Grid.Column="1" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="• Written by Num0005."/></TextBlock>
                     <TextBlock Grid.Row="5" Grid.Column="1" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="• Misc features and QoL fixes added by General_101"/></TextBlock>
-                    <TextBlock Grid.Row="6" Grid.Column="1"  Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text=""/></TextBlock>
+                    <TextBlock x:Name="license_intro" Grid.Row="6" Grid.Column="1"  Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15" Height="24" Margin="-1,2,0,5" LineHeight="7"><Run Text="This program is licensed under the terms of the MIT license,"/><Button x:Name="license_info_open" Content="Click here for more info" VerticalAlignment="Bottom" HorizontalAlignment="Center" Height="{Binding Height, ElementName=license_intro}" Click="license_info_open_Click"/></TextBlock>
                     <TextBlock Grid.Row="7" Grid.ColumnSpan="2" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="Special thanks to :"/></TextBlock>
                     <TextBlock Grid.Row="8" Grid.Column="1" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="• 343 Industries"/></TextBlock>
                     <TextBlock Grid.Row="9" Grid.Column="1" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="• Bungie"/></TextBlock>
@@ -57,6 +57,7 @@
                     <TextBlock Grid.Row="19" Grid.ColumnSpan="2" Foreground="{DynamicResource TextColor}" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap" FontSize="15"><Run Text="Version: "/><Run x:Name="version" Text="$Version"/></TextBlock>
                     <Button x:Name="update_button" Grid.Row="20" Grid.ColumnSpan="2" Click="update_button_Click" >Check for update</Button>
                 </Grid>
+
             </Grid>
         </Grid>
     </ScrollViewer>

Launcher/Credits.xaml.cs

@@ -150,5 +150,20 @@ private async void update_button_Click(object sender, RoutedEventArgs e)
 
 
         }
+
+        private void license_info_open_Click(object sender, RoutedEventArgs e)
+        {
+            string license_file_name = Path.Combine(Path.GetTempPath(), $"launcher_copyright_{Guid.NewGuid()}.txt");
+            Assembly assembly = Assembly.GetExecutingAssembly();
+            string resourceName = assembly.GetManifestResourceNames().Single(str => str.EndsWith("LicenseInfoFull.txt"));
+            using Stream stream = assembly.GetManifestResourceStream(resourceName);
+            using (StreamWriter fileStream = File.CreateText(license_file_name))
+            {
+                stream.CopyTo(fileStream.BaseStream);
+            }
+            ProcessStartInfo startInfo = new(license_file_name);
+            startInfo.UseShellExecute = true;
+            System.Diagnostics.Process.Start(startInfo);
+        }
     }
 }

Launcher/FilePicker.cs

@@ -1,5 +1,4 @@
-using Microsoft.WindowsAPICodePack.Dialogs;
-using System;
+using System;
 using System.IO;
 using System.Windows.Forms;
 using ToolkitLauncher.ToolkitInterface;
@@ -59,16 +58,10 @@ public FilePicker(System.Windows.Controls.TextBox box, ToolkitBase toolkit, Opti
 		this.toolkitInterface = toolkit;
 		this.options = options;
 		if (options.IsFolderSelect()) {
-			folderDialog = new CommonOpenFileDialog();
-			folderDialog.Title = options.title;
-			folderDialog.IsFolderPicker = true;
+			folderDialog = new FolderBrowserDialog();
+			folderDialog.Description = options.title;
 
-			folderDialog.AllowNonFileSystemItems = false;
-			folderDialog.EnsureFileExists = true;
-			folderDialog.EnsurePathExists = true;
-			folderDialog.Multiselect = false;
-			folderDialog.ShowPlacesList = true;
-			folderDialog.InitialDirectory = InitialDirectory;
+			folderDialog.SelectedPath = InitialDirectory;
 		} else {
 			fileDialog = new OpenFileDialog();
 			fileDialog.Title = options.title;
@@ -80,9 +73,9 @@ public bool Prompt()
     {
 		if (folderDialog is null && fileDialog is null)
 			throw new InvalidOperationException("No valid dialog");
-		if (folderDialog is not null && folderDialog.ShowDialog() == CommonFileDialogResult.Ok)
+		if (folderDialog is not null && folderDialog.ShowDialog() == DialogResult.OK)
         {
-			return ProcessInput(folderDialog.FileName);
+			return ProcessInput(folderDialog.SelectedPath);
 		}
 		if (fileDialog is not null && fileDialog.ShowDialog() == DialogResult.OK)
 		{
@@ -144,7 +137,7 @@ bool ProcessInput(string path)
 #nullable restore
 
 	private OpenFileDialog fileDialog;
-	private CommonOpenFileDialog folderDialog;
+	private FolderBrowserDialog folderDialog;
 	private System.Windows.Controls.TextBox textBox;
 	private ToolkitBase toolkitInterface;
 	private Options options;