Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

theme change

This commit is contained in:
Bitl 2020-05-29 10:06:43 -07:00
parent 2622b8e60a
commit 040e7d7913
24 changed files with 35066 additions and 6600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NovetusLauncher/NovetusFuncs/GlobalVars.cs
View File

@ -25,7 +25,6 @@ public static class Env
public static class GlobalVars
{
public static bool OldLayout = false;
public static readonly string RootPathLauncher = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
public static readonly string BasePathLauncher = RootPathLauncher.Replace(@"\", @"\\");
public static readonly string RootPath = Directory.GetParent(RootPathLauncher).ToString();
@ -163,8 +162,9 @@ public static class GlobalVars
//launcher settings.
public static bool CloseOnLaunch = false;
public static bool LocalPlayMode = false;
//client shit
public static string SelectedClient = "";
public static bool OldLayout = false;
//client shit
public static string SelectedClient = "";
public static string DefaultClient = "";
public static string RegisterClient1 = "";
public static string RegisterClient2 = "";

14
NovetusLauncher/NovetusFuncs/LauncherFuncs.cs
View File

@ -57,6 +57,7 @@ public class LauncherFuncs
ini.IniWriteValue(section, "GraphicsMode", GlobalVars.GraphicsMode.ToString());
ini.IniWriteValue(section, "ReShade", GlobalVars.ReShade.ToString());
ini.IniWriteValue(section, "QualityLevel", GlobalVars.QualityLevel.ToString());
ini.IniWriteValue(section, "OldLayout", GlobalVars.OldLayout.ToString());
}
else
{
@ -64,7 +65,7 @@ public class LauncherFuncs
string Decryptline1, Decryptline2, Decryptline3, Decryptline4,
Decryptline5, Decryptline6, Decryptline7, Decryptline9, Decryptline10,
Decryptline11, Decryptline12, Decryptline13, Decryptline14, Decryptline15,
Decryptline16, Decryptline17, Decryptline20;
Decryptline16, Decryptline17, Decryptline20, Decryptline21;
IniFile ini = new IniFile(cfgpath);
@ -207,6 +208,14 @@ public class LauncherFuncs
Decryptline20 = ini.IniReadValue(section, "QualityLevel");
}
Decryptline21 = ini.IniReadValue(section, "OldLayout");
if (string.IsNullOrWhiteSpace(Decryptline21))
{
ini.IniWriteValue(section, "OldLayout", GlobalVars.OldLayout.ToString());
Decryptline21 = ini.IniReadValue(section, "OldLayout");
}
bool bline1 = Convert.ToBoolean(Decryptline1);
GlobalVars.CloseOnLaunch = bline1;
@ -264,6 +273,8 @@ public class LauncherFuncs
GlobalVars.ReShade = bline17;
int iline20 = Convert.ToInt32(Decryptline20);
GlobalVars.QualityLevel = iline20;
bool bline21 = Convert.ToBoolean(Decryptline21);
GlobalVars.OldLayout = bline21;
}
Customization(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization, write);
@ -670,6 +681,7 @@ public class LauncherFuncs
GlobalVars.GraphicsMode = 1;
GlobalVars.ReShade = true;
GlobalVars.QualityLevel = 5;
GlobalVars.OldLayout = false;
ResetCustomizationValues();
}

3671
NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2041
NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

57
NovetusLauncher/NovetusLauncher/CharacterCustomization.cs → NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs
View File

