diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj index 17848f8..85a0f7c 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj @@ -61,9 +61,6 @@ - - ..\..\..\..\..\..\..\OneDrive\Documents\Visual Studio 2015\Projects\Zulas OS - Lite\Zulas OS - Lite\bin\Debug\AxInterop.WMPLib.dll - ..\..\..\old\upd_extract_Source\upd_extract\bin\x86\Release\Ionic.Zip.dll @@ -119,15 +116,19 @@ dev_faq.cs + Designer dev_settings.cs + Designer FormMain.cs + Designer main_load.cs + Designer ResXFileCodeGenerator diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.sln b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.sln new file mode 100644 index 0000000..bd55d31 --- /dev/null +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "3DNUS Material Edition", "3DNUS Material Edition.csproj", "{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|x86.ActiveCfg = Debug|x86 + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|x86.Build.0 = Debug|x86 + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|Any CPU.Build.0 = Release|Any CPU + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|x86.ActiveCfg = Release|x86 + {86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config index ec3d97d..742767c 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config @@ -28,6 +28,9 @@ + + + \ No newline at end of file diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/FormMain.cs b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/FormMain.cs index 79e8059..9fa3628 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/FormMain.cs +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/FormMain.cs @@ -122,14 +122,19 @@ private void Form1_Load(object sender, EventArgs e) // Process.Start(cd + "\\3DNUS Upd - Lite.exe"); t_log.Text += " " + DateTime.Now; - DialogResult dialogResult = MessageBox.Show("All components that are used in 3DNUS are either created by Me, or other users; these components are Open-Source, and can not be distributed for any cost. \r\nThis also includes 3DNUS, and/or it's Components. \r\n \r\nIF you paid for 3DNUS or any other of its components, please demand your Money back Immediately! \r\nAlso, report where you Purchased 3DNUS or as a Bundle. \r\nWe are NOT affiliated with Nintendo, or any other Company. \r\n \r\nThis project is Non-Profit, meaning it will always be Free, and is maintained by Volunteers. \r\nBy using this Program, you agree to these Terms. \r\n \r\nDo you agree to these Terms? \r\n \r\nIn order to access other menu's, right-click the main Window. \r\n \r\nCaution: Some parts of 3DNUS may have some Loud Bck Music!", "Legal Terms:", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation); - if (dialogResult == DialogResult.Yes) + if(Properties.Settings.Default.eula_read != "yiss") { - } - else if (dialogResult == DialogResult.No) - { - MessageBox.Show("You have chosen to NOT agree to the Terms, therefor the Program will now Close.", "Legal Terms:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - Application.Exit(); + DialogResult dialogResult = MessageBox.Show("All components that are used in 3DNUS are either created by Me, or other users; these components are Open-Source, and can not be distributed for any cost. \r\nThis also includes 3DNUS, and/or it's Components. \r\n \r\nIF you paid for 3DNUS or any other of its components, please demand your Money back Immediately! \r\nAlso, report where you Purchased 3DNUS or as a Bundle. \r\nWe are NOT affiliated with Nintendo, or any other Company. \r\n \r\nThis project is Non-Profit, meaning it will always be Free, and is maintained by Volunteers. \r\nBy using this Program, you agree to these Terms. \r\n \r\nDo you agree to these Terms? \r\n \r\nIn order to access other menu's, right-click the main Window. \r\n \r\nCaution: Some parts of 3DNUS may have some Loud Bck Music!", "Legal Terms:", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation); + if(dialogResult == DialogResult.Yes) + { + Properties.Settings.Default.eula_read = "yiss"; + Properties.Settings.Default.Save(); + } + else if(dialogResult == DialogResult.No) + { + MessageBox.Show("You have chosen to NOT agree to the Terms, therefor the Program will now Close.", "Legal Terms:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + Application.Exit(); + } } //} //catch diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs index e8612b7..5320ef8 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs @@ -32,5 +32,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("2.8.0.0")] -[assembly: AssemblyFileVersion("2.8.0.0")] +[assembly: AssemblyVersion("2.8.0.1")] +[assembly: AssemblyFileVersion("2.8.0.1")] diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs index 80b3c96..b452206 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace _3DNUS_Material_Edition.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -94,5 +94,17 @@ public string dev_mode { this["dev_mode"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string eula_read { + get { + return ((string)(this["eula_read"])); + } + set { + this["eula_read"] = value; + } + } } } diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.settings b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.settings index 86a437d..0584884 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.settings +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.settings @@ -20,5 +20,8 @@ + + + \ No newline at end of file diff --git a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/main_load.cs b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/main_load.cs index ac25027..33e6b22 100644 --- a/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/main_load.cs +++ b/Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/main_load.cs @@ -20,6 +20,8 @@ public partial class main_load : Form private bool is64 = System.Environment.Is64BitOperatingSystem; private bool checksum; + FormMain frm; + public main_load() { InitializeComponent(); @@ -77,14 +79,20 @@ private void main_load_Load(object sender, EventArgs e) { Properties.Settings.Default.dev_music = "0"; Properties.Settings.Default.Save(); - Application.Restart(); + //Application.Restart(); } if (Properties.Settings.Default.dev_auto_upd == "") { Properties.Settings.Default.dev_auto_upd = "1"; Properties.Settings.Default.Save(); - Application.Restart(); + //Application.Restart(); + } + if(Properties.Settings.Default.eula_read == "") + { + Properties.Settings.Default.eula_read = "nope"; + Properties.Settings.Default.Save(); } + /* if (Properties.Settings.Default.dev_auto_upd == "1") { try @@ -143,16 +151,16 @@ private void main_load_Load(object sender, EventArgs e) } } else - { - splash_timer.Start(); - } + {*/ + frm = new FormMain(); + splash_timer.Start(); + //} } private void timer1_Tick(object sender, EventArgs e) { splash_timer.Stop(); - FormMain f = new FormMain(); - f.Show(); + frm.Show(); Hide(); }