UI: Fixed layout issues in video config (+ down arrow icon change in win8+)

This commit is contained in:
Souryo 2017-09-18 21:40:21 -04:00
parent 1f2457769b
commit b8630ddeeb
16 changed files with 61 additions and 76 deletions

View file

@ -1,13 +1,14 @@
using System.Windows.Forms; using System.Windows.Forms;
using System.Drawing; using System.Drawing;
using Mesen.GUI; using Mesen.GUI;
using System;
namespace Mesen.GUI.Controls namespace Mesen.GUI.Controls
{ {
public class BaseControl : UserControl public class BaseControl : UserControl
{ {
public static float DefaultFontSize = Program.IsMono ? 10 : 12; public static float DefaultFontSize = Program.IsMono ? 10 : 12;
public static string MonospaceFontFamily public static string MonospaceFontFamily
{ {
get get
@ -20,6 +21,18 @@ namespace Mesen.GUI.Controls
} }
} }
public static Bitmap DownArrow
{
get
{
if(!Program.IsMono && Environment.OSVersion.Version >= new Version(6, 2)) {
return Properties.Resources.DownArrowWin10;
} else {
return Properties.Resources.DownArrow;
}
}
}
public new AutoScaleMode AutoScaleMode public new AutoScaleMode AutoScaleMode
{ {
set { set {

View file

@ -28,7 +28,6 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ctrlConsoleStatus));
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.grpPPUStatus = new System.Windows.Forms.GroupBox(); this.grpPPUStatus = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel();
@ -1162,7 +1161,7 @@
// //
this.btnGoto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnGoto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnGoto.AutoSize = true; this.btnGoto.AutoSize = true;
this.btnGoto.Image = ((System.Drawing.Image)(resources.GetObject("btnGoto.Image"))); this.btnGoto.Image = global::Mesen.GUI.Properties.Resources.DownArrow;
this.btnGoto.Location = new System.Drawing.Point(378, 3); this.btnGoto.Location = new System.Drawing.Point(378, 3);
this.btnGoto.Name = "btnGoto"; this.btnGoto.Name = "btnGoto";
this.btnGoto.Size = new System.Drawing.Size(72, 23); this.btnGoto.Size = new System.Drawing.Size(72, 23);

View file

@ -38,6 +38,8 @@ namespace Mesen.GUI.Debugger
this.Font = new Font("Microsoft Sans Serif", 7.75F); this.Font = new Font("Microsoft Sans Serif", 7.75F);
} }
btnGoto.Image = BaseControl.DownArrow;
_cpuBinder.Entity = new CPUState(); _cpuBinder.Entity = new CPUState();
_ppuControlBinder.Entity = new PPUControlFlags(); _ppuControlBinder.Entity = new PPUControlFlags();
_ppuStatusBinder.Entity = new PPUStatusFlags(); _ppuStatusBinder.Entity = new PPUStatusFlags();

View file

@ -117,15 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnGoto.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUA
AAArSURBVBhXY/j//z9OjFUQhkEARGLHUBUYEmBxJCNQJFAkwRwkif///zMAAD5AXaOzoq98AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="tmrButton.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="tmrButton.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View file

@ -29,7 +29,6 @@ namespace Mesen.GUI.Forms.Cheats
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmCheatList));
this.tabMain = new System.Windows.Forms.TabControl(); this.tabMain = new System.Windows.Forms.TabControl();
this.tabCheats = new System.Windows.Forms.TabPage(); this.tabCheats = new System.Windows.Forms.TabPage();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@ -234,11 +233,11 @@ namespace Mesen.GUI.Forms.Cheats
this.mnuDeleteCheat, this.mnuDeleteCheat,
this.mnuExportSelectedCheats}); this.mnuExportSelectedCheats});
this.contextMenuCheats.Name = "contextMenuCheats"; this.contextMenuCheats.Name = "contextMenuCheats";
this.contextMenuCheats.Size = new System.Drawing.Size(160, 70); this.contextMenuCheats.Size = new System.Drawing.Size(160, 92);
// //
// mnuAddCheat // mnuAddCheat
// //
this.mnuAddCheat.Image = ((System.Drawing.Image)(resources.GetObject("mnuAddCheat.Image"))); this.mnuAddCheat.Image = global::Mesen.GUI.Properties.Resources.Add;
this.mnuAddCheat.Name = "mnuAddCheat"; this.mnuAddCheat.Name = "mnuAddCheat";
this.mnuAddCheat.ShortcutKeys = System.Windows.Forms.Keys.Insert; this.mnuAddCheat.ShortcutKeys = System.Windows.Forms.Keys.Insert;
this.mnuAddCheat.Size = new System.Drawing.Size(159, 22); this.mnuAddCheat.Size = new System.Drawing.Size(159, 22);
@ -280,7 +279,7 @@ namespace Mesen.GUI.Forms.Cheats
// //
// btnAddCheat // btnAddCheat
// //
this.btnAddCheat.Image = ((System.Drawing.Image)(resources.GetObject("btnAddCheat.Image"))); this.btnAddCheat.Image = global::Mesen.GUI.Properties.Resources.Add;
this.btnAddCheat.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnAddCheat.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnAddCheat.Name = "btnAddCheat"; this.btnAddCheat.Name = "btnAddCheat";
this.btnAddCheat.Size = new System.Drawing.Size(83, 20); this.btnAddCheat.Size = new System.Drawing.Size(83, 20);

