empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Changed all icons (to public domain ones) + redrew Mesen icon in blue. Hid/disabled some UI elements for things that are not implemented yet.

Browse source
This commit is contained in:
Souryo 2016-02-11 18:34:55 -05:00
parent 163c2f3eaa
commit 63d2c2f9d3
64 changed files with 330 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GUI.NET/Config/PlayerProfile.cs
View file

@ -12,11 +12,13 @@ namespace Mesen.GUI.Config
public class PlayerProfile
{
public string PlayerName = "NewPlayer";
[NonSerialized]
public byte[] PlayerAvatar;
public PlayerProfile()
{
SetAvatar(Properties.Resources.MesenLogo);
//SetAvatar(Properties.Resources.MesenLogo);
}

2
GUI.NET/Debugger/frmBreakpoint.Designer.cs generated
View file

@ -148,7 +148,7 @@
//
// picHelp
//
this.picHelp.Image = global::Mesen.GUI.Properties.Resources.help;
this.picHelp.Image = global::Mesen.GUI.Properties.Resources.Help;
this.picHelp.Location = new System.Drawing.Point(297, 5);
this.picHelp.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
this.picHelp.Name = "picHelp";

2
GUI.NET/Forms/Config/frmAudioConfig.cs
View file

@ -17,7 +17,7 @@ namespace Mesen.GUI.Forms.Config
{
InitializeComponent();
Icon = Properties.Resources.music;
Icon = Properties.Resources.Audio;
Entity = ConfigManager.Config.AudioInfo;
cboAudioDevice.Items.AddRange(InteropEmu.GetAudioDevices().ToArray());

2
GUI.NET/Forms/Config/frmVideoConfig.Designer.cs generated
View file

@ -269,7 +269,7 @@
//
// picHdNesTooltip
//
this.picHdNesTooltip.Image = global::Mesen.GUI.Properties.Resources.help;
this.picHdNesTooltip.Image = global::Mesen.GUI.Properties.Resources.Help;
this.picHdNesTooltip.Location = new System.Drawing.Point(143, 3);
this.picHdNesTooltip.Name = "picHdNesTooltip";
this.picHdNesTooltip.Size = new System.Drawing.Size(17, 17);

12
GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs generated
View file

@ -36,6 +36,11 @@
((System.ComponentModel.ISupportInitialize)(this.picAvatar)).BeginInit();
this.SuspendLayout();
//
// baseConfigPanel
//
this.baseConfigPanel.Location = new System.Drawing.Point(0, 59);
this.baseConfigPanel.Size = new System.Drawing.Size(302, 29);
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
@ -53,7 +58,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.Size = new System.Drawing.Size(302, 106);
this.tableLayoutPanel1.Size = new System.Drawing.Size(302, 59);
this.tableLayoutPanel1.TabIndex = 1;
//
// lblName
@ -75,6 +80,7 @@
this.lblAvatar.Size = new System.Drawing.Size(41, 13);
this.lblAvatar.TabIndex = 4;
this.lblAvatar.Text = "Avatar:";
this.lblAvatar.Visible = false;
//
// txtPlayerName
//
@ -93,13 +99,14 @@
this.picAvatar.Size = new System.Drawing.Size(66, 66);
this.picAvatar.TabIndex = 8;
this.picAvatar.TabStop = false;
this.picAvatar.Visible = false;
this.picAvatar.Click += new System.EventHandler(this.picAvatar_Click);
//
// frmPlayerProfile
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(302, 136);
this.ClientSize = new System.Drawing.Size(302, 88);
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
@ -107,6 +114,7 @@
this.Name = "frmPlayerProfile";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Profile";
this.Controls.SetChildIndex(this.baseConfigPanel, 0);
this.Controls.SetChildIndex(this.tableLayoutPanel1, 0);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();

3
GUI.NET/Forms/NetPlay/frmPlayerProfile.resx
View file

@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

10
GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs generated
View file

@ -42,6 +42,11 @@
((System.ComponentModel.ISupportInitialize)(this.nudNbPlayers)).BeginInit();
this.SuspendLayout();
//
// baseConfigPanel
//
this.baseConfigPanel.Location = new System.Drawing.Point(0, 161);
this.baseConfigPanel.Size = new System.Drawing.Size(302, 29);
//
// tlpMain
//
this.tlpMain.ColumnCount = 2;
@ -68,7 +73,7 @@
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpMain.Size = new System.Drawing.Size(302, 160);
this.tlpMain.Size = new System.Drawing.Size(302, 161);
this.tlpMain.TabIndex = 1;
//
// txtPort
@ -158,6 +163,7 @@
// txtPassword
//
this.txtPassword.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtPassword.Enabled = false;
this.txtPassword.Location = new System.Drawing.Point(128, 55);
this.txtPassword.Name = "txtPassword";
this.txtPassword.Size = new System.Drawing.Size(171, 20);
@ -167,6 +173,7 @@
//
// nudNbPlayers
//
this.nudNbPlayers.Enabled = false;
this.nudNbPlayers.Location = new System.Drawing.Point(128, 81);
this.nudNbPlayers.Maximum = new decimal(new int[] {
4,
@ -200,6 +207,7 @@
this.Name = "frmServerConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Server Configuration";
this.Controls.SetChildIndex(this.baseConfigPanel, 0);
this.Controls.SetChildIndex(this.tlpMain, 0);
this.tlpMain.ResumeLayout(false);
this.tlpMain.PerformLayout();

3
GUI.NET/Forms/NetPlay/frmServerConfig.resx
View file

@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

194
GUI.NET/Forms/frmMain.Designer.cs generated
View file

@ -45,6 +45,7 @@ namespace Mesen.GUI.Forms
this.components = new System.ComponentModel.Container();
this.menuTimer = new System.Windows.Forms.Timer(this.components);
this.panelRenderer = new System.Windows.Forms.Panel();
this.ctrlRenderer = new Mesen.GUI.Controls.ctrlRenderer();
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.mnuFile = new System.Windows.Forms.ToolStripMenuItem();
this.mnuOpen = new System.Windows.Forms.ToolStripMenuItem();
@ -75,18 +76,19 @@ namespace Mesen.GUI.Forms
this.mnuEmuSpeedDouble = new System.Windows.Forms.ToolStripMenuItem();
this.mnuEmuSpeedHalf = new System.Windows.Forms.ToolStripMenuItem();
this.mnuEmuSpeedQuarter = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripSeparator();
this.mnuShowFPS = new System.Windows.Forms.ToolStripMenuItem();
this.mnuVideoScale = new System.Windows.Forms.ToolStripMenuItem();
this.mnuScale1x = new System.Windows.Forms.ToolStripMenuItem();
this.mnuScale2x = new System.Windows.Forms.ToolStripMenuItem();
this.mnuScale3x = new System.Windows.Forms.ToolStripMenuItem();
this.mnuScale4x = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripSeparator();
this.mnuScaleCustom = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripSeparator();
this.mnuFullscreen = new System.Windows.Forms.ToolStripMenuItem();
this.mnuVideoFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuNoneFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuNtscFilter = new System.Windows.Forms.ToolStripMenuItem();
this.mnuShowFPS = new System.Windows.Forms.ToolStripMenuItem();
this.mnuFullscreen = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
this.mnuAudioConfig = new System.Windows.Forms.ToolStripMenuItem();
this.mnuInput = new System.Windows.Forms.ToolStripMenuItem();
@ -112,13 +114,13 @@ namespace Mesen.GUI.Forms
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.mnuFindServer = new System.Windows.Forms.ToolStripMenuItem();
this.mnuProfile = new System.Windows.Forms.ToolStripMenuItem();
this.mnuCheats = new System.Windows.Forms.ToolStripMenuItem();
this.mnuMovies = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPlayMovie = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRecordFrom = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRecordFromStart = new System.Windows.Forms.ToolStripMenuItem();
this.mnuRecordFromNow = new System.Windows.Forms.ToolStripMenuItem();
this.mnuStopMovie = new System.Windows.Forms.ToolStripMenuItem();
this.mnuCheats = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator();
this.mnuTests = new System.Windows.Forms.ToolStripMenuItem();
this.mnuTestRun = new System.Windows.Forms.ToolStripMenuItem();
@ -136,7 +138,6 @@ namespace Mesen.GUI.Forms
this.mnuCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
this.mnuAbout = new System.Windows.Forms.ToolStripMenuItem();
this.ctrlRenderer = new Mesen.GUI.Controls.ctrlRenderer();
this.panelRenderer.SuspendLayout();
this.menuStrip.SuspendLayout();
this.SuspendLayout();
@ -156,6 +157,16 @@ namespace Mesen.GUI.Forms
this.panelRenderer.TabIndex = 2;
this.panelRenderer.Click += new System.EventHandler(this.panelRenderer_Click);
//
// ctrlRenderer
//
this.ctrlRenderer.BackColor = System.Drawing.Color.Black;
this.ctrlRenderer.Location = new System.Drawing.Point(0, 0);
this.ctrlRenderer.Margin = new System.Windows.Forms.Padding(0);
this.ctrlRenderer.Name = "ctrlRenderer";
this.ctrlRenderer.Size = new System.Drawing.Size(263, 176);
this.ctrlRenderer.TabIndex = 1;
this.ctrlRenderer.Enter += new System.EventHandler(this.ctrlRenderer_Enter);
//
// menuStrip
//
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -188,52 +199,53 @@ namespace Mesen.GUI.Forms
//
// mnuOpen
//
this.mnuOpen.Image = global::Mesen.GUI.Properties.Resources.folder;
this.mnuOpen.Image = global::Mesen.GUI.Properties.Resources.FolderOpen;
this.mnuOpen.Name = "mnuOpen";
this.mnuOpen.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.mnuOpen.Size = new System.Drawing.Size(146, 22);
this.mnuOpen.Size = new System.Drawing.Size(152, 22);
this.mnuOpen.Text = "Open";
this.mnuOpen.Click += new System.EventHandler(this.mnuOpen_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(143, 6);
this.toolStripMenuItem4.Size = new System.Drawing.Size(149, 6);
//
// mnuSaveState
//
this.mnuSaveState.Name = "mnuSaveState";
this.mnuSaveState.Size = new System.Drawing.Size(146, 22);
this.mnuSaveState.Size = new System.Drawing.Size(152, 22);
this.mnuSaveState.Text = "Save State";
this.mnuSaveState.DropDownOpening += new System.EventHandler(this.mnuSaveState_DropDownOpening);
//
// mnuLoadState
//
this.mnuLoadState.Name = "mnuLoadState";
this.mnuLoadState.Size = new System.Drawing.Size(146, 22);
this.mnuLoadState.Size = new System.Drawing.Size(152, 22);
this.mnuLoadState.Text = "Load State";
this.mnuLoadState.DropDownOpening += new System.EventHandler(this.mnuLoadState_DropDownOpening);
//
// toolStripMenuItem7
//
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(143, 6);
this.toolStripMenuItem7.Size = new System.Drawing.Size(149, 6);
//
// mnuRecentFiles
//
this.mnuRecentFiles.Name = "mnuRecentFiles";
this.mnuRecentFiles.Size = new System.Drawing.Size(146, 22);
this.mnuRecentFiles.Size = new System.Drawing.Size(152, 22);
this.mnuRecentFiles.Text = "Recent Files";
//
// toolStripMenuItem6
//
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(143, 6);
this.toolStripMenuItem6.Size = new System.Drawing.Size(149, 6);
//
// mnuExit
//
this.mnuExit.Image = global::Mesen.GUI.Properties.Resources.Exit;
this.mnuExit.Name = "mnuExit";
this.mnuExit.Size = new System.Drawing.Size(146, 22);
this.mnuExit.Size = new System.Drawing.Size(152, 22);
this.mnuExit.Text = "Exit";
this.mnuExit.Click += new System.EventHandler(this.mnuExit_Click);
//
@ -254,7 +266,7 @@ namespace Mesen.GUI.Forms
// mnuPause
//
this.mnuPause.Enabled = false;
this.mnuPause.Image = global::Mesen.GUI.Properties.Resources.control_pause;
this.mnuPause.Image = global::Mesen.GUI.Properties.Resources.Pause;
this.mnuPause.Name = "mnuPause";
this.mnuPause.ShortcutKeyDisplayString = "Esc";
this.mnuPause.Size = new System.Drawing.Size(200, 22);
@ -264,6 +276,7 @@ namespace Mesen.GUI.Forms
// mnuReset
//
this.mnuReset.Enabled = false;
this.mnuReset.Image = global::Mesen.GUI.Properties.Resources.Reset;
this.mnuReset.Name = "mnuReset";
this.mnuReset.Size = new System.Drawing.Size(200, 22);
this.mnuReset.Text = "Reset";
@ -272,7 +285,7 @@ namespace Mesen.GUI.Forms
// mnuStop
//
this.mnuStop.Enabled = false;
this.mnuStop.Image = global::Mesen.GUI.Properties.Resources.control_stop;
this.mnuStop.Image = global::Mesen.GUI.Properties.Resources.Stop;
this.mnuStop.Name = "mnuStop";
this.mnuStop.Size = new System.Drawing.Size(200, 22);
this.mnuStop.Text = "Stop";
@ -293,14 +306,14 @@ namespace Mesen.GUI.Forms
//
// mnuSelectDisk
//
this.mnuSelectDisk.Image = global::Mesen.GUI.Properties.Resources.diskette;
this.mnuSelectDisk.Image = global::Mesen.GUI.Properties.Resources.Floppy;
this.mnuSelectDisk.Name = "mnuSelectDisk";
this.mnuSelectDisk.Size = new System.Drawing.Size(200, 22);
this.mnuSelectDisk.Text = "Select Disk";
//
// mnuEjectDisk
//
this.mnuEjectDisk.Image = global::Mesen.GUI.Properties.Resources.control_eject;
this.mnuEjectDisk.Image = global::Mesen.GUI.Properties.Resources.Eject;
this.mnuEjectDisk.Name = "mnuEjectDisk";
this.mnuEjectDisk.Size = new System.Drawing.Size(200, 22);
this.mnuEjectDisk.Text = "Eject Disk";
@ -312,8 +325,6 @@ namespace Mesen.GUI.Forms
this.mnuEmulationSpeed,
this.mnuVideoScale,
this.mnuVideoFilter,
this.mnuShowFPS,
this.mnuFullscreen,
this.toolStripMenuItem10,
this.mnuAudioConfig,
this.mnuInput,
@ -337,11 +348,13 @@ namespace Mesen.GUI.Forms
this.mnuEmuSpeedTriple,
this.mnuEmuSpeedDouble,
this.mnuEmuSpeedHalf,
this.mnuEmuSpeedQuarter});
this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.speedometer;
this.mnuEmuSpeedQuarter,
this.toolStripMenuItem14,
this.mnuShowFPS});
this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.Speed;
this.mnuEmulationSpeed.Name = "mnuEmulationSpeed";
this.mnuEmulationSpeed.Size = new System.Drawing.Size(163, 22);
this.mnuEmulationSpeed.Text = "Emulation Speed";
this.mnuEmulationSpeed.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationSpeed.Text = "Speed";
//
// mnuEmuSpeedNormal
//
@ -413,6 +426,20 @@ namespace Mesen.GUI.Forms
this.mnuEmuSpeedQuarter.Text = "Quarter (25%)";
this.mnuEmuSpeedQuarter.Click += new System.EventHandler(this.mnuEmulationSpeedOption_Click);
//
// toolStripMenuItem14
//
this.toolStripMenuItem14.Name = "toolStripMenuItem14";
this.toolStripMenuItem14.Size = new System.Drawing.Size(179, 6);
//
// mnuShowFPS
//
this.mnuShowFPS.CheckOnClick = true;
this.mnuShowFPS.Name = "mnuShowFPS";
this.mnuShowFPS.ShortcutKeys = System.Windows.Forms.Keys.F10;
this.mnuShowFPS.Size = new System.Drawing.Size(182, 22);
this.mnuShowFPS.Text = "Show FPS";
this.mnuShowFPS.Click += new System.EventHandler(this.mnuShowFPS_Click);
//
// mnuVideoScale
//
this.mnuVideoScale.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -420,17 +447,18 @@ namespace Mesen.GUI.Forms
this.mnuScale2x,
this.mnuScale3x,
this.mnuScale4x,
this.mnuScaleCustom,
this.toolStripMenuItem13,
this.mnuScaleCustom});
this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.slideshow_full_screen;
this.mnuFullscreen});
this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.Fullscreen;
this.mnuVideoScale.Name = "mnuVideoScale";
this.mnuVideoScale.Size = new System.Drawing.Size(163, 22);
this.mnuVideoScale.Text = "Video Scale";
this.mnuVideoScale.Size = new System.Drawing.Size(152, 22);
this.mnuVideoScale.Text = "Video Size";
//
// mnuScale1x
//
this.mnuScale1x.Name = "mnuScale1x";
this.mnuScale1x.Size = new System.Drawing.Size(116, 22);
this.mnuScale1x.Size = new System.Drawing.Size(152, 22);
this.mnuScale1x.Tag = "1";
this.mnuScale1x.Text = "1x";
this.mnuScale1x.Click += new System.EventHandler(this.mnuScale_Click);
@ -438,7 +466,7 @@ namespace Mesen.GUI.Forms
// mnuScale2x
//
this.mnuScale2x.Name = "mnuScale2x";
this.mnuScale2x.Size = new System.Drawing.Size(116, 22);
this.mnuScale2x.Size = new System.Drawing.Size(152, 22);
this.mnuScale2x.Tag = "2";
this.mnuScale2x.Text = "2x";
this.mnuScale2x.Click += new System.EventHandler(this.mnuScale_Click);
@ -446,7 +474,7 @@ namespace Mesen.GUI.Forms
// mnuScale3x
//
this.mnuScale3x.Name = "mnuScale3x";
this.mnuScale3x.Size = new System.Drawing.Size(116, 22);
this.mnuScale3x.Size = new System.Drawing.Size(152, 22);
this.mnuScale3x.Tag = "3";
this.mnuScale3x.Text = "3x";
this.mnuScale3x.Click += new System.EventHandler(this.mnuScale_Click);
@ -454,30 +482,38 @@ namespace Mesen.GUI.Forms
// mnuScale4x
//
this.mnuScale4x.Name = "mnuScale4x";
this.mnuScale4x.Size = new System.Drawing.Size(116, 22);
this.mnuScale4x.Size = new System.Drawing.Size(152, 22);
this.mnuScale4x.Tag = "4";
this.mnuScale4x.Text = "4x";
this.mnuScale4x.Click += new System.EventHandler(this.mnuScale_Click);
//
// toolStripMenuItem13
//
this.toolStripMenuItem13.Name = "toolStripMenuItem13";
this.toolStripMenuItem13.Size = new System.Drawing.Size(113, 6);
//
// mnuScaleCustom
//
this.mnuScaleCustom.Name = "mnuScaleCustom";
this.mnuScaleCustom.Size = new System.Drawing.Size(116, 22);
this.mnuScaleCustom.Size = new System.Drawing.Size(152, 22);
this.mnuScaleCustom.Text = "Custom";
this.mnuScaleCustom.Click += new System.EventHandler(this.mnuScaleCustom_Click);
//
// toolStripMenuItem13
//
this.toolStripMenuItem13.Name = "toolStripMenuItem13";
this.toolStripMenuItem13.Size = new System.Drawing.Size(149, 6);
//
// mnuFullscreen
//
this.mnuFullscreen.Name = "mnuFullscreen";
this.mnuFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11;
this.mnuFullscreen.Size = new System.Drawing.Size(152, 22);
this.mnuFullscreen.Text = "Fullscreen";
this.mnuFullscreen.Click += new System.EventHandler(this.mnuFullscreen_Click);
//
// mnuVideoFilter
//
this.mnuVideoFilter.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuNoneFilter,
this.mnuNtscFilter});
this.mnuVideoFilter.Name = "mnuVideoFilter";
this.mnuVideoFilter.Size = new System.Drawing.Size(163, 22);
this.mnuVideoFilter.Size = new System.Drawing.Size(152, 22);
this.mnuVideoFilter.Text = "Video Filter";
//
// mnuNoneFilter
@ -494,41 +530,24 @@ namespace Mesen.GUI.Forms
this.mnuNtscFilter.Text = "NTSC";
this.mnuNtscFilter.Click += new System.EventHandler(this.mnuNtscFilter_Click);
//
// mnuShowFPS
//
this.mnuShowFPS.CheckOnClick = true;
this.mnuShowFPS.Name = "mnuShowFPS";
this.mnuShowFPS.ShortcutKeys = System.Windows.Forms.Keys.F10;
this.mnuShowFPS.Size = new System.Drawing.Size(163, 22);
this.mnuShowFPS.Text = "Show FPS";
this.mnuShowFPS.Click += new System.EventHandler(this.mnuShowFPS_Click);
//
// mnuFullscreen
//
this.mnuFullscreen.Name = "mnuFullscreen";
this.mnuFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11;
this.mnuFullscreen.Size = new System.Drawing.Size(163, 22);
this.mnuFullscreen.Text = "Fullscreen";
this.mnuFullscreen.Click += new System.EventHandler(this.mnuFullscreen_Click);
//
// toolStripMenuItem10
//
this.toolStripMenuItem10.Name = "toolStripMenuItem10";
this.toolStripMenuItem10.Size = new System.Drawing.Size(160, 6);
this.toolStripMenuItem10.Size = new System.Drawing.Size(149, 6);
//
// mnuAudioConfig
//
this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.music;
this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio;
this.mnuAudioConfig.Name = "mnuAudioConfig";
this.mnuAudioConfig.Size = new System.Drawing.Size(163, 22);
this.mnuAudioConfig.Size = new System.Drawing.Size(152, 22);
this.mnuAudioConfig.Text = "Audio";
this.mnuAudioConfig.Click += new System.EventHandler(this.mnuAudioConfig_Click);
//
// mnuInput
//
this.mnuInput.Image = global::Mesen.GUI.Properties.Resources.controller;
this.mnuInput.Image = global::Mesen.GUI.Properties.Resources.Controller;
this.mnuInput.Name = "mnuInput";
this.mnuInput.Size = new System.Drawing.Size(163, 22);
this.mnuInput.Size = new System.Drawing.Size(152, 22);
this.mnuInput.Text = "Input";
this.mnuInput.Click += new System.EventHandler(this.mnuInput_Click);
//
@ -539,9 +558,9 @@ namespace Mesen.GUI.Forms
this.mnuRegionNtsc,
this.mnuRegionPal,
this.mnuRegionDendy});
this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.globe_place;
this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.Globe;
this.mnuRegion.Name = "mnuRegion";
this.mnuRegion.Size = new System.Drawing.Size(163, 22);
this.mnuRegion.Size = new System.Drawing.Size(152, 22);
this.mnuRegion.Text = "Region";
//
// mnuRegionAuto
@ -574,22 +593,22 @@ namespace Mesen.GUI.Forms
//
// mnuVideoConfig
//
this.mnuVideoConfig.Image = global::Mesen.GUI.Properties.Resources.lcd_tv_image;
this.mnuVideoConfig.Image = global::Mesen.GUI.Properties.Resources.Video;
this.mnuVideoConfig.Name = "mnuVideoConfig";
this.mnuVideoConfig.Size = new System.Drawing.Size(163, 22);
this.mnuVideoConfig.Size = new System.Drawing.Size(152, 22);
this.mnuVideoConfig.Text = "Video";
this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click);
//
// toolStripMenuItem11
//
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
this.toolStripMenuItem11.Size = new System.Drawing.Size(160, 6);
this.toolStripMenuItem11.Size = new System.Drawing.Size(149, 6);
//
// mnuPreferences
//
this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.cog;
this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog;
this.mnuPreferences.Name = "mnuPreferences";
this.mnuPreferences.Size = new System.Drawing.Size(163, 22);
this.mnuPreferences.Size = new System.Drawing.Size(152, 22);
this.mnuPreferences.Text = "Preferences";
this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click);
//
@ -597,8 +616,8 @@ namespace Mesen.GUI.Forms
//
this.mnuTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuNetPlay,
this.mnuCheats,
this.mnuMovies,
this.mnuCheats,
this.toolStripMenuItem12,
this.mnuTests,
this.mnuDebugger,
@ -617,7 +636,7 @@ namespace Mesen.GUI.Forms
this.toolStripMenuItem2,
this.mnuFindServer,
this.mnuProfile});
this.mnuNetPlay.Image = global::Mesen.GUI.Properties.Resources.globe_network;
this.mnuNetPlay.Image = global::Mesen.GUI.Properties.Resources.NetPlay;
this.mnuNetPlay.Name = "mnuNetPlay";
this.mnuNetPlay.Size = new System.Drawing.Size(185, 22);
this.mnuNetPlay.Text = "Net Play";
@ -709,20 +728,13 @@ namespace Mesen.GUI.Forms
this.mnuProfile.Text = "Configure Profile";
this.mnuProfile.Click += new System.EventHandler(this.mnuProfile_Click);
//
// mnuCheats
//
this.mnuCheats.Name = "mnuCheats";
this.mnuCheats.Size = new System.Drawing.Size(185, 22);
this.mnuCheats.Text = "Cheats";
this.mnuCheats.Click += new System.EventHandler(this.mnuCheats_Click);
//
// mnuMovies
//
this.mnuMovies.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuPlayMovie,
this.mnuRecordFrom,
this.mnuStopMovie});
this.mnuMovies.Image = global::Mesen.GUI.Properties.Resources.movies;
this.mnuMovies.Image = global::Mesen.GUI.Properties.Resources.Movie;
this.mnuMovies.Name = "mnuMovies";
this.mnuMovies.Size = new System.Drawing.Size(185, 22);
this.mnuMovies.Text = "Movies";
@ -764,6 +776,13 @@ namespace Mesen.GUI.Forms
this.mnuStopMovie.Text = "Stop";
this.mnuStopMovie.Click += new System.EventHandler(this.mnuStopMovie_Click);
//
// mnuCheats
//
this.mnuCheats.Name = "mnuCheats";
this.mnuCheats.Size = new System.Drawing.Size(185, 22);
this.mnuCheats.Text = "Cheats";
this.mnuCheats.Click += new System.EventHandler(this.mnuCheats_Click);
//
// toolStripMenuItem12
//
this.toolStripMenuItem12.Name = "toolStripMenuItem12";
@ -844,7 +863,6 @@ namespace Mesen.GUI.Forms
//
// mnuDebugger
//
this.mnuDebugger.Image = global::Mesen.GUI.Properties.Resources.debugging;
this.mnuDebugger.Name = "mnuDebugger";
this.mnuDebugger.Size = new System.Drawing.Size(185, 22);
this.mnuDebugger.Text = "Debugger";
@ -857,7 +875,7 @@ namespace Mesen.GUI.Forms
//
// mnuTakeScreenshot
//
this.mnuTakeScreenshot.Image = global::Mesen.GUI.Properties.Resources.camera;
this.mnuTakeScreenshot.Image = global::Mesen.GUI.Properties.Resources.Camera;
this.mnuTakeScreenshot.Name = "mnuTakeScreenshot";
this.mnuTakeScreenshot.ShortcutKeys = System.Windows.Forms.Keys.F12;
this.mnuTakeScreenshot.Size = new System.Drawing.Size(185, 22);
@ -876,6 +894,7 @@ namespace Mesen.GUI.Forms
//
// mnuCheckForUpdates
//
this.mnuCheckForUpdates.Image = global::Mesen.GUI.Properties.Resources.SoftwareUpdate;
this.mnuCheckForUpdates.Name = "mnuCheckForUpdates";
this.mnuCheckForUpdates.Size = new System.Drawing.Size(170, 22);
this.mnuCheckForUpdates.Text = "Check for updates";
@ -888,22 +907,12 @@ namespace Mesen.GUI.Forms
//
// mnuAbout
//
this.mnuAbout.Image = global::Mesen.GUI.Properties.Resources.help;
this.mnuAbout.Image = global::Mesen.GUI.Properties.Resources.Help;
this.mnuAbout.Name = "mnuAbout";
this.mnuAbout.Size = new System.Drawing.Size(170, 22);
this.mnuAbout.Text = "About";
this.mnuAbout.Click += new System.EventHandler(this.mnuAbout_Click);
//
// ctrlRenderer
//
this.ctrlRenderer.BackColor = System.Drawing.Color.Black;
this.ctrlRenderer.Location = new System.Drawing.Point(0, 0);
this.ctrlRenderer.Margin = new System.Windows.Forms.Padding(0);
this.ctrlRenderer.Name = "ctrlRenderer";
this.ctrlRenderer.Size = new System.Drawing.Size(263, 176);
this.ctrlRenderer.TabIndex = 1;
this.ctrlRenderer.Enter += new System.EventHandler(this.ctrlRenderer_Enter);
//
// frmMain
//
this.AllowDrop = true;
@ -940,7 +949,6 @@ namespace Mesen.GUI.Forms
private System.Windows.Forms.ToolStripMenuItem mnuStop;
private System.Windows.Forms.ToolStripMenuItem mnuOptions;
private System.Windows.Forms.ToolStripMenuItem mnuEmulationSpeed;
private System.Windows.Forms.ToolStripMenuItem mnuShowFPS;
private System.Windows.Forms.ToolStripMenuItem mnuInput;
private System.Windows.Forms.ToolStripMenuItem mnuVideoConfig;
private System.Windows.Forms.ToolStripMenuItem mnuAudioConfig;
@ -1023,6 +1031,8 @@ namespace Mesen.GUI.Forms
private System.Windows.Forms.Panel panelRenderer;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem13;
private System.Windows.Forms.ToolStripMenuItem mnuScaleCustom;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem14;
private System.Windows.Forms.ToolStripMenuItem mnuShowFPS;
private System.Windows.Forms.ToolStripMenuItem mnuFullscreen;
}
}