@ -33,16 +33,8 @@ namespace NovetusLauncher
InitializeComponent();
InitColors();
if (GlobalVars.OldLayout == false)
{
Size = new Size(671, 337);
panel2.Size = new Size(568, 302);
}
else
{
Size = new Size(483, 301);
}
Size = new Size(671, 337);
panel2.Size = new Size(568, 302);
//
// TODO: Add constructor code after the InitializeComponent() call.
@ -154,10 +146,7 @@ namespace NovetusLauncher
{
if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage1"])//your specific tabname
{
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -170,10 +159,7 @@ namespace NovetusLauncher
}
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage7"])
{
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -198,10 +184,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage2"])//your specific tabname
{
//hats
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 239);
}
panel3.Location = new Point(110, 239);
listBox4.Items.Clear();
listBox5.Items.Clear();
listBox6.Items.Clear();
@ -267,10 +250,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage3"])//your specific tabname
{
//faces
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -311,10 +291,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage4"])//your specific tabname
{
//faces
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -355,10 +332,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage5"])//your specific tabname
{
//faces
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -399,10 +373,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage6"])//your specific tabname
{
//faces
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -443,10 +414,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage8"])//your specific tabname
{
//faces
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();
@ -487,10 +455,7 @@ namespace NovetusLauncher
else if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage9"])//your specific tabname
{
//faces
if (GlobalVars.OldLayout == false)
{
panel3.Location = new Point(110, 359);
}
panel3.Location = new Point(110, 359);
listBox1.Items.Clear();
listBox2.Items.Clear();
listBox3.Items.Clear();

0
NovetusLauncher/NovetusLauncher/CharacterCustomization.resx → NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.resx
View File

1784
NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

1772
NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs Normal file
View File

File diff suppressed because it is too large Load Diff

2608
NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.resx Normal file
View File

File diff suppressed because it is too large Load Diff

0
NovetusLauncher/NovetusLauncher/Resources/BC.png → NovetusLauncher/NovetusLauncher/CharacterCustomization/Resources/BC.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 170 KiB

0
NovetusLauncher/NovetusLauncher/Resources/BC_legacy.png → NovetusLauncher/NovetusLauncher/CharacterCustomization/Resources/BC_legacy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
NovetusLauncher/NovetusLauncher/Resources/OBC.png → NovetusLauncher/NovetusLauncher/CharacterCustomization/Resources/OBC.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 141 KiB

0
NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png → NovetusLauncher/NovetusLauncher/CharacterCustomization/Resources/OBC_legacy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
NovetusLauncher/NovetusLauncher/Resources/TBC.png → NovetusLauncher/NovetusLauncher/CharacterCustomization/Resources/TBC.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 153 KiB

After

Width:  |  Height:  |  Size: 153 KiB

0
NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png → NovetusLauncher/NovetusLauncher/CharacterCustomization/Resources/TBC_legacy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

2721
NovetusLauncher/NovetusLauncher/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1578
NovetusLauncher/NovetusLauncher/MainForm/MainForm.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

237
NovetusLauncher/NovetusLauncher/MainForm.cs → NovetusLauncher/NovetusLauncher/MainForm/MainForm.cs
View File

@ -35,21 +35,12 @@ namespace NovetusLauncher
InitializeComponent();
if (GlobalVars.OldLayout == false)
{
Size = new Size(745, 377);
panel2.Size = new Size(646, 272);
}
else
{
Size = new Size(427, 395);
panel2.Visible = false;
}
//
// TODO: Add constructor code after the InitializeComponent() call.
//
}
Size = new Size(745, 377);
panel2.Size = new Size(646, 272);
//
// TODO: Add constructor code after the InitializeComponent() call.
//
}
public void InitUPnP()
{
@ -541,7 +532,7 @@ namespace NovetusLauncher
{
LauncherFuncs.Config(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName, false);
checkBox1.Checked = GlobalVars.CloseOnLaunch;
checkBox1.Checked = GlobalVars.CloseOnLaunch;
textBox5.Text = GlobalVars.UserID.ToString();
label18.Text = GlobalVars.PlayerTripcode.ToString();
numericUpDown3.Value = Convert.ToDecimal(GlobalVars.PlayerLimit);
@ -558,43 +549,40 @@ namespace NovetusLauncher
label38.Text = GlobalVars.RobloxPort.ToString();
checkBox4.Checked = GlobalVars.UPnP;
checkBox2.Checked = GlobalVars.DiscordPresence;
if (!GlobalVars.OldLayout)
checkBox5.Checked = GlobalVars.ReShade;
checkBox6.Checked = GlobalVars.ReShadeFPSDisplay;
checkBox7.Checked = GlobalVars.ReShadePerformanceMode;
if (GlobalVars.GraphicsMode == 1)
{
checkBox5.Checked = GlobalVars.ReShade;
checkBox6.Checked = GlobalVars.ReShadeFPSDisplay;
checkBox7.Checked = GlobalVars.ReShadePerformanceMode;
if (GlobalVars.GraphicsMode == 1)
{
comboBox1.SelectedIndex = 0;
}
else if (GlobalVars.GraphicsMode == 2)
{
comboBox1.SelectedIndex = 1;
}
if (GlobalVars.QualityLevel == 1)
{
comboBox2.SelectedIndex = 0;
}
else if (GlobalVars.QualityLevel == 2)
{
comboBox2.SelectedIndex = 1;
}
else if (GlobalVars.QualityLevel == 3)
{
comboBox2.SelectedIndex = 2;
}
else if (GlobalVars.QualityLevel == 4)
{
comboBox2.SelectedIndex = 3;
}
else if (GlobalVars.QualityLevel == 5)
{
comboBox2.SelectedIndex = 4;
}
comboBox1.SelectedIndex = 0;
}
else if (GlobalVars.GraphicsMode == 2)
{
comboBox1.SelectedIndex = 1;
}
ConsolePrint("Config loaded.", 3);
if (GlobalVars.QualityLevel == 1)
{
comboBox2.SelectedIndex = 0;
}
else if (GlobalVars.QualityLevel == 2)
{
comboBox2.SelectedIndex = 1;
}
else if (GlobalVars.QualityLevel == 3)
{
comboBox2.SelectedIndex = 2;
}
else if (GlobalVars.QualityLevel == 4)
{
comboBox2.SelectedIndex = 3;
}
else if (GlobalVars.QualityLevel == 5)
{
comboBox2.SelectedIndex = 4;
}
ConsolePrint("Config loaded.", 3);
ReadClientValues(GlobalVars.SelectedClient);
}
@ -1805,122 +1793,81 @@ namespace NovetusLauncher
private void checkBox5_CheckedChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
if (checkBox5.Checked == true)
{
if (checkBox5.Checked == true)
{
GlobalVars.ReShade = true;
}
else if (checkBox5.Checked == false)
{
GlobalVars.ReShade = false;
}
GlobalVars.ReShade = true;
}
}
else if (checkBox5.Checked == false)
{
GlobalVars.ReShade = false;
}
}
private void checkBox6_CheckedChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
if (checkBox6.Checked == true)
{
if (checkBox6.Checked == true)
{
GlobalVars.ReShadeFPSDisplay = true;
}
else if (checkBox6.Checked == false)
{
GlobalVars.ReShadeFPSDisplay = false;
}
GlobalVars.ReShadeFPSDisplay = true;
}
}
else if (checkBox6.Checked == false)
{
GlobalVars.ReShadeFPSDisplay = false;
}
}
private void checkBox7_CheckedChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
if (checkBox7.Checked == true)
{
if (checkBox7.Checked == true)
{
GlobalVars.ReShadePerformanceMode = true;
}
else if (checkBox7.Checked == false)
{
GlobalVars.ReShadePerformanceMode = false;
}
GlobalVars.ReShadePerformanceMode = true;
}
}
else if (checkBox7.Checked == false)
{
GlobalVars.ReShadePerformanceMode = false;
}
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
if (comboBox1.SelectedIndex == 0)
{
if (comboBox1.SelectedIndex == 0)
{
GlobalVars.GraphicsMode = 1;
}
else if (comboBox1.SelectedIndex == 1)
{
GlobalVars.GraphicsMode = 2;
}
GlobalVars.GraphicsMode = 1;
}
}
else if (comboBox1.SelectedIndex == 1)
{
GlobalVars.GraphicsMode = 2;
}
}
private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
{
if (!GlobalVars.OldLayout)
if (comboBox2.SelectedIndex == 0)
{
if (comboBox2.SelectedIndex == 0)
{
GlobalVars.QualityLevel = 1;
}
else if (comboBox2.SelectedIndex == 1)
{
GlobalVars.QualityLevel = 2;
}
else if (comboBox2.SelectedIndex == 2)
{
GlobalVars.QualityLevel = 3;
}
else if (comboBox2.SelectedIndex == 3)
{
GlobalVars.QualityLevel = 4;
}
else if (comboBox2.SelectedIndex == 4)
{
GlobalVars.QualityLevel = 5;
}
GlobalVars.QualityLevel = 1;
}
else if (comboBox2.SelectedIndex == 1)
{
GlobalVars.QualityLevel = 2;
}
else if (comboBox2.SelectedIndex == 2)
{
GlobalVars.QualityLevel = 3;
}
else if (comboBox2.SelectedIndex == 3)
{
GlobalVars.QualityLevel = 4;
}
else if (comboBox2.SelectedIndex == 4)
{
GlobalVars.QualityLevel = 5;
}
}
private void button36_Click(object sender, EventArgs e)
{
GlobalVars.OldLayout = true;
WriteConfigValues();
Application.Restart();
}
void SettingsButtonClick(object sender, EventArgs e)
{
if (GlobalVars.OldLayout)
{
NovetusSettings im = new NovetusSettings();
im.Show();
}
}
void Button3Click_legacy(object sender, EventArgs e)
{
if (GlobalVars.OldLayout)
{
DialogResult result = MessageBox.Show("If you want to test out your place, you will have to save your place in Novetus's map folder, then launch your place in Play Solo." + Environment.NewLine + Environment.NewLine + "Press Yes to launch Studio with a map, or No to launch Studio without a map.", "Novetus - Launch ROBLOX Studio", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Information);
bool nomap = false;
if (result == DialogResult.Cancel)
{
return;
}
else if (result == DialogResult.No)
{
nomap = true;
}
WriteConfigValues();
StartStudio(nomap);
if (GlobalVars.CloseOnLaunch == true)
{
Visible = false;
}
}
}
}
}
}

