fixed some designer woes. more renaming.
This commit is contained in:
parent
f88845361f
commit
9330ac430b
|
|
@ -6,11 +6,9 @@
|
|||
*
|
||||
* 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
|
||||
partial class CharacterCustomizationCompact
|
||||
{
|
||||
/// <summary>
|
||||
/// Designer variable used to keep track of non-visual components.
|
||||
|
|
@ -41,9 +39,9 @@ namespace NovetusLauncher
|
|||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomization_legacy));
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomizationCompact));
|
||||
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
|
||||
this.tabControl1 = new TabControlWithoutHeader(2);
|
||||
this.tabControl1 = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.groupBox3 = new System.Windows.Forms.GroupBox();
|
||||
this.button61 = new System.Windows.Forms.Button();
|
||||
|
|
@ -101,7 +99,7 @@ namespace NovetusLauncher
|
|||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.tabControl2 = new TabControlWithoutHeader(2);
|
||||
this.tabControl2 = new System.Windows.Forms.TabControl();
|
||||
this.tabPage10 = new System.Windows.Forms.TabPage();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
this.listBox1 = new System.Windows.Forms.ListBox();
|
||||
|
|
@ -1776,7 +1774,7 @@ namespace NovetusLauncher
|
|||
private System.Windows.Forms.TabPage tabPage12;
|
||||
private System.Windows.Forms.TabPage tabPage11;
|
||||
private System.Windows.Forms.TabPage tabPage10;
|
||||
private TabControlWithoutHeader tabControl2;
|
||||
private System.Windows.Forms.TabControl tabControl2;
|
||||
private System.Windows.Forms.CheckBox checkBox1;
|
||||
private System.Windows.Forms.ListBox listBox9;
|
||||
private System.Windows.Forms.PictureBox pictureBox9;
|
||||
|
|
@ -1874,7 +1872,7 @@ namespace NovetusLauncher
|
|||
private System.Windows.Forms.PictureBox pictureBox2;
|
||||
private System.Windows.Forms.TabPage tabPage2;
|
||||
private System.Windows.Forms.TabPage tabPage1;
|
||||
private TabControlWithoutHeader tabControl1;
|
||||
private System.Windows.Forms.TabControl tabControl1;
|
||||
private System.Windows.Forms.Button button60;
|
||||
private System.Windows.Forms.Label label8;
|
||||
private System.Windows.Forms.PictureBox pictureBox10;
|
||||
|
|
@ -19,7 +19,7 @@ namespace NovetusLauncher
|
|||
/// <summary>
|
||||
/// Description of CharacterCustomization.
|
||||
/// </summary>
|
||||
public partial class CharacterCustomization_legacy : Form
|
||||
public partial class CharacterCustomizationCompact : Form
|
||||
{
|
||||
private string SelectedPart = "Head";
|
||||
private string Custom_T_Shirt_URL = "http://www.roblox.com/asset/?id=";
|
||||
|
|
@ -27,7 +27,7 @@ namespace NovetusLauncher
|
|||
private string Custom_Pants_URL = "http://www.roblox.com/asset/?id=";
|
||||
List<VarStorage.PartColors> PartColorList;
|
||||
|
||||
public CharacterCustomization_legacy()
|
||||
public CharacterCustomizationCompact()
|
||||
{
|
||||
//
|
||||
// The InitializeComponent() call is required for Windows Forms designer support.
|
||||
|
|
@ -6,12 +6,10 @@
|
|||
*
|
||||
* 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
|
||||
{
|
||||
partial class CharacterCustomizationExtended
|
||||
{
|
||||
/// <summary>
|
||||
/// Designer variable used to keep track of non-visual components.
|
||||
/// </summary>
|
||||
|
|
@ -39,7 +37,7 @@ namespace NovetusLauncher
|
|||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomization));
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomizationExtended));
|
||||
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
|
|
@ -55,7 +53,7 @@ namespace NovetusLauncher
|
|||
this.button73 = new System.Windows.Forms.Button();
|
||||
this.button72 = new System.Windows.Forms.Button();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.tabControl1 = new TabControlWithoutHeader(1);
|
||||
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();
|
||||
|
|
@ -113,7 +111,7 @@ namespace NovetusLauncher
|
|||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.tabControl2 = new TabControlWithoutHeader(1);
|
||||
this.tabControl2 = new TabControlWithoutHeader();
|
||||
this.tabPage10 = new System.Windows.Forms.TabPage();
|
||||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
|
|
@ -19,7 +19,7 @@ namespace NovetusLauncher
|
|||
/// <summary>
|
||||
/// Description of CharacterCustomization.
|
||||
/// </summary>
|
||||
public partial class CharacterCustomization : Form
|
||||
public partial class CharacterCustomizationExtended : Form
|
||||
{
|
||||
private string SelectedPart = "Head";
|
||||
private string Custom_T_Shirt_URL = "http://www.roblox.com/asset/?id=";
|
||||
|
|
@ -27,7 +27,7 @@ namespace NovetusLauncher
|
|||
private string Custom_Pants_URL = "http://www.roblox.com/asset/?id=";
|
||||
List<VarStorage.PartColors> PartColorList;
|
||||
|
||||
public CharacterCustomization()
|
||||
public CharacterCustomizationExtended()
|
||||
{
|
||||
//
|
||||
// The InitializeComponent() call is required for Windows Forms designer support.
|
||||
|
|
@ -8,34 +8,13 @@ using System.Windows.Forms;
|
|||
|
||||
public partial class TabControlWithoutHeader : TabControl
|
||||
{
|
||||
int layoutval = 1;
|
||||
|
||||
public TabControlWithoutHeader(int layout)
|
||||
{
|
||||
SetLayout(layout);
|
||||
}
|
||||
public TabControlWithoutHeader()
|
||||
{
|
||||
SetLayout(1);
|
||||
}
|
||||
|
||||
private void SetLayout(int layout)
|
||||
{
|
||||
layoutval = layout;
|
||||
if (layoutval == 1)
|
||||
{
|
||||
if (!DesignMode) Multiline = true;
|
||||
}
|
||||
if (!DesignMode) Multiline = true;
|
||||
}
|
||||
|
||||
protected override void WndProc(ref Message m)
|
||||
{
|
||||
if (layoutval == 2)
|
||||
{
|
||||
base.WndProc(ref m);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m.Msg == 0x1328 && !DesignMode)
|
||||
m.Result = new IntPtr(1);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
*
|
||||
* To change this template use Tools | Options | Coding | Edit Standard Headers.
|
||||
*/
|
||||
//this.tabControl1 = new TabControlWithoutHeader(2);
|
||||
//This ALWAYS gets lost whenever I compile. WTF VS?
|
||||
namespace NovetusLauncher
|
||||
{
|
||||
partial class LauncherFormCompact
|
||||
|
|
@ -44,7 +42,7 @@ namespace NovetusLauncher
|
|||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompact));
|
||||
this.tabControl1 = new TabControlWithoutHeader(2);
|
||||
this.tabControl1 = new System.Windows.Forms.TabControl();
|
||||
this.button25 = new System.Windows.Forms.Button();
|
||||
this.button21 = new System.Windows.Forms.Button();
|
||||
this.textBox5 = new System.Windows.Forms.TextBox();
|
||||
|
|
@ -1456,7 +1454,7 @@ namespace NovetusLauncher
|
|||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.TabPage tabPage2;
|
||||
private System.Windows.Forms.TabPage tabPage1;
|
||||
private TabControlWithoutHeader tabControl1;
|
||||
private System.Windows.Forms.TabControl tabControl1;
|
||||
private System.Windows.Forms.TreeView _fieldsTreeCache;
|
||||
private System.Windows.Forms.Button button24;
|
||||
private System.Windows.Forms.Button button25;
|
||||
|
|
|
|||
|
|
@ -679,7 +679,7 @@ namespace NovetusLauncher
|
|||
|
||||
void Button8Click(object sender, EventArgs e)
|
||||
{
|
||||
CharacterCustomization_legacy ccustom = new CharacterCustomization_legacy();
|
||||
CharacterCustomizationCompact ccustom = new CharacterCustomizationCompact();
|
||||
ccustom.Show();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -715,7 +715,7 @@ namespace NovetusLauncher
|
|||
|
||||
void Button8Click(object sender, EventArgs e)
|
||||
{
|
||||
CharacterCustomization ccustom = new CharacterCustomization();
|
||||
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
|
||||
ccustom.Show();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -122,17 +122,17 @@
|
|||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="CharacterCustomization\CharacterCustomization_legacy.cs">
|
||||
<Compile Include="CharacterCustomization\Compact\CharacterCustomizationCompact.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CharacterCustomization\CharacterCustomization_legacy.Designer.cs">
|
||||
<DependentUpon>CharacterCustomization_legacy.cs</DependentUpon>
|
||||
<Compile Include="CharacterCustomization\Compact\CharacterCustomizationCompact.Designer.cs">
|
||||
<DependentUpon>CharacterCustomizationCompact.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CharacterCustomization\CharacterCustomization.cs">
|
||||
<Compile Include="CharacterCustomization\Extended\CharacterCustomizationExtended.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CharacterCustomization\CharacterCustomization.Designer.cs">
|
||||
<DependentUpon>CharacterCustomization.cs</DependentUpon>
|
||||
<Compile Include="CharacterCustomization\Extended\CharacterCustomizationExtended.Designer.cs">
|
||||
<DependentUpon>CharacterCustomizationExtended.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Classes\Launcher\AddonLoader.cs" />
|
||||
<Compile Include="Classes\CharCustom\IconLoader.cs" />
|
||||
|
|
@ -221,11 +221,11 @@
|
|||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="CharacterCustomization\CharacterCustomization_legacy.resx">
|
||||
<DependentUpon>CharacterCustomization_legacy.cs</DependentUpon>
|
||||
<EmbeddedResource Include="CharacterCustomization\Compact\CharacterCustomizationCompact.resx">
|
||||
<DependentUpon>CharacterCustomizationCompact.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="CharacterCustomization\CharacterCustomization.resx">
|
||||
<DependentUpon>CharacterCustomization.cs</DependentUpon>
|
||||
<EmbeddedResource Include="CharacterCustomization\Extended\CharacterCustomizationExtended.resx">
|
||||
<DependentUpon>CharacterCustomizationExtended.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\LauncherForm\Compact\LauncherFormCompact.resx">
|
||||
<DependentUpon>LauncherFormCompact.cs</DependentUpon>
|
||||
|
|
|
|||
|
|
@ -82,8 +82,19 @@ namespace NovetusURI
|
|||
|
||||
void Button1Click(object sender, EventArgs e)
|
||||
{
|
||||
CharacterCustomization ccustom = new CharacterCustomization();
|
||||
ccustom.Show();
|
||||
switch(GlobalVars.UserConfiguration.LauncherStyle)
|
||||
{
|
||||
case Settings.UIOptions.Style.Extended:
|
||||
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
|
||||
ccustom.Show();
|
||||
break;
|
||||
case Settings.UIOptions.Style.Compact:
|
||||
CharacterCustomizationCompact ccustom2 = new CharacterCustomizationCompact();
|
||||
ccustom2.Show();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Button2Click(object sender, EventArgs e)
|
||||
|
|
|
|||
Loading…
Reference in New Issue