2
GUI.NET/Forms/frmMain.cs
View file

@ -396,7 +396,7 @@ namespace Mesen.GUI.Forms
mnuSaveState.Enabled = mnuLoadState.Enabled = mnuPause.Enabled = mnuStop.Enabled = mnuReset.Enabled = (_emuThread != null && !isNetPlayClient);
mnuPause.Text = InteropEmu.IsPaused() ? "Resume" : "Pause";
mnuPause.Image = InteropEmu.IsPaused() ? Mesen.GUI.Properties.Resources.control_play : Mesen.GUI.Properties.Resources.control_pause;
mnuPause.Image = InteropEmu.IsPaused() ? Mesen.GUI.Properties.Resources.Play : Mesen.GUI.Properties.Resources.Pause;
bool netPlay = InteropEmu.IsServerRunning() || isNetPlayClient;

58
GUI.NET/GUI.NET.csproj
View file

@ -539,15 +539,14 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="..\Windows\Resources\Roboto.12.spritefont">
<None Include="..\Windows\Resources\Roboto.12.spritefont">
<Link>Dependencies\Roboto.12.spritefont</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Windows\Resources\Roboto.9.spritefont">
<Link>Dependencies\Roboto.9.spritefont</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Windows\Resources\Toast.dds">
<Link>Dependencies\Toast.dds</Link>
</EmbeddedResource>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\Windows\Resources\Roboto.32.spritefont">
<Link>Dependencies\Roboto.32.spritefont</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@ -559,36 +558,35 @@
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Resources\globe_network.png" />
<None Include="Resources\speedometer.png" />
<None Include="Resources\camera.png" />
<None Include="Resources\cog.png" />
<None Include="Resources\slideshow_full_screen.png" />
<None Include="Resources\folder.png" />
<None Include="Resources\control_stop.png" />
<None Include="Resources\control_play.png" />
<None Include="Resources\control_pause.png" />
<None Include="Resources\movies.png" />
<None Include="Resources\debugging.png" />
<None Include="Resources\globe_place.png" />
<None Include="Resources\music.png" />
<None Include="Resources\lcd_tv_image.png" />
<None Include="Resources\diskette.png" />
<None Include="Resources\control_eject.png" />
<None Include="Resources\controller.png" />
<None Include="Resources\MesenIcon.png" />
<None Include="Resources\system-software-update.png" />
<None Include="Resources\view-refresh.png" />
<None Include="Resources\appointment-new.png" />
<None Include="Resources\view-fullscreen.png" />
<None Include="Resources\network-workgroup.png" />
<None Include="Resources\folder-open.png" />
<None Include="Resources\image-x-generic.png" />
<None Include="Resources\system-log-out.png" />
<None Include="Resources\media-playback-stop.png" />
<None Include="Resources\media-playback-start.png" />
<None Include="Resources\media-playback-pause.png" />
<None Include="Resources\media-eject.png" />
<None Include="Resources\audio-x-generic.png" />
<None Include="Resources\emblem-system.png" />
<None Include="Resources\camera-photo.png" />
<None Include="Resources\media-floppy.png" />
<None Include="Resources\input-gaming.png" />
<None Include="Resources\applications-multimedia.png" />
<None Include="Resources\internet-web-browser.png" />
<None Include="Resources\help-browser.png" />
<EmbeddedResource Include="$(OutputPath)Dependencies.zip">
<Link>Dependencies\Dependencies.zip</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Windows\Resources\MesenIcon.bmp">
<Link>Dependencies\MesenIcon.bmp</Link>
</EmbeddedResource>
<Content Include="Icon.ico" />
<None Include="Resources\help.png" />
<None Include="Resources\Close.png" />
<None Include="Resources\PreviousArrow.png" />
<None Include="Resources\NextArrow.png" />
<None Include="Resources\MesenIcon.ico" />
<None Include="Resources\MesenLogo.bmp" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