0
NovetusLauncher/NovetusLauncher/MainForm.resx → NovetusLauncher/NovetusLauncher/MainForm/MainForm.resx
View File

1482
NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

1794
NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.cs Normal file
View File

File diff suppressed because it is too large Load Diff

21854
NovetusLauncher/NovetusLauncher/MainForm/MainForm_legacy.resx Normal file
View File

File diff suppressed because it is too large Load Diff

30
NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
View File

@ -121,13 +121,25 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CharacterCustomization.cs">
<Compile Include="CharacterCustomization\CharacterCustomization_legacy.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CharacterCustomization.Designer.cs">
<Compile Include="CharacterCustomization\CharacterCustomization_legacy.Designer.cs">
<DependentUpon>CharacterCustomization_legacy.cs</DependentUpon>
</Compile>
<Compile Include="CharacterCustomization\CharacterCustomization.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CharacterCustomization\CharacterCustomization.Designer.cs">
<DependentUpon>CharacterCustomization.cs</DependentUpon>
</Compile>
<Compile Include="LocalVars.cs" />
<Compile Include="MainForm\MainForm_legacy.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainForm\MainForm_legacy.Designer.cs">
<DependentUpon>MainForm_legacy.cs</DependentUpon>
</Compile>
<Compile Include="NovetusSettings.cs">
<SubType>Form</SubType>
</Compile>
@ -187,19 +199,25 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="MainForm.cs">
<Compile Include="MainForm\MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainForm.Designer.cs">
<Compile Include="MainForm\MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="CharacterCustomization.resx">
<EmbeddedResource Include="CharacterCustomization\CharacterCustomization_legacy.resx">
<DependentUpon>CharacterCustomization_legacy.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CharacterCustomization\CharacterCustomization.resx">
<DependentUpon>CharacterCustomization.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainForm\MainForm_legacy.resx">
<DependentUpon>MainForm_legacy.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="NovetusSettings.resx">
<DependentUpon>NovetusSettings.cs</DependentUpon>
</EmbeddedResource>
@ -221,7 +239,7 @@
<EmbeddedResource Include="SDK\SplashTester.resx">
<DependentUpon>SplashTester.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<EmbeddedResource Include="MainForm\MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SDK\NovetusSDK.resx">

17
NovetusLauncher/NovetusLauncher/Program.cs
View File

@ -31,7 +31,16 @@ namespace NovetusLauncher
Application.SetCompatibleTextRenderingDefault(false);
if (args.Length == 0)
{
Application.Run(new MainForm());
//read from our config to determine which clients to load.
LauncherFuncs.Config(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName, false);
if (GlobalVars.OldLayout == false)
{
Application.Run(new MainForm());
}
else
{
Application.Run(new MainForm_legacy());
}
}
else
{
@ -40,12 +49,6 @@ namespace NovetusLauncher
GlobalVars.SharedArgs = ProcessInput(s);
}
if (GlobalVars.SharedArgs.Equals("-oldlayout"))
{
GlobalVars.OldLayout = true;
Application.Run(new MainForm());
}
if (GlobalVars.SharedArgs.Equals("-sdk"))
{
Application.Run(new NovetusSDK());