diff --git a/.vs/Elite Power Management Simulator/v16/.suo b/.vs/Elite Power Management Simulator/v16/.suo index e3cd819..db6313e 100644 Binary files a/.vs/Elite Power Management Simulator/v16/.suo and b/.vs/Elite Power Management Simulator/v16/.suo differ diff --git a/Elite Power Management Simulator/Form1.Designer.cs b/Elite Power Management Simulator/Form1.Designer.cs index 08fce33..3883c41 100644 --- a/Elite Power Management Simulator/Form1.Designer.cs +++ b/Elite Power Management Simulator/Form1.Designer.cs @@ -145,7 +145,7 @@ // this.lbl_copyright.AutoSize = true; this.lbl_copyright.ForeColor = System.Drawing.SystemColors.ControlDark; - this.lbl_copyright.Location = new System.Drawing.Point(274, 188); + this.lbl_copyright.Location = new System.Drawing.Point(666, 324); this.lbl_copyright.Name = "lbl_copyright"; this.lbl_copyright.Size = new System.Drawing.Size(106, 13); this.lbl_copyright.TabIndex = 7; @@ -156,7 +156,7 @@ // this.lbl_xant_ad.AutoSize = true; this.lbl_xant_ad.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.lbl_xant_ad.Location = new System.Drawing.Point(61, 188); + this.lbl_xant_ad.Location = new System.Drawing.Point(288, 324); this.lbl_xant_ad.Name = "lbl_xant_ad"; this.lbl_xant_ad.Size = new System.Drawing.Size(209, 13); this.lbl_xant_ad.TabIndex = 8; @@ -178,11 +178,11 @@ // this.lbl_version.AutoSize = true; this.lbl_version.ForeColor = System.Drawing.SystemColors.ControlDark; - this.lbl_version.Location = new System.Drawing.Point(9, 188); + this.lbl_version.Location = new System.Drawing.Point(12, 324); this.lbl_version.Name = "lbl_version"; this.lbl_version.Size = new System.Drawing.Size(46, 13); this.lbl_version.TabIndex = 11; - this.lbl_version.Text = "v1.0.1.1"; + this.lbl_version.Text = "v1.0.2.2"; // // gbox_pipmgmt // @@ -199,12 +199,16 @@ // cbox_showLog // this.cbox_showLog.AutoSize = true; + this.cbox_showLog.Checked = true; + this.cbox_showLog.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbox_showLog.Enabled = false; this.cbox_showLog.Location = new System.Drawing.Point(7, 159); this.cbox_showLog.Name = "cbox_showLog"; - this.cbox_showLog.Size = new System.Drawing.Size(139, 17); + this.cbox_showLog.Size = new System.Drawing.Size(144, 17); this.cbox_showLog.TabIndex = 11; - this.cbox_showLog.Text = "Show Log/Macro Assist"; + this.cbox_showLog.Text = "Show Log/Macro Builder"; this.cbox_showLog.UseVisualStyleBackColor = true; + this.cbox_showLog.Visible = false; this.cbox_showLog.CheckedChanged += new System.EventHandler(this.cbox_showLog_CheckedChanged); // // gbox_log @@ -212,11 +216,10 @@ this.gbox_log.Controls.Add(this.lst_log); this.gbox_log.Location = new System.Drawing.Point(396, 3); this.gbox_log.Name = "gbox_log"; - this.gbox_log.Size = new System.Drawing.Size(385, 204); + this.gbox_log.Size = new System.Drawing.Size(385, 203); this.gbox_log.TabIndex = 13; this.gbox_log.TabStop = false; this.gbox_log.Text = "Distribution Log"; - this.gbox_log.Visible = false; // // lst_log // @@ -253,8 +256,7 @@ this.gbox_macroBuilder.Size = new System.Drawing.Size(778, 116); this.gbox_macroBuilder.TabIndex = 14; this.gbox_macroBuilder.TabStop = false; - this.gbox_macroBuilder.Text = "Macro Build Assist"; - this.gbox_macroBuilder.Visible = false; + this.gbox_macroBuilder.Text = "Macro Builder"; // // lbl_mbaChangeWarning // @@ -279,13 +281,13 @@ this.gbox_custom.Controls.Add(this.txt_custWep); this.gbox_custom.Controls.Add(this.txt_custEng); this.gbox_custom.Controls.Add(this.txt_custSys); + this.gbox_custom.Enabled = false; this.gbox_custom.Location = new System.Drawing.Point(393, 7); this.gbox_custom.Name = "gbox_custom"; this.gbox_custom.Size = new System.Drawing.Size(381, 80); this.gbox_custom.TabIndex = 27; this.gbox_custom.TabStop = false; this.gbox_custom.Text = "Custom Macro Buttons"; - this.gbox_custom.Visible = false; // // lbl_custRst // @@ -394,7 +396,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(392, 209); + this.ClientSize = new System.Drawing.Size(784, 342); this.Controls.Add(this.gbox_macroBuilder); this.Controls.Add(this.gbox_log); this.Controls.Add(this.lbl_version); diff --git a/Elite Power Management Simulator/Form1.cs b/Elite Power Management Simulator/Form1.cs index 6f6ef68..602fa4d 100644 --- a/Elite Power Management Simulator/Form1.cs +++ b/Elite Power Management Simulator/Form1.cs @@ -368,7 +368,8 @@ namespace Elite_Power_Management_Simulator global.key_wep = "KBRIGHT "; lbl_mbaChangeWarning.Show(); - gbox_custom.Hide(); + //gbox_custom.Hide(); + gbox_custom.Enabled = false; } if (rad_ahk.Checked) { @@ -378,7 +379,8 @@ namespace Elite_Power_Management_Simulator global.key_wep = "{right}"; lbl_mbaChangeWarning.Show(); - gbox_custom.Hide(); + //gbox_custom.Hide(); + gbox_custom.Enabled = false; } if (rad_custom.Checked) { @@ -388,7 +390,8 @@ namespace Elite_Power_Management_Simulator global.key_wep = txt_custWep.Text; lbl_mbaChangeWarning.Show(); - gbox_custom.Show(); + //gbox_custom.Show(); + gbox_custom.Enabled = true; } } } diff --git a/Elite Power Management Simulator/Properties/AssemblyInfo.cs b/Elite Power Management Simulator/Properties/AssemblyInfo.cs index 0a89784..aec0683 100644 --- a/Elite Power Management Simulator/Properties/AssemblyInfo.cs +++ b/Elite Power Management Simulator/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.1")] -[assembly: AssemblyFileVersion("1.0.1.1")] +[assembly: AssemblyVersion("1.0.2.2")] +[assembly: AssemblyFileVersion("1.0.2.2")] diff --git a/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache b/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache index 7c206bc..b82eb2f 100644 Binary files a/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache and b/Elite Power Management Simulator/obj/Debug/Elite Power Management Simulator.csproj.GenerateResource.cache differ diff --git a/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe b/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe index 9efd0d6..4a33ff9 100644 Binary files a/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe and b/Elite Power Management Simulator/obj/Debug/elite_power_sim.exe differ diff --git a/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb b/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb index 73d137e..d053dfb 100644 Binary files a/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb and b/Elite Power Management Simulator/obj/Debug/elite_power_sim.pdb differ diff --git a/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache b/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache index a259509..845f98e 100644 Binary files a/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache and b/Elite Power Management Simulator/obj/Release/Elite Power Management Simulator.csproj.GenerateResource.cache differ diff --git a/Elite Power Management Simulator/obj/Release/elite_power_sim.exe b/Elite Power Management Simulator/obj/Release/elite_power_sim.exe index 89be7d5..d921442 100644 Binary files a/Elite Power Management Simulator/obj/Release/elite_power_sim.exe and b/Elite Power Management Simulator/obj/Release/elite_power_sim.exe differ diff --git a/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb b/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb index e6950b0..452e72b 100644 Binary files a/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb and b/Elite Power Management Simulator/obj/Release/elite_power_sim.pdb differ