View file

@ -126,26 +126,7 @@
<metadata name="contextMenuCheats.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuCheats.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>107, 17</value> <value>107, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="mnuAddCheat.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAAACFSURBVDhPpZDR
DYAgDET50An8dRjWczHWqlQ5bOqBEC95ooW+EoOI/OJ6xBjlC5e3oBXsuTNcoKsFNcS8cwGL3yvfXKCr
hdVKnQtG0hVgQgucyeGCiXABJjE0y7FVcuZvoI1r2tsCOxFo7GQIwNAN0OiZEgA0girogVhBzvMPRrGT
75qEE3LcyzzdiXihAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="tsCheatActions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="tsCheatActions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>267, 17</value> <value>267, 17</value>
</metadata> </metadata>
<data name="btnAddCheat.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACKSURBVDhPrY3LDYAwDEN7gAm4MkzXYzHWAgXyGlMoH4kn
WZTEdtIv5JyXJykeC2qDwk49HgvUpGIGvD0WqKmm3tm/xwJM9lVdzUweC2z4ltsCLrSEx2MBy7d4LND2
loxuGoo8uoPhCQv289gu0IvI0MsUoENBC4K1PhUggqgU3Am0YAt+5XQ5pbQCv1TxCMUky/oAAAAASUVO
RK5CYII=
</value>
</data>
</root> </root>

View file

@ -242,7 +242,7 @@
// //
this.btnSelectPreset.Anchor = System.Windows.Forms.AnchorStyles.Left; this.btnSelectPreset.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.btnSelectPreset.AutoSize = true; this.btnSelectPreset.AutoSize = true;
this.btnSelectPreset.Image = ((System.Drawing.Image)(resources.GetObject("btnSelectPreset.Image"))); this.btnSelectPreset.Image = global::Mesen.GUI.Properties.Resources.DownArrow;
this.btnSelectPreset.Location = new System.Drawing.Point(3, 281); this.btnSelectPreset.Location = new System.Drawing.Point(3, 281);
this.btnSelectPreset.Name = "btnSelectPreset"; this.btnSelectPreset.Name = "btnSelectPreset";
this.btnSelectPreset.Size = new System.Drawing.Size(105, 23); this.btnSelectPreset.Size = new System.Drawing.Size(105, 23);

View file

@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Mesen.GUI.Config; using Mesen.GUI.Config;
using Mesen.GUI.Controls;
namespace Mesen.GUI.Forms.Config namespace Mesen.GUI.Forms.Config
{ {
@ -34,6 +35,8 @@ namespace Mesen.GUI.Forms.Config
ctrlStandardController3.ShowMicrophone = true; ctrlStandardController3.ShowMicrophone = true;
} }
this.btnSelectPreset.Image = BaseControl.DownArrow;
ResourceHelper.ApplyResources(this, mnuStripPreset); ResourceHelper.ApplyResources(this, mnuStripPreset);
this.Text += ": " + ResourceHelper.GetMessage("PlayerNumber", (portNumber + 1).ToString()); this.Text += ": " + ResourceHelper.GetMessage("PlayerNumber", (portNumber + 1).ToString());

View file

@ -120,15 +120,6 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnSelectPreset.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUA
AAArSURBVBhXY/j//z9OjFUQhkEARGLHUBUYEmBxJCNQJFAkwRwkif///zMAAD5AXaOzoq98AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="imageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>242, 17</value> <value>242, 17</value>
</metadata> </metadata>
@ -137,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK
CQAAAk1TRnQBSQFMAgEBAgEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CQAAAk1TRnQBSQFMAgEBAgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

