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

UI: Renamed option to "Power Off"

Browse source
This commit is contained in:
Souryo 2017-05-13 16:15:25 -04:00
parent 7d1fa8aaaf
commit 4f96aed58a
14 changed files with 59 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GUI.NET/Dependencies/resources.es.xml
View file

@ -12,7 +12,7 @@
<Control ID="mnuPause">Pausa</Control> <Control ID="mnuPause">Pausa</Control>
<Control ID="mnuReset">Reset</Control> <Control ID="mnuReset">Reset</Control>
<Control ID="mnuPowerCycle">Power Cycle</Control> <Control ID="mnuPowerCycle">Power Cycle</Control>
<Control ID="mnuEjectCartridge">Eject Cartridge</Control> <Control ID="mnuPowerOff">Power Off</Control>
<Control ID="mnuSwitchDiskSide">Cambiar la cara del disco</Control> <Control ID="mnuSwitchDiskSide">Cambiar la cara del disco</Control>
<Control ID="mnuSelectDisk">Elegir el disco</Control> <Control ID="mnuSelectDisk">Elegir el disco</Control>
<Control ID="mnuEjectDisk">Expulsar el disco</Control> <Control ID="mnuEjectDisk">Expulsar el disco</Control>

2
GUI.NET/Dependencies/resources.fr.xml
View file

@ -12,7 +12,7 @@
<Control ID="mnuPause">Pause</Control> <Control ID="mnuPause">Pause</Control>
<Control ID="mnuReset">Reset</Control> <Control ID="mnuReset">Reset</Control>
<Control ID="mnuPowerCycle">Arrêt &amp;&amp; redémarrage</Control> <Control ID="mnuPowerCycle">Arrêt &amp;&amp; redémarrage</Control>
<Control ID="mnuEjectCartridge">Éjecter le jeu</Control> <Control ID="mnuPowerOff">Arrêter le jeu</Control>
<Control ID="mnuSwitchDiskSide">Changer le disque de côté</Control> <Control ID="mnuSwitchDiskSide">Changer le disque de côté</Control>
<Control ID="mnuSelectDisk">Choisir le disque</Control> <Control ID="mnuSelectDisk">Choisir le disque</Control>
<Control ID="mnuEjectDisk">Éjecter le disque</Control> <Control ID="mnuEjectDisk">Éjecter le disque</Control>

2
GUI.NET/Dependencies/resources.ja.xml
View file

@ -12,7 +12,7 @@
<Control ID="mnuPause">ポーズ</Control> <Control ID="mnuPause">ポーズ</Control>
<Control ID="mnuReset">リセット</Control> <Control ID="mnuReset">リセット</Control>
<Control ID="mnuPowerCycle">停止と再起動</Control> <Control ID="mnuPowerCycle">停止と再起動</Control>
<Control ID="mnuEjectCartridge">ゲームを取り出す</Control> <Control ID="mnuPowerOff">ゲームを停止する</Control>
<Control ID="mnuSwitchDiskSide">A面B面切り替え</Control> <Control ID="mnuSwitchDiskSide">A面B面切り替え</Control>
<Control ID="mnuSelectDisk">ディスク選択</Control> <Control ID="mnuSelectDisk">ディスク選択</Control>
<Control ID="mnuEjectDisk">ディスクを取り出す</Control> <Control ID="mnuEjectDisk">ディスクを取り出す</Control>

2
GUI.NET/Dependencies/resources.pt.xml
View file

@ -12,7 +12,7 @@
<Control ID="mnuPause">Pausar</Control> <Control ID="mnuPause">Pausar</Control>
<Control ID="mnuReset">Resetar</Control> <Control ID="mnuReset">Resetar</Control>
<Control ID="mnuPowerCycle">Power Cycle</Control> <Control ID="mnuPowerCycle">Power Cycle</Control>
<Control ID="mnuEjectCartridge">Eject Cartridge</Control> <Control ID="mnuPowerOff">Power Off</Control>
<Control ID="mnuSwitchDiskSide">Trocar o lado do disco</Control> <Control ID="mnuSwitchDiskSide">Trocar o lado do disco</Control>
<Control ID="mnuSelectDisk">Selecionar o disco</Control> <Control ID="mnuSelectDisk">Selecionar o disco</Control>
<Control ID="mnuEjectDisk">Ejetar o disco</Control> <Control ID="mnuEjectDisk">Ejetar o disco</Control>

