redesign pass 1

This commit is contained in:
Bitl 2020-03-24 13:47:15 -07:00
parent b60997e76a
commit 62f484bb6b
6 changed files with 398 additions and 19904 deletions

View File

@ -166,3 +166,20 @@ static class SubstringExtensions
return value.Substring(adjustedPosA);
}
}
//credit to https://stackoverflow.com/questions/23247941/c-sharp-how-to-remove-tabcontrol-border
public partial class TabControlWithoutHeader : TabControl
{
public TabControlWithoutHeader()
{
if (!DesignMode) Multiline = true;
}
protected override void WndProc(ref Message m)
{
if (m.Msg == 0x1328 && !DesignMode)
m.Result = new IntPtr(1);
else
base.WndProc(ref m);
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1609,5 +1609,45 @@ namespace NovetusLauncher
MessageBox.Show("Restart the launcher to apply changes.");
}
}
private void button27_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage1;
}
private void button20_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage2;
}
private void button28_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage3;
}
private void button29_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage4;
}
private void button30_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage6;
}
private void button31_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage7;
}
private void button32_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage8;
}
private void button33_Click(object sender, EventArgs e)
{
tabControl1.SelectedTab = tabPage5;
}
}
}

View File

@ -37,201 +37,41 @@ namespace NovetusLauncher
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SplashTester));
this.textBox5 = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.textBox2 = new System.Windows.Forms.TextBox();
this.button4 = new System.Windows.Forms.Button();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.label25 = new System.Windows.Forms.Label();
this.label26 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label();
this.label28 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.button25 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button();
this.button21 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.Preview = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// textBox5
//
this.textBox5.Enabled = false;
this.textBox5.Location = new System.Drawing.Point(95, 53);
this.textBox5.Multiline = true;
this.textBox5.Name = "textBox5";
this.textBox5.ReadOnly = true;
this.textBox5.Size = new System.Drawing.Size(71, 18);
this.textBox5.TabIndex = 20;
this.textBox5.Text = "0";
this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label15
//
this.label15.Location = new System.Drawing.Point(55, 34);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(40, 16);
this.label15.TabIndex = 12;
this.label15.Text = "Name:";
//
// label13
//
this.label13.Location = new System.Drawing.Point(55, 55);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(34, 13);
this.label13.TabIndex = 7;
this.label13.Text = "ID:";
//
// textBox2
//
this.textBox2.Enabled = false;
this.textBox2.Location = new System.Drawing.Point(95, 31);
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.textBox2.Size = new System.Drawing.Size(121, 20);
this.textBox2.TabIndex = 11;
this.textBox2.Text = "Player";
this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// button4
//
this.button4.Enabled = false;
this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button4.Location = new System.Drawing.Point(169, 52);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(48, 20);
this.button4.TabIndex = 9;
this.button4.Text = "Regen";
this.button4.UseVisualStyleBackColor = true;
//
// pictureBox2
//
this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage")));
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pictureBox2.Location = new System.Drawing.Point(6, 12);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(43, 41);
this.pictureBox2.TabIndex = 7;
this.pictureBox2.TabStop = false;
//
// label25
//
this.label25.Location = new System.Drawing.Point(55, 4);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(109, 14);
this.label25.TabIndex = 16;
this.label25.Text = "SELECTED CLIENT:";
//
// label26
//
this.label26.Location = new System.Drawing.Point(160, 4);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(245, 13);
this.label26.TabIndex = 17;
this.label26.Text = "2009E";
//
// label27
//
this.label27.Location = new System.Drawing.Point(55, 18);
this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(95, 12);
this.label27.TabIndex = 18;
this.label27.Text = "SELECTED MAP:";
//
// label28
//
this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label28.Location = new System.Drawing.Point(145, 18);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(260, 12);
this.label28.TabIndex = 19;
this.label28.Text = "Baseplate.rbxl";
//
// label11
//
this.label11.Location = new System.Drawing.Point(4, 51);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(47, 25);
this.label11.TabIndex = 50;
this.label11.Text = "v1.0";
this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// label12
//
this.label12.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.label12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label12.ForeColor = System.Drawing.Color.Black;
this.label12.Location = new System.Drawing.Point(223, 51);
this.label12.Location = new System.Drawing.Point(28, 22);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(192, 21);
this.label12.Size = new System.Drawing.Size(214, 17);
this.label12.TabIndex = 0;
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label16
//
this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.label16.Location = new System.Drawing.Point(54, 6);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(2, 65);
this.label16.TabIndex = 51;
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(7, 79);
this.textBox1.Location = new System.Drawing.Point(7, 58);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(399, 20);
this.textBox1.Size = new System.Drawing.Size(265, 39);
this.textBox1.TabIndex = 52;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
//
// button25
// Preview
//
this.button25.Enabled = false;
this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button25.Location = new System.Drawing.Point(315, 31);
this.button25.Name = "button25";
this.button25.Size = new System.Drawing.Size(63, 20);
this.button25.TabIndex = 60;
this.button25.Text = "Install Mod";
this.button25.UseVisualStyleBackColor = true;
//
// button3
//
this.button3.Enabled = false;
this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button3.Location = new System.Drawing.Point(271, 31);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(43, 20);
this.button3.TabIndex = 57;
this.button3.Text = "Studio";
this.button3.UseVisualStyleBackColor = true;
//
// button8
//
this.button8.Enabled = false;
this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button8.Location = new System.Drawing.Point(223, 31);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(47, 20);
this.button8.TabIndex = 58;
this.button8.Text = "Avatar";
this.button8.UseVisualStyleBackColor = true;
//
// button21
//
this.button21.Enabled = false;
this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button21.Location = new System.Drawing.Point(380, 31);
this.button21.Name = "button21";
this.button21.Size = new System.Drawing.Size(35, 20);
this.button21.TabIndex = 59;
this.button21.Text = "URI";
this.button21.UseVisualStyleBackColor = true;
this.Preview.AutoSize = true;
this.Preview.Location = new System.Drawing.Point(115, 9);
this.Preview.Name = "Preview";
this.Preview.Size = new System.Drawing.Size(45, 13);
this.Preview.TabIndex = 53;
this.Preview.Text = "Preview";
//
// SplashTester
//
@ -239,54 +79,22 @@ namespace NovetusLauncher
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.ClientSize = new System.Drawing.Size(417, 109);
this.Controls.Add(this.button25);
this.Controls.Add(this.button3);
this.Controls.Add(this.button8);
this.Controls.Add(this.button21);
this.ClientSize = new System.Drawing.Size(285, 109);
this.Controls.Add(this.Preview);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.label16);
this.Controls.Add(this.label12);
this.Controls.Add(this.label28);
this.Controls.Add(this.label11);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.label13);
this.Controls.Add(this.label15);
this.Controls.Add(this.button4);
this.Controls.Add(this.textBox5);
this.Controls.Add(this.label27);
this.Controls.Add(this.label26);
this.Controls.Add(this.label25);
this.Controls.Add(this.textBox2);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "SplashTester";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Splash Tester";
this.Load += new System.EventHandler(this.SplashTester_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Label label28;
private System.Windows.Forms.Label label27;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.Label label25;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Button button25;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button8;
private System.Windows.Forms.Button button21;
private System.Windows.Forms.Label Preview;
}
}

View File

@ -40,28 +40,5 @@ namespace NovetusLauncher
{
label12.Text = textBox1.Text;
}
private void SplashTester_Load(object sender, EventArgs e)
{
string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO
string version = lines[0].Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString());
GlobalVars.DefaultClient = lines[1];
GlobalVars.DefaultMap = lines[2];
GlobalVars.SelectedClient = GlobalVars.DefaultClient;
GlobalVars.Map = GlobalVars.DefaultMap;
label11.Text = version;
GlobalVars.Version = version;
ReadConfigValues();
}
void ReadConfigValues()
{
LauncherFuncs.ReadConfigValues(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName);
textBox5.Text = GlobalVars.UserID.ToString();
textBox2.Text = GlobalVars.PlayerName;
label26.Text = GlobalVars.SelectedClient;
label28.Text = GlobalVars.Map;
}
}
}

File diff suppressed because it is too large Load Diff