View file

@ -30,7 +30,6 @@ namespace Mesen.GUI.Forms.Config
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVideoConfig));
this.tlpMain = new System.Windows.Forms.TableLayoutPanel(); this.tlpMain = new System.Windows.Forms.TableLayoutPanel();
this.lblVideoScale = new System.Windows.Forms.Label(); this.lblVideoScale = new System.Windows.Forms.Label();
this.chkVerticalSync = new System.Windows.Forms.CheckBox(); this.chkVerticalSync = new System.Windows.Forms.CheckBox();
@ -450,23 +449,24 @@ namespace Mesen.GUI.Forms.Config
this.tableLayoutPanel7.Controls.Add(this.btnSelectPreset, 1, 0); this.tableLayoutPanel7.Controls.Add(this.btnSelectPreset, 1, 0);
this.tableLayoutPanel7.Controls.Add(this.btnResetPictureSettings, 0, 0); this.tableLayoutPanel7.Controls.Add(this.btnResetPictureSettings, 0, 0);
this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel7.Location = new System.Drawing.Point(0, 339); this.tableLayoutPanel7.Location = new System.Drawing.Point(0, 341);
this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel7.Name = "tableLayoutPanel7"; this.tableLayoutPanel7.Name = "tableLayoutPanel7";
this.tableLayoutPanel7.RowCount = 1; this.tableLayoutPanel7.RowCount = 1;
this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel7.Size = new System.Drawing.Size(260, 31); this.tableLayoutPanel7.Size = new System.Drawing.Size(260, 29);
this.tableLayoutPanel7.TabIndex = 3; this.tableLayoutPanel7.TabIndex = 3;
// //
// btnSelectPreset // btnSelectPreset
// //
this.btnSelectPreset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnSelectPreset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnSelectPreset.AutoSize = true; this.btnSelectPreset.AutoSize = true;
this.btnSelectPreset.Image = ((System.Drawing.Image)(resources.GetObject("btnSelectPreset.Image"))); this.btnSelectPreset.Image = global::Mesen.GUI.Properties.Resources.DownArrow;
this.btnSelectPreset.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.btnSelectPreset.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.btnSelectPreset.Location = new System.Drawing.Point(161, 5); this.btnSelectPreset.Location = new System.Drawing.Point(158, 3);
this.btnSelectPreset.Name = "btnSelectPreset"; this.btnSelectPreset.Name = "btnSelectPreset";
this.btnSelectPreset.Size = new System.Drawing.Size(96, 23); this.btnSelectPreset.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
this.btnSelectPreset.Size = new System.Drawing.Size(99, 23);
this.btnSelectPreset.TabIndex = 3; this.btnSelectPreset.TabIndex = 3;
this.btnSelectPreset.Text = "Select Preset..."; this.btnSelectPreset.Text = "Select Preset...";
this.btnSelectPreset.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; this.btnSelectPreset.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
@ -477,7 +477,7 @@ namespace Mesen.GUI.Forms.Config
// //
this.btnResetPictureSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnResetPictureSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnResetPictureSettings.AutoSize = true; this.btnResetPictureSettings.AutoSize = true;
this.btnResetPictureSettings.Location = new System.Drawing.Point(3, 5); this.btnResetPictureSettings.Location = new System.Drawing.Point(3, 3);
this.btnResetPictureSettings.Name = "btnResetPictureSettings"; this.btnResetPictureSettings.Name = "btnResetPictureSettings";
this.btnResetPictureSettings.Size = new System.Drawing.Size(75, 23); this.btnResetPictureSettings.Size = new System.Drawing.Size(75, 23);
this.btnResetPictureSettings.TabIndex = 3; this.btnResetPictureSettings.TabIndex = 3;
@ -699,7 +699,8 @@ namespace Mesen.GUI.Forms.Config
this.grpCommon.Location = new System.Drawing.Point(0, 27); this.grpCommon.Location = new System.Drawing.Point(0, 27);
this.grpCommon.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); this.grpCommon.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0);
this.grpCommon.Name = "grpCommon"; this.grpCommon.Name = "grpCommon";
this.grpCommon.Size = new System.Drawing.Size(258, 240); this.grpCommon.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.grpCommon.Size = new System.Drawing.Size(258, 242);
this.grpCommon.TabIndex = 3; this.grpCommon.TabIndex = 3;
this.grpCommon.TabStop = false; this.grpCommon.TabStop = false;
this.grpCommon.Text = "Common Settings"; this.grpCommon.Text = "Common Settings";
@ -715,7 +716,7 @@ namespace Mesen.GUI.Forms.Config
this.tableLayoutPanel4.Controls.Add(this.trkHue, 0, 2); this.tableLayoutPanel4.Controls.Add(this.trkHue, 0, 2);
this.tableLayoutPanel4.Controls.Add(this.trkSaturation, 0, 3); this.tableLayoutPanel4.Controls.Add(this.trkSaturation, 0, 3);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 15);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 5; this.tableLayoutPanel4.RowCount = 5;
@ -724,7 +725,7 @@ namespace Mesen.GUI.Forms.Config
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.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(252, 221); this.tableLayoutPanel4.Size = new System.Drawing.Size(252, 225);
this.tableLayoutPanel4.TabIndex = 4; this.tableLayoutPanel4.TabIndex = 4;
// //
// chkBilinearInterpolation // chkBilinearInterpolation
@ -733,7 +734,7 @@ namespace Mesen.GUI.Forms.Config
this.tableLayoutPanel4.SetColumnSpan(this.chkBilinearInterpolation, 2); this.tableLayoutPanel4.SetColumnSpan(this.chkBilinearInterpolation, 2);
this.chkBilinearInterpolation.Location = new System.Drawing.Point(3, 203); this.chkBilinearInterpolation.Location = new System.Drawing.Point(3, 203);
this.chkBilinearInterpolation.Name = "chkBilinearInterpolation"; this.chkBilinearInterpolation.Name = "chkBilinearInterpolation";
this.chkBilinearInterpolation.Size = new System.Drawing.Size(206, 15); this.chkBilinearInterpolation.Size = new System.Drawing.Size(206, 17);
this.chkBilinearInterpolation.TabIndex = 28; this.chkBilinearInterpolation.TabIndex = 28;
this.chkBilinearInterpolation.Text = "Use bilinear interpolation when scaling"; this.chkBilinearInterpolation.Text = "Use bilinear interpolation when scaling";
this.chkBilinearInterpolation.UseVisualStyleBackColor = true; this.chkBilinearInterpolation.UseVisualStyleBackColor = true;
@ -802,7 +803,7 @@ namespace Mesen.GUI.Forms.Config
// //
this.grpScanlines.Controls.Add(this.trkScanlines); this.grpScanlines.Controls.Add(this.trkScanlines);
this.grpScanlines.Dock = System.Windows.Forms.DockStyle.Fill; this.grpScanlines.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpScanlines.Location = new System.Drawing.Point(0, 267); this.grpScanlines.Location = new System.Drawing.Point(0, 269);
this.grpScanlines.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); this.grpScanlines.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0);
this.grpScanlines.Name = "grpScanlines"; this.grpScanlines.Name = "grpScanlines";
this.grpScanlines.Size = new System.Drawing.Size(258, 72); this.grpScanlines.Size = new System.Drawing.Size(258, 72);
@ -1205,7 +1206,7 @@ namespace Mesen.GUI.Forms.Config
// //
this.btnSelectPalette.AutoSize = true; this.btnSelectPalette.AutoSize = true;
this.btnSelectPalette.Dock = System.Windows.Forms.DockStyle.Top; this.btnSelectPalette.Dock = System.Windows.Forms.DockStyle.Top;
this.btnSelectPalette.Image = ((System.Drawing.Image)(resources.GetObject("btnSelectPalette.Image"))); this.btnSelectPalette.Image = global::Mesen.GUI.Properties.Resources.DownArrow;
this.btnSelectPalette.Location = new System.Drawing.Point(3, 3); this.btnSelectPalette.Location = new System.Drawing.Point(3, 3);
this.btnSelectPalette.Name = "btnSelectPalette"; this.btnSelectPalette.Name = "btnSelectPalette";
this.btnSelectPalette.Size = new System.Drawing.Size(175, 23); this.btnSelectPalette.Size = new System.Drawing.Size(175, 23);

