diff --git a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs index 625ffc88..cff0c484 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs @@ -27,9 +27,10 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVideoConfig)); this.tlpMain = new System.Windows.Forms.TableLayoutPanel(); this.lblVideoScale = new System.Windows.Forms.Label(); - this.lblVideoFilter = new System.Windows.Forms.Label(); this.chkVerticalSync = new System.Windows.Forms.CheckBox(); this.cboAspectRatio = new System.Windows.Forms.ComboBox(); this.lblDisplayRatio = new System.Windows.Forms.Label(); @@ -42,10 +43,34 @@ this.chkUseHdPacks = new System.Windows.Forms.CheckBox(); this.picHdNesTooltip = new System.Windows.Forms.PictureBox(); this.nudScale = new System.Windows.Forms.NumericUpDown(); - this.cboFilter = new System.Windows.Forms.ComboBox(); - this.chkBilinearInterpolation = new System.Windows.Forms.CheckBox(); this.tabMain = new System.Windows.Forms.TabControl(); this.tpgGeneral = new System.Windows.Forms.TabPage(); + this.tpgPicture = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.btnSelectPreset = new System.Windows.Forms.Button(); + this.btnResetPictureSettings = new System.Windows.Forms.Button(); + this.flowLayoutPanel8 = new System.Windows.Forms.FlowLayoutPanel(); + this.lblVideoFilter = new System.Windows.Forms.Label(); + this.cboFilter = new System.Windows.Forms.ComboBox(); + this.grpNtscFilter = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.trkArtifacts = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkBleed = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkFringing = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkGamma = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkResolution = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkSharpness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.chkMergeFields = new System.Windows.Forms.CheckBox(); + this.grpCommon = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.chkBilinearInterpolation = new System.Windows.Forms.CheckBox(); + this.trkBrightness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkContrast = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkHue = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkSaturation = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.grpScanlines = new System.Windows.Forms.GroupBox(); + this.trkScanlines = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.tpgOverscan = new System.Windows.Forms.TabPage(); this.grpCropping = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); @@ -62,32 +87,17 @@ this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); this.lblRight = new System.Windows.Forms.Label(); this.nudOverscanRight = new System.Windows.Forms.NumericUpDown(); - this.tpgPicture = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.btnResetPictureSettings = new System.Windows.Forms.Button(); - this.grpNtscFilter = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); - this.trkArtifacts = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkBleed = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkFringing = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkGamma = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkResolution = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkSharpness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.chkMergeFields = new System.Windows.Forms.CheckBox(); - this.grpCommon = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.trkBrightness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkContrast = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkHue = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkSaturation = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.grpScanlines = new System.Windows.Forms.GroupBox(); - this.trkScanlines = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.tpgPalette = new System.Windows.Forms.TabPage(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.picPalette = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.btnResetPalette = new System.Windows.Forms.Button(); this.btnLoadPalFile = new System.Windows.Forms.Button(); + this.contextPicturePresets = new System.Windows.Forms.ContextMenuStrip(this.components); + this.mnuPresetComposite = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPresetSVideo = new System.Windows.Forms.ToolStripMenuItem(); + this.menuPresetRgb = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPresetMonochrome = new System.Windows.Forms.ToolStripMenuItem(); this.colorDialog = new System.Windows.Forms.ColorDialog(); this.tlpMain.SuspendLayout(); this.flowLayoutPanel6.SuspendLayout(); @@ -97,6 +107,15 @@ ((System.ComponentModel.ISupportInitialize)(this.nudScale)).BeginInit(); this.tabMain.SuspendLayout(); this.tpgGeneral.SuspendLayout(); + this.tpgPicture.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); + this.flowLayoutPanel8.SuspendLayout(); + this.grpNtscFilter.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.grpCommon.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); + this.grpScanlines.SuspendLayout(); this.tpgOverscan.SuspendLayout(); this.grpCropping.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -109,22 +128,16 @@ ((System.ComponentModel.ISupportInitialize)(this.nudOverscanBottom)).BeginInit(); this.flowLayoutPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudOverscanRight)).BeginInit(); - this.tpgPicture.SuspendLayout(); - this.tableLayoutPanel5.SuspendLayout(); - this.grpNtscFilter.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.grpCommon.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); - this.grpScanlines.SuspendLayout(); this.tpgPalette.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picPalette)).BeginInit(); this.tableLayoutPanel2.SuspendLayout(); + this.contextPicturePresets.SuspendLayout(); this.SuspendLayout(); // // baseConfigPanel // - this.baseConfigPanel.Location = new System.Drawing.Point(0, 376); + this.baseConfigPanel.Location = new System.Drawing.Point(0, 402); this.baseConfigPanel.Size = new System.Drawing.Size(515, 29); // // tlpMain @@ -133,22 +146,19 @@ this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpMain.Controls.Add(this.lblVideoScale, 0, 0); - this.tlpMain.Controls.Add(this.lblVideoFilter, 0, 1); - this.tlpMain.Controls.Add(this.chkVerticalSync, 0, 5); - this.tlpMain.Controls.Add(this.cboAspectRatio, 1, 2); - this.tlpMain.Controls.Add(this.lblDisplayRatio, 0, 2); - this.tlpMain.Controls.Add(this.flowLayoutPanel6, 1, 7); - this.tlpMain.Controls.Add(this.lblEmulationSpeed, 0, 7); - this.tlpMain.Controls.Add(this.chkShowFps, 0, 6); - this.tlpMain.Controls.Add(this.flowLayoutPanel7, 0, 4); + this.tlpMain.Controls.Add(this.chkVerticalSync, 0, 3); + this.tlpMain.Controls.Add(this.cboAspectRatio, 1, 1); + this.tlpMain.Controls.Add(this.lblDisplayRatio, 0, 1); + this.tlpMain.Controls.Add(this.flowLayoutPanel6, 1, 5); + this.tlpMain.Controls.Add(this.lblEmulationSpeed, 0, 5); + this.tlpMain.Controls.Add(this.chkShowFps, 0, 4); + this.tlpMain.Controls.Add(this.flowLayoutPanel7, 0, 2); this.tlpMain.Controls.Add(this.nudScale, 1, 0); - this.tlpMain.Controls.Add(this.cboFilter, 1, 1); - this.tlpMain.Controls.Add(this.chkBilinearInterpolation, 0, 3); this.tlpMain.Dock = System.Windows.Forms.DockStyle.Fill; this.tlpMain.Location = new System.Drawing.Point(3, 3); this.tlpMain.Margin = new System.Windows.Forms.Padding(0); this.tlpMain.Name = "tlpMain"; - this.tlpMain.RowCount = 9; + this.tlpMain.RowCount = 7; this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -156,9 +166,8 @@ this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.Size = new System.Drawing.Size(501, 344); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tlpMain.Size = new System.Drawing.Size(501, 370); this.tlpMain.TabIndex = 1; // // lblVideoScale @@ -171,22 +180,12 @@ this.lblVideoScale.TabIndex = 11; this.lblVideoScale.Text = "Scale:"; // - // lblVideoFilter - // - this.lblVideoFilter.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblVideoFilter.AutoSize = true; - this.lblVideoFilter.Location = new System.Drawing.Point(3, 33); - this.lblVideoFilter.Name = "lblVideoFilter"; - this.lblVideoFilter.Size = new System.Drawing.Size(32, 13); - this.lblVideoFilter.TabIndex = 12; - this.lblVideoFilter.Text = "Filter:"; - // // chkVerticalSync // this.chkVerticalSync.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkVerticalSync.AutoSize = true; this.tlpMain.SetColumnSpan(this.chkVerticalSync, 2); - this.chkVerticalSync.Location = new System.Drawing.Point(3, 129); + this.chkVerticalSync.Location = new System.Drawing.Point(3, 79); this.chkVerticalSync.Name = "chkVerticalSync"; this.chkVerticalSync.Size = new System.Drawing.Size(121, 17); this.chkVerticalSync.TabIndex = 15; @@ -203,7 +202,7 @@ "PAL (18:13)", "Standard (4:3)", "Widescreen (16:9)"}); - this.cboAspectRatio.Location = new System.Drawing.Point(99, 56); + this.cboAspectRatio.Location = new System.Drawing.Point(99, 29); this.cboAspectRatio.Name = "cboAspectRatio"; this.cboAspectRatio.Size = new System.Drawing.Size(121, 21); this.cboAspectRatio.TabIndex = 16; @@ -212,7 +211,7 @@ // this.lblDisplayRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblDisplayRatio.AutoSize = true; - this.lblDisplayRatio.Location = new System.Drawing.Point(3, 60); + this.lblDisplayRatio.Location = new System.Drawing.Point(3, 33); this.lblDisplayRatio.Name = "lblDisplayRatio"; this.lblDisplayRatio.Size = new System.Drawing.Size(71, 13); this.lblDisplayRatio.TabIndex = 17; @@ -224,7 +223,7 @@ this.flowLayoutPanel6.Controls.Add(this.nudEmulationSpeed); this.flowLayoutPanel6.Controls.Add(this.lblEmuSpeedHint); this.flowLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel6.Location = new System.Drawing.Point(96, 172); + this.flowLayoutPanel6.Location = new System.Drawing.Point(96, 122); this.flowLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel6.Name = "flowLayoutPanel6"; this.flowLayoutPanel6.Size = new System.Drawing.Size(405, 26); @@ -256,7 +255,7 @@ // this.lblEmulationSpeed.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblEmulationSpeed.AutoSize = true; - this.lblEmulationSpeed.Location = new System.Drawing.Point(3, 178); + this.lblEmulationSpeed.Location = new System.Drawing.Point(3, 128); this.lblEmulationSpeed.Name = "lblEmulationSpeed"; this.lblEmulationSpeed.Size = new System.Drawing.Size(90, 13); this.lblEmulationSpeed.TabIndex = 0; @@ -267,7 +266,7 @@ this.chkShowFps.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkShowFps.AutoSize = true; this.tlpMain.SetColumnSpan(this.chkShowFps, 2); - this.chkShowFps.Location = new System.Drawing.Point(3, 152); + this.chkShowFps.Location = new System.Drawing.Point(3, 102); this.chkShowFps.Name = "chkShowFps"; this.chkShowFps.Size = new System.Drawing.Size(76, 17); this.chkShowFps.TabIndex = 9; @@ -280,7 +279,7 @@ this.flowLayoutPanel7.Controls.Add(this.chkUseHdPacks); this.flowLayoutPanel7.Controls.Add(this.picHdNesTooltip); this.flowLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel7.Location = new System.Drawing.Point(0, 103); + this.flowLayoutPanel7.Location = new System.Drawing.Point(0, 53); this.flowLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel7.Name = "flowLayoutPanel7"; this.flowLayoutPanel7.Size = new System.Drawing.Size(501, 23); @@ -319,41 +318,17 @@ this.nudScale.Size = new System.Drawing.Size(48, 20); this.nudScale.TabIndex = 21; // - // cboFilter - // - this.cboFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboFilter.FormattingEnabled = true; - this.cboFilter.Items.AddRange(new object[] { - "None", - "NTSC"}); - this.cboFilter.Location = new System.Drawing.Point(99, 29); - this.cboFilter.Name = "cboFilter"; - this.cboFilter.Size = new System.Drawing.Size(76, 21); - this.cboFilter.TabIndex = 14; - // - // chkBilinearInterpolation - // - this.chkBilinearInterpolation.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkBilinearInterpolation.AutoSize = true; - this.tlpMain.SetColumnSpan(this.chkBilinearInterpolation, 2); - this.chkBilinearInterpolation.Location = new System.Drawing.Point(3, 83); - this.chkBilinearInterpolation.Name = "chkBilinearInterpolation"; - this.chkBilinearInterpolation.Size = new System.Drawing.Size(206, 17); - this.chkBilinearInterpolation.TabIndex = 22; - this.chkBilinearInterpolation.Text = "Use bilinear interpolation when scaling"; - this.chkBilinearInterpolation.UseVisualStyleBackColor = true; - // // tabMain // this.tabMain.Controls.Add(this.tpgGeneral); - this.tabMain.Controls.Add(this.tpgOverscan); this.tabMain.Controls.Add(this.tpgPicture); + this.tabMain.Controls.Add(this.tpgOverscan); this.tabMain.Controls.Add(this.tpgPalette); this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMain.Location = new System.Drawing.Point(0, 0); this.tabMain.Name = "tabMain"; this.tabMain.SelectedIndex = 0; - this.tabMain.Size = new System.Drawing.Size(515, 376); + this.tabMain.Size = new System.Drawing.Size(515, 402); this.tabMain.TabIndex = 2; // // tpgGeneral @@ -362,18 +337,397 @@ this.tpgGeneral.Location = new System.Drawing.Point(4, 22); this.tpgGeneral.Name = "tpgGeneral"; this.tpgGeneral.Padding = new System.Windows.Forms.Padding(3); - this.tpgGeneral.Size = new System.Drawing.Size(507, 350); + this.tpgGeneral.Size = new System.Drawing.Size(507, 376); this.tpgGeneral.TabIndex = 0; this.tpgGeneral.Text = "General"; this.tpgGeneral.UseVisualStyleBackColor = true; // + // tpgPicture + // + this.tpgPicture.Controls.Add(this.tableLayoutPanel5); + this.tpgPicture.Location = new System.Drawing.Point(4, 22); + this.tpgPicture.Name = "tpgPicture"; + this.tpgPicture.Padding = new System.Windows.Forms.Padding(3); + this.tpgPicture.Size = new System.Drawing.Size(507, 376); + this.tpgPicture.TabIndex = 3; + this.tpgPicture.Text = "Picture"; + this.tpgPicture.UseVisualStyleBackColor = true; + // + // tableLayoutPanel5 + // + this.tableLayoutPanel5.ColumnCount = 2; + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel7, 0, 3); + this.tableLayoutPanel5.Controls.Add(this.flowLayoutPanel8, 0, 0); + this.tableLayoutPanel5.Controls.Add(this.grpNtscFilter, 1, 1); + this.tableLayoutPanel5.Controls.Add(this.grpCommon, 0, 1); + this.tableLayoutPanel5.Controls.Add(this.grpScanlines, 0, 2); + this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + this.tableLayoutPanel5.RowCount = 4; + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel5.Size = new System.Drawing.Size(501, 370); + this.tableLayoutPanel5.TabIndex = 5; + // + // tableLayoutPanel7 + // + this.tableLayoutPanel7.ColumnCount = 2; + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel7.Controls.Add(this.btnSelectPreset, 1, 0); + this.tableLayoutPanel7.Controls.Add(this.btnResetPictureSettings, 0, 0); + this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel7.Location = new System.Drawing.Point(0, 336); + this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + this.tableLayoutPanel7.RowCount = 1; + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel7.Size = new System.Drawing.Size(250, 34); + this.tableLayoutPanel7.TabIndex = 3; + // + // btnSelectPreset + // + this.btnSelectPreset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnSelectPreset.AutoSize = true; + this.btnSelectPreset.Image = ((System.Drawing.Image)(resources.GetObject("btnSelectPreset.Image"))); + this.btnSelectPreset.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.btnSelectPreset.Location = new System.Drawing.Point(151, 8); + this.btnSelectPreset.Name = "btnSelectPreset"; + this.btnSelectPreset.Size = new System.Drawing.Size(96, 23); + this.btnSelectPreset.TabIndex = 3; + this.btnSelectPreset.Text = "Select Preset..."; + this.btnSelectPreset.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; + this.btnSelectPreset.UseVisualStyleBackColor = true; + this.btnSelectPreset.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnSelectPreset_MouseClick); + // + // btnResetPictureSettings + // + this.btnResetPictureSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btnResetPictureSettings.AutoSize = true; + this.btnResetPictureSettings.Location = new System.Drawing.Point(3, 8); + this.btnResetPictureSettings.Name = "btnResetPictureSettings"; + this.btnResetPictureSettings.Size = new System.Drawing.Size(75, 23); + this.btnResetPictureSettings.TabIndex = 3; + this.btnResetPictureSettings.Text = "Reset"; + this.btnResetPictureSettings.UseVisualStyleBackColor = true; + this.btnResetPictureSettings.Click += new System.EventHandler(this.btnResetPictureSettings_Click); + // + // flowLayoutPanel8 + // + this.tableLayoutPanel5.SetColumnSpan(this.flowLayoutPanel8, 2); + this.flowLayoutPanel8.Controls.Add(this.lblVideoFilter); + this.flowLayoutPanel8.Controls.Add(this.cboFilter); + this.flowLayoutPanel8.Location = new System.Drawing.Point(0, 0); + this.flowLayoutPanel8.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel8.Name = "flowLayoutPanel8"; + this.flowLayoutPanel8.Size = new System.Drawing.Size(501, 26); + this.flowLayoutPanel8.TabIndex = 6; + // + // lblVideoFilter + // + this.lblVideoFilter.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblVideoFilter.AutoSize = true; + this.lblVideoFilter.Location = new System.Drawing.Point(3, 7); + this.lblVideoFilter.Name = "lblVideoFilter"; + this.lblVideoFilter.Size = new System.Drawing.Size(32, 13); + this.lblVideoFilter.TabIndex = 13; + this.lblVideoFilter.Text = "Filter:"; + // + // cboFilter + // + this.cboFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboFilter.FormattingEnabled = true; + this.cboFilter.Items.AddRange(new object[] { + "None", + "NTSC"}); + this.cboFilter.Location = new System.Drawing.Point(41, 3); + this.cboFilter.Name = "cboFilter"; + this.cboFilter.Size = new System.Drawing.Size(457, 21); + this.cboFilter.TabIndex = 15; + // + // grpNtscFilter + // + this.grpNtscFilter.Controls.Add(this.tableLayoutPanel6); + this.grpNtscFilter.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpNtscFilter.Location = new System.Drawing.Point(252, 26); + this.grpNtscFilter.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); + this.grpNtscFilter.Name = "grpNtscFilter"; + this.tableLayoutPanel5.SetRowSpan(this.grpNtscFilter, 3); + this.grpNtscFilter.Size = new System.Drawing.Size(249, 344); + this.grpNtscFilter.TabIndex = 4; + this.grpNtscFilter.TabStop = false; + this.grpNtscFilter.Text = "NTSC Filter"; + // + // tableLayoutPanel6 + // + this.tableLayoutPanel6.ColumnCount = 1; + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel6.Controls.Add(this.trkArtifacts, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.trkBleed, 0, 1); + this.tableLayoutPanel6.Controls.Add(this.trkFringing, 0, 2); + this.tableLayoutPanel6.Controls.Add(this.trkGamma, 0, 3); + this.tableLayoutPanel6.Controls.Add(this.trkResolution, 0, 4); + this.tableLayoutPanel6.Controls.Add(this.trkSharpness, 0, 5); + this.tableLayoutPanel6.Controls.Add(this.chkMergeFields, 0, 6); + this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + this.tableLayoutPanel6.RowCount = 7; + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel6.Size = new System.Drawing.Size(243, 325); + this.tableLayoutPanel6.TabIndex = 5; + // + // trkArtifacts + // + this.trkArtifacts.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkArtifacts.Location = new System.Drawing.Point(0, 0); + this.trkArtifacts.Margin = new System.Windows.Forms.Padding(0); + this.trkArtifacts.Maximum = 100; + this.trkArtifacts.MaximumSize = new System.Drawing.Size(0, 60); + this.trkArtifacts.Minimum = -100; + this.trkArtifacts.MinimumSize = new System.Drawing.Size(206, 50); + this.trkArtifacts.Name = "trkArtifacts"; + this.trkArtifacts.Size = new System.Drawing.Size(243, 50); + this.trkArtifacts.TabIndex = 24; + this.trkArtifacts.Text = "Artifacts"; + this.trkArtifacts.Value = 0; + // + // trkBleed + // + this.trkBleed.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkBleed.Location = new System.Drawing.Point(0, 50); + this.trkBleed.Margin = new System.Windows.Forms.Padding(0); + this.trkBleed.Maximum = 100; + this.trkBleed.MaximumSize = new System.Drawing.Size(400, 55); + this.trkBleed.Minimum = -100; + this.trkBleed.MinimumSize = new System.Drawing.Size(206, 50); + this.trkBleed.Name = "trkBleed"; + this.trkBleed.Size = new System.Drawing.Size(243, 50); + this.trkBleed.TabIndex = 25; + this.trkBleed.Text = "Bleed"; + this.trkBleed.Value = 0; + // + // trkFringing + // + this.trkFringing.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkFringing.Location = new System.Drawing.Point(0, 100); + this.trkFringing.Margin = new System.Windows.Forms.Padding(0); + this.trkFringing.Maximum = 100; + this.trkFringing.MaximumSize = new System.Drawing.Size(0, 41); + this.trkFringing.Minimum = -100; + this.trkFringing.MinimumSize = new System.Drawing.Size(206, 50); + this.trkFringing.Name = "trkFringing"; + this.trkFringing.Size = new System.Drawing.Size(243, 50); + this.trkFringing.TabIndex = 26; + this.trkFringing.Text = "Fringing"; + this.trkFringing.Value = 0; + // + // trkGamma + // + this.trkGamma.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkGamma.Location = new System.Drawing.Point(0, 150); + this.trkGamma.Margin = new System.Windows.Forms.Padding(0); + this.trkGamma.Maximum = 100; + this.trkGamma.MaximumSize = new System.Drawing.Size(0, 41); + this.trkGamma.Minimum = -100; + this.trkGamma.MinimumSize = new System.Drawing.Size(206, 50); + this.trkGamma.Name = "trkGamma"; + this.trkGamma.Size = new System.Drawing.Size(243, 50); + this.trkGamma.TabIndex = 27; + this.trkGamma.Text = "Gamma"; + this.trkGamma.Value = 0; + // + // trkResolution + // + this.trkResolution.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkResolution.Location = new System.Drawing.Point(0, 200); + this.trkResolution.Margin = new System.Windows.Forms.Padding(0); + this.trkResolution.Maximum = 100; + this.trkResolution.MaximumSize = new System.Drawing.Size(0, 41); + this.trkResolution.Minimum = -100; + this.trkResolution.MinimumSize = new System.Drawing.Size(206, 50); + this.trkResolution.Name = "trkResolution"; + this.trkResolution.Size = new System.Drawing.Size(243, 50); + this.trkResolution.TabIndex = 28; + this.trkResolution.Text = "Resolution"; + this.trkResolution.Value = 0; + // + // trkSharpness + // + this.trkSharpness.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkSharpness.Location = new System.Drawing.Point(0, 250); + this.trkSharpness.Margin = new System.Windows.Forms.Padding(0); + this.trkSharpness.Maximum = 100; + this.trkSharpness.MaximumSize = new System.Drawing.Size(0, 41); + this.trkSharpness.Minimum = -100; + this.trkSharpness.MinimumSize = new System.Drawing.Size(206, 50); + this.trkSharpness.Name = "trkSharpness"; + this.trkSharpness.Size = new System.Drawing.Size(243, 50); + this.trkSharpness.TabIndex = 29; + this.trkSharpness.Text = "Sharpness"; + this.trkSharpness.Value = 0; + // + // chkMergeFields + // + this.chkMergeFields.AutoSize = true; + this.chkMergeFields.Location = new System.Drawing.Point(3, 303); + this.chkMergeFields.Name = "chkMergeFields"; + this.chkMergeFields.Size = new System.Drawing.Size(86, 17); + this.chkMergeFields.TabIndex = 30; + this.chkMergeFields.Text = "Merge Fields"; + this.chkMergeFields.UseVisualStyleBackColor = true; + // + // grpCommon + // + this.grpCommon.Controls.Add(this.tableLayoutPanel4); + this.grpCommon.Location = new System.Drawing.Point(0, 26); + this.grpCommon.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); + this.grpCommon.Name = "grpCommon"; + this.grpCommon.Size = new System.Drawing.Size(248, 238); + this.grpCommon.TabIndex = 3; + this.grpCommon.TabStop = false; + this.grpCommon.Text = "Common Settings"; + // + // tableLayoutPanel4 + // + this.tableLayoutPanel4.ColumnCount = 1; + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel4.Controls.Add(this.chkBilinearInterpolation, 0, 4); + this.tableLayoutPanel4.Controls.Add(this.trkBrightness, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.trkContrast, 0, 1); + this.tableLayoutPanel4.Controls.Add(this.trkHue, 0, 2); + this.tableLayoutPanel4.Controls.Add(this.trkSaturation, 0, 3); + this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + this.tableLayoutPanel4.RowCount = 5; + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(242, 236); + this.tableLayoutPanel4.TabIndex = 4; + // + // chkBilinearInterpolation + // + this.chkBilinearInterpolation.AutoSize = true; + this.tableLayoutPanel4.SetColumnSpan(this.chkBilinearInterpolation, 2); + this.chkBilinearInterpolation.Location = new System.Drawing.Point(3, 203); + this.chkBilinearInterpolation.Name = "chkBilinearInterpolation"; + this.chkBilinearInterpolation.Size = new System.Drawing.Size(206, 17); + this.chkBilinearInterpolation.TabIndex = 28; + this.chkBilinearInterpolation.Text = "Use bilinear interpolation when scaling"; + this.chkBilinearInterpolation.UseVisualStyleBackColor = true; + // + // trkBrightness + // + this.trkBrightness.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkBrightness.Location = new System.Drawing.Point(0, 0); + this.trkBrightness.Margin = new System.Windows.Forms.Padding(0); + this.trkBrightness.Maximum = 100; + this.trkBrightness.MaximumSize = new System.Drawing.Size(0, 60); + this.trkBrightness.Minimum = -100; + this.trkBrightness.MinimumSize = new System.Drawing.Size(206, 50); + this.trkBrightness.Name = "trkBrightness"; + this.trkBrightness.Size = new System.Drawing.Size(242, 50); + this.trkBrightness.TabIndex = 24; + this.trkBrightness.Text = "Brightness"; + this.trkBrightness.Value = 0; + // + // trkContrast + // + this.trkContrast.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkContrast.Location = new System.Drawing.Point(0, 50); + this.trkContrast.Margin = new System.Windows.Forms.Padding(0); + this.trkContrast.Maximum = 100; + this.trkContrast.MaximumSize = new System.Drawing.Size(400, 55); + this.trkContrast.Minimum = -100; + this.trkContrast.MinimumSize = new System.Drawing.Size(206, 50); + this.trkContrast.Name = "trkContrast"; + this.trkContrast.Size = new System.Drawing.Size(242, 50); + this.trkContrast.TabIndex = 25; + this.trkContrast.Text = "Contrast"; + this.trkContrast.Value = 0; + // + // trkHue + // + this.trkHue.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkHue.Location = new System.Drawing.Point(0, 100); + this.trkHue.Margin = new System.Windows.Forms.Padding(0); + this.trkHue.Maximum = 100; + this.trkHue.MaximumSize = new System.Drawing.Size(0, 41); + this.trkHue.Minimum = -100; + this.trkHue.MinimumSize = new System.Drawing.Size(206, 50); + this.trkHue.Name = "trkHue"; + this.trkHue.Size = new System.Drawing.Size(242, 50); + this.trkHue.TabIndex = 26; + this.trkHue.Text = "Hue"; + this.trkHue.Value = 0; + // + // trkSaturation + // + this.trkSaturation.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkSaturation.Location = new System.Drawing.Point(0, 150); + this.trkSaturation.Margin = new System.Windows.Forms.Padding(0); + this.trkSaturation.Maximum = 100; + this.trkSaturation.MaximumSize = new System.Drawing.Size(0, 41); + this.trkSaturation.Minimum = -100; + this.trkSaturation.MinimumSize = new System.Drawing.Size(206, 50); + this.trkSaturation.Name = "trkSaturation"; + this.trkSaturation.Size = new System.Drawing.Size(242, 50); + this.trkSaturation.TabIndex = 27; + this.trkSaturation.Text = "Saturation"; + this.trkSaturation.Value = 0; + // + // grpScanlines + // + this.grpScanlines.Controls.Add(this.trkScanlines); + this.grpScanlines.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpScanlines.Location = new System.Drawing.Point(0, 264); + this.grpScanlines.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0); + this.grpScanlines.Name = "grpScanlines"; + this.grpScanlines.Size = new System.Drawing.Size(250, 72); + this.grpScanlines.TabIndex = 5; + this.grpScanlines.TabStop = false; + this.grpScanlines.Text = "Scanlines"; + // + // trkScanlines + // + this.trkScanlines.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkScanlines.Location = new System.Drawing.Point(3, 16); + this.trkScanlines.Margin = new System.Windows.Forms.Padding(0); + this.trkScanlines.Maximum = 100; + this.trkScanlines.MaximumSize = new System.Drawing.Size(0, 41); + this.trkScanlines.Minimum = 0; + this.trkScanlines.MinimumSize = new System.Drawing.Size(206, 50); + this.trkScanlines.Name = "trkScanlines"; + this.trkScanlines.Size = new System.Drawing.Size(244, 50); + this.trkScanlines.TabIndex = 28; + this.trkScanlines.Text = "Scanlines"; + this.trkScanlines.Value = 0; + // // tpgOverscan // this.tpgOverscan.Controls.Add(this.grpCropping); this.tpgOverscan.Location = new System.Drawing.Point(4, 22); this.tpgOverscan.Name = "tpgOverscan"; this.tpgOverscan.Padding = new System.Windows.Forms.Padding(3); - this.tpgOverscan.Size = new System.Drawing.Size(507, 350); + this.tpgOverscan.Size = new System.Drawing.Size(507, 376); this.tpgOverscan.TabIndex = 1; this.tpgOverscan.Text = "Overscan"; this.tpgOverscan.UseVisualStyleBackColor = true; @@ -384,7 +738,7 @@ this.grpCropping.Dock = System.Windows.Forms.DockStyle.Fill; this.grpCropping.Location = new System.Drawing.Point(3, 3); this.grpCropping.Name = "grpCropping"; - this.grpCropping.Size = new System.Drawing.Size(501, 344); + this.grpCropping.Size = new System.Drawing.Size(501, 370); this.grpCropping.TabIndex = 8; this.grpCropping.TabStop = false; this.grpCropping.Text = "Video Cropping"; @@ -401,7 +755,7 @@ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel4, 1, 0); this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel5, 1, 2); this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 2, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(65, 12); + this.tableLayoutPanel1.Location = new System.Drawing.Point(65, 25); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -544,315 +898,13 @@ this.nudOverscanRight.TabIndex = 1; this.nudOverscanRight.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); // - // tpgPicture - // - this.tpgPicture.Controls.Add(this.tableLayoutPanel5); - this.tpgPicture.Location = new System.Drawing.Point(4, 22); - this.tpgPicture.Name = "tpgPicture"; - this.tpgPicture.Padding = new System.Windows.Forms.Padding(3); - this.tpgPicture.Size = new System.Drawing.Size(507, 350); - this.tpgPicture.TabIndex = 3; - this.tpgPicture.Text = "Picture"; - this.tpgPicture.UseVisualStyleBackColor = true; - // - // tableLayoutPanel5 - // - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.Controls.Add(this.btnResetPictureSettings, 0, 2); - this.tableLayoutPanel5.Controls.Add(this.grpNtscFilter, 1, 0); - this.tableLayoutPanel5.Controls.Add(this.grpCommon, 0, 0); - this.tableLayoutPanel5.Controls.Add(this.grpScanlines, 0, 1); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 3; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(501, 344); - this.tableLayoutPanel5.TabIndex = 5; - // - // btnResetPictureSettings - // - this.btnResetPictureSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnResetPictureSettings.AutoSize = true; - this.btnResetPictureSettings.Location = new System.Drawing.Point(3, 318); - this.btnResetPictureSettings.Name = "btnResetPictureSettings"; - this.btnResetPictureSettings.Size = new System.Drawing.Size(75, 23); - this.btnResetPictureSettings.TabIndex = 3; - this.btnResetPictureSettings.Text = "Reset"; - this.btnResetPictureSettings.UseVisualStyleBackColor = true; - this.btnResetPictureSettings.Click += new System.EventHandler(this.btnResetPictureSettings_Click); - // - // grpNtscFilter - // - this.grpNtscFilter.Controls.Add(this.tableLayoutPanel6); - this.grpNtscFilter.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpNtscFilter.Location = new System.Drawing.Point(252, 0); - this.grpNtscFilter.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); - this.grpNtscFilter.Name = "grpNtscFilter"; - this.tableLayoutPanel5.SetRowSpan(this.grpNtscFilter, 3); - this.grpNtscFilter.Size = new System.Drawing.Size(249, 344); - this.grpNtscFilter.TabIndex = 4; - this.grpNtscFilter.TabStop = false; - this.grpNtscFilter.Text = "NTSC Filter"; - // - // tableLayoutPanel6 - // - this.tableLayoutPanel6.ColumnCount = 1; - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Controls.Add(this.trkArtifacts, 0, 0); - this.tableLayoutPanel6.Controls.Add(this.trkBleed, 0, 1); - this.tableLayoutPanel6.Controls.Add(this.trkFringing, 0, 2); - this.tableLayoutPanel6.Controls.Add(this.trkGamma, 0, 3); - this.tableLayoutPanel6.Controls.Add(this.trkResolution, 0, 4); - this.tableLayoutPanel6.Controls.Add(this.trkSharpness, 0, 5); - this.tableLayoutPanel6.Controls.Add(this.chkMergeFields, 0, 6); - this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 16); - this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - this.tableLayoutPanel6.RowCount = 7; - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(243, 325); - this.tableLayoutPanel6.TabIndex = 5; - // - // trkArtifacts - // - this.trkArtifacts.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkArtifacts.Location = new System.Drawing.Point(0, 0); - this.trkArtifacts.Margin = new System.Windows.Forms.Padding(0); - this.trkArtifacts.Maximum = 100; - this.trkArtifacts.MaximumSize = new System.Drawing.Size(0, 60); - this.trkArtifacts.Minimum = -100; - this.trkArtifacts.MinimumSize = new System.Drawing.Size(206, 50); - this.trkArtifacts.Name = "trkArtifacts"; - this.trkArtifacts.Size = new System.Drawing.Size(243, 50); - this.trkArtifacts.TabIndex = 24; - this.trkArtifacts.Text = "Artifacts"; - this.trkArtifacts.Value = 0; - // - // trkBleed - // - this.trkBleed.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBleed.Location = new System.Drawing.Point(0, 50); - this.trkBleed.Margin = new System.Windows.Forms.Padding(0); - this.trkBleed.Maximum = 100; - this.trkBleed.MaximumSize = new System.Drawing.Size(400, 55); - this.trkBleed.Minimum = -100; - this.trkBleed.MinimumSize = new System.Drawing.Size(206, 50); - this.trkBleed.Name = "trkBleed"; - this.trkBleed.Size = new System.Drawing.Size(243, 50); - this.trkBleed.TabIndex = 25; - this.trkBleed.Text = "Bleed"; - this.trkBleed.Value = 0; - // - // trkFringing - // - this.trkFringing.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkFringing.Location = new System.Drawing.Point(0, 100); - this.trkFringing.Margin = new System.Windows.Forms.Padding(0); - this.trkFringing.Maximum = 100; - this.trkFringing.MaximumSize = new System.Drawing.Size(0, 41); - this.trkFringing.Minimum = -100; - this.trkFringing.MinimumSize = new System.Drawing.Size(206, 50); - this.trkFringing.Name = "trkFringing"; - this.trkFringing.Size = new System.Drawing.Size(243, 50); - this.trkFringing.TabIndex = 26; - this.trkFringing.Text = "Fringing"; - this.trkFringing.Value = 0; - // - // trkGamma - // - this.trkGamma.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkGamma.Location = new System.Drawing.Point(0, 150); - this.trkGamma.Margin = new System.Windows.Forms.Padding(0); - this.trkGamma.Maximum = 100; - this.trkGamma.MaximumSize = new System.Drawing.Size(0, 41); - this.trkGamma.Minimum = -100; - this.trkGamma.MinimumSize = new System.Drawing.Size(206, 50); - this.trkGamma.Name = "trkGamma"; - this.trkGamma.Size = new System.Drawing.Size(243, 50); - this.trkGamma.TabIndex = 27; - this.trkGamma.Text = "Gamma"; - this.trkGamma.Value = 0; - // - // trkResolution - // - this.trkResolution.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkResolution.Location = new System.Drawing.Point(0, 200); - this.trkResolution.Margin = new System.Windows.Forms.Padding(0); - this.trkResolution.Maximum = 100; - this.trkResolution.MaximumSize = new System.Drawing.Size(0, 41); - this.trkResolution.Minimum = -100; - this.trkResolution.MinimumSize = new System.Drawing.Size(206, 50); - this.trkResolution.Name = "trkResolution"; - this.trkResolution.Size = new System.Drawing.Size(243, 50); - this.trkResolution.TabIndex = 28; - this.trkResolution.Text = "Resolution"; - this.trkResolution.Value = 0; - // - // trkSharpness - // - this.trkSharpness.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkSharpness.Location = new System.Drawing.Point(0, 250); - this.trkSharpness.Margin = new System.Windows.Forms.Padding(0); - this.trkSharpness.Maximum = 100; - this.trkSharpness.MaximumSize = new System.Drawing.Size(0, 41); - this.trkSharpness.Minimum = -100; - this.trkSharpness.MinimumSize = new System.Drawing.Size(206, 50); - this.trkSharpness.Name = "trkSharpness"; - this.trkSharpness.Size = new System.Drawing.Size(243, 50); - this.trkSharpness.TabIndex = 29; - this.trkSharpness.Text = "Sharpness"; - this.trkSharpness.Value = 0; - // - // chkMergeFields - // - this.chkMergeFields.AutoSize = true; - this.chkMergeFields.Location = new System.Drawing.Point(3, 303); - this.chkMergeFields.Name = "chkMergeFields"; - this.chkMergeFields.Size = new System.Drawing.Size(86, 17); - this.chkMergeFields.TabIndex = 30; - this.chkMergeFields.Text = "Merge Fields"; - this.chkMergeFields.UseVisualStyleBackColor = true; - // - // grpCommon - // - this.grpCommon.Controls.Add(this.tableLayoutPanel4); - this.grpCommon.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpCommon.Location = new System.Drawing.Point(0, 0); - this.grpCommon.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); - this.grpCommon.Name = "grpCommon"; - this.grpCommon.Size = new System.Drawing.Size(248, 217); - this.grpCommon.TabIndex = 3; - this.grpCommon.TabStop = false; - this.grpCommon.Text = "Common Settings"; - // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.ColumnCount = 1; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Controls.Add(this.trkBrightness, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.trkContrast, 0, 1); - this.tableLayoutPanel4.Controls.Add(this.trkHue, 0, 2); - this.tableLayoutPanel4.Controls.Add(this.trkSaturation, 0, 3); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 16); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 5; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(242, 198); - this.tableLayoutPanel4.TabIndex = 4; - // - // trkBrightness - // - this.trkBrightness.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBrightness.Location = new System.Drawing.Point(0, 0); - this.trkBrightness.Margin = new System.Windows.Forms.Padding(0); - this.trkBrightness.Maximum = 100; - this.trkBrightness.MaximumSize = new System.Drawing.Size(0, 60); - this.trkBrightness.Minimum = -100; - this.trkBrightness.MinimumSize = new System.Drawing.Size(206, 50); - this.trkBrightness.Name = "trkBrightness"; - this.trkBrightness.Size = new System.Drawing.Size(242, 50); - this.trkBrightness.TabIndex = 24; - this.trkBrightness.Text = "Brightness"; - this.trkBrightness.Value = 0; - // - // trkContrast - // - this.trkContrast.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkContrast.Location = new System.Drawing.Point(0, 50); - this.trkContrast.Margin = new System.Windows.Forms.Padding(0); - this.trkContrast.Maximum = 100; - this.trkContrast.MaximumSize = new System.Drawing.Size(400, 55); - this.trkContrast.Minimum = -100; - this.trkContrast.MinimumSize = new System.Drawing.Size(206, 50); - this.trkContrast.Name = "trkContrast"; - this.trkContrast.Size = new System.Drawing.Size(242, 50); - this.trkContrast.TabIndex = 25; - this.trkContrast.Text = "Contrast"; - this.trkContrast.Value = 0; - // - // trkHue - // - this.trkHue.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkHue.Location = new System.Drawing.Point(0, 100); - this.trkHue.Margin = new System.Windows.Forms.Padding(0); - this.trkHue.Maximum = 100; - this.trkHue.MaximumSize = new System.Drawing.Size(0, 41); - this.trkHue.Minimum = -100; - this.trkHue.MinimumSize = new System.Drawing.Size(206, 50); - this.trkHue.Name = "trkHue"; - this.trkHue.Size = new System.Drawing.Size(242, 50); - this.trkHue.TabIndex = 26; - this.trkHue.Text = "Hue"; - this.trkHue.Value = 0; - // - // trkSaturation - // - this.trkSaturation.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkSaturation.Location = new System.Drawing.Point(0, 150); - this.trkSaturation.Margin = new System.Windows.Forms.Padding(0); - this.trkSaturation.Maximum = 100; - this.trkSaturation.MaximumSize = new System.Drawing.Size(0, 41); - this.trkSaturation.Minimum = -100; - this.trkSaturation.MinimumSize = new System.Drawing.Size(206, 50); - this.trkSaturation.Name = "trkSaturation"; - this.trkSaturation.Size = new System.Drawing.Size(242, 50); - this.trkSaturation.TabIndex = 27; - this.trkSaturation.Text = "Saturation"; - this.trkSaturation.Value = 0; - // - // grpScanlines - // - this.grpScanlines.Controls.Add(this.trkScanlines); - this.grpScanlines.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpScanlines.Location = new System.Drawing.Point(3, 220); - this.grpScanlines.Name = "grpScanlines"; - this.grpScanlines.Size = new System.Drawing.Size(244, 72); - this.grpScanlines.TabIndex = 5; - this.grpScanlines.TabStop = false; - this.grpScanlines.Text = "Scanlines"; - // - // trkScanlines - // - this.trkScanlines.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkScanlines.Location = new System.Drawing.Point(3, 16); - this.trkScanlines.Margin = new System.Windows.Forms.Padding(0); - this.trkScanlines.Maximum = 100; - this.trkScanlines.MaximumSize = new System.Drawing.Size(0, 41); - this.trkScanlines.Minimum = 0; - this.trkScanlines.MinimumSize = new System.Drawing.Size(206, 50); - this.trkScanlines.Name = "trkScanlines"; - this.trkScanlines.Size = new System.Drawing.Size(238, 50); - this.trkScanlines.TabIndex = 28; - this.trkScanlines.Text = "Scanlines"; - this.trkScanlines.Value = 0; - // // tpgPalette // this.tpgPalette.Controls.Add(this.tableLayoutPanel3); this.tpgPalette.Location = new System.Drawing.Point(4, 22); this.tpgPalette.Name = "tpgPalette"; this.tpgPalette.Padding = new System.Windows.Forms.Padding(3); - this.tpgPalette.Size = new System.Drawing.Size(507, 350); + this.tpgPalette.Size = new System.Drawing.Size(507, 376); this.tpgPalette.TabIndex = 2; this.tpgPalette.Text = "Palette"; this.tpgPalette.UseVisualStyleBackColor = true; @@ -871,7 +923,7 @@ this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.Size = new System.Drawing.Size(501, 344); + this.tableLayoutPanel3.Size = new System.Drawing.Size(501, 370); this.tableLayoutPanel3.TabIndex = 4; // // picPalette @@ -926,11 +978,49 @@ this.btnLoadPalFile.UseVisualStyleBackColor = true; this.btnLoadPalFile.Click += new System.EventHandler(this.btnLoadPalFile_Click); // + // contextPicturePresets + // + this.contextPicturePresets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuPresetComposite, + this.mnuPresetSVideo, + this.menuPresetRgb, + this.mnuPresetMonochrome}); + this.contextPicturePresets.Name = "contextPicturePresets"; + this.contextPicturePresets.Size = new System.Drawing.Size(148, 92); + // + // mnuPresetComposite + // + this.mnuPresetComposite.Name = "mnuPresetComposite"; + this.mnuPresetComposite.Size = new System.Drawing.Size(147, 22); + this.mnuPresetComposite.Text = "Composite"; + this.mnuPresetComposite.Click += new System.EventHandler(this.mnuPresetComposite_Click); + // + // mnuPresetSVideo + // + this.mnuPresetSVideo.Name = "mnuPresetSVideo"; + this.mnuPresetSVideo.Size = new System.Drawing.Size(147, 22); + this.mnuPresetSVideo.Text = "S-Video"; + this.mnuPresetSVideo.Click += new System.EventHandler(this.mnuPresetSVideo_Click); + // + // menuPresetRgb + // + this.menuPresetRgb.Name = "menuPresetRgb"; + this.menuPresetRgb.Size = new System.Drawing.Size(147, 22); + this.menuPresetRgb.Text = "RGB"; + this.menuPresetRgb.Click += new System.EventHandler(this.menuPresetRgb_Click); + // + // mnuPresetMonochrome + // + this.mnuPresetMonochrome.Name = "mnuPresetMonochrome"; + this.mnuPresetMonochrome.Size = new System.Drawing.Size(147, 22); + this.mnuPresetMonochrome.Text = "Monochrome"; + this.mnuPresetMonochrome.Click += new System.EventHandler(this.mnuPresetMonochrome_Click); + // // frmVideoConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(515, 405); + this.ClientSize = new System.Drawing.Size(515, 431); this.Controls.Add(this.tabMain); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; @@ -951,6 +1041,19 @@ ((System.ComponentModel.ISupportInitialize)(this.nudScale)).EndInit(); this.tabMain.ResumeLayout(false); this.tpgGeneral.ResumeLayout(false); + this.tpgPicture.ResumeLayout(false); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel7.PerformLayout(); + this.flowLayoutPanel8.ResumeLayout(false); + this.flowLayoutPanel8.PerformLayout(); + this.grpNtscFilter.ResumeLayout(false); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); + this.grpCommon.ResumeLayout(false); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); + this.grpScanlines.ResumeLayout(false); this.tpgOverscan.ResumeLayout(false); this.grpCropping.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); @@ -967,20 +1070,12 @@ this.flowLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudOverscanRight)).EndInit(); - this.tpgPicture.ResumeLayout(false); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel5.PerformLayout(); - this.grpNtscFilter.ResumeLayout(false); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel6.PerformLayout(); - this.grpCommon.ResumeLayout(false); - this.tableLayoutPanel4.ResumeLayout(false); - this.grpScanlines.ResumeLayout(false); this.tpgPalette.ResumeLayout(false); this.tableLayoutPanel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.picPalette)).EndInit(); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); + this.contextPicturePresets.ResumeLayout(false); this.ResumeLayout(false); } @@ -994,8 +1089,6 @@ private System.Windows.Forms.NumericUpDown nudEmulationSpeed; private System.Windows.Forms.Label lblEmuSpeedHint; private System.Windows.Forms.Label lblVideoScale; - private System.Windows.Forms.Label lblVideoFilter; - private System.Windows.Forms.ComboBox cboFilter; private System.Windows.Forms.CheckBox chkVerticalSync; private System.Windows.Forms.ComboBox cboAspectRatio; private System.Windows.Forms.Label lblDisplayRatio; @@ -1028,7 +1121,6 @@ private System.Windows.Forms.Button btnLoadPalFile; private System.Windows.Forms.ColorDialog colorDialog; private System.Windows.Forms.NumericUpDown nudScale; - private System.Windows.Forms.CheckBox chkBilinearInterpolation; private System.Windows.Forms.TabPage tpgPicture; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private Controls.ctrlHorizontalTrackbar trkBrightness; @@ -1049,5 +1141,16 @@ private System.Windows.Forms.Button btnResetPictureSettings; private System.Windows.Forms.GroupBox grpScanlines; private Controls.ctrlHorizontalTrackbar trkScanlines; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel7; + private System.Windows.Forms.Button btnSelectPreset; + private System.Windows.Forms.ContextMenuStrip contextPicturePresets; + private System.Windows.Forms.ToolStripMenuItem mnuPresetComposite; + private System.Windows.Forms.ToolStripMenuItem mnuPresetSVideo; + private System.Windows.Forms.ToolStripMenuItem menuPresetRgb; + private System.Windows.Forms.ToolStripMenuItem mnuPresetMonochrome; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel8; + private System.Windows.Forms.Label lblVideoFilter; + private System.Windows.Forms.ComboBox cboFilter; + private System.Windows.Forms.CheckBox chkBilinearInterpolation; } } \ No newline at end of file diff --git a/GUI.NET/Forms/Config/frmVideoConfig.cs b/GUI.NET/Forms/Config/frmVideoConfig.cs index 3e750887..d168ff77 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.cs @@ -171,6 +171,7 @@ namespace Mesen.GUI.Forms.Config private void btnResetPictureSettings_Click(object sender, EventArgs e) { + cboFilter.SelectedIndex = 0; trkBrightness.Value = 0; trkContrast.Value = 0; trkHue.Value = 0; @@ -186,5 +187,82 @@ namespace Mesen.GUI.Forms.Config trkSharpness.Value = 0; chkMergeFields.Checked = false; } + + private void btnSelectPreset_MouseClick(object sender, MouseEventArgs e) + { + contextPicturePresets.Show(btnSelectPreset.PointToScreen(new Point(0, btnSelectPreset.Height-1))); + } + + private void mnuPresetComposite_Click(object sender, EventArgs e) + { + cboFilter.SelectedIndex = 1; + trkHue.Value = 0; + trkSaturation.Value = 0; + trkContrast.Value = 0; + trkBrightness.Value = 0; + trkSharpness.Value = 0; + trkGamma.Value = 0; + trkResolution.Value = 0; + trkArtifacts.Value = 0; + trkFringing.Value = 0; + trkBleed.Value = 0; + chkMergeFields.Checked = false; + + trkScanlines.Value = 15; + } + + private void mnuPresetSVideo_Click(object sender, EventArgs e) + { + cboFilter.SelectedIndex = 1; + trkHue.Value = 0; + trkSaturation.Value = 0; + trkContrast.Value = 0; + trkBrightness.Value = 0; + trkSharpness.Value = 20; + trkGamma.Value = 0; + trkResolution.Value = 20; + trkArtifacts.Value = -100; + trkFringing.Value = -100; + trkBleed.Value = 0; + chkMergeFields.Checked = false; + + trkScanlines.Value = 15; + } + + private void menuPresetRgb_Click(object sender, EventArgs e) + { + cboFilter.SelectedIndex = 1; + trkHue.Value = 0; + trkSaturation.Value = 0; + trkContrast.Value = 0; + trkBrightness.Value = 0; + trkSharpness.Value = 20; + trkGamma.Value = 0; + trkResolution.Value = 70; + trkArtifacts.Value = -100; + trkFringing.Value = -100; + trkBleed.Value = -100; + chkMergeFields.Checked = false; + + trkScanlines.Value = 15; + } + + private void mnuPresetMonochrome_Click(object sender, EventArgs e) + { + cboFilter.SelectedIndex = 1; + trkHue.Value = 0; + trkSaturation.Value = -100; + trkContrast.Value = 0; + trkBrightness.Value = 0; + trkSharpness.Value = 20; + trkGamma.Value = 0; + trkResolution.Value = 70; + trkArtifacts.Value = -20; + trkFringing.Value = -20; + trkBleed.Value = -10; + chkMergeFields.Checked = false; + + trkScanlines.Value = 15; + } } } diff --git a/GUI.NET/Forms/Config/frmVideoConfig.resx b/GUI.NET/Forms/Config/frmVideoConfig.resx index aeccf29f..413f6efb 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.resx +++ b/GUI.NET/Forms/Config/frmVideoConfig.resx @@ -120,6 +120,18 @@ 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUA + AAArSURBVBhXY/j//z9OjFUQhkEARGLHUBUYEmBxJCNQJFAkwRwkif///zMAAD5AXaOzoq98AAAAAElF + TkSuQmCC + + + + 221, 17 + 107, 17 diff --git a/GUI.NET/GUI.NET.csproj b/GUI.NET/GUI.NET.csproj index a494e27f..d3fdb183 100644 --- a/GUI.NET/GUI.NET.csproj +++ b/GUI.NET/GUI.NET.csproj @@ -683,6 +683,7 @@ Always + diff --git a/GUI.NET/Properties/Resources.Designer.cs b/GUI.NET/Properties/Resources.Designer.cs index 5a09969e..a0cfc8b8 100644 --- a/GUI.NET/Properties/Resources.Designer.cs +++ b/GUI.NET/Properties/Resources.Designer.cs @@ -140,6 +140,16 @@ namespace Mesen.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap DownArrow { + get { + object obj = ResourceManager.GetObject("DownArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/GUI.NET/Properties/Resources.resx b/GUI.NET/Properties/Resources.resx index f49fd2ab..1c6c24a5 100644 --- a/GUI.NET/Properties/Resources.resx +++ b/GUI.NET/Properties/Resources.resx @@ -202,4 +202,7 @@ ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DownArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/GUI.NET/Resources/DownArrow.png b/GUI.NET/Resources/DownArrow.png new file mode 100644 index 00000000..7e8a5597 Binary files /dev/null and b/GUI.NET/Resources/DownArrow.png differ