Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit 6b1de70

Browse files
SonoSooSSonoSooS
committed
Bump version to 2.8.0.1
+ added EULA read checker * reduced loading time
1 parent b06f51f commit 6b1de70

File tree

8 files changed

+79
-21
lines changed

8 files changed

+79
-21
lines changed

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
</PropertyGroup>
6262
<PropertyGroup />
6363
<ItemGroup>
64-
<Reference Include="AxInterop.WMPLib">
65-
<HintPath>..\..\..\..\..\..\..\OneDrive\Documents\Visual Studio 2015\Projects\Zulas OS - Lite\Zulas OS - Lite\bin\Debug\AxInterop.WMPLib.dll</HintPath>
66-
</Reference>
6764
<Reference Include="Ionic.Zip">
6865
<HintPath>..\..\..\old\upd_extract_Source\upd_extract\bin\x86\Release\Ionic.Zip.dll</HintPath>
6966
</Reference>
@@ -119,15 +116,19 @@
119116
<Compile Include="YLS.cs" />
120117
<EmbeddedResource Include="dev_faq.resx">
121118
<DependentUpon>dev_faq.cs</DependentUpon>
119+
<SubType>Designer</SubType>
122120
</EmbeddedResource>
123121
<EmbeddedResource Include="dev_settings.resx">
124122
<DependentUpon>dev_settings.cs</DependentUpon>
123+
<SubType>Designer</SubType>
125124
</EmbeddedResource>
126125
<EmbeddedResource Include="FormMain.resx">
127126
<DependentUpon>FormMain.cs</DependentUpon>
127+
<SubType>Designer</SubType>
128128
</EmbeddedResource>
129129
<EmbeddedResource Include="main_load.resx">
130130
<DependentUpon>main_load.cs</DependentUpon>
131+
<SubType>Designer</SubType>
131132
</EmbeddedResource>
132133
<EmbeddedResource Include="Properties\Resources.resx">
133134
<Generator>ResXFileCodeGenerator</Generator>

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.sln‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "3DNUS Material Edition", "3DNUS Material Edition.csproj", "{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|Any CPU = Debug|Any CPU
9+
Debug|x86 = Debug|x86
10+
Release|Any CPU = Release|Any CPU
11+
Release|x86 = Release|x86
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|x86.ActiveCfg = Debug|x86
17+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Debug|x86.Build.0 = Debug|x86
18+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|x86.ActiveCfg = Release|x86
21+
{86EA0C30-AC5D-4955-9C6A-7304D5066F1C}.Release|x86.Build.0 = Release|x86
22+
EndGlobalSection
23+
GlobalSection(SolutionProperties) = preSolution
24+
HideSolutionNode = FALSE
25+
EndGlobalSection
26+
EndGlobal

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<setting name="dev_mode" serializeAs="String">
2929
<value />
3030
</setting>
31+
<setting name="eula_read" serializeAs="String">
32+
<value />
33+
</setting>
3134
</_3DNUS_Material_Edition.Properties.Settings>
3235
</userSettings>
3336
</configuration>

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/FormMain.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,19 @@ private void Form1_Load(object sender, EventArgs e)
122122
// Process.Start(cd + "\\3DNUS Upd - Lite.exe");
123123
t_log.Text += " " + DateTime.Now;
124124

125-
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);
126-
if (dialogResult == DialogResult.Yes)
125+
if(Properties.Settings.Default.eula_read != "yiss")
127126
{
128-
}
129-
else if (dialogResult == DialogResult.No)
130-
{
131-
MessageBox.Show("You have chosen to NOT agree to the Terms, therefor the Program will now Close.", "Legal Terms:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
132-
Application.Exit();
127+
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);
128+
if(dialogResult == DialogResult.Yes)
129+
{
130+
Properties.Settings.Default.eula_read = "yiss";
131+
Properties.Settings.Default.Save();
132+
}
133+
else if(dialogResult == DialogResult.No)
134+
{
135+
MessageBox.Show("You have chosen to NOT agree to the Terms, therefor the Program will now Close.", "Legal Terms:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
136+
Application.Exit();
137+
}
133138
}
134139
//}
135140
//catch

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.8.0.0")]
36-
[assembly: AssemblyFileVersion("2.8.0.0")]
35+
[assembly: AssemblyVersion("2.8.0.1")]
36+
[assembly: AssemblyFileVersion("2.8.0.1")]

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs‎

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

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.settings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@
2020
<Setting Name="dev_mode" Type="System.String" Scope="User">
2121
<Value Profile="(Default)" />
2222
</Setting>
23+
<Setting Name="eula_read" Type="System.String" Scope="User">
24+
<Value Profile="(Default)" />
25+
</Setting>
2326
</Settings>
2427
</SettingsFile>

‎Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/main_load.cs‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public partial class main_load : Form
2020
private bool is64 = System.Environment.Is64BitOperatingSystem;
2121
private bool checksum;
2222

23+
FormMain frm;
24+
2325
public main_load()
2426
{
2527
InitializeComponent();
@@ -77,14 +79,20 @@ private void main_load_Load(object sender, EventArgs e)
7779
{
7880
Properties.Settings.Default.dev_music = "0";
7981
Properties.Settings.Default.Save();
80-
Application.Restart();
82+
//Application.Restart();
8183
}
8284
if (Properties.Settings.Default.dev_auto_upd == "")
8385
{
8486
Properties.Settings.Default.dev_auto_upd = "1";
8587
Properties.Settings.Default.Save();
86-
Application.Restart();
88+
//Application.Restart();
89+
}
90+
if(Properties.Settings.Default.eula_read == "")
91+
{
92+
Properties.Settings.Default.eula_read = "nope";
93+
Properties.Settings.Default.Save();
8794
}
95+
/*
8896
if (Properties.Settings.Default.dev_auto_upd == "1")
8997
{
9098
try
@@ -143,16 +151,16 @@ private void main_load_Load(object sender, EventArgs e)
143151
}
144152
}
145153
else
146-
{
147-
splash_timer.Start();
148-
}
154+
{*/
155+
frm = new FormMain();
156+
splash_timer.Start();
157+
//}
149158
}
150159

151160
private void timer1_Tick(object sender, EventArgs e)
152161
{
153162
splash_timer.Stop();
154-
FormMain f = new FormMain();
155-
f.Show();
163+
frm.Show();
156164
Hide();
157165
}
158166

0 commit comments

Comments
 (0)