View file

@ -73,6 +73,9 @@ namespace Mesen.GUI.Forms.Config
toolTip.SetToolTip(picHdNesTooltip, ResourceHelper.GetMessage("HDNesTooltip")); toolTip.SetToolTip(picHdNesTooltip, ResourceHelper.GetMessage("HDNesTooltip"));
btnSelectPreset.Image = BaseControl.DownArrow;
btnSelectPalette.Image = BaseControl.DownArrow;
UpdateOverscanImage(); UpdateOverscanImage();
ResourceHelper.ApplyResources(this, contextPaletteList); ResourceHelper.ApplyResources(this, contextPaletteList);

View file

@ -120,23 +120,6 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnSelectPreset.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUA
AAArSURBVBhXY/j//z9OjFUQhkEARGLHUBUYEmBxJCNQJFAkwRwkif///zMAAD5AXaOzoq98AAAAAElF
TkSuQmCC
</value>
</data>
<data name="btnSelectPalette.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUA
AAArSURBVBhXY/j//z9OjFUQhkEARGLHUBUYEmBxJCNQJFAkwRwkif///zMAAD5AXaOzoq98AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="contextPicturePresets.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextPicturePresets.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>221, 17</value> <value>221, 17</value>
</metadata> </metadata>

View file

@ -846,6 +846,7 @@
<Compile Include="ResourceManager.cs" /> <Compile Include="ResourceManager.cs" />
<Compile Include="RuntimeChecker.cs" /> <Compile Include="RuntimeChecker.cs" />
<Compile Include="SingleInstance.cs" /> <Compile Include="SingleInstance.cs" />
<None Include="Resources\DownArrowWin10.png" />
<None Include="app.manifest" /> <None Include="app.manifest" />
<None Include="Resources\Exclamation.png" /> <None Include="Resources\Exclamation.png" />
<None Include="Resources\Comment.png" /> <None Include="Resources\Comment.png" />
@ -924,6 +925,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Debugger\Controls\ctrlConsoleStatus.resx"> <EmbeddedResource Include="Debugger\Controls\ctrlConsoleStatus.resx">
<DependentUpon>ctrlConsoleStatus.cs</DependentUpon> <DependentUpon>ctrlConsoleStatus.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Debugger\Controls\ctrlDebuggerCode.resx"> <EmbeddedResource Include="Debugger\Controls\ctrlDebuggerCode.resx">
<DependentUpon>ctrlDebuggerCode.cs</DependentUpon> <DependentUpon>ctrlDebuggerCode.cs</DependentUpon>
@ -1043,6 +1045,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Config\frmControllerConfig.resx"> <EmbeddedResource Include="Forms\Config\frmControllerConfig.resx">
<DependentUpon>frmControllerConfig.cs</DependentUpon> <DependentUpon>frmControllerConfig.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Config\frmCopyFiles.resx"> <EmbeddedResource Include="Forms\Config\frmCopyFiles.resx">
<DependentUpon>frmCopyFiles.cs</DependentUpon> <DependentUpon>frmCopyFiles.cs</DependentUpon>
@ -1068,6 +1071,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Cheats\frmCheatList.resx"> <EmbeddedResource Include="Forms\Cheats\frmCheatList.resx">
<DependentUpon>frmCheatList.cs</DependentUpon> <DependentUpon>frmCheatList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\Config\frmVsGameConfig.resx"> <EmbeddedResource Include="Forms\Config\frmVsGameConfig.resx">
<DependentUpon>frmVsGameConfig.cs</DependentUpon> <DependentUpon>frmVsGameConfig.cs</DependentUpon>
@ -1077,6 +1081,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\frmAbout.resx"> <EmbeddedResource Include="Forms\frmAbout.resx">
<DependentUpon>frmAbout.cs</DependentUpon> <DependentUpon>frmAbout.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\frmConfigWizard.resx"> <EmbeddedResource Include="Forms\frmConfigWizard.resx">
<DependentUpon>frmConfigWizard.cs</DependentUpon> <DependentUpon>frmConfigWizard.cs</DependentUpon>
@ -1101,6 +1106,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\frmUpdatePrompt.resx"> <EmbeddedResource Include="Forms\frmUpdatePrompt.resx">
<DependentUpon>frmUpdatePrompt.cs</DependentUpon> <DependentUpon>frmUpdatePrompt.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Forms\HdPackEditor\frmHdPackEditor.resx"> <EmbeddedResource Include="Forms\HdPackEditor\frmHdPackEditor.resx">
<DependentUpon>frmHdPackEditor.cs</DependentUpon> <DependentUpon>frmHdPackEditor.cs</DependentUpon>

View file

@ -280,6 +280,16 @@ namespace Mesen.GUI.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap DownArrowWin10 {
get {
object obj = ResourceManager.GetObject("DownArrowWin10", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>

View file

@ -355,4 +355,7 @@
<data name="Exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="DownArrowWin10" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DownArrowWin10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B