2
GUI.NET/Dependencies/resources.ru.xml
View file

@ -12,7 +12,7 @@
<Control ID="mnuPause">Пауза</Control> <Control ID="mnuPause">Пауза</Control>
<Control ID="mnuReset">Сброс</Control> <Control ID="mnuReset">Сброс</Control>
<Control ID="mnuPowerCycle">Power Cycle</Control> <Control ID="mnuPowerCycle">Power Cycle</Control>
<Control ID="mnuEjectCartridge">Eject Cartridge</Control> <Control ID="mnuPowerOff">Power Off</Control>
<Control ID="mnuSwitchDiskSide">Сменить сторону диска</Control> <Control ID="mnuSwitchDiskSide">Сменить сторону диска</Control>
<Control ID="mnuSelectDisk">Выбрать диск</Control> <Control ID="mnuSelectDisk">Выбрать диск</Control>
<Control ID="mnuEjectDisk">Извлечь диск</Control> <Control ID="mnuEjectDisk">Извлечь диск</Control>

2
GUI.NET/Dependencies/resources.uk.xml
View file

@ -12,7 +12,7 @@
<Control ID="mnuPause">Пауза</Control> <Control ID="mnuPause">Пауза</Control>
<Control ID="mnuReset">Скидання</Control> <Control ID="mnuReset">Скидання</Control>
<Control ID="mnuPowerCycle">Цикл включення</Control> <Control ID="mnuPowerCycle">Цикл включення</Control>
<Control ID="mnuEjectCartridge">Витягти Картридж</Control> <Control ID="mnuPowerOff">Power Off</Control>
<Control ID="mnuSwitchDiskSide">Змінити сторону диска</Control> <Control ID="mnuSwitchDiskSide">Змінити сторону диска</Control>
<Control ID="mnuSelectDisk">Вибрати диск</Control> <Control ID="mnuSelectDisk">Вибрати диск</Control>
<Control ID="mnuEjectDisk">Вилучити диск</Control> <Control ID="mnuEjectDisk">Вилучити диск</Control>

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

