diff --git a/Code/Cupscale/MainForm.Designer.cs b/Code/Cupscale/MainForm.Designer.cs index 2dab294..213b204 100644 --- a/Code/Cupscale/MainForm.Designer.cs +++ b/Code/Cupscale/MainForm.Designer.cs @@ -163,6 +163,7 @@ private void InitializeComponent() this.label4 = new System.Windows.Forms.Label(); this.confSaveBtn = new System.Windows.Forms.Button(); this.alphaBgColorDialog = new System.Windows.Forms.ColorDialog(); + this.modelDropdown1 = new Cupscale.UI.Controls.ModelDropdown(); this.mainTabControl.SuspendLayout(); this.upscaleTab.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -359,6 +360,7 @@ private void InitializeComponent() // interpMdlTab // this.interpMdlTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.interpMdlTab.Controls.Add(this.modelDropdown1); this.interpMdlTab.Controls.Add(this.label16); this.interpMdlTab.Controls.Add(this.label14); this.interpMdlTab.Location = new System.Drawing.Point(1, 21); @@ -1069,6 +1071,18 @@ private void InitializeComponent() this.confSaveBtn.UseVisualStyleBackColor = false; this.confSaveBtn.Click += new System.EventHandler(this.confSaveEsrganBtn_Click); // + // modelDropdown1 + // + this.modelDropdown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.modelDropdown1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.modelDropdown1.ForeColor = System.Drawing.Color.White; + this.modelDropdown1.FormattingEnabled = true; + this.modelDropdown1.Location = new System.Drawing.Point(5, 28); + this.modelDropdown1.Margin = new System.Windows.Forms.Padding(8); + this.modelDropdown1.Name = "modelDropdown1"; + this.modelDropdown1.Size = new System.Drawing.Size(315, 21); + this.modelDropdown1.TabIndex = 6; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1118,5 +1132,7 @@ private void InitializeComponent() this.ResumeLayout(false); } + + private UI.Controls.ModelDropdown modelDropdown1; } } diff --git a/Code/UI/Controls/ModelBox.cs b/Code/UI/Controls/ModelBox.cs deleted file mode 100644 index fa5920d..0000000 --- a/Code/UI/Controls/ModelBox.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Cupscale.UI.Controls -{ - class ModelBox : ComboBox - { - - //bool initialized = false; - - public ModelBox() // Constructor - { - // :thinking: - } - - /* - protected override void OnVisibleChanged(EventArgs e) - { - - if (!IsRunning()) - return; - base.Text = "running"; - - base.OnVisibleChanged(e); - - if (!initialized) - { - UIHelpers.FillModelComboBox(this, false); - initialized = true; - } - - } - */ - - protected override void OnDropDown(EventArgs e) - { - // if (!IsRunning()) - // return; - base.OnDropDown(e); - UIHelpers.FillModelComboBox(this, false); - } - - /* - bool IsRunning() - { - return LicenseManager.UsageMode == LicenseUsageMode.Runtime; - } - */ - } -}