From 63d2c2f9d3d360a47a17763db2d523ec1f19f5bb Mon Sep 17 00:00:00 2001 From: Souryo Date: Thu, 11 Feb 2016 18:34:55 -0500 Subject: [PATCH] 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. --- GUI.NET/Config/PlayerProfile.cs | 4 +- GUI.NET/Debugger/frmBreakpoint.Designer.cs | 2 +- GUI.NET/Forms/Config/frmAudioConfig.cs | 2 +- .../Forms/Config/frmVideoConfig.Designer.cs | 2 +- .../NetPlay/frmPlayerProfile.Designer.cs | 12 +- GUI.NET/Forms/NetPlay/frmPlayerProfile.resx | 3 + .../Forms/NetPlay/frmServerConfig.Designer.cs | 10 +- GUI.NET/Forms/NetPlay/frmServerConfig.resx | 3 + GUI.NET/Forms/frmMain.Designer.cs | 194 +++++++++--------- GUI.NET/Forms/frmMain.cs | 2 +- GUI.NET/GUI.NET.csproj | 58 +++--- GUI.NET/Icon.ico | Bin 17006 -> 17006 bytes GUI.NET/Properties/Resources.Designer.cs | 156 ++++++++------ GUI.NET/Properties/Resources.resx | 86 ++++---- GUI.NET/ResourceManager.cs | 8 +- GUI.NET/Resources/MesenIcon.ico | Bin 10134 -> 0 bytes GUI.NET/Resources/MesenIcon.png | Bin 0 -> 1705 bytes GUI.NET/Resources/MesenIconMedium.png | Bin 0 -> 1053 bytes GUI.NET/Resources/MesenIconSmall.png | Bin 0 -> 314 bytes GUI.NET/Resources/MesenLogo.bmp | Bin 5174 -> 0 bytes GUI.NET/Resources/applications-multimedia.png | Bin 0 -> 592 bytes GUI.NET/Resources/appointment-new.png | Bin 0 -> 897 bytes GUI.NET/Resources/audio-x-generic.png | Bin 0 -> 688 bytes GUI.NET/Resources/camera-photo.png | Bin 0 -> 864 bytes GUI.NET/Resources/camera.png | Bin 729 -> 0 bytes GUI.NET/Resources/cog.png | Bin 777 -> 0 bytes GUI.NET/Resources/control_eject.png | Bin 685 -> 0 bytes GUI.NET/Resources/control_pause.png | Bin 700 -> 0 bytes GUI.NET/Resources/control_play.png | Bin 730 -> 0 bytes GUI.NET/Resources/control_stop.png | Bin 709 -> 0 bytes GUI.NET/Resources/controller.png | Bin 717 -> 0 bytes GUI.NET/Resources/debugging.png | Bin 793 -> 0 bytes GUI.NET/Resources/diskette.png | Bin 730 -> 0 bytes GUI.NET/Resources/emblem-system.png | Bin 0 -> 629 bytes GUI.NET/Resources/folder-open.png | Bin 0 -> 625 bytes GUI.NET/Resources/folder.png | Bin 632 -> 0 bytes GUI.NET/Resources/globe_network.png | Bin 1613 -> 0 bytes GUI.NET/Resources/globe_place.png | Bin 1611 -> 0 bytes GUI.NET/Resources/help-browser.png | Bin 0 -> 932 bytes GUI.NET/Resources/help.png | Bin 763 -> 0 bytes GUI.NET/Resources/image-x-generic.png | Bin 0 -> 558 bytes GUI.NET/Resources/input-gaming.png | Bin 0 -> 812 bytes GUI.NET/Resources/internet-web-browser.png | Bin 0 -> 928 bytes GUI.NET/Resources/lcd_tv_image.png | Bin 1518 -> 0 bytes GUI.NET/Resources/media-eject.png | Bin 0 -> 628 bytes GUI.NET/Resources/media-floppy.png | Bin 0 -> 561 bytes GUI.NET/Resources/media-playback-pause.png | Bin 0 -> 464 bytes GUI.NET/Resources/media-playback-start.png | Bin 0 -> 660 bytes GUI.NET/Resources/media-playback-stop.png | Bin 0 -> 429 bytes GUI.NET/Resources/movies.png | Bin 697 -> 0 bytes GUI.NET/Resources/music.png | Bin 554 -> 0 bytes GUI.NET/Resources/network-workgroup.png | Bin 0 -> 517 bytes GUI.NET/Resources/slideshow_full_screen.png | Bin 1627 -> 0 bytes GUI.NET/Resources/speedometer.png | Bin 852 -> 0 bytes GUI.NET/Resources/system-log-out.png | Bin 0 -> 799 bytes GUI.NET/Resources/system-software-update.png | Bin 0 -> 964 bytes GUI.NET/Resources/view-fullscreen.png | Bin 0 -> 650 bytes GUI.NET/Resources/view-refresh.png | Bin 0 -> 912 bytes UpdateHelper/Icon.ico | Bin 17006 -> 17006 bytes Windows/Renderer.cpp | 42 ++-- Windows/Renderer.h | 8 +- Windows/Resources/Roboto.9.spritefont | Bin 11784 -> 0 bytes Windows/Windows.vcxproj | 12 +- Windows/Windows.vcxproj.filters | 12 +- 64 files changed, 330 insertions(+), 286 deletions(-) delete mode 100644 GUI.NET/Resources/MesenIcon.ico create mode 100644 GUI.NET/Resources/MesenIcon.png create mode 100644 GUI.NET/Resources/MesenIconMedium.png create mode 100644 GUI.NET/Resources/MesenIconSmall.png delete mode 100644 GUI.NET/Resources/MesenLogo.bmp create mode 100644 GUI.NET/Resources/applications-multimedia.png create mode 100644 GUI.NET/Resources/appointment-new.png create mode 100644 GUI.NET/Resources/audio-x-generic.png create mode 100644 GUI.NET/Resources/camera-photo.png delete mode 100644 GUI.NET/Resources/camera.png delete mode 100644 GUI.NET/Resources/cog.png delete mode 100644 GUI.NET/Resources/control_eject.png delete mode 100644 GUI.NET/Resources/control_pause.png delete mode 100644 GUI.NET/Resources/control_play.png delete mode 100644 GUI.NET/Resources/control_stop.png delete mode 100644 GUI.NET/Resources/controller.png delete mode 100644 GUI.NET/Resources/debugging.png delete mode 100644 GUI.NET/Resources/diskette.png create mode 100644 GUI.NET/Resources/emblem-system.png create mode 100644 GUI.NET/Resources/folder-open.png delete mode 100644 GUI.NET/Resources/folder.png delete mode 100644 GUI.NET/Resources/globe_network.png delete mode 100644 GUI.NET/Resources/globe_place.png create mode 100644 GUI.NET/Resources/help-browser.png delete mode 100644 GUI.NET/Resources/help.png create mode 100644 GUI.NET/Resources/image-x-generic.png create mode 100644 GUI.NET/Resources/input-gaming.png create mode 100644 GUI.NET/Resources/internet-web-browser.png delete mode 100644 GUI.NET/Resources/lcd_tv_image.png create mode 100644 GUI.NET/Resources/media-eject.png create mode 100644 GUI.NET/Resources/media-floppy.png create mode 100644 GUI.NET/Resources/media-playback-pause.png create mode 100644 GUI.NET/Resources/media-playback-start.png create mode 100644 GUI.NET/Resources/media-playback-stop.png delete mode 100644 GUI.NET/Resources/movies.png delete mode 100644 GUI.NET/Resources/music.png create mode 100644 GUI.NET/Resources/network-workgroup.png delete mode 100644 GUI.NET/Resources/slideshow_full_screen.png delete mode 100644 GUI.NET/Resources/speedometer.png create mode 100644 GUI.NET/Resources/system-log-out.png create mode 100644 GUI.NET/Resources/system-software-update.png create mode 100644 GUI.NET/Resources/view-fullscreen.png create mode 100644 GUI.NET/Resources/view-refresh.png delete mode 100644 Windows/Resources/Roboto.9.spritefont 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 0c43cba3749dbd91b7f5849042f5827675d7b347..50a50c592809bdd538ea6f749685a627d2ee2317 100644 GIT binary patch literal 17006 zcmeI3TWnoN6^2jMS04JvV;=j6c;F3W3RHl&NQg@%Bm@XSg#x6e9Wd(P}Rv-jCPu}JaO z@yVK*HUIo;&6?RWb0&qt1BC|*4?R@i`C#Gk2MdLdAgx&=>BbKf3hT+MtCRG@A1)Lg zMfYKnQI$3PJwUzUgP!}mQT<~wKZ335ZxOqEC`Xifm=6rB%=oeaVq;MOMKs4d`RwojZ4w zlGG~c*Z;)uDLz;&$f6wU7j;VdYd>!IELGXQeY;DBqM}ZWFIB8sCE81x0vPjuyE($w zT8=;w3QPS}g5n?Yom!H!q!HsU<%Itg{i?p*@lb6#8fRWI^ zrNVhR2;sW_3-}8Q3lkF)eSLk$jvYIA@L*?WXIEF(i4!LV2M4cSy?XcV-GB)J{`2$m zr%#{WyLT^98R&Y(@sT4(Xvo`&7k_4E2CB?b0oY_wYisMJOP8Eh9Q>O%Z-VR)CW#d| zWME)mWMt&Rg$sQ5_xB$@e0b~DtxiK79UaiqRurFEiYl8nZL;y*wQM1buMP}=OVRM~unntn7(W$O6?%Gl6w?;M_!~EFR0KyL zR;Q+>2>!;#Mv4dw8&>5o{(%Dr99T&*oORGKxX82zi-IG>_zQF9PBh}|2d^gaVXokW z9DT%4(t$?xNCpZ(#qVh|Pt}H&D zO^-3YX!doQ-+ig9mFK=}_P=CCy3Im7kCkBOZkU0?rs-+3?o)9U`mz00b9+&ATzqop zXHDB*%+rs?Rp28ZOs3;r{&w{3Re0sQX7p64_2NGsd?|i!I%&^I}1FOjteAN>HqbA49#E_X9H}q+S zr#k!$fR4)h17EDTN8j##V5QU1KBbPowfyNmi(_aj<_u$o%M}Il|X_`$6Oaj|Uo3>ZRSP-zCjnB&P=b(dwltYIO zReO--<*%8bfk{7BWrbAFScMJUsZ*z9W3KJiT;L?F(ylzoGb4Wn9p_-gZOz$M0%ZT5 z#fnt^_?(TcZlWtS=j3B4#}Nefn@bNv8%mrTR26kZ)QuZAl5W?WFn=aJ_WKSuZxRFB z+uM74dvThaaB34tf!URTk40HJ)IK#$LRI3=0R@LeUaEE`GY^M^$>Zf@L*5*w0?u$i zNbO%vZqJ=Nmjp@jXC4F4Ch3(426`ve)yWpUIpAcO8R%jsoNWGhgCpEjS8%o*b~tk& zLx#5O<7;Gc$PdhrS*)PPIcw6xYUR(%D0yV(cpm0~)^RLn%e!~)c4{S)=%DHC2r{t( zGsDB2BRF|+D}R3GNH(N7tO}gNf2VbZB$%q7ML@sou&x}DIN_&?01guyHADfS(mX>r z@p9MxDsQBeVi}Wf2|+FDdNC!F(T(f8RzMgXTn8OY4d-}@7ilF2848KCMd%FUmZVLp<9T3~uf1~PN=mtW8VWO5XN8KCMd%FTcI z(`M2@W<@W_KxS_K$<}L<6QJrX%FREw|8X)?CF?+5H_i$NOfShmW^VrZ;-3YNv#YgD zSjqTj`B!bgB+27gdO>kyNg42VvM9IzS#)W;Sp+Y6_z*~1J>$B?wjwuw-j!K)--2I> zJWO;E0$L5;zx-G~HDTu8vu&&-vrAIf1q24H6Y~maue~#^fB5klde)7CGXM7+~NZMA_L7ZU7?5ST!wwf{2R`^pqVnM)mM9bq%^b^$lg93R+K zh%Sgbl}PMyQnNpAX?#*E!gh(CI~@1Pe5MQsI3w>)LuX*1Wan8k|sqDxJ4 zAMD)`b7+Hk<$Ec##YM%b(x$C)3V+eN*q_p~YK02)_3yuKUjIQf*0w(reRu(peEut? zSG;P51!}QisQhH&FV(rS7?{w)G;)+;esPAc%sncpg8zzHkv6~C7FEq(D&ra66j{ba zRi4M^$D68}({l0`D|m@8g)%e9val+uwlaf)tE7p!(e`sCd0G4wl(zsEeOaqu3qG{D zd1dTns^9x!v}g)+P#gY9bY^uHFc`(Cha?}?ha@kb4J@LPFsV8BihpXuHBwmR pUn586gjw}}PRG@#+N%F+?8*u;t literal 17006 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 /// 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 498c8b8f846377d1c626b65bdcc4c7610244d986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10134 zcmeHNzi%T&6n^VCSv#Da=!%rY5{kGADBR~17wImDD&>Wf&^4S)LrfJ*poDIf@=zoS zuDFV;@2V7B9sUCvKy)!A7jLAKhVPr*XOGwGtbgo@1N`FInK$pp_vX!bJv$o_PnM)s zTSZ-zKMEqBiOA||#NY8m?kx!90(nWEmPEcRQXcUS7e(H!sJtdm(SLYb#B$$S_$oI|(>U^5pImM>0{Vx3J=pK=UF_6j z|3RZ=x@%$V5Bl|ku)AkWPrnqJux*01Sl=|ZgXR~Pn|m71+U;-G*8bX!@Zo=BgTbml zM8bIC-{QkRIzn_cG=3(aFZaVvD{OpIugCE<&8rVh{i4y>R(*`sT-NIcaXcXtaO9Va z%_sabIh|$@a=08Xlk@8RNGvuxiyIq}HS)c0bM41s&PPPn8W$VgcvEZFfVF-tvJU(e zgp_Alhrdmf0~7@8nNSwY>we6J>wFcZhNA1djdnVbt1Kd zxtc<_87ZYm(bZF^R()@X{A#stJ|soQpuCcx$>n_vx*E3kyju&Nw{XkzAWW4nS4ySI z@@RRHj*F0w@V`jG;z)U!;!34F(%vgnDg_KP3QuiWE{-V#-mFBQCk@9<@+yZYr4)qDDuae25d zGX}-8%Gfgu@)6sMw`iq^Unw=|`92TUEJm9T(sRnp0G@U4qx^zmaw_NW)6N8j0`xx4 z2{SGB%ou=e$BnZ9gL8sh3Vp?6I?u|1jy*4I^`m|##mCu)nWg+!@O2znbuw3~KWqNg z56+_u&aHaul5O^>ocL+&yzp@@X4eDuqlSfe>`TLRW6292=XFEtk$o<{I|tgI7e3Ak zhw#~_I4*YHTI0%V{Pc&j(;g1nilO+*=RJP)%Nl311M6O8E~eYg zbNq^xR%_n1R-IY#)!(G`96$OE&m;euOLq?3K5eJf|0F)n4|M;Lc>t<$>KNRyX0_GE ztzB&R{{BtwKU`e4C&gxLd5wP>?7Z-&#ZJRd<}{0+1v|#K`)~Tm!b-|##g6g$?9=XPha%8iE@Bq_Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&1{z63K~#8N?U{i~B}E*^`^SPH2!bF8f*=Tj zAP9mW2!i6MsECTAA|j3>^)x+A)6*11(G)F7)YDV+G)>Xd(=pesg$e)z?Ww6w@90BiW=uk`~wD?a;)$d98U4^K*ivOsD9&V%D&5)nkA4Xg#Ywdy7& z-2hDa+^6nfU%x8yX0^yi%`V^g&i#ya{`80XXHAG5(}Za(z`cJ&KD%MR#-I6Exix+9qAmgep^hpE~7yG zaD7d0=y&J=}M0qF3pYkI>vzHr&y0<&agQy{MCQe??RZJUt-^xra{b(<`_ zySpn>Q&ZB{*C)-*%~D-m?F@of{^xVPr=1CiP8`&Y%TJc>wVz85`A{an{Ri%Tt}_xQ zq5l0)p#Q6VX8DPv>t7P|;|ahFzIH|bV3_YWMb_*8 zmR=nk92`h@cXyd{VRm(OInJ)Huglojm=_t4=dqIn&KD+IGfPKJ8umQ_IE?5X@RI~& zT883GZEdaRNEC5CjOFF!fC$*ZUJ{r@&K^n8py~x|djha+=o&)|5@reO{B#angdK=u zRG5ct@Se{?INe;!L6Rgl>3o4|i^Q%c03oewOjr?Krr6opk(!zsZ{SJX+&n%1Mj$K# zcCl{){Glic`@wUnCS=XWAuIy+PfpAR#n|yd zolJSfM+NK!1OOxmN=bGETTD()dIL2j&c#Im2#YW=F;V))3{|X{q#0dSE9v0fvT#0s~CL zI1#qCwgPSGFDtN*g7jm09*6_BauWdf%hgKK_AC$uYy|{h&m9>Vk>TOtRHf$e@v$^D zHI)rGPhy{bY_PJj;@mev|HTUSJOS3$)&eIk*xugmh++fUS87YduFZJ%_xH=Lu(bm@HwBx-eKvL+EcxGp3ol6fB zpfYv6&Xz5)qh>7$gm_C!i`I@Jz5?ER0*sE1mNnE7<17~w?CtGIXJ@C@jwyK_J4xW? zSa)X7QJo}t?+HL+iCYF?_Vn}^-_May2|JygDAK-^h`GVr=8X=7J2z3Lc?UsN66JqS z06=)p&COZu=LoT}u~D)R4+LYdy}i9ERN62%t%8+L%>cHSw_>-(}5+- z=K%o}NO&YZzkwtYJyd6T6ew}9bsQqB?#C6r(+Z%#mSg*q7D^+YX;heiStGe&*Csj} z8yjPH4%);Dpuo(gDR3Ap>hpsqw>&n{LE@XApO?YGLF>y_^1=A{cw&FFH4*?|jP+?V z13Kai1r`Mg*;o-rSw0+f1hh96K;h`<$SE??UV&GNh?jJ=9tO`@3!soD z8C8PR_qL8J@O)|k6i84MMuc9L(6u4`(4T1?5(R8!7Qhb*3=$XXJFhZWk+T4HDaUQj zC2_!Rt^$O?3^8C593`~P0f`)g!~A&4Il%S^Yy$eJr~o>!y-_3J)WX7oN48o%-`?JK z675;we-Yq3p%9=Dpb(%Cpb(%C;PlVMWtIE~L_WsEK;Bb800000NkvXXu0mjf$Y3At literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/MesenIconMedium.png b/GUI.NET/Resources/MesenIconMedium.png new file mode 100644 index 0000000000000000000000000000000000000000..c3876c4117f96716c0f526fad08ad10cb000f985 GIT binary patch literal 1053 zcmV+&1mgRNP)N2bZe?^J zG%heMHD!e|WdHyJn@L1LR9HvtR^3a}Q5fzYDqU%75j0pO;DEsol z{2WW?2UDl6oG3amXo}j@F@?EJhuV_0+|+GP=Q;cR=I?7?6nNtU55IZNd*1gs=Y7w6 zJkiwDgrlSsa8x)J@J|AE{s56}Ag~TZ<3M6pnWzF43pmIC--5tv7jXMMaP~29vc}8{ zPk{TMfJP6n6jc_NKv@CYeNuD$^32LazIklt5}4fve`#{EE@12|_$)9Hsm z!`FN|Rp=?%8~fu8U&&E^=&yaD>6ZK~r#Yds{RE1*!;+ zN2BI@=of{^g5@T^%o%DRB?>E(l|M}g27|hwTK4tzVQ+6wvCNBbI2`Ei?v}!};E6B> zV-Z|m5Ksz3Lqn#(TK4z%>qL0HUO66%#gq|i(54~*ZEbD3fL7#5#N%;Ugm$}Kjx8)K zC?2dqn~DUeL8>LMXerR9A_2^))^Vj|?UVv-DiSa?HDz*Mj=YY$yQQB<+DQTX`}2kW!qSoK#lpkxr+vy1FXAw37nVJI)Tr!pUaM_mS;ZbzY9_1>BSt zypl^xOR{s)W?*1Iex-n}t}dN}o}L~=BBDPVu(GmJa8QhHw_EN`3pOh?ph~r_q=2oh zEg4j6K+>7 zN~&jn*EXAC;8C*|uo< zB)=5TSCOY-Tt|+KjL2fvg5xFuDrjuAi)uMMJdBNv4aKV-oG&Us1q*6%aZ&Ev>Qt=A zLY0#LT=By}Z;C1rt33 zJ=4@yqg0@p)t)YnAr}5iCphvsDGE66oz-6SK9E7UEXRhu{ecq8<@~7jpHJNP`|e7( zv`?|P)3C38597Hk&K3uC{BkPAG#=NzhkG_f?xaHjt^*W7fvogbHrVH)@T}P)}Vn3kRcYM3JvB~{i zjD4+&=C?MO8l7;ec;DC2aG$L>uk|P2hi(>&_ZD#yRzBSwhMT2;&Svm*^>bP0l+XkK D`?GKT literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/MesenLogo.bmp b/GUI.NET/Resources/MesenLogo.bmp deleted file mode 100644 index 12dfc3ebbf5711e74bc9de18c64fd0418c313bc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5174 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 X$s}Y37Q!~)00000NkvXXu0mjf?g64A literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/audio-x-generic.png b/GUI.NET/Resources/audio-x-generic.png new file mode 100644 index 0000000000000000000000000000000000000000..2bd5af93884992dce73468227aa296a2b5780ee1 GIT binary patch literal 688 zcmV;h0#E&kP)^MF*i^r8aGC)22;clK1a-4t0{mr8nMj zAHH{dL{-^InH_BdZoB5C8+)IM=rL6chyw_sMioaCqk@1qD64G&S*GX5$4_++^bNBs z*hj(d!}9`+amccWR#c_lT;|b}2mNgU0D}Yj$@@M*5Kt_X2>c;(UXfN*p%yNX_X7~L zBcNKFC$U?^NsW4=OjoW4!68XQqGXdO-T@3oDZc{)zi)3wz2)yeco3#m6|DG^4GjQ7V%x%vUj_11a;(BhT#E787Wn}Vd zX{^gN_wxDPLn7ihuCZ2QP{h4>ZSaEUIgihtIhP+fe3G!a#7gCpvr(Hv6+$z3v%k0J z?)2oX!k*njgv}L}Dj(Sj=K#cYj9eKxTF6KGmG3_nX+`TaqczNSI0buW^u&R}@2$5i zS5umCg(L|v#zPh3D*EBaTw}D@Q!e=a3Tdi@^^AJ0fwk7Sj;t=0e-(4xiHI1YRzzjJ zL1nFx07g`m>FcHYAeXaD`$QyhT$xApa~kU_&~J`so@JRHF-BsA%rWvMP3#+tdHn}< WF%C7a=_bMe0000Mh53JODVWnpw>WFU8GbZ8({Xk{Qr zNlj3Y*^6%g00OK@L_t(I%Z-vtZxd$}hM#XdnVTCEU&1(18>Ug9t`t~g(IrAvH(dc$ z+g-M#S@kclg@3>wKr~V-)JR>mfgRnTSS?X0BvmFM$<)D~IAhNwp84iu;YQ+C!Mi(0 zub%TBog;XQT=(=Bw(b04+jilk*X?%uS(aXGwf395ORnpt4}O23Ue@yR&ynl8gV(+K z|1iY8dn;^jZw)I2zpeaQ1hV%6NGS_TOFu9@J&k3VIF7@^hpR#eG4ck$^So=CrrnZK zG8haHnm{iUsMja>>Bqa`#Q4p(U#rbcpL)Hngboi?+d zUBt01(j*}W0{-1^^Stwzq~Bw8b(Kq(J|C`-W-0xC52fI*$7`JNKE^vYOFwM0v9`nU zU;w!y%_X&3jqR;%+U<~|BpCv7nIokHK+`m=;wk=q^arLf!k>@UXa#$m8Y|Oie8Q6_ zPxn7IfN9zM zv+2_c0*n!zZnw+A!U9uMQ{+;D%*Zl{Gg|sDfqE5STNYWCahxQWhQZ?EB6D+d%+Jp= zK0Z#dSVRaxnhrpzR}*NOAdZKzEX%_8eVWZChlhuhN+l*ICn=AO4c}B~Bu5ES=7mDJ zT)sX!I*RMom1&q%D;3d;V~&#qr4-F(lQ0Z9f8jh)FQQhhg38md-O=JWekMH6yQb^< ztt`tjfFKCsbF&vpx`57p3(K;oR4Rnw0a9k9X^K)x3L#RZ)c4}`-=3M7`4l({e5q;L qWd#!g_VPSm25tlE>+9<~C;k_v??1QHVkU6_00005P)gv(RQ~*3boXL z;0LrZ0#MW2}Y{qJO~nz>8lAhEhzLAX=eDS`ugqrl}~j zyY22w$C+s`MBikRo4tF_ojd2AJEJhhaFC_!IS(H_-cnWVNTWfw?%%uHDPoBylk86h zKj+TvTgpELrlz02;G3>D8jWTiXCz2@y&eplJ_WzGxyN!CzN~zO<2dqPRaI!3{t{Eu z&)EJ&C}j?D*><_i^0`&^V2()>{`QYDb2&yRk-3SdlT1&i)5v5pFbo6z{e!r9;~L7P zGD_tVK7Yz!p!P;Rt^1>>%3L3qlA~P6OlPWAOQWSTC$Yw6dDdV}5=C z!PXWW@9B{y{8Z`#a`~Lhaa>n^byZc6Or{V&8^^{*0j^82vXaHgV?CHzYr(FsTQWFQ zFW_pg2g@8AzA!Ac5VGk)u#u6ASX}%F!!#vOsZ7 zv|FvB(fA&)Fj z+}y^icPWHIhv5d23IAC=9l>A_9UOD{ z1T21#oC0GFIWj-r9E-*zHLuUW(XMVDYXPOSSwPd!-qyy)Ep%W!uP)@D=;PM*pO5jUa?t1eTYv!o(12EEkpV;%00000 LNkvXXu0mjfpI=I` diff --git a/GUI.NET/Resources/cog.png b/GUI.NET/Resources/cog.png deleted file mode 100644 index 8f4eeb7611d8f7e47350bf4f6b4b196c657cf34d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 777 zcmV+k1NQuhP)Te z3L;=)DTG#wz=lLz5I4GDg~WsfD^MaJAQ}}!6L~6IHY9G4l^Xm3wHpNj2{up)iIfJ1 z5-3`<4=d2|o`KOy|K6zj z-rgQ=)YU1gDt!Y(I~?;ikwjsB);~CDHlMqCaBzUdMR$OEH5d&BoXO9}+UhE{0|D|T z7Zq8UR;z`_v;6Mf-HvM%fj|V&Xf$Pa_dCkV%8;3P%8;9T8j(m8{tZ7WD=U$%PlwOv zV@87!(=#&){+|fA6g=$io#h@xlgWh8j}X-SRY^-vgCt2j!o}c|$K9pe^f|ExT#1V| zYl-5S--Ksn1@5IKc$SwD`}I??+pJb1774Es3q8G0<^BDA9=ZXca0E#@9p*pH!?)&r zJv}w`vb>_Ao-w(`T4LkpVFmZ#QI9MLO7={k!ZkEBAQp>ZYkLd2Bprxw$?YDQ`uJf+ zuh)Oe&d#YJdn6h`b@de_CnsZUZ0s-s`i+i`A}=ow))MQXk+a**U#Ks=SSE3@deQ~0 z0)^A*gxBkZjz_8%(N3H8&aT-y{_f;G7z|=zVL|Bu0u~n+Lli}Yczk>uLj!%KM~yT` zv~#4y<+v=ZODsFb1Y<@9E>~6k?YMYcDeRYZ2|VSXdWS@Lh0d<~JB8*#X116iZEPSV zH5CH)tl>>VE9qpXbBo0ya{Ql;RT2w_!!C_RbIIXwz~yoU`TL7mSy{MVTZ>l{6WH9` zq@Ixdem~M$iv z85w1@Nm}o8@YLfVk1vJ?RUDCrRLpUL<6=+P&z&^RzXcconJh2WhKU{;00000NkvXX Hu0mjflC)gi diff --git a/GUI.NET/Resources/control_eject.png b/GUI.NET/Resources/control_eject.png deleted file mode 100644 index 00deee0d20af0726ca13158a544ac10785270fc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcmV;e0#f~nP)+n?#>9k(?{;>e>v}Si$-Mn90G%aEHMPDD$%JpsCc0f4n#TiY zJVq!K#MxL3QW>_&Wjd-L4B%k^W=^G2uZVRRaq`Hgp9&xnAUGNi5ex?LsPGuqlSy=?+{MK+>ZVRRaq`HgAAfxATi86x zsgo!0rdpkyuClwF=`#u7_xlx?PNxwF1mN*-KokdKX`TNcLnZQ{q_&$$4n$MQ_c&S}&> zegOSkESAsbomQ*ubUIzfvi>--M2^gSBGfI*QaE|!)6ZR`X1!j|R4UuBEE9g+uQqNl z7)*q^Uq(orJo4!`X=15VdcnKb>lIg5uV88Eyu3N`Z`U=A<)T*mgx%fu%Gu@PsLk$) zik!>kau1@>=neU=Phow-FkTDxQ2y_W7;|6a)QO24KUy;PNDJ}HEqnTN{wu%$cuGOZ T6S&mg00000NkvXXu0mjfVEjtx diff --git a/GUI.NET/Resources/control_pause.png b/GUI.NET/Resources/control_pause.png deleted file mode 100644 index 6102c6b481a0cba0dd68c449944008dd585f6508..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 700 zcmV;t0z>_YP)DoxW7qi} zZd34WCbRSA`{vEen`hwK%4V}~T-SZ-d0xohGYq3?n&!K?xw+^4Si!*Xja)AGpwsEB z-kqF8Vr&edP>+vhvx(x)4!&(|K`AwzPNzRz2|%)(usS>Y5T1Pd2M4Iv8@&M0Xaw=0 zApsj$Sy_f;sDm(oNdQlto|!?tae>m0pAs1ehr>DxYTDeVpE%&W!%o)Vd z@e#gmZenBOi%xrVbQJk~9_#BHVqd_y<=|#4hHxl|sj2(7lgZ?=+3j|pjf^C4`uh~2 zppD(#5>k&Iqg2{MI2hFWNh+oH=_ihO@|Xcj2u7k|blnbY+h%<@JU-UimH^bh4v#Kv z@e@Zpc{%_a!7mU9h$u!zMCztiDsaW7pE%86V;Dg07=~-WvMgSaK8ekvR?50&D~%(b zJT4{Ds?}>YK>^cbhjr)M?KYIy)U>&;XpkCt!Z>+$gWu{m=QY00RJvkXXRaa>#T50000F-zRCwBCQ_oKmQ4s!iyY04HG;O@L zBoKP5vD^%QfK-h^J;F_on)GNi9@Lx12EB+ep`^VK6Gc+M$h`>(n8*P`fdo#v{Y6V_ z)9w#vrY@RGw(eG|2+A8{_F4B>Dk%Y&wmLpnKEo#Pv3w;@A1hAI-OtV z0)`R7Xgm&;-nI22XoVue0xAPI^K?3mvrd~b9njoHC=?RYgF50ZoISOb-NbaBzf~ zTQ{+|xCDb&LOzZ&j`7SB0W#ePhhW(j{C+=~CVy%XR#uCcn!1WN3vUPI&?+p)2IHA0 z0^A6Gsk`v`d}2JNMj;xFU~lg`B9REz*NWoTC@u`*i2&^}6i0zZSp}dC{x%7Wj9fr0 z7K2H(-@bEK#Cdg$XP#F=uhniLM2%u~O;yGEy&mGRI7+1wo<4aD*S0yEG?eko6M;sf z@!{z3kg|=yN7+@%4iZQvllZi{f)~%9QGaalah!3CXP&o}qq$tpHO-3KYMr^2O4Y4a zYwqc3(`}N~YIX6kah!3CXP$SEj<>e99&T=akt1t_jX|AUBN^8npeZU?-A0-2!tU-jA$xeaXhWClB3UAv%|41oqcb!P z$YmLHyH~H*KV~wSmo(ldYyNi|hn`WgOMiCAdmOT=x9s8T{9Awl0DKKK13W)xg#Z8m M07*qoM6N<$g4fAURsaA1 diff --git a/GUI.NET/Resources/control_stop.png b/GUI.NET/Resources/control_stop.png deleted file mode 100644 index 0cbe9b6d3489f8e28c577c7fe5bbaa61566c5c65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmV;$0y_PPP)~4?+W*BS8 zkO|npNGek#+L^?{SXn@4$~Z&mZ?I(0)&eKgCWV=(%osIeK@l9&=w^r}jl2YbU0~UV z=UiB3lboFo?&JH;J&$`ixMDjyJ1;HEdSctQ*IDB@Zpicet4t=d?dBo}IA>BU7VjH| zagbVCg4p6Bc)c?{42MHdPEVn7d<=phtfkZGcb6QH7*9CZ*mwXoe&-h#plXBZF#xiB z10vxtk~!Gle+w8Pb3zVy;?T)!>+7Hm25|Q4Hw6uTS)RZz<4FKjTqmc*Bfb-zKshIq z3E+7TG+Te+=;$ld>$R(;fiOm}ynKiKr&70Bt#El;Fimr7VIc;!KQ-{qNlg4`^C3Ic zZM%DWaPRIaH0wqli#fobIUnX|SjMbyB>wdI3s#@Uu?4FuD{NhoBp8iGKz!1% z6sQpNc|0BlvXQPsFc_rvu}agN%;7M_G(>?&oW+4CiVS39eT1FH$HJ>_($ytEy&qyFI(#S8Wy1chKwG-G5y+ZZw)U@k!@g zr1NsQ{Ipbh51OWdD2c2xGL#VK)utQXcfe0Zg?q)Un z)6UL+?>lR7?bcdSAN95 zhJjMKfQ7{ceEjq|_~+;1Lr;uYEQY?mL+IGO3$AMiLu6mUWKoocz<^!^nM`K&`n9VA zmSuUh%%gJU8#ixF4i249CK3tQwiOU9AQJHak>&_yX6GcXlsf8i6|*yM zN4xiRr!NeggRbWTehAm~RvtWj+{G+3%H_Ei>F3kOPn`T`X?Ryy*LV2H+{8rs*m`z@ znYF@A_VVs*+3AGk|198sLd(|OlyVHkeCbI#7$+!msv zg<&@vC@N~XZt|kY&BPxj!ki)1jiy(TS`b}ifdpMhIMNCV%_MN;nn@9xmN({2UPK8I zNsvlfy17D~+c`UZJ8m-yq=)nJ@_s+h_q@+}$>`XaSCk~X9E(8#A=_D&Q#C`#GQ%+Y zXwWjTp8zL{qP?!R7P~==MvX81{;!fG9r&AslM^q^FDzpE%@hKG05UT(v9hv))|M7L za=X#k(13EQHQP5n{tpS05DG!yF*i2{Cp~Pn*$@hauttMpS*!+v;CUVuHe0qzrCJgM z0UC`4dc7W8QjCfh6jnl*RQvIla&vOv^ZO8^9@X0I$jHbrs?}=5Njk4w1()ol@0JT$ zSy^CMN=XUw^YYNw*Nf)nvnVPoO!chM>d@779RjaHT3Xr;!TGieaP`~-%WN-wn4Lv? z$3=)z4C~=29($hQiFXVdwFZJVy_09;Ya}L84-$F_krkOdWsZm9Fvp^*ss>uM3i9ht zRIWaN_4^$h{@mLx5nj2(?ffi)f`S4J^!H=0(FlXVp!hNQ%7+R^6K>>vgVt;Wp}w$? z_Dp|b<-vP*Ehz$)Wl&jN4Wg(ashKLPti#F3Q{-Asf#07GIkJgJa0!hw-B2~1d&?yc zk9xf@n@uPxDu!od1SXRS#Rm^z;)Mr2M+km=oC3G}1zSHBAyVstAz*0OW#N)@;BeHZ znsGQBNKSSf;VocoH3&{32>)D%BmtWuFi?(})Ev0o!*DvCG`p!1vtp>lVo~<|*{6{= zKL|tk7a|)mY)CRDOqZc%qJYQim3PB&TZNL}Kff*Cuh+}26Ob<*;~!Gqk~6JsG8r5i zn$+oZM`M3#PB_TM9cMYnai16!{RFzs25ZVn3%g6P&@qLQcn2mL>G*%p?(r^J{1#vU XkR%nfb7@}d00000NkvXXu0mjf5QkrT diff --git a/GUI.NET/Resources/diskette.png b/GUI.NET/Resources/diskette.png deleted file mode 100644 index d0d400ec6459b70b39a5b97890f9073cfc8a080a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 730 zcmV<00ww*4P)RCwBqQ%y)!K^Q%A@7(vE_o>eo zlKmUjqT1WW7A-1i7qkhB2%>1?wjw3+iP)l*e~T7|B(_j=6BfRL5W&ZoFDpqK1Oy*Tyl3hv#|jpA*=#wa#ImpKF3} zB_k{w1p2TvbNac(lHV`ebnNI8oA&vFdixEE#m z(B9EaRfRY{aB08u>TN=G5U%fm>Iu~fDZNdbmHOU z9h4?Uk@4Z?tu@3Rb{yeqNn?ff=Q+xEe7!WAFH^3DIaxi8Xw-#WK@;gi103CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00G%aL_t(I%f*vTYZGA< zg`a6_gEXBqBcUckH-X08gk(ZUidc0eHCc%W6$Bw<{y`C3bs>l=5jQRU1EnnpL$Xl} zSV57z`Iw@D+a#2UG$mQIh#zrbXGq(0)rEI;dC%o=?>Xm%bCz@#@buY}zSBQidVJ>G znA6<7cPFFkaT7p@N){lWGgw_)Ifk7ia|v`kZsv0amSq8$p`c33ZV(Eppkt)Fl@Owm{qp(iw__VPf`x)A0JU1JXWQRj2~pit6y>TUjXqq++zL47=z84M zV#Hy}=L}+rf2;a@KDpU!Zf>k^nVnAOy)1hJ&N=yE|O=HjAr(hPT zmg@ji%XJE7kv)6g$-!_9j#TZtNz^ej(-{i8MJJi&$4?(lCGp&U;s4iPvstez0t~w? P00000NkvXXu0mjf3(pax literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/folder-open.png b/GUI.NET/Resources/folder-open.png new file mode 100644 index 0000000000000000000000000000000000000000..b67403d9fe8cc15d91acf2eaa7dba47e815dd5ae GIT binary patch literal 625 zcmV-%0*?KOP)i{e+ zE)M)Cu@n(kRkpXc$vKZfYPH%-yWKu;cif$-s&IE^XJV$6vP>MgS3^+wBrUAcR1S5rCA^@#aer@s!dSAm_}e zZFfHdP}SolmMJAuRdUWOe~j$)B2YWmI;-y2W}YnfLX2NaRYgR|IkVe~JbiqRB8DT6 zfPcJ`q;~1qi?_E+5it?L%m_FWje@oBzi=Pw38#DqVhr54JV6LpDI%si1Qan)#6S$; zjPOKd`u$A23VWOEut9F1wEs#;2kg8?)r>ul{0=%kmf=A()x*Wv9;dYfW|!g}xZQq{pJuBgGKd*f}JIxK+Bt>L#rI ztaGbb=gsO5vR(W`JMDe4+v_qnuDtuOS=|I@?en(_g(qSIv**77-=a~Y&?|SC00000 LNkvXXu0mjfka`Wo literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/folder.png b/GUI.NET/Resources/folder.png deleted file mode 100644 index f1ed9abe0338be5a0401f4aee1b3bb168b4d815f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmV-;0*C#HP)4gUbq(tw1lgoXx`HVs0gK|-QT;Nk*gBnKlTn_z-{ zmhYU)-7d3t&KJ-ik94}dotgJ$-pr9P27{QufTqgxGmAP3uNoaE7bGM|sxpx{$6x!S zseeO+ZJ)Bq=VzY*TTvP$C03r?ILjc0=nnu+A|W7D<`Wa0NdS!2oVvxShDKmPGuu1Z{X#D3g|-0BZ&qN9*G%zO46N zD4sVu^%@Qrc`Ds1baRPAMG7LbeA>HftOGIA&>{S+y14WB!(!4xyYUUh=}X*79hA*; zs@NUjK4So91b$-;-y6->tMfCSvO&Q{3%OG#fnJLTF^s=9aIa;Dv9bIfwI98O6QfM# z&RzC+V0j(IuuEljHs;@Ei!vnIlXu^Ym7iYmY~+PRvHvr>_inmd1OCpx1sDLU%fF)P S!b7P50000 diff --git a/GUI.NET/Resources/globe_network.png b/GUI.NET/Resources/globe_network.png deleted file mode 100644 index 7b19f4ac3bde565493e79a57c2edd4c8e50dd961..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1613 zcmaJ?drT8|96v!&5u7}&PmZG|x=F9s7wt)bmMel%$4Uia5Ix!}RBW%dhb?GE=tRLe zmDkWA%G`WJ!GWSjj3^*XbgV;#pvD)GT@l#+7`x=|_sHk-`My5M<;SjF z<>9u#4FCX-=qOAY?fJ9BE5MZUZvX#pKU;h;sgMQ=haVrWbkrT30&7y`#2RJs^? zmsFxW7K|W`1juKxgH&t*0t$F6gvS=~L@PiJ8)3r;2WAHcA#9W%jIt4M{DJ6bMzsc2 zV3Fgo=#v;qqbLIk!)CLYW#+O-V=9b@L?W2YfjOKY8WCj5)Kj=6NN)<9P{0V2%BVF^ zT2c=>6!8=?gAzk@rteD7875`*rtvn>4TCMX0Y+GCM@bVvx%~g3I^87NL@9`W^8HU? zlQPplzzV`dW*AlU;531bPzE%@NZ=G{RFdSDi7v*bkrZi4BMo3g9G``N30l3HG@Hio zayc5UH&M7=MMPs_h*n@}wQ4kyC*(z9Sg<6RCqfVzB8iBMz#|+a#Yk0# zj?hyRT=hR(;gnp56?6tVGDaA++X!`}k<@`>C8OG@bKy^^H_la0or_>fE=(r_I|lo& zK~G%K?s04mS<>ZOuC(ed6b$2~2AN;s~N57(wnR9GeV_^L&=Y^j3(g#TeOc$SGCtee` zw&QYZ!I?D|y>o6E0#j^6t|t0FbQFwz@mCD6W%S=Lj`Tc7)u)%ZDS z#3$z-xRO&l=SJ3h1%mgH`s7bS`++(0UPztd7Jj4hYIDwwRp!gWdOrhJm(QMtNRt=u ziuX{b3Tt|oH)=Y<4?qeZfY<)T5@85r&n|hkB!B6APESBW@DDcVSmD(&dweUiR0?)p zKD`RD|AF)gaP5ytelDy^8Tj>X7z?bcYG~iQ)b?aqRNaBw?L-S_Fs!P%DPTQgcs1kA zaB@R2-)X}YVb@zo+E6jt7KnA<9~v%dUYGq{^>3Z`8Zt|3Jf9VWiYm8yJqpvS8t&{_ zv~BkGy=}b~KWk6k^Czhu%iSIXr0r84y;WY%&x>)E+OviV-F66_%`5zNl%X^FTR!b| z^-p-Z(e+;QuP3)avwU^eU}E4%C$ymL(CZ6Jt|0ctp(cUEH)-+xl>_Usmf`6(-KeRg z$TfXi?P4AOuk%&RS>IlL@jAS(fBS>v9xFo4~iveN32{f-|85G`Aaot18~{tft~Y)1e9 diff --git a/GUI.NET/Resources/globe_place.png b/GUI.NET/Resources/globe_place.png deleted file mode 100644 index e106ffc8b5333bf73e26d3dcc59f6df9ae4e8293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1611 zcmaJ>e@qj196eEfq>7+J2MpvmP?^&9t}V1ZDNwjpYG{E{1sNzudq6GimFr;(I7J62 zE((HEwIZMkzAzGXp0P5u?~ug1S4!HBVZ(G9JCqpOcvB8fhKiPX79M>Lf|BXHb|hi zNu??i!B~5e3k%r@jD`tO7y+jqh>1q&vQafA zpNhqtBv39*n^7*;YPE8#d=5$Fa1pUs%!PSe9*@l+*p@;Qjoa8JOVG3eMp(3z-c0LB z6X;OHv&aHk0x_AsEx~A>ku_PS+Qc-BYs1Z4gabQDng%MB{|_}9XV4Z}O}xwZKZPxt zLNmct6Be?7(lUd~4swJtqp=i$(QHCrd{4v*#k3Rd0%`n>`ottXwXW4A(K(e+_#2 zigAx)J7ZhsFk^he#JHVeY+dDPiUt6u4h1IF*!m78XT&AvdrkCLZsa#wMuX0&19(9p zdlzp*&U+j?dgR`4{m^nxXuR4j$76ALMOVWn){74p@ZMbO$=VRvTT^bliI+b*#4@P* z`$r>3N8A5;cBB60;e~#;18$2uUalFla_U1^n%a<6OPZUv4`3CAs8)l(87t$&iLNGUWp)f2A9_$)w-#x7Ag^edqav4&uSKiurIz*!C%xYD-Jz_0 zbi3caCNbrLPZSgw95ymQvtjQoNohSLfmZH|7O`J1xw0wm@s`cL(Hp!Bh5AL??Ilm_ z4+lO&GVdnGyLt>1ckbKa`-}VpMg0FPC2PMoO zI-7AM&Vr{T!cl~o#FMn4wcJ<8TRrkLe zhVzq#dBvWKM0*1HP7)7azIRn@*7@BDKM%2mgr#YaN{DDwXth#Fl=kTjy}#m`nli6?DhTMQ@J?!=6Rm$_0~Nr!y^V?Z+*Qw zZRyh`id|5*q2x)_fn$Mp^Tv!{j-l* zEdAlr(}ywVlO4D2r?rk&*}iIS$gErzwKM*B_gU7dx)qJ6vL>nq|EZa%t+csK;B{pB cz7A(^VB*<2$%MK7j^p>Pkg2fKF`2vm0gP*000000 diff --git a/GUI.NET/Resources/help-browser.png b/GUI.NET/Resources/help-browser.png new file mode 100644 index 0000000000000000000000000000000000000000..f25fc3fbf106af60de59581bf2e6fba58d489bf8 GIT binary patch literal 932 zcmV;V16%xwP)n<^0M7t*KyZHC1w??>xEt=fabLR*P`s^00F8@s%vX0ly3W2Q;1iYQ`2d{1 zn56SU!aH>A*UV&krU`gE?uNYufcfLL`>KjUEiXOnoQe)`qCG}W|1bb+O7eK1#?QvJ zs|dgU_0&(D106tZ+zosBJd?&v>qnWFmUKydqeslSKE)YIWlRZ)Gjda>n*%4R*)(?6s}$J0tF zrB0rXshXW1sfM?{P>GRo72Li*T~yy3kh%V?FTe2QhE1d6Y3FzU6LKF3;uj?|T^;O;NgH2_-9*%2UxlCj?MeRpHZ4w8sFjOr1-Y$4FjHVOs`O z6+Qs2{*%TqbaEVv&fkX!tu7E!h&mkz2FsQcy_m!>B&KO#Sq7GA5DFBqd&fqUQXD+m zfn!?;p^>;U$?D=fJf(uyMMMYXO4>Md`aVN{(Y9gut;(G&D3o z09{?N%Y*_27>1l9_a8%EHtR(M(E9O_Gnox*SF!%CmFQBU zOF`};huu%zOT%N;EOv}x2@;w%)hg>aX0MU5~e$Dv-j=Valc(v;nT_sm!fGJ@x&;<^^bV( zeDYmpd~&)e>v=ba>Hp#^rKnR%1p%a#U9+>g~R1l~XMe=-k9G}q`(rzQu+fVdrLSl0*_jtxkkY_3JU1?{G*37Lb zM~e<o;Ce2{O$|X1_X3Q`PU~Yl>jPa&!b4rRXEeZYaJ!tA5$0M^1 zwGUsT`o0C#jaJlkj^ND)37MMJV3sqpH}5EIpcf7|8G4x^U86~&mBUZQl zBkeDHL5C{)sM7LYW;w%IzPnCu8lV=NiwfF?DE&ga9AM?wzNWvb`s78UE)Q)hY@@=q zVVUI&XG0Xg`eaos>=Pb%y#Xv!MWftg$K>=NB!v>6-P0KRBtaD$4xcZ8uUj$uGX|&9YiiMovtOAFwQS<42 zxc%~fc)S4wHQ{ulXm2VstKyJT(FNyp05M`ID=IVu2REs(tJnx$&}YcjsRzd;Se=sy z$~FE4R}ZVfI$32wTtXCrN?RU-#MlMMs%W$*0a&{1POM!Vff@e{eBOX;A|S`m&E|Tp zFPJs);oyvryr7`2!-|DrAxK&jCT{ez1?)$6NjjVB*?w|D1j6Sl!5PkiCC<2%p>H8$ zhl7sY>LqQlnYNrYk>;Ofwp?#7F;ni{S5({SAZ9u9(_7$gp}W{b_nr?^d8?g{|JOr1 z&zmWuw4F|gf8qKQn>^bs7-l*1+hgLbG1)ii$c<-I_Si}fIvi}S$`Swo002ovPDHLkV1mRLZOH%t diff --git a/GUI.NET/Resources/image-x-generic.png b/GUI.NET/Resources/image-x-generic.png new file mode 100644 index 0000000000000000000000000000000000000000..68da5027cf1aa23d6ca16eca99fd01025c82f776 GIT binary patch literal 558 zcmV+}0@3}6P)W8+D$+wD1(hb7ZnxQ)>0#;WVhSMx1M~WOW`<`(y-`~O?lW3>LcLKl zTI-Q&y-_m`fH8&#kDju%^KPiHOVtHdSC#>A0E7_i?tf4s(+R0|vB7qwa4%ryoayflfE%+4_t0F6nNx)`Z6qVHi=FPKTS#CU}=K zz{+W!#C9YIhrSlXiNSHls7#+^Yo;a`d;);QTNPSAe+|gJYq?(Q!^i)DrRoA3o7+RD wat;teu)4CGrROk3N|^!cjmHn~jryI>0JT`*mWx6Xs{jB107*qoM6N<$f&tz34gdfE literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/input-gaming.png b/GUI.NET/Resources/input-gaming.png new file mode 100644 index 0000000000000000000000000000000000000000..9d040ee84356e8c9412d290dd72537c93d012189 GIT binary patch literal 812 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~iJd>I%_u3fJNif|Tq zL>4nJa0`PlBg3pY5H=O_Ny%H{9NjrPA;Aa6zVB)jVN)>&&^HED`D_W%`4R{ z&a6sJQOHcr&*QR%11>I&WK9Jl0|R3Puf*)qBn9=X%-r0>WOaq$lGMz+)FK@Pu8fkB z0xNxeh=g8lX>n$9Mq*BmUUC%|S8`EmVhPaL^30M9g_4X^1$R&103Dc?^73-M^vv7> zz5Jr|^seLX3=B+)o-U3d7N@69I-MQtC~~ZR@|`DY*DfvDX!iAD`+^;w8$|v$HB}3C zbu_I|h~PNbx|V;--3~n$F0LjIvDmA-gk3JQ?p6xfEbJnpC2DHAJ@d=6()?#Tc4W?S z+VrB4`S6Fc=KFs>)3Ca7d~?hHRdYP;%mal}rgpIe0%CEWiYw`il@t9Jc@ z4_9(?Za+J=R+EQet!b-MBKPYbmPPq;m+h|{Kas)TCb{6pXa1d`?aa^hlOn|&jdx6K z%=j3!C#+F``TF#TE6acG`qFy-z1_!ECg=XmejnHwlSeO?x>s<5?Ule%B@c*;dJSOJmD|yjJQqd#GG;VOkNkn&C>; n);_kr#}#gG-748lf6K2pz%W1Y*_t!JM9kpn>gTe~DWM4fe9c@A literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/internet-web-browser.png b/GUI.NET/Resources/internet-web-browser.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5957ad62d73408cd754a27453b4ce601a2b042 GIT binary patch literal 928 zcmV;R17G}!P)Mh53JODVWnpw>WFU8GbZ8({Xk{Qr zNlj3Y*^6%g00QhuL_t(I%dL}LXj^3*hoASH_nc#sG-;dWqm6CW(4s83b+X9Bt0|~3 z6mOI%-9=?M5O0K`ptn*G#rs`|6-PnD>5WW=H?uIcvzCo^E3WHYKeL=HA5C(SbCR6b z3)#f&*5~^FdoKR`eu4)${@&~<;4NLs{R%AQ`wgX7&~)wW+|1M$58jLW!S}zMGrL#P4P+<|J^kR=q!LjUR<=1mzj7BLp1miL0MTgZr{|x^iYGDyl!|!#OL6OV`f;PXlOge)!c#$#{SGXl@)s^XbSCXaYk@OhXc|B#CG* zL-81~z96~mqojuij=b@~*=YbR90{B}oE@c7E^@~W5Fg%$Qs65I} literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/lcd_tv_image.png b/GUI.NET/Resources/lcd_tv_image.png deleted file mode 100644 index 9bb42d13916b839161942ce804191d60c413234f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1518 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHm(b8{CnQ&&S%OAA*+Lsuh9Lo*{M7e@m_ zCsS7^XGas5UYGpj(%jU%5}4i;gkB?@dO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#INjpn zhSNN#-W1$!F~F%;ALtl;P{bldG)xGXdO%EgvITPB2|qOtnA(eg$@=Br1HKFlOi7+D zjv*DddV=qIiv)`NziVy0YuDp7yCOnV5-;fKUI_|JxpduIUSe8?fM>txk30KZxg7)Z zzdouD6cn`kk#Jx4O;c?Hi|AU8s8^3(ynFTT+@0GyjkDJ(J#9R_v)E$){hxD-&u`eb z@1FWpua)jQ_*Bf&dibuFNVxso6Q?=7T4?+Hg)vM=*d#3suUuvRoQ76y8L{?zrY{I7M$A69=q5lk8!g6WP`P9GhXiKdb(8R zSUm57Isf_63;EaNh9|sz(N^+LC_}AsrAP*2Pw$uHGNa~i-H8(;QFYdo=Yygb`r^6W*|BaXzKc3893Bg-m~qx^Ar ztawq4^}e%09zWh%-kHB~ozyfJO${wC?hbaL+IL8BF5{`D~Eorka1Q zhr{ET-P#@j(`#9tCML!#KA)B<%G|rsc>b2+`XbLC2_c+Xefxc)bi}-^a-UC>_{ETW z-85#ub=#UZ2NR5(-&sDd+ zk}_MNpqLIfC6A>+aXM1H2ev)GJm=%_{CoS}#qNH)`pu1tk1tL4yd?QsIr{F^%8x}; n{!VVl`Cngm%;)X#d`32g4eMT<6qKsu1C_v@u6{1-oD!M5 zQ%z_SVGw<@o0xWKEJ5g+-EI@Jr}+p~AqQ-L78e)Z-c5ha<~tOGN1%>zIHJSR>a ze=;`qV(H!cx66a!lj8t<<#B58jT~&)x4-vDAQkHXH!1f(GcW1J5(U;H1?*W)@ z>HvVG>w0f29?j6gz4-l}1q%(eL+fIz1Hrko=S^ z<_mdF%}nv{=}BH#%<{zdiPD)^_(w1p-0JmuZFM8~e7=p{9_7k`P-u&;>q2HO4I%;& zA(vl-swfm5h{(*3ZchH3x(eVIDocq(BAvxz@sRB9x_{^P-8NAW8=jV#abx&;;oFz5 z*Bp-ahlxZYV*>zHRXb+>qy}cw>2;SbU$m%dH(1r1re$wycf?es`x$^00guPCv)k#{vLS6$c^!j64`^iG224w5TYG zSnZ%B2*PqKK16F%{}s!!Tms5h0MH4b3o9{hNdQ0^z${gLXZlY827td5xAz{|3C=bE O00005 zlfR1-K@`V7GrPHjTF9HM`NVrQkDDElJ zh*(^!7J*!0<8G7eGMko`R|gs-Q{;YB;P_L1kWtz|QptJbUx`b_^gI`2FHBL4;MM*X{!l14cwR z_2@Z-zp4MN%F8SOFM*S{?yhVGkayn~0~8TqI2^8IPLgDaz=$YO6pI7cr1adIE z!Cnt0mkIxCb2uup1VxKFQ zFHx`8snu$;Ypta$OY%HtclSN{+6LaY0I-KRs*1G{?RJ}fzfZ5%quFdCB8Z476IU8FiYblx2x?4(A+YSrS4Zs8Cf4L!4Be*iJVj%d%NOmSsz3 z=Nti0RVweN0oIr=dq01j-|Vb6##tauQ#zdv-h0wCT{1i8Ai#-ZYcm3K@y^S2WB63J ze)C-Xt!_+AATT`#yRon%hQOY`kc+7sk?`XW{qqkxXGvR800000NkvXXu0mjf#Dw-o literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/media-playback-pause.png b/GUI.NET/Resources/media-playback-pause.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b4fe2251f885e2362b7ef36b85d6c3a178f7c8 GIT binary patch literal 464 zcmV;>0WbcEP)fkXfR0bNN% zK~y-)&5}!Q6hRDzzbd<#?kMWj*ortnatw&zNJwy`D9RZCg*!wL5UgjGNHA&oVHW+! z028qUFG{7aT)%!l;9p1DyPy6&J1w6g;v*0`zpdA6&YwMbzc2ds_4Qc{Lq320^k$!5 zzj=4I*=`dMd4^_&s>bET6_*!RsOsQmtPgN=Ura3y+#M02?|VLd`GAOE?sQ$Z@Y~Nf zBRBg~z|0U4c6Z+?v_MoabGo)gM7V2qh$y0hKP1q!JDR3JR1gu|*FYL}%{SWi2j!|- zoXv6H10NkUZ9^gMh7Gi5vrqV;>BD-9GXJBeDwkV$vM~cQN1dU zzy8jT>#CjwmhIYXH>X4*rDN*a%Jzqz;k7x5ETI&B|H7dZO>0000H0h#)QuLQNI1SZtsXO8U^GGfgrxxh}+}VkxnAb?)YabMHAocX%9NxLrB| zzyY8MfO-Y6yO;d<*y~_0mS+_>8utCg%c)OS>fRtAV|%-`d2TEk2V8nL~zb!m)|pEA$SF2->jn-2hWj=^AH zPL5B%P2Stz^{Pr7#{fi4VAUxi)#JB!S3FMcd3k;2Es0696z@F%)>@ou3v24+*vND076Ixy33;9q2pAv`@ZPsg6f3A(Qi1k* zFkavM@*Aa-5I$9)h)6g*I{0=DB#I*EIzT(hNs`o~9IE3`*}+soD!;iA7_JPj`4{UQ XDQtDP+C_)X00000NkvXXu0mjf5}&Iv literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/movies.png b/GUI.NET/Resources/movies.png deleted file mode 100644 index db97e5b2bb75711f941f357380327054dca93c40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 697 zcmV;q0!ICbP)DVn%wOdx@@)P%0+-~+Zk z7D7qe>Gj;9j3u!#p5)}7@7{C1^SS~^Mn-N$>h*e(v>*tADvDw_|5$W9rHi+`{~c3^(~8487usMTs_ zuOcsNb8`!fjGKc&?0?-yJRXN2iU>Agky;7_1JE>$=QatfpiLHccJS);GTJ2xa<>!P z+XdwF+tjyc;#@9I^I-5@9xzUmfU!C%H63oZ+XxT@q2;&b11%p{=+w^=&=w%ea?9Xm z67I`mOafgeK$*Lp&Xb!~B&<<3`5G~&1jLwq|L$#|uIo*s`MYpxK1?3deAn0bb^jwj fNj2WmZvh4X1vDu1=svjF00000NkvXXu0mjf(eg>n diff --git a/GUI.NET/Resources/music.png b/GUI.NET/Resources/music.png deleted file mode 100644 index e8c20b9f9f579f849bb395edfdc03787a3ae8a6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmV+_0@eMAP)WTASBX z)LT|rh4PAO_(+1c1nVpFxpV&}FgV|8ZtFy;uN)dABvKi~lWE*sK0?!OscOMF0l@H> z5fM4PhOR1jSF;qDAwLVIsgMNGIe|cg=*0=Rng-J~fa?$q4yMT4O5$l(s;(b(u7C*Q z+kH%vUpAHaL+~sxw;|tODYWxOl6xi=T@sM3O^x(f0Vz_P#DAZ0>;YNOW#2V{HPWRz z&h;=&Cf7M82ru+};CcnyNY5LZTHvdx&8?qfmt|*12j2<0$Crt~iJ)5qF;Doa=JlQ7 zE)>bFiagTKD|`}~e-RG9!x{KfG$QEM?2|Ooujen=2|*&5GJSgw!hyL#mQL{kIRR6q zAM(%i=PRIWL^vk`ECTXR)wHXfRX?fKmesuAalV3ZV3r6;A|zqT^h5sXep?f=qB2g5DKj9&4ziGxQYh@Ldz<{JPSh!3**yOS0wxei~V2Vi*{{dOM4Kovv zRNE}5wbi6ZySwNHF_?j=wRkX2iu@qzOg6WChjZTj?!6fRDP;?=Nv~7Kan6ziA*E~; zi$&Ws%~bbbFt7oVLIhx&rb!rvxURcpE))usN+tUJz6~S>kj-XsU6F|KJuzcTlfn5QxTCLW^`TZ@rZV?1Q zDwbgwc%EkqfH;m5e|e2{eSHJK{{9~A_Bn=Otk0lYtg zPbu|D(==+e8UU7MZ3QhBi^MJkaA8^2TSo*y``2A+fZgeIh@yz;bc&{F)a!MCRIGBj zynYAs`J5mKST2`@VTe)+-}ljVokpXPwnhLlJ3AkLR4QM-Zs=X$8~?9vCh1j58E;|% zOeT|;qs!;>G@H#wgrwTU0#Hhk%jFP4FdmN|5mGw%{$7L!q*k&!+xe}P00000NkvXX Hu0mjfZMxp| literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/slideshow_full_screen.png b/GUI.NET/Resources/slideshow_full_screen.png deleted file mode 100644 index ac8b4fdb10f24b341d79f5131664f654da01b7e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1627 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHnQb7x~00|PfxOH)@vLsuh5BUeK=3uiY& z3kxG>Hw!bEUYGpj(%jU%5}4i;xL!j8oO(e?A-4c%vrB4GW?5>ATTyuAHS0CsYeNebp}@M8`%8*Nn(JPVD=sb_juWPq zG3#wANjA+WVHFhjA6t3$0(Gti6(D5=k>&nOX47Tas(SA@f{M&-pOJ>bETXX6zHU z2v@)E^u1Fp1^PT!3zPfRvx6FTenWxVs ztNg+hvU*NvXG?{~203%w>Dl$zjPUoC+<;S>|kR42zqc8xP-iyID2fB5RdCUXIqgIDKmea!Lp>HD`HJxh-yHp%s+ zCT)5l^J&GNT>>qeDg^yLvfglYPZbRHe3Z!$ow;+3?2f*UY4cp~{9x(!YnHZap5nM% z{=659{WHC0&7TF&tR9|T+jj8uiiTF_@U-~os?H;imPa|2ha@iXT;*1z@yX-e^v=5; zOHFr8bxN12eeZZlEPv5%nGW*;-a|VdJ5Ca+D9uuKHB5&pCg@a(`^N!t+e4`rT(#!wOi!r8KkL z3YM>BJHAVTFDx|R_@gV2w|p@RHra5Xil=oubD5ePe|y3AklrUd+!j^q+`9Z@he5}* z!v_}cn|>nDP9X5cjVWo2n;zV#^!O08#e{MFKE6d;0;c}E&{CWHOXN#Tl|a;Qe}>w< zsS*~-x4)!ci9b4H|IDCSR}_yw<ulE1%b>lg2%3sEH y^U&0uf^Ch73zOy=T++JC{dZz$_5UM(g%TLbg54e`N|~2{ihEC2KbLh*2~7Yz-EkQJ diff --git a/GUI.NET/Resources/speedometer.png b/GUI.NET/Resources/speedometer.png deleted file mode 100644 index ecd620b7473e552f7110287ce640792075da9f7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 852 zcmV-a1FQUrP)K+s=?8cK>ECD``|1X)zl$KRkLi>x2|BP#pwJEIz!q5EN=5S3|CVW4xH zh`7u-?`&+>?XGif%~lAWD)liS#zE_wcIEtq{MIaaq9!W__#(>p|g}GT=)#sqs zH-chz8H|twO^6%2Nc$#c6y#KfIzBUXL4#v5B~(&&Fl&c)cs2c*=_iKwMr1%d+U|XhW=;!H|%F!9*i=xM#s~8gLx1L}zEa zf}?oKTNC)<^MNCYlc&x=%d-&FG8)oyP_m^O>lhh4%Yf%O96ffNd~*suBEW`1AxR1Z zcp)JHSy@}bk@7F_sbIqLAHxt&q)0BTk|mDUfZ#!Sih$d__(G@C?KT(;m~lD@F@!h9 zVxqiC>J$dGN>I(AZ1NuQgc=4z8kRgBP#%8Q(s=FqO{dvx#)?Es{HgXyS4T@E zr;2JWfyAcMXU|;_1fi7l08cb&C(@pfL{YTdZn#lTFq0(2|GF`17)d145=X7kk}O8H e9o^191sDKg!B=*!h#t@Y0000#yLz&Ndx##4AnMLxFXBZ(g%HuJ zXi&qdfM(p}?71_;z-a>z1OY)1kR%Cdn$l{uaL%E% z20$r|G3H}0Xl>|O*#nSQ0Qr2LFbv7%a)e>nxm#-iK?Fn;rO}H#*uEVR!P*eOn08KU zEzY@4ZV^E#g$TGTkl0Q5yTko z96r1hp-s`2)|%YZ6svCDq_A@*KN&-G|2`-NL;2>{ay<)mpM1>)Xl?vJ194<}C>UEMz1(#)? z2-^S9HcD2kVCu*bayPCMH=C^7umK&0EG{h2Qi}O%6`Yd}!S|+-h9S4NY{31bkNg24I=4Iksz%a>Tzznj;k653ieJ|1K8_%QpT zsQ-%yp65||Q^JNmza1DLpU)yz5Kkbm-p{$%*@Oz8Th_`>gu&CBehx;5n=4n*f;C^bvfq< dg5VDz{U1L){aup)rDXsB002ovPDHLkV1hluXGs76 literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/system-software-update.png b/GUI.NET/Resources/system-software-update.png new file mode 100644 index 0000000000000000000000000000000000000000..58f19c68b047fb2fddff951c60bb56bf03bd7191 GIT binary patch literal 964 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 pUn586gjw}}PRG@#+N%F+?8*u;t literal 17006 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 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 00488c2cfdb884037e8330ba3e35cfdec4609cc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11784 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 bM|$Xy=uh!N7|G@Q|HqH`3wQmW^T&Sz*r(q_ 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