From 9e41bdba3362c6f934cfdab59fe6206409297ab4 Mon Sep 17 00:00:00 2001 From: Bitl Date: Thu, 2 Jul 2020 18:51:16 -0700 Subject: [PATCH] added url switcher and made the whole thing function. added a note for implementing the save/load implementation later --- .../CharacterCustomization.Designer.cs | 158 +++++++++++------ .../CharacterCustomization.cs | 61 ++++++- .../CharacterCustomization.resx | 2 +- .../CharacterCustomization_legacy.Designer.cs | 159 ++++++++++++------ .../CharacterCustomization_legacy.cs | 46 ++++- 5 files changed, 305 insertions(+), 121 deletions(-) diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs index e47a142..04288cf 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs @@ -7,6 +7,7 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ //this.tabControl1 = new TabControlWithoutHeader(1); +//this.tabControl2 = new TabControlWithoutHeader(1); namespace NovetusLauncher { partial class CharacterCustomization @@ -40,7 +41,6 @@ namespace NovetusLauncher this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomization)); this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.tabControl1 = new TabControlWithoutHeader(1); this.panel1 = new System.Windows.Forms.Panel(); this.label9 = new System.Windows.Forms.Label(); this.button71 = new System.Windows.Forms.Button(); @@ -142,18 +142,24 @@ namespace NovetusLauncher this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.listBox4 = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox12 = new System.Windows.Forms.TextBox(); this.textBox7 = new System.Windows.Forms.TextBox(); this.button46 = new System.Windows.Forms.Button(); this.button47 = new System.Windows.Forms.Button(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.listBox5 = new System.Windows.Forms.ListBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.label14 = new System.Windows.Forms.Label(); + this.textBox11 = new System.Windows.Forms.TextBox(); this.textBox8 = new System.Windows.Forms.TextBox(); this.button48 = new System.Windows.Forms.Button(); this.button49 = new System.Windows.Forms.Button(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.listBox6 = new System.Windows.Forms.ListBox(); this.tabPage6 = new System.Windows.Forms.TabPage(); + this.label15 = new System.Windows.Forms.Label(); + this.textBox13 = new System.Windows.Forms.TextBox(); this.textBox9 = new System.Windows.Forms.TextBox(); this.button50 = new System.Windows.Forms.Button(); this.button51 = new System.Windows.Forms.Button(); @@ -186,12 +192,9 @@ namespace NovetusLauncher this.button82 = new System.Windows.Forms.Button(); this.button42 = new System.Windows.Forms.Button(); this.button81 = new System.Windows.Forms.Button(); - this.label13 = new System.Windows.Forms.Label(); - this.textBox12 = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.textBox13 = new System.Windows.Forms.TextBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -1356,6 +1359,7 @@ namespace NovetusLauncher // // tabPage4 // + this.tabPage4.Controls.Add(this.comboBox3); this.tabPage4.Controls.Add(this.label13); this.tabPage4.Controls.Add(this.textBox12); this.tabPage4.Controls.Add(this.textBox7); @@ -1370,6 +1374,23 @@ namespace NovetusLauncher this.tabPage4.Text = "T-SHIRTS"; this.tabPage4.UseVisualStyleBackColor = true; // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(111, 198); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(90, 13); + this.label13.TabIndex = 74; + this.label13.Text = "Custom T-Shirt ID"; + // + // textBox12 + // + this.textBox12.Location = new System.Drawing.Point(3, 195); + this.textBox12.Name = "textBox12"; + this.textBox12.Size = new System.Drawing.Size(100, 20); + this.textBox12.TabIndex = 73; + this.textBox12.TextChanged += new System.EventHandler(this.textBox12_TextChanged); + // // textBox7 // this.textBox7.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -1415,12 +1436,13 @@ namespace NovetusLauncher this.listBox5.FormattingEnabled = true; this.listBox5.Location = new System.Drawing.Point(3, 3); this.listBox5.Name = "listBox5"; - this.listBox5.Size = new System.Drawing.Size(253, 212); + this.listBox5.Size = new System.Drawing.Size(253, 186); this.listBox5.TabIndex = 62; this.listBox5.SelectedIndexChanged += new System.EventHandler(this.ListBox5SelectedIndexChanged); // // tabPage5 // + this.tabPage5.Controls.Add(this.comboBox2); this.tabPage5.Controls.Add(this.label14); this.tabPage5.Controls.Add(this.textBox11); this.tabPage5.Controls.Add(this.textBox8); @@ -1435,6 +1457,23 @@ namespace NovetusLauncher this.tabPage5.Text = "SHIRTS"; this.tabPage5.UseVisualStyleBackColor = true; // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(111, 198); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(80, 13); + this.label14.TabIndex = 76; + this.label14.Text = "Custom Shirt ID"; + // + // textBox11 + // + this.textBox11.Location = new System.Drawing.Point(3, 195); + this.textBox11.Name = "textBox11"; + this.textBox11.Size = new System.Drawing.Size(100, 20); + this.textBox11.TabIndex = 75; + this.textBox11.TextChanged += new System.EventHandler(this.textBox11_TextChanged); + // // textBox8 // this.textBox8.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -1480,12 +1519,13 @@ namespace NovetusLauncher this.listBox6.FormattingEnabled = true; this.listBox6.Location = new System.Drawing.Point(3, 3); this.listBox6.Name = "listBox6"; - this.listBox6.Size = new System.Drawing.Size(253, 212); + this.listBox6.Size = new System.Drawing.Size(253, 186); this.listBox6.TabIndex = 62; this.listBox6.SelectedIndexChanged += new System.EventHandler(this.ListBox6SelectedIndexChanged); // // tabPage6 // + this.tabPage6.Controls.Add(this.comboBox1); this.tabPage6.Controls.Add(this.label15); this.tabPage6.Controls.Add(this.textBox13); this.tabPage6.Controls.Add(this.textBox9); @@ -1500,6 +1540,23 @@ namespace NovetusLauncher this.tabPage6.Text = "PANTS"; this.tabPage6.UseVisualStyleBackColor = true; // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(111, 198); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(86, 13); + this.label15.TabIndex = 76; + this.label15.Text = "Custom Pants ID"; + // + // textBox13 + // + this.textBox13.Location = new System.Drawing.Point(3, 195); + this.textBox13.Name = "textBox13"; + this.textBox13.Size = new System.Drawing.Size(100, 20); + this.textBox13.TabIndex = 75; + this.textBox13.TextChanged += new System.EventHandler(this.textBox13_TextChanged); + // // textBox9 // this.textBox9.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -1545,7 +1602,7 @@ namespace NovetusLauncher this.listBox7.FormattingEnabled = true; this.listBox7.Location = new System.Drawing.Point(3, 3); this.listBox7.Name = "listBox7"; - this.listBox7.Size = new System.Drawing.Size(253, 212); + this.listBox7.Size = new System.Drawing.Size(253, 186); this.listBox7.TabIndex = 62; this.listBox7.SelectedIndexChanged += new System.EventHandler(this.ListBox7SelectedIndexChanged); // @@ -1843,56 +1900,44 @@ namespace NovetusLauncher this.button81.UseVisualStyleBackColor = true; this.button81.Click += new System.EventHandler(this.button81_Click); // - // label13 + // comboBox1 // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(111, 225); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(90, 13); - this.label13.TabIndex = 74; - this.label13.Text = "Custom T-Shirt ID"; + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "Roblox", + "Finobe"}); + this.comboBox1.Location = new System.Drawing.Point(3, 221); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(194, 21); + this.comboBox1.TabIndex = 77; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // - // textBox12 + // comboBox2 // - this.textBox12.Location = new System.Drawing.Point(3, 222); - this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(100, 20); - this.textBox12.TabIndex = 73; - this.textBox12.TextChanged += new System.EventHandler(this.textBox12_TextChanged); + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Items.AddRange(new object[] { + "Roblox", + "Finobe"}); + this.comboBox2.Location = new System.Drawing.Point(3, 221); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(194, 21); + this.comboBox2.TabIndex = 78; + this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); // - // label14 + // comboBox3 // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(111, 225); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(80, 13); - this.label14.TabIndex = 76; - this.label14.Text = "Custom Shirt ID"; - // - // textBox11 - // - this.textBox11.Location = new System.Drawing.Point(3, 222); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(100, 20); - this.textBox11.TabIndex = 75; - this.textBox11.TextChanged += new System.EventHandler(this.textBox11_TextChanged); - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(111, 225); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(86, 13); - this.label15.TabIndex = 76; - this.label15.Text = "Custom Pants ID"; - // - // textBox13 - // - this.textBox13.Location = new System.Drawing.Point(3, 222); - this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(100, 20); - this.textBox13.TabIndex = 75; - this.textBox13.TextChanged += new System.EventHandler(this.textBox13_TextChanged); + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Items.AddRange(new object[] { + "Roblox", + "Finobe"}); + this.comboBox3.Location = new System.Drawing.Point(3, 221); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(194, 21); + this.comboBox3.TabIndex = 78; + this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); // // CharacterCustomization // @@ -2105,5 +2150,8 @@ namespace NovetusLauncher private System.Windows.Forms.TextBox textBox11; private System.Windows.Forms.Label label15; private System.Windows.Forms.TextBox textBox13; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.ComboBox comboBox1; } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs index 4ea94e9..ecbe989 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs @@ -24,6 +24,7 @@ namespace NovetusLauncher { private string SelectedPart = "Head"; List PartColorList; + private string Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; public CharacterCustomization() { @@ -1783,22 +1784,68 @@ namespace NovetusLauncher private void textBox11_TextChanged(object sender, EventArgs e) { - GlobalVars.Custom_Shirt_Offline = "" + textBox11.Text; + GlobalVars.Custom_Shirt_Offline = Custom_Clothing_URL + textBox11.Text; } private void textBox12_TextChanged(object sender, EventArgs e) { - GlobalVars.Custom_T_Shirt_Offline = "" + textBox12.Text; + GlobalVars.Custom_T_Shirt_Offline = Custom_Clothing_URL + textBox12.Text; } private void textBox13_TextChanged(object sender, EventArgs e) { - GlobalVars.Custom_Pants_Offline = "" + textBox13.Text; + GlobalVars.Custom_Pants_Offline = Custom_Clothing_URL + textBox13.Text; } - //add proper loading scheme for urls. - //add asset id url selector: - //http://www.roblox.com/asset/?id= - //http://finobe.com/asset/?id= + private void comboBox2_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox2.SelectedIndex) + { + case 1: + Custom_Clothing_URL = "http://finobe.com/asset/?id="; + break; + default: + Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; + break; + } + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox1.SelectedIndex) + { + case 1: + Custom_Clothing_URL = "http://finobe.com/asset/?id="; + break; + default: + Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; + break; + } + } + + private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox3.SelectedIndex) + { + case 1: + Custom_Clothing_URL = "http://finobe.com/asset/?id="; + break; + default: + Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; + break; + } + } + + /* + * When we load up the chracter customization menu, do the following: + * + * If we are set to a URL, set the main offline listbox to the placeholder "no" item. + * Note that this will set the item's value to the placeholder item. To fix this, load a local var containing the original url and + * change it AFTER we set the listbox. + * + * parse the url to remove the item id from it and fill the textbox with the item id + * + * check if the url is from finobe or roblox, and set the comboboxes accordingly. + */ } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.resx b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.resx index 94d8d8f..8a1d005 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.resx +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACe - OAAAAk1TRnQBSQFMAgEBAwEAAWwBAAFsAQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + OAAAAk1TRnQBSQFMAgEBAwEAAXwBAAF8AQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo BAABAQIAAUADAAEBAQABCAYAAUAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs index 79d4973..2e2a2de 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs @@ -7,6 +7,7 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ //this.tabControl1 = new TabControlWithoutHeader(2); +//this.tabControl2 = new TabControlWithoutHeader(2); namespace NovetusLauncher { partial class CharacterCustomization_legacy @@ -42,7 +43,7 @@ namespace NovetusLauncher this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomization_legacy)); this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.tabControl1 = new TabControlWithoutHeader(2); + this.tabControl1 = new TabControlWithoutHeader(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.button61 = new System.Windows.Forms.Button(); @@ -128,18 +129,24 @@ namespace NovetusLauncher this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.listBox4 = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); + this.label9 = new System.Windows.Forms.Label(); + this.textBox11 = new System.Windows.Forms.TextBox(); this.textBox7 = new System.Windows.Forms.TextBox(); this.button46 = new System.Windows.Forms.Button(); this.button47 = new System.Windows.Forms.Button(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.listBox5 = new System.Windows.Forms.ListBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.label10 = new System.Windows.Forms.Label(); + this.textBox12 = new System.Windows.Forms.TextBox(); this.textBox8 = new System.Windows.Forms.TextBox(); this.button48 = new System.Windows.Forms.Button(); this.button49 = new System.Windows.Forms.Button(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.listBox6 = new System.Windows.Forms.ListBox(); this.tabPage6 = new System.Windows.Forms.TabPage(); + this.label11 = new System.Windows.Forms.Label(); + this.textBox13 = new System.Windows.Forms.TextBox(); this.textBox9 = new System.Windows.Forms.TextBox(); this.button50 = new System.Windows.Forms.Button(); this.button51 = new System.Windows.Forms.Button(); @@ -168,12 +175,9 @@ namespace NovetusLauncher this.button54 = new System.Windows.Forms.Button(); this.button53 = new System.Windows.Forms.Button(); this.button52 = new System.Windows.Forms.Button(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.textBox12 = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); - this.textBox13 = new System.Windows.Forms.TextBox(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -1174,6 +1178,7 @@ namespace NovetusLauncher // // tabPage4 // + this.tabPage4.Controls.Add(this.comboBox2); this.tabPage4.Controls.Add(this.label9); this.tabPage4.Controls.Add(this.textBox11); this.tabPage4.Controls.Add(this.textBox7); @@ -1188,6 +1193,23 @@ namespace NovetusLauncher this.tabPage4.Text = "T-SHIRTS"; this.tabPage4.UseVisualStyleBackColor = true; // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(114, 139); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(90, 13); + this.label9.TabIndex = 70; + this.label9.Text = "Custom T-Shirt ID"; + // + // textBox11 + // + this.textBox11.Location = new System.Drawing.Point(6, 136); + this.textBox11.Name = "textBox11"; + this.textBox11.Size = new System.Drawing.Size(100, 20); + this.textBox11.TabIndex = 69; + this.textBox11.TextChanged += new System.EventHandler(this.textBox11_TextChanged); + // // textBox7 // this.textBox7.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -1233,12 +1255,13 @@ namespace NovetusLauncher this.listBox5.FormattingEnabled = true; this.listBox5.Location = new System.Drawing.Point(6, 9); this.listBox5.Name = "listBox5"; - this.listBox5.Size = new System.Drawing.Size(219, 147); + this.listBox5.Size = new System.Drawing.Size(219, 121); this.listBox5.TabIndex = 62; this.listBox5.SelectedIndexChanged += new System.EventHandler(this.ListBox5SelectedIndexChanged); // // tabPage5 // + this.tabPage5.Controls.Add(this.comboBox1); this.tabPage5.Controls.Add(this.label10); this.tabPage5.Controls.Add(this.textBox12); this.tabPage5.Controls.Add(this.textBox8); @@ -1253,6 +1276,23 @@ namespace NovetusLauncher this.tabPage5.Text = "SHIRTS"; this.tabPage5.UseVisualStyleBackColor = true; // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(114, 139); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(80, 13); + this.label10.TabIndex = 72; + this.label10.Text = "Custom Shirt ID"; + // + // textBox12 + // + this.textBox12.Location = new System.Drawing.Point(6, 136); + this.textBox12.Name = "textBox12"; + this.textBox12.Size = new System.Drawing.Size(100, 20); + this.textBox12.TabIndex = 71; + this.textBox12.TextChanged += new System.EventHandler(this.textBox12_TextChanged); + // // textBox8 // this.textBox8.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -1298,12 +1338,13 @@ namespace NovetusLauncher this.listBox6.FormattingEnabled = true; this.listBox6.Location = new System.Drawing.Point(6, 9); this.listBox6.Name = "listBox6"; - this.listBox6.Size = new System.Drawing.Size(219, 147); + this.listBox6.Size = new System.Drawing.Size(219, 121); this.listBox6.TabIndex = 62; this.listBox6.SelectedIndexChanged += new System.EventHandler(this.ListBox6SelectedIndexChanged); // // tabPage6 // + this.tabPage6.Controls.Add(this.comboBox3); this.tabPage6.Controls.Add(this.label11); this.tabPage6.Controls.Add(this.textBox13); this.tabPage6.Controls.Add(this.textBox9); @@ -1318,6 +1359,23 @@ namespace NovetusLauncher this.tabPage6.Text = "PANTS"; this.tabPage6.UseVisualStyleBackColor = true; // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(114, 139); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(86, 13); + this.label11.TabIndex = 74; + this.label11.Text = "Custom Pants ID"; + // + // textBox13 + // + this.textBox13.Location = new System.Drawing.Point(6, 136); + this.textBox13.Name = "textBox13"; + this.textBox13.Size = new System.Drawing.Size(100, 20); + this.textBox13.TabIndex = 73; + this.textBox13.TextChanged += new System.EventHandler(this.textBox13_TextChanged); + // // textBox9 // this.textBox9.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -1363,7 +1421,7 @@ namespace NovetusLauncher this.listBox7.FormattingEnabled = true; this.listBox7.Location = new System.Drawing.Point(6, 9); this.listBox7.Name = "listBox7"; - this.listBox7.Size = new System.Drawing.Size(219, 147); + this.listBox7.Size = new System.Drawing.Size(219, 121); this.listBox7.TabIndex = 62; this.listBox7.SelectedIndexChanged += new System.EventHandler(this.ListBox7SelectedIndexChanged); // @@ -1619,56 +1677,44 @@ namespace NovetusLauncher this.button52.UseVisualStyleBackColor = true; this.button52.Click += new System.EventHandler(this.Button52Click); // - // textBox11 + // comboBox3 // - this.textBox11.Location = new System.Drawing.Point(6, 162); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(100, 20); - this.textBox11.TabIndex = 69; - this.textBox11.TextChanged += new System.EventHandler(this.textBox11_TextChanged); + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Items.AddRange(new object[] { + "Roblox", + "Finobe"}); + this.comboBox3.Location = new System.Drawing.Point(6, 162); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(194, 21); + this.comboBox3.TabIndex = 79; + this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); // - // label9 + // comboBox1 // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(114, 165); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(90, 13); - this.label9.TabIndex = 70; - this.label9.Text = "Custom T-Shirt ID"; + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "Roblox", + "Finobe"}); + this.comboBox1.Location = new System.Drawing.Point(6, 162); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(194, 21); + this.comboBox1.TabIndex = 80; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // - // label10 + // comboBox2 // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(114, 165); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(80, 13); - this.label10.TabIndex = 72; - this.label10.Text = "Custom Shirt ID"; - // - // textBox12 - // - this.textBox12.Location = new System.Drawing.Point(6, 162); - this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(100, 20); - this.textBox12.TabIndex = 71; - this.textBox12.TextChanged += new System.EventHandler(this.textBox12_TextChanged); - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(114, 165); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(86, 13); - this.label11.TabIndex = 74; - this.label11.Text = "Custom Pants ID"; - // - // textBox13 - // - this.textBox13.Location = new System.Drawing.Point(6, 162); - this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(100, 20); - this.textBox13.TabIndex = 73; - this.textBox13.TextChanged += new System.EventHandler(this.textBox13_TextChanged); + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Items.AddRange(new object[] { + "Roblox", + "Finobe"}); + this.comboBox2.Location = new System.Drawing.Point(6, 162); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(194, 21); + this.comboBox2.TabIndex = 80; + this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); // // CharacterCustomization_legacy // @@ -1857,5 +1903,8 @@ namespace NovetusLauncher private System.Windows.Forms.TextBox textBox12; private System.Windows.Forms.Label label11; private System.Windows.Forms.TextBox textBox13; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ComboBox comboBox3; } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs index 9a0883d..77ababf 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs @@ -23,6 +23,7 @@ namespace NovetusLauncher public partial class CharacterCustomization_legacy : Form { private string SelectedPart = "Head"; + private string Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; List PartColorList; public CharacterCustomization_legacy() @@ -1771,17 +1772,56 @@ namespace NovetusLauncher private void textBox11_TextChanged(object sender, EventArgs e) { - GlobalVars.Custom_T_Shirt_Offline = "" + textBox11.Text; + GlobalVars.Custom_T_Shirt_Offline = Custom_Clothing_URL + textBox11.Text; } private void textBox12_TextChanged(object sender, EventArgs e) { - GlobalVars.Custom_Shirt_Offline = "" + textBox12.Text; + GlobalVars.Custom_Shirt_Offline = Custom_Clothing_URL + textBox12.Text; } private void textBox13_TextChanged(object sender, EventArgs e) { - GlobalVars.Custom_Pants_Offline = "" + textBox13.Text; + GlobalVars.Custom_Pants_Offline = Custom_Clothing_URL + textBox13.Text; + } + + private void comboBox2_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox2.SelectedIndex) + { + case 1: + Custom_Clothing_URL = "http://finobe.com/asset/?id="; + break; + default: + Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; + break; + } + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox1.SelectedIndex) + { + case 1: + Custom_Clothing_URL = "http://finobe.com/asset/?id="; + break; + default: + Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; + break; + } + } + + private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox3.SelectedIndex) + { + case 1: + Custom_Clothing_URL = "http://finobe.com/asset/?id="; + break; + default: + Custom_Clothing_URL = "http://www.roblox.com/asset/?id="; + break; + } } } }