BIN
GUI.NET/Icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

156
GUI.NET/Properties/Resources.Designer.cs generated
View file

@ -63,9 +63,19 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap camera {
internal static System.Drawing.Bitmap Audio {
get {
object obj = ResourceManager.GetObject("camera", resourceCulture);
object obj = ResourceManager.GetObject("Audio", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Camera {
get {
object obj = ResourceManager.GetObject("Camera", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -83,9 +93,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap cog {
internal static System.Drawing.Bitmap Cog {
get {
object obj = ResourceManager.GetObject("cog", resourceCulture);
object obj = ResourceManager.GetObject("Cog", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -93,9 +103,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap control_eject {
internal static System.Drawing.Bitmap Controller {
get {
object obj = ResourceManager.GetObject("control_eject", resourceCulture);
object obj = ResourceManager.GetObject("Controller", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -103,9 +113,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap control_pause {
internal static System.Drawing.Bitmap Eject {
get {
object obj = ResourceManager.GetObject("control_pause", resourceCulture);
object obj = ResourceManager.GetObject("Eject", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -113,9 +123,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap control_play {
internal static System.Drawing.Bitmap Exit {
get {
object obj = ResourceManager.GetObject("control_play", resourceCulture);
object obj = ResourceManager.GetObject("Exit", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -123,9 +133,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap control_stop {
internal static System.Drawing.Bitmap Floppy {
get {
object obj = ResourceManager.GetObject("control_stop", resourceCulture);
object obj = ResourceManager.GetObject("Floppy", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -133,9 +143,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap controller {
internal static System.Drawing.Bitmap FolderOpen {
get {
object obj = ResourceManager.GetObject("controller", resourceCulture);
object obj = ResourceManager.GetObject("FolderOpen", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -143,9 +153,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap debugging {
internal static System.Drawing.Bitmap Fullscreen {
get {
object obj = ResourceManager.GetObject("debugging", resourceCulture);
object obj = ResourceManager.GetObject("Fullscreen", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -153,9 +163,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap diskette {
internal static System.Drawing.Bitmap Globe {
get {
object obj = ResourceManager.GetObject("diskette", resourceCulture);
object obj = ResourceManager.GetObject("Globe", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -163,49 +173,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap folder {
internal static System.Drawing.Bitmap Help {
get {
object obj = ResourceManager.GetObject("folder", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap globe_network {
get {
object obj = ResourceManager.GetObject("globe_network", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap globe_place {
get {
object obj = ResourceManager.GetObject("globe_place", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap help {
get {
object obj = ResourceManager.GetObject("help", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap lcd_tv_image {
get {
object obj = ResourceManager.GetObject("lcd_tv_image", resourceCulture);
object obj = ResourceManager.GetObject("Help", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -233,9 +203,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap movies {
internal static System.Drawing.Bitmap Movie {
get {
object obj = ResourceManager.GetObject("movies", resourceCulture);
object obj = ResourceManager.GetObject("Movie", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -243,9 +213,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap music {
internal static System.Drawing.Bitmap NetPlay {
get {
object obj = ResourceManager.GetObject("music", resourceCulture);
object obj = ResourceManager.GetObject("NetPlay", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -260,6 +230,26 @@ namespace Mesen.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Pause {
get {
object obj = ResourceManager.GetObject("Pause", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Play {
get {
object obj = ResourceManager.GetObject("Play", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -273,9 +263,9 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap slideshow_full_screen {
internal static System.Drawing.Bitmap Reset {
get {
object obj = ResourceManager.GetObject("slideshow_full_screen", resourceCulture);
object obj = ResourceManager.GetObject("Reset", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -283,9 +273,39 @@ namespace Mesen.GUI.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap speedometer {
internal static System.Drawing.Bitmap SoftwareUpdate {
get {
object obj = ResourceManager.GetObject("speedometer", resourceCulture);
object obj = ResourceManager.GetObject("SoftwareUpdate", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Speed {
get {
object obj = ResourceManager.GetObject("Speed", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Stop {
get {
object obj = ResourceManager.GetObject("Stop", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Video {
get {
object obj = ResourceManager.GetObject("Video", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}

86
GUI.NET/Properties/Resources.resx
View file

@ -121,70 +121,76 @@
<data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MesenIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MesenLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MesenLogo.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NextArrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\NextArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PreviousArrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\previousarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Audio" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\audio-x-generic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera-photo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\emblem-system.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control_eject" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control_eject.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Controller" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\input-gaming.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control_pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control_pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Eject" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\media-eject.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control_play" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control_play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\system-log-out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control_stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control_stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Floppy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\media-floppy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="debugging" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\debugging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="FolderOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="diskette" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\diskette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Fullscreen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\view-fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\internet-web-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="globe_network" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe_network.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\help-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="globe_place" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe_place.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="MesenLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MesenIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lcd_tv_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lcd_tv_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Movie" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\applications-multimedia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="movies" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\movies.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="NetPlay" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\network-workgroup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="music" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\music.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\media-playback-pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="slideshow_full_screen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\slideshow_full_screen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\media-playback-start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="speedometer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\speedometer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Reset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\view-refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SoftwareUpdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\system-software-update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Speed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\appointment-new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\media-playback-stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Video" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-x-generic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

12
GUI.NET/ResourceManager.cs
View file

@ -53,13 +53,11 @@ namespace Mesen.GUI
if(entry.Name.Contains(suffix) || entry.Name == "MesenUpdater.exe") {
string outputFilename = Path.Combine(ConfigManager.HomeFolder, entry.Name.Replace(suffix, ""));
ExtractFile(entry, outputFilename);
}
}
ExtractResource("Mesen.GUI.Dependencies.MesenIcon.bmp", Path.Combine("Resources", "MesenIcon.bmp"));
ExtractResource("Mesen.GUI.Dependencies.Roboto.12.spritefont", Path.Combine("Resources", "Roboto.12.spritefont"));
ExtractResource("Mesen.GUI.Dependencies.Roboto.9.spritefont", Path.Combine("Resources", "Roboto.9.spritefont"));
ExtractResource("Mesen.GUI.Dependencies.Toast.dds", Path.Combine("Resources", "Toast.dds"));
} else if(entry.Name == "Roboto.12.spritefont" || entry.Name == "Roboto.32.spritefont") {
string outputFilename = Path.Combine(ConfigManager.HomeFolder, "Resources", entry.Name.Replace(suffix, ""));
ExtractFile(entry, outputFilename);
}
}
}
}
}

BIN
GUI.NET/Resources/MesenIcon.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.9 KiB

BIN
GUI.NET/Resources/MesenIcon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
GUI.NET/Resources/MesenIconMedium.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
GUI.NET/Resources/MesenIconSmall.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 314 B

BIN
GUI.NET/Resources/MesenLogo.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
GUI.NET/Resources/applications-multimedia.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 592 B

BIN
GUI.NET/Resources/appointment-new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 897 B

BIN
GUI.NET/Resources/audio-x-generic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 688 B

BIN
GUI.NET/Resources/camera-photo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 864 B

BIN
GUI.NET/Resources/camera.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 729 B

BIN
GUI.NET/Resources/cog.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 777 B

BIN
GUI.NET/Resources/control_eject.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 685 B

BIN
GUI.NET/Resources/control_pause.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 700 B

BIN
GUI.NET/Resources/control_play.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 730 B

BIN
GUI.NET/Resources/control_stop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 709 B

BIN
GUI.NET/Resources/controller.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 717 B

BIN
GUI.NET/Resources/debugging.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 793 B

BIN
GUI.NET/Resources/diskette.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 730 B

BIN
GUI.NET/Resources/emblem-system.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 629 B

BIN
GUI.NET/Resources/folder-open.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 625 B

BIN
GUI.NET/Resources/folder.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 632 B

BIN
GUI.NET/Resources/globe_network.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
GUI.NET/Resources/globe_place.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
GUI.NET/Resources/help-browser.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 932 B

BIN
GUI.NET/Resources/help.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 763 B

BIN
GUI.NET/Resources/image-x-generic.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 558 B

BIN
GUI.NET/Resources/input-gaming.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 812 B

BIN
GUI.NET/Resources/internet-web-browser.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 928 B

BIN
GUI.NET/Resources/lcd_tv_image.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
GUI.NET/Resources/media-eject.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 628 B

BIN
GUI.NET/Resources/media-floppy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 561 B

BIN
GUI.NET/Resources/media-playback-pause.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 464 B

BIN
GUI.NET/Resources/media-playback-start.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 660 B

BIN
GUI.NET/Resources/media-playback-stop.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 429 B

BIN
GUI.NET/Resources/movies.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 697 B

BIN
GUI.NET/Resources/music.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 554 B

BIN
GUI.NET/Resources/network-workgroup.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 517 B

BIN
GUI.NET/Resources/slideshow_full_screen.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
GUI.NET/Resources/speedometer.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 852 B

BIN
GUI.NET/Resources/system-log-out.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 799 B

BIN
GUI.NET/Resources/system-software-update.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 964 B

BIN
GUI.NET/Resources/view-fullscreen.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 650 B

BIN
GUI.NET/Resources/view-refresh.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 912 B

BIN
UpdateHelper/Icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

42
Windows/Renderer.cpp
View file

@ -69,7 +69,7 @@ namespace NES
{
if(_pTexture) _pTexture->Release();
if(_overlayTexture) _overlayTexture->Release();
if(_toastTexture) _toastTexture->Release();
//if(_toastTexture) _toastTexture->Release();
if(_samplerState) _samplerState->Release();
if(_pRenderTargetView) _pRenderTargetView->Release();
@ -231,7 +231,7 @@ namespace NES
////////////////////////////////////////////////////////////////////////////
_spriteBatch.reset(new SpriteBatch(_pDeviceContext));
_smallFont.reset(new SpriteFont(_pd3dDevice, L"Resources\\Roboto.9.spritefont"));
_largeFont.reset(new SpriteFont(_pd3dDevice, L"Resources\\Roboto.32.spritefont"));
_font.reset(new SpriteFont(_pd3dDevice, L"Resources\\Roboto.12.spritefont"));
//Sample state
@ -250,9 +250,9 @@ namespace NES
_pd3dDevice->CreateSamplerState(&samplerDesc, &_samplerState);
if(!FAILED(CreateDDSTextureFromFile(_pd3dDevice, L"Resources\\Toast.dds", nullptr, &_toastTexture))) {
/*if(!FAILED(CreateDDSTextureFromFile(_pd3dDevice, L"Resources\\Toast.dds", nullptr, &_toastTexture))) {
return S_FALSE;
}
}*/
return S_OK;
}
@ -303,7 +303,7 @@ namespace NES
void Renderer::DisplayMessage(string title, string message)
{
shared_ptr<ToastInfo> toast(new ToastInfo(title, message, 4000, "Resources\\MesenIcon.bmp"));
shared_ptr<ToastInfo> toast(new ToastInfo(title, message, 4000, ""));
DisplayToast(toast);
}
@ -312,30 +312,34 @@ namespace NES
_toasts.push_front(toast);
}
void Renderer::DrawOutlinedString(string message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor)
void Renderer::DrawOutlinedString(string message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor, SpriteFont* font)
{
std::wstring textStr = utf8::utf8::decode(message);
DrawOutlinedString(textStr, x, y, color, scale, outlineColor);
DrawOutlinedString(textStr, x, y, color, scale, outlineColor, font);
}
void Renderer::DrawOutlinedString(std::wstring message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor)
void Renderer::DrawOutlinedString(std::wstring message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor, SpriteFont* font)
{
SpriteBatch* spritebatch = _spriteBatch.get();
const wchar_t *text = message.c_str();
if(font == nullptr) {
font = _font.get();
}
for(uint8_t offsetX = 2; offsetX > 0; offsetX--) {
for(uint8_t offsetY = 2; offsetY > 0; offsetY--) {
_font->DrawString(spritebatch, text, XMFLOAT2(x + offsetX, y + offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x - offsetX, y + offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x + offsetX, y - offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x - offsetX, y - offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x + offsetX, y), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x - offsetX, y), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x, y + offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, text, XMFLOAT2(x, y - offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x + offsetX, y + offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x - offsetX, y + offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x + offsetX, y - offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x - offsetX, y - offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x + offsetX, y), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x - offsetX, y), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x, y + offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x, y - offsetY), outlineColor, 0.0f, XMFLOAT2(0, 0), scale);
}
}
_font->DrawString(spritebatch, text, XMFLOAT2(x, y), color, 0.0f, XMFLOAT2(0, 0), scale);
font->DrawString(spritebatch, text, XMFLOAT2(x, y), color, 0.0f, XMFLOAT2(0, 0), scale);
}
void Renderer::UpdateFrame(void *frameBuffer, uint32_t width, uint32_t height)
@ -399,7 +403,9 @@ namespace NES
_spriteBatch->Draw(shaderResourceView, destRect); // , position, &sourceRect, Colors::White, 0.0f, position, 4.0f);
shaderResourceView->Release();
DrawOutlinedString("PAUSED", (float)_screenWidth / 2 - 60, (float)_screenHeight / 2 - 20, Colors::AntiqueWhite, 2.0f);
XMVECTOR stringDimensions = _largeFont->MeasureString(L"PAUSED");
DrawOutlinedString("PAUSED", (float)_screenWidth / 2 - stringDimensions.m128_f32[0] / 2, (float)_screenHeight / 2 - stringDimensions.m128_f32[1] / 2, Colors::AntiqueWhite, 1.0f, Colors::Black, _largeFont.get());
}
void Renderer::Render()

8
Windows/Renderer.h
View file

@ -43,7 +43,7 @@ namespace NES {
uint32_t _currentRenderedFPS = 0;
unique_ptr<SpriteFont> _font;
unique_ptr<SpriteFont> _smallFont;
unique_ptr<SpriteFont> _largeFont;
unique_ptr<SpriteBatch> _spriteBatch;
@ -59,7 +59,7 @@ namespace NES {
uint32_t _noUpdateCount = 0;
list<shared_ptr<ToastInfo>> _toasts;
ID3D11ShaderResourceView* _toastTexture = nullptr;
//ID3D11ShaderResourceView* _toastTexture = nullptr;
HRESULT InitDevice();
void CleanupDevice();
@ -72,8 +72,8 @@ namespace NES {
void DrawPauseScreen();
std::wstring WrapText(string text, SpriteFont* font, float maxLineWidth, uint32_t &lineCount);
void DrawOutlinedString(string message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor = Colors::Black);
void DrawOutlinedString(std::wstring message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor = Colors::Black);
void DrawOutlinedString(string message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor = Colors::Black, SpriteFont* font = nullptr);
void DrawOutlinedString(std::wstring message, float x, float y, DirectX::FXMVECTOR color, float scale, DirectX::FXMVECTOR outlineColor = Colors::Black, SpriteFont* font = nullptr);
void DrawToasts();
void DrawToast(shared_ptr<ToastInfo> toast, int &lastHeight);

BIN
Windows/Resources/Roboto.9.spritefont
View file

Binary file not shown.

12
Windows/Windows.vcxproj
View file

@ -393,17 +393,7 @@
<None Include="Resources\Roboto.12.spritefont">
<DeploymentContent>false</DeploymentContent>
</None>
<None Include="Resources\Roboto.9.spritefont">
<DeploymentContent>false</DeploymentContent>
</None>
</ItemGroup>
<ItemGroup>
<Image Include="Resources\MesenIcon.bmp">
<DeploymentContent>false</DeploymentContent>
</Image>
<Image Include="Resources\Toast.dds">
<DeploymentContent>false</DeploymentContent>
</Image>
<None Include="Resources\Roboto.32.spritefont" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

12
Windows/Windows.vcxproj.filters
View file

@ -103,19 +103,11 @@
<None Include="DirectXTK\SimpleMath.inl">
<Filter>Header Files\DirectXTK</Filter>
</None>
<None Include="Resources\Roboto.9.spritefont">
<Filter>Resource Files</Filter>
</None>
<None Include="Resources\Roboto.12.spritefont">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Image Include="Resources\Toast.dds">
<None Include="Resources\Roboto.32.spritefont">
<Filter>Resource Files</Filter>
</Image>
<Image Include="Resources\MesenIcon.bmp">
<Filter>Resource Files</Filter>
</Image>
</None>
</ItemGroup>
</Project>