diff --git a/GUI.NET/Config/PlayerProfile.cs b/GUI.NET/Config/PlayerProfile.cs index 7906d99c..348cde53 100644 --- a/GUI.NET/Config/PlayerProfile.cs +++ b/GUI.NET/Config/PlayerProfile.cs @@ -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); } diff --git a/GUI.NET/Debugger/frmBreakpoint.Designer.cs b/GUI.NET/Debugger/frmBreakpoint.Designer.cs index 7bbf6ca2..e55e01d8 100644 --- a/GUI.NET/Debugger/frmBreakpoint.Designer.cs +++ b/GUI.NET/Debugger/frmBreakpoint.Designer.cs @@ -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"; diff --git a/GUI.NET/Forms/Config/frmAudioConfig.cs b/GUI.NET/Forms/Config/frmAudioConfig.cs index f2726448..4d83edab 100644 --- a/GUI.NET/Forms/Config/frmAudioConfig.cs +++ b/GUI.NET/Forms/Config/frmAudioConfig.cs @@ -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()); diff --git a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs index de086561..d56ca5c4 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs @@ -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); diff --git a/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs b/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs index 5e9019ec..2568446c 100644 --- a/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs +++ b/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs @@ -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(); diff --git a/GUI.NET/Forms/NetPlay/frmPlayerProfile.resx b/GUI.NET/Forms/NetPlay/frmPlayerProfile.resx index 1af7de15..8766f298 100644 --- a/GUI.NET/Forms/NetPlay/frmPlayerProfile.resx +++ b/GUI.NET/Forms/NetPlay/frmPlayerProfile.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs b/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs index fcf44727..5be42242 100644 --- a/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs +++ b/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs @@ -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(); diff --git a/GUI.NET/Forms/NetPlay/frmServerConfig.resx b/GUI.NET/Forms/NetPlay/frmServerConfig.resx index 1af7de15..8766f298 100644 --- a/GUI.NET/Forms/NetPlay/frmServerConfig.resx +++ b/GUI.NET/Forms/NetPlay/frmServerConfig.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUI.NET/Forms/frmMain.Designer.cs b/GUI.NET/Forms/frmMain.Designer.cs index 52a6f9c8..e3a6173d 100644 --- a/GUI.NET/Forms/frmMain.Designer.cs +++ b/GUI.NET/Forms/frmMain.Designer.cs @@ -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; } } diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs index cd9d7eb1..b2fc6d8f 100644 --- a/GUI.NET/Forms/frmMain.cs +++ b/GUI.NET/Forms/frmMain.cs @@ -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; diff --git a/GUI.NET/GUI.NET.csproj b/GUI.NET/GUI.NET.csproj index 709e5307..1f300d2e 100644 --- a/GUI.NET/GUI.NET.csproj +++ b/GUI.NET/GUI.NET.csproj @@ -539,15 +539,14 @@ Resources.resx True - + Dependencies\Roboto.12.spritefont - - - Dependencies\Roboto.9.spritefont - - - Dependencies\Toast.dds - + Always + + + Dependencies\Roboto.32.spritefont + Always + SettingsSingleFileGenerator Settings.Designer.cs @@ -559,36 +558,35 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + Dependencies\Dependencies.zip - - Dependencies\MesenIcon.bmp - - - diff --git a/GUI.NET/Icon.ico b/GUI.NET/Icon.ico index 0c43cba3..50a50c59 100644 Binary files a/GUI.NET/Icon.ico and b/GUI.NET/Icon.ico differ diff --git a/GUI.NET/Properties/Resources.Designer.cs b/GUI.NET/Properties/Resources.Designer.cs index f6c67bea..8cfe74fe 100644 --- a/GUI.NET/Properties/Resources.Designer.cs +++ b/GUI.NET/Properties/Resources.Designer.cs @@ -63,9 +63,19 @@ namespace Mesen.GUI.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap folder { + internal static System.Drawing.Bitmap Help { get { - object obj = ResourceManager.GetObject("folder", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap globe_network { - get { - object obj = ResourceManager.GetObject("globe_network", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap globe_place { - get { - object obj = ResourceManager.GetObject("globe_place", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap help { - get { - object obj = ResourceManager.GetObject("help", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Pause { + get { + object obj = ResourceManager.GetObject("Pause", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Play { + get { + object obj = ResourceManager.GetObject("Play", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -273,9 +263,9 @@ namespace Mesen.GUI.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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 { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - 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)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Speed { + get { + object obj = ResourceManager.GetObject("Speed", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Stop { + get { + object obj = ResourceManager.GetObject("Stop", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Video { + get { + object obj = ResourceManager.GetObject("Video", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/GUI.NET/Properties/Resources.resx b/GUI.NET/Properties/Resources.resx index 92e9a6fe..e55f8225 100644 --- a/GUI.NET/Properties/Resources.resx +++ b/GUI.NET/Properties/Resources.resx @@ -121,70 +121,76 @@ ..\resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MesenLogo.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\NextArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\previousarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\audio-x-generic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\camera-photo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\emblem-system.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\control_eject.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\input-gaming.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\control_pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\media-eject.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\control_play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\system-log-out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\control_stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\media-floppy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\debugging.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\folder-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\diskette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\view-fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\internet-web-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\globe_network.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\help-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\globe_place.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MesenIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lcd_tv_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\applications-multimedia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\movies.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\network-workgroup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\music.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\media-playback-pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\slideshow_full_screen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\media-playback-start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\speedometer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\view-refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\system-software-update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\appointment-new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\media-playback-stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\image-x-generic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GUI.NET/ResourceManager.cs b/GUI.NET/ResourceManager.cs index 7ce87dc7..2f1cdac1 100644 --- a/GUI.NET/ResourceManager.cs +++ b/GUI.NET/ResourceManager.cs @@ -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); + } 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); } } - - 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")); } } } diff --git a/GUI.NET/Resources/MesenIcon.ico b/GUI.NET/Resources/MesenIcon.ico deleted file mode 100644 index 498c8b8f..00000000 Binary files a/GUI.NET/Resources/MesenIcon.ico and /dev/null differ diff --git a/GUI.NET/Resources/MesenIcon.png b/GUI.NET/Resources/MesenIcon.png new file mode 100644 index 00000000..e7391026 Binary files /dev/null and b/GUI.NET/Resources/MesenIcon.png differ diff --git a/GUI.NET/Resources/MesenIconMedium.png b/GUI.NET/Resources/MesenIconMedium.png new file mode 100644 index 00000000..c3876c41 Binary files /dev/null and b/GUI.NET/Resources/MesenIconMedium.png differ diff --git a/GUI.NET/Resources/MesenIconSmall.png b/GUI.NET/Resources/MesenIconSmall.png new file mode 100644 index 00000000..ad333d61 Binary files /dev/null and b/GUI.NET/Resources/MesenIconSmall.png differ diff --git a/GUI.NET/Resources/MesenLogo.bmp b/GUI.NET/Resources/MesenLogo.bmp deleted file mode 100644 index 12dfc3eb..00000000 Binary files a/GUI.NET/Resources/MesenLogo.bmp and /dev/null differ diff --git a/GUI.NET/Resources/applications-multimedia.png b/GUI.NET/Resources/applications-multimedia.png new file mode 100644 index 00000000..3e4ced5b Binary files /dev/null and b/GUI.NET/Resources/applications-multimedia.png differ diff --git a/GUI.NET/Resources/appointment-new.png b/GUI.NET/Resources/appointment-new.png new file mode 100644 index 00000000..18b7c678 Binary files /dev/null and b/GUI.NET/Resources/appointment-new.png differ diff --git a/GUI.NET/Resources/audio-x-generic.png b/GUI.NET/Resources/audio-x-generic.png new file mode 100644 index 00000000..2bd5af93 Binary files /dev/null and b/GUI.NET/Resources/audio-x-generic.png differ diff --git a/GUI.NET/Resources/camera-photo.png b/GUI.NET/Resources/camera-photo.png new file mode 100644 index 00000000..1e8e8863 Binary files /dev/null and b/GUI.NET/Resources/camera-photo.png differ diff --git a/GUI.NET/Resources/camera.png b/GUI.NET/Resources/camera.png deleted file mode 100644 index 0a7ef900..00000000 Binary files a/GUI.NET/Resources/camera.png and /dev/null differ diff --git a/GUI.NET/Resources/cog.png b/GUI.NET/Resources/cog.png deleted file mode 100644 index 8f4eeb76..00000000 Binary files a/GUI.NET/Resources/cog.png and /dev/null differ diff --git a/GUI.NET/Resources/control_eject.png b/GUI.NET/Resources/control_eject.png deleted file mode 100644 index 00deee0d..00000000 Binary files a/GUI.NET/Resources/control_eject.png and /dev/null differ diff --git a/GUI.NET/Resources/control_pause.png b/GUI.NET/Resources/control_pause.png deleted file mode 100644 index 6102c6b4..00000000 Binary files a/GUI.NET/Resources/control_pause.png and /dev/null differ diff --git a/GUI.NET/Resources/control_play.png b/GUI.NET/Resources/control_play.png deleted file mode 100644 index eac3be18..00000000 Binary files a/GUI.NET/Resources/control_play.png and /dev/null differ diff --git a/GUI.NET/Resources/control_stop.png b/GUI.NET/Resources/control_stop.png deleted file mode 100644 index 0cbe9b6d..00000000 Binary files a/GUI.NET/Resources/control_stop.png and /dev/null differ diff --git a/GUI.NET/Resources/controller.png b/GUI.NET/Resources/controller.png deleted file mode 100644 index fd281bbc..00000000 Binary files a/GUI.NET/Resources/controller.png and /dev/null differ diff --git a/GUI.NET/Resources/debugging.png b/GUI.NET/Resources/debugging.png deleted file mode 100644 index c364714e..00000000 Binary files a/GUI.NET/Resources/debugging.png and /dev/null differ diff --git a/GUI.NET/Resources/diskette.png b/GUI.NET/Resources/diskette.png deleted file mode 100644 index d0d400ec..00000000 Binary files a/GUI.NET/Resources/diskette.png and /dev/null differ diff --git a/GUI.NET/Resources/emblem-system.png b/GUI.NET/Resources/emblem-system.png new file mode 100644 index 00000000..259ed26d Binary files /dev/null and b/GUI.NET/Resources/emblem-system.png differ diff --git a/GUI.NET/Resources/folder-open.png b/GUI.NET/Resources/folder-open.png new file mode 100644 index 00000000..b67403d9 Binary files /dev/null and b/GUI.NET/Resources/folder-open.png differ diff --git a/GUI.NET/Resources/folder.png b/GUI.NET/Resources/folder.png deleted file mode 100644 index f1ed9abe..00000000 Binary files a/GUI.NET/Resources/folder.png and /dev/null differ diff --git a/GUI.NET/Resources/globe_network.png b/GUI.NET/Resources/globe_network.png deleted file mode 100644 index 7b19f4ac..00000000 Binary files a/GUI.NET/Resources/globe_network.png and /dev/null differ diff --git a/GUI.NET/Resources/globe_place.png b/GUI.NET/Resources/globe_place.png deleted file mode 100644 index e106ffc8..00000000 Binary files a/GUI.NET/Resources/globe_place.png and /dev/null differ diff --git a/GUI.NET/Resources/help-browser.png b/GUI.NET/Resources/help-browser.png new file mode 100644 index 00000000..f25fc3fb Binary files /dev/null and b/GUI.NET/Resources/help-browser.png differ diff --git a/GUI.NET/Resources/help.png b/GUI.NET/Resources/help.png deleted file mode 100644 index dd83ee06..00000000 Binary files a/GUI.NET/Resources/help.png and /dev/null differ diff --git a/GUI.NET/Resources/image-x-generic.png b/GUI.NET/Resources/image-x-generic.png new file mode 100644 index 00000000..68da5027 Binary files /dev/null and b/GUI.NET/Resources/image-x-generic.png differ diff --git a/GUI.NET/Resources/input-gaming.png b/GUI.NET/Resources/input-gaming.png new file mode 100644 index 00000000..9d040ee8 Binary files /dev/null and b/GUI.NET/Resources/input-gaming.png differ diff --git a/GUI.NET/Resources/internet-web-browser.png b/GUI.NET/Resources/internet-web-browser.png new file mode 100644 index 00000000..ac5957ad Binary files /dev/null and b/GUI.NET/Resources/internet-web-browser.png differ diff --git a/GUI.NET/Resources/lcd_tv_image.png b/GUI.NET/Resources/lcd_tv_image.png deleted file mode 100644 index 9bb42d13..00000000 Binary files a/GUI.NET/Resources/lcd_tv_image.png and /dev/null differ diff --git a/GUI.NET/Resources/media-eject.png b/GUI.NET/Resources/media-eject.png new file mode 100644 index 00000000..2084067e Binary files /dev/null and b/GUI.NET/Resources/media-eject.png differ diff --git a/GUI.NET/Resources/media-floppy.png b/GUI.NET/Resources/media-floppy.png new file mode 100644 index 00000000..f1d7a198 Binary files /dev/null and b/GUI.NET/Resources/media-floppy.png differ diff --git a/GUI.NET/Resources/media-playback-pause.png b/GUI.NET/Resources/media-playback-pause.png new file mode 100644 index 00000000..c8b4fe22 Binary files /dev/null and b/GUI.NET/Resources/media-playback-pause.png differ diff --git a/GUI.NET/Resources/media-playback-start.png b/GUI.NET/Resources/media-playback-start.png new file mode 100644 index 00000000..a7de0feb Binary files /dev/null and b/GUI.NET/Resources/media-playback-start.png differ diff --git a/GUI.NET/Resources/media-playback-stop.png b/GUI.NET/Resources/media-playback-stop.png new file mode 100644 index 00000000..ede2815e Binary files /dev/null and b/GUI.NET/Resources/media-playback-stop.png differ diff --git a/GUI.NET/Resources/movies.png b/GUI.NET/Resources/movies.png deleted file mode 100644 index db97e5b2..00000000 Binary files a/GUI.NET/Resources/movies.png and /dev/null differ diff --git a/GUI.NET/Resources/music.png b/GUI.NET/Resources/music.png deleted file mode 100644 index e8c20b9f..00000000 Binary files a/GUI.NET/Resources/music.png and /dev/null differ diff --git a/GUI.NET/Resources/network-workgroup.png b/GUI.NET/Resources/network-workgroup.png new file mode 100644 index 00000000..5c140d83 Binary files /dev/null and b/GUI.NET/Resources/network-workgroup.png differ diff --git a/GUI.NET/Resources/slideshow_full_screen.png b/GUI.NET/Resources/slideshow_full_screen.png deleted file mode 100644 index ac8b4fdb..00000000 Binary files a/GUI.NET/Resources/slideshow_full_screen.png and /dev/null differ diff --git a/GUI.NET/Resources/speedometer.png b/GUI.NET/Resources/speedometer.png deleted file mode 100644 index ecd620b7..00000000 Binary files a/GUI.NET/Resources/speedometer.png and /dev/null differ diff --git a/GUI.NET/Resources/system-log-out.png b/GUI.NET/Resources/system-log-out.png new file mode 100644 index 00000000..0010931e Binary files /dev/null and b/GUI.NET/Resources/system-log-out.png differ diff --git a/GUI.NET/Resources/system-software-update.png b/GUI.NET/Resources/system-software-update.png new file mode 100644 index 00000000..58f19c68 Binary files /dev/null and b/GUI.NET/Resources/system-software-update.png differ diff --git a/GUI.NET/Resources/view-fullscreen.png b/GUI.NET/Resources/view-fullscreen.png new file mode 100644 index 00000000..ffdabd4e Binary files /dev/null and b/GUI.NET/Resources/view-fullscreen.png differ diff --git a/GUI.NET/Resources/view-refresh.png b/GUI.NET/Resources/view-refresh.png new file mode 100644 index 00000000..3fd71d6e Binary files /dev/null and b/GUI.NET/Resources/view-refresh.png differ diff --git a/UpdateHelper/Icon.ico b/UpdateHelper/Icon.ico index 0c43cba3..50a50c59 100644 Binary files a/UpdateHelper/Icon.ico and b/UpdateHelper/Icon.ico differ diff --git a/Windows/Renderer.cpp b/Windows/Renderer.cpp index 783bd482..f58eb7ee 100644 --- a/Windows/Renderer.cpp +++ b/Windows/Renderer.cpp @@ -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 toast(new ToastInfo(title, message, 4000, "Resources\\MesenIcon.bmp")); + shared_ptr 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() diff --git a/Windows/Renderer.h b/Windows/Renderer.h index 55bbfe20..482e1f03 100644 --- a/Windows/Renderer.h +++ b/Windows/Renderer.h @@ -43,7 +43,7 @@ namespace NES { uint32_t _currentRenderedFPS = 0; unique_ptr _font; - unique_ptr _smallFont; + unique_ptr _largeFont; unique_ptr _spriteBatch; @@ -59,7 +59,7 @@ namespace NES { uint32_t _noUpdateCount = 0; list> _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 toast, int &lastHeight); diff --git a/Windows/Resources/Roboto.9.spritefont b/Windows/Resources/Roboto.9.spritefont deleted file mode 100644 index 00488c2c..00000000 Binary files a/Windows/Resources/Roboto.9.spritefont and /dev/null differ diff --git a/Windows/Windows.vcxproj b/Windows/Windows.vcxproj index 7b18179a..92d25c0f 100644 --- a/Windows/Windows.vcxproj +++ b/Windows/Windows.vcxproj @@ -393,17 +393,7 @@ false - - false - - - - - false - - - false - + diff --git a/Windows/Windows.vcxproj.filters b/Windows/Windows.vcxproj.filters index c56d7aa5..38df736b 100644 --- a/Windows/Windows.vcxproj.filters +++ b/Windows/Windows.vcxproj.filters @@ -103,19 +103,11 @@ Header Files\DirectXTK - - Resource Files - Resource Files - - - + Resource Files - - - Resource Files - + \ No newline at end of file