@ -55,7 +55,7 @@ namespace Mesen.GUI.Forms
this.mnuReset = new System.Windows.Forms.ToolStripMenuItem(); this.mnuReset = new System.Windows.Forms.ToolStripMenuItem();
this.mnuPowerCycle = new System.Windows.Forms.ToolStripMenuItem(); this.mnuPowerCycle = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem24 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem24 = new System.Windows.Forms.ToolStripSeparator();
this.mnuEjectCartridge = new System.Windows.Forms.ToolStripMenuItem(); this.mnuPowerOff = new System.Windows.Forms.ToolStripMenuItem();
this.sepFdsDisk = new System.Windows.Forms.ToolStripSeparator(); this.sepFdsDisk = new System.Windows.Forms.ToolStripSeparator();
this.mnuSwitchDiskSide = new System.Windows.Forms.ToolStripMenuItem(); this.mnuSwitchDiskSide = new System.Windows.Forms.ToolStripMenuItem();
this.mnuSelectDisk = new System.Windows.Forms.ToolStripMenuItem(); this.mnuSelectDisk = new System.Windows.Forms.ToolStripMenuItem();
@ -379,7 +379,7 @@ namespace Mesen.GUI.Forms
this.mnuReset, this.mnuReset,
this.mnuPowerCycle, this.mnuPowerCycle,
this.toolStripMenuItem24, this.toolStripMenuItem24,
this.mnuEjectCartridge, this.mnuPowerOff,
this.sepFdsDisk, this.sepFdsDisk,
this.mnuSwitchDiskSide, this.mnuSwitchDiskSide,
this.mnuSelectDisk, this.mnuSelectDisk,
@ -415,7 +415,7 @@ namespace Mesen.GUI.Forms
// mnuPowerCycle // mnuPowerCycle
// //
this.mnuPowerCycle.Enabled = false; this.mnuPowerCycle.Enabled = false;
this.mnuPowerCycle.Image = global::Mesen.GUI.Properties.Resources.Stop; this.mnuPowerCycle.Image = global::Mesen.GUI.Properties.Resources.PowerCycle;
this.mnuPowerCycle.Name = "mnuPowerCycle"; this.mnuPowerCycle.Name = "mnuPowerCycle";
this.mnuPowerCycle.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); this.mnuPowerCycle.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
this.mnuPowerCycle.Size = new System.Drawing.Size(200, 22); this.mnuPowerCycle.Size = new System.Drawing.Size(200, 22);
@ -427,13 +427,13 @@ namespace Mesen.GUI.Forms
this.toolStripMenuItem24.Name = "toolStripMenuItem24"; this.toolStripMenuItem24.Name = "toolStripMenuItem24";
this.toolStripMenuItem24.Size = new System.Drawing.Size(197, 6); this.toolStripMenuItem24.Size = new System.Drawing.Size(197, 6);
// //
// mnuEjectCartridge // mnuPowerOff
// //
this.mnuEjectCartridge.Image = global::Mesen.GUI.Properties.Resources.Eject; this.mnuPowerOff.Image = global::Mesen.GUI.Properties.Resources.Stop;
this.mnuEjectCartridge.Name = "mnuEjectCartridge"; this.mnuPowerOff.Name = "mnuPowerOff";
this.mnuEjectCartridge.Size = new System.Drawing.Size(200, 22); this.mnuPowerOff.Size = new System.Drawing.Size(200, 22);
this.mnuEjectCartridge.Text = "Eject Cartridge"; this.mnuPowerOff.Text = "Power Off";
this.mnuEjectCartridge.Click += new System.EventHandler(this.mnuEjectCartridge_Click); this.mnuPowerOff.Click += new System.EventHandler(this.mnuPowerOff_Click);
// //
// sepFdsDisk // sepFdsDisk
// //
@ -530,7 +530,7 @@ namespace Mesen.GUI.Forms
this.mnuShowFPS}); this.mnuShowFPS});
this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.Speed; this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.Speed;
this.mnuEmulationSpeed.Name = "mnuEmulationSpeed"; this.mnuEmulationSpeed.Name = "mnuEmulationSpeed";
this.mnuEmulationSpeed.Size = new System.Drawing.Size(135, 22); this.mnuEmulationSpeed.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationSpeed.Text = "Speed"; this.mnuEmulationSpeed.Text = "Speed";
this.mnuEmulationSpeed.DropDownOpening += new System.EventHandler(this.mnuEmulationSpeed_DropDownOpening); this.mnuEmulationSpeed.DropDownOpening += new System.EventHandler(this.mnuEmulationSpeed_DropDownOpening);
// //
@ -632,7 +632,7 @@ namespace Mesen.GUI.Forms
this.mnuFullscreen}); this.mnuFullscreen});
this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.Fullscreen; this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.Fullscreen;
this.mnuVideoScale.Name = "mnuVideoScale"; this.mnuVideoScale.Name = "mnuVideoScale";
this.mnuVideoScale.Size = new System.Drawing.Size(135, 22); this.mnuVideoScale.Size = new System.Drawing.Size(152, 22);
this.mnuVideoScale.Text = "Video Size"; this.mnuVideoScale.Text = "Video Size";
// //
// mnuScale1x // mnuScale1x
@ -746,8 +746,9 @@ namespace Mesen.GUI.Forms
this.mnuPrescale10xFilter, this.mnuPrescale10xFilter,
this.toolStripMenuItem19, this.toolStripMenuItem19,
this.mnuBilinearInterpolation}); this.mnuBilinearInterpolation});
this.mnuVideoFilter.Image = global::Mesen.GUI.Properties.Resources.VideoFilter;
this.mnuVideoFilter.Name = "mnuVideoFilter"; this.mnuVideoFilter.Name = "mnuVideoFilter";
this.mnuVideoFilter.Size = new System.Drawing.Size(135, 22); this.mnuVideoFilter.Size = new System.Drawing.Size(152, 22);
this.mnuVideoFilter.Text = "Video Filter"; this.mnuVideoFilter.Text = "Video Filter";
// //
// mnuNoneFilter // mnuNoneFilter
@ -977,7 +978,7 @@ namespace Mesen.GUI.Forms
this.mnuRegionDendy}); this.mnuRegionDendy});
this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.Globe; this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.Globe;
this.mnuRegion.Name = "mnuRegion"; this.mnuRegion.Name = "mnuRegion";
this.mnuRegion.Size = new System.Drawing.Size(135, 22); this.mnuRegion.Size = new System.Drawing.Size(152, 22);
this.mnuRegion.Text = "Region"; this.mnuRegion.Text = "Region";
// //
// mnuRegionAuto // mnuRegionAuto
@ -1011,13 +1012,13 @@ namespace Mesen.GUI.Forms
// toolStripMenuItem10 // toolStripMenuItem10
// //
this.toolStripMenuItem10.Name = "toolStripMenuItem10"; this.toolStripMenuItem10.Name = "toolStripMenuItem10";
this.toolStripMenuItem10.Size = new System.Drawing.Size(132, 6); this.toolStripMenuItem10.Size = new System.Drawing.Size(149, 6);
// //
// mnuAudioConfig // mnuAudioConfig
// //
this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio; this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio;
this.mnuAudioConfig.Name = "mnuAudioConfig"; this.mnuAudioConfig.Name = "mnuAudioConfig";
this.mnuAudioConfig.Size = new System.Drawing.Size(135, 22); this.mnuAudioConfig.Size = new System.Drawing.Size(152, 22);
this.mnuAudioConfig.Text = "Audio"; this.mnuAudioConfig.Text = "Audio";
this.mnuAudioConfig.Click += new System.EventHandler(this.mnuAudioConfig_Click); this.mnuAudioConfig.Click += new System.EventHandler(this.mnuAudioConfig_Click);
// //
@ -1025,7 +1026,7 @@ namespace Mesen.GUI.Forms
// //
this.mnuInput.Image = global::Mesen.GUI.Properties.Resources.Controller; this.mnuInput.Image = global::Mesen.GUI.Properties.Resources.Controller;
this.mnuInput.Name = "mnuInput"; this.mnuInput.Name = "mnuInput";
this.mnuInput.Size = new System.Drawing.Size(135, 22); this.mnuInput.Size = new System.Drawing.Size(152, 22);
this.mnuInput.Text = "Input"; this.mnuInput.Text = "Input";
this.mnuInput.Click += new System.EventHandler(this.mnuInput_Click); this.mnuInput.Click += new System.EventHandler(this.mnuInput_Click);
// //
@ -1033,7 +1034,7 @@ namespace Mesen.GUI.Forms
// //
this.mnuVideoConfig.Image = global::Mesen.GUI.Properties.Resources.Video; this.mnuVideoConfig.Image = global::Mesen.GUI.Properties.Resources.Video;
this.mnuVideoConfig.Name = "mnuVideoConfig"; this.mnuVideoConfig.Name = "mnuVideoConfig";
this.mnuVideoConfig.Size = new System.Drawing.Size(135, 22); this.mnuVideoConfig.Size = new System.Drawing.Size(152, 22);
this.mnuVideoConfig.Text = "Video"; this.mnuVideoConfig.Text = "Video";
this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click); this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click);
// //
@ -1041,20 +1042,20 @@ namespace Mesen.GUI.Forms
// //
this.mnuEmulationConfig.Image = global::Mesen.GUI.Properties.Resources.DipSwitches; this.mnuEmulationConfig.Image = global::Mesen.GUI.Properties.Resources.DipSwitches;
this.mnuEmulationConfig.Name = "mnuEmulationConfig"; this.mnuEmulationConfig.Name = "mnuEmulationConfig";
this.mnuEmulationConfig.Size = new System.Drawing.Size(135, 22); this.mnuEmulationConfig.Size = new System.Drawing.Size(152, 22);
this.mnuEmulationConfig.Text = "Emulation"; this.mnuEmulationConfig.Text = "Emulation";
this.mnuEmulationConfig.Click += new System.EventHandler(this.mnuEmulationConfig_Click); this.mnuEmulationConfig.Click += new System.EventHandler(this.mnuEmulationConfig_Click);
// //
// toolStripMenuItem11 // toolStripMenuItem11
// //
this.toolStripMenuItem11.Name = "toolStripMenuItem11"; this.toolStripMenuItem11.Name = "toolStripMenuItem11";
this.toolStripMenuItem11.Size = new System.Drawing.Size(132, 6); this.toolStripMenuItem11.Size = new System.Drawing.Size(149, 6);
// //
// mnuPreferences // 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.Name = "mnuPreferences";
this.mnuPreferences.Size = new System.Drawing.Size(135, 22); this.mnuPreferences.Size = new System.Drawing.Size(152, 22);
this.mnuPreferences.Text = "Preferences"; this.mnuPreferences.Text = "Preferences";
this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click); this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click);
// //
@ -1666,7 +1667,7 @@ namespace Mesen.GUI.Forms
private System.Windows.Forms.Label lblVersion; private System.Windows.Forms.Label lblVersion;
private Controls.ctrlRecentGames ctrlRecentGames; private Controls.ctrlRecentGames ctrlRecentGames;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem24; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem24;
private System.Windows.Forms.ToolStripMenuItem mnuEjectCartridge; private System.Windows.Forms.ToolStripMenuItem mnuPowerOff;
} }
} }

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

@ -653,7 +653,7 @@ namespace Mesen.GUI.Forms
} else { } else {
panelInfo.Visible = _emuThread == null; panelInfo.Visible = _emuThread == null;
ctrlRecentGames.Visible = _emuThread == null; ctrlRecentGames.Visible = _emuThread == null;
mnuEjectCartridge.Enabled = _emuThread != null; mnuPowerOff.Enabled = _emuThread != null;
ctrlLoading.Visible = (_romLoadCounter > 0); ctrlLoading.Visible = (_romLoadCounter > 0);
@ -940,7 +940,7 @@ namespace Mesen.GUI.Forms
InteropEmu.PowerCycle(); InteropEmu.PowerCycle();
} }
private void mnuEjectCartridge_Click(object sender, EventArgs e) private void mnuPowerOff_Click(object sender, EventArgs e)
{ {
InteropEmu.Stop(); InteropEmu.Stop();
} }

3
GUI.NET/GUI.NET.csproj
View file

@ -678,6 +678,9 @@
<Compile Include="ResourceManager.cs" /> <Compile Include="ResourceManager.cs" />
<Compile Include="RuntimeChecker.cs" /> <Compile Include="RuntimeChecker.cs" />
<Compile Include="SingleInstance.cs" /> <Compile Include="SingleInstance.cs" />
<None Include="Resources\VideoFilter.png" />
<None Include="Resources\map.png" />
<None Include="Resources\PowerCycle.png" />
<None Include="Resources\MesenIconSmall.png" /> <None Include="Resources\MesenIconSmall.png" />
<EmbeddedResource Include="Controls\ctrlHorizontalTrackbar.resx"> <EmbeddedResource Include="Controls\ctrlHorizontalTrackbar.resx">
<DependentUpon>ctrlHorizontalTrackbar.cs</DependentUpon> <DependentUpon>ctrlHorizontalTrackbar.cs</DependentUpon>

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

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

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

@ -298,4 +298,10 @@
<data name="MesenIconSmall" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="MesenIconSmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MesenIconSmall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\MesenIconSmall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="PowerCycle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\PowerCycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="VideoFilter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\VideoFilter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 775 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 611 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 747 B