From 4f96aed58a83306ed8d3b5d043fcc3fcbc2a119b Mon Sep 17 00:00:00 2001 From: Souryo Date: Sat, 13 May 2017 16:15:25 -0400 Subject: [PATCH] UI: Renamed option to "Power Off" --- GUI.NET/Dependencies/resources.es.xml | 2 +- GUI.NET/Dependencies/resources.fr.xml | 2 +- GUI.NET/Dependencies/resources.ja.xml | 2 +- GUI.NET/Dependencies/resources.pt.xml | 2 +- GUI.NET/Dependencies/resources.ru.xml | 2 +- GUI.NET/Dependencies/resources.uk.xml | 2 +- GUI.NET/Forms/frmMain.Designer.cs | 43 ++++++++++++----------- GUI.NET/Forms/frmMain.cs | 4 +-- GUI.NET/GUI.NET.csproj | 3 ++ GUI.NET/Properties/Resources.Designer.cs | 20 +++++++++++ GUI.NET/Properties/Resources.resx | 6 ++++ GUI.NET/Resources/PowerCycle.png | Bin 0 -> 775 bytes GUI.NET/Resources/VideoFilter.png | Bin 0 -> 611 bytes GUI.NET/Resources/view-refresh.png | Bin 912 -> 747 bytes 14 files changed, 59 insertions(+), 29 deletions(-) create mode 100644 GUI.NET/Resources/PowerCycle.png create mode 100644 GUI.NET/Resources/VideoFilter.png diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml index e3cb1f8f..581cf679 100644 --- a/GUI.NET/Dependencies/resources.es.xml +++ b/GUI.NET/Dependencies/resources.es.xml @@ -12,7 +12,7 @@ Pausa Reset Power Cycle - Eject Cartridge + Power Off Cambiar la cara del disco Elegir el disco Expulsar el disco diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml index e5f7af97..dd7f8682 100644 --- a/GUI.NET/Dependencies/resources.fr.xml +++ b/GUI.NET/Dependencies/resources.fr.xml @@ -12,7 +12,7 @@ Pause Reset Arrêt && redémarrage - Éjecter le jeu + Arrêter le jeu Changer le disque de côté Choisir le disque Éjecter le disque diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml index 883e2eb9..10829c9c 100644 --- a/GUI.NET/Dependencies/resources.ja.xml +++ b/GUI.NET/Dependencies/resources.ja.xml @@ -12,7 +12,7 @@ ポーズ リセット 停止と再起動 - ゲームを取り出す + ゲームを停止する A面B面切り替え ディスク選択 ディスクを取り出す diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml index 749e01ab..a2d8125b 100644 --- a/GUI.NET/Dependencies/resources.pt.xml +++ b/GUI.NET/Dependencies/resources.pt.xml @@ -12,7 +12,7 @@ Pausar Resetar Power Cycle - Eject Cartridge + Power Off Trocar o lado do disco Selecionar o disco Ejetar o disco diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml index 826276b8..293f2612 100644 --- a/GUI.NET/Dependencies/resources.ru.xml +++ b/GUI.NET/Dependencies/resources.ru.xml @@ -12,7 +12,7 @@ Пауза Сброс Power Cycle - Eject Cartridge + Power Off Сменить сторону диска Выбрать диск Извлечь диск diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml index 63da8259..2193a572 100644 --- a/GUI.NET/Dependencies/resources.uk.xml +++ b/GUI.NET/Dependencies/resources.uk.xml @@ -12,7 +12,7 @@ Пауза Скидання Цикл включення - Витягти Картридж + Power Off Змінити сторону диска Вибрати диск Вилучити диск diff --git a/GUI.NET/Forms/frmMain.Designer.cs b/GUI.NET/Forms/frmMain.Designer.cs index 45b3575c..16c279bf 100644 --- a/GUI.NET/Forms/frmMain.Designer.cs +++ b/GUI.NET/Forms/frmMain.Designer.cs @@ -55,7 +55,7 @@ namespace Mesen.GUI.Forms this.mnuReset = new System.Windows.Forms.ToolStripMenuItem(); this.mnuPowerCycle = new System.Windows.Forms.ToolStripMenuItem(); 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.mnuSwitchDiskSide = new System.Windows.Forms.ToolStripMenuItem(); this.mnuSelectDisk = new System.Windows.Forms.ToolStripMenuItem(); @@ -379,7 +379,7 @@ namespace Mesen.GUI.Forms this.mnuReset, this.mnuPowerCycle, this.toolStripMenuItem24, - this.mnuEjectCartridge, + this.mnuPowerOff, this.sepFdsDisk, this.mnuSwitchDiskSide, this.mnuSelectDisk, @@ -415,7 +415,7 @@ namespace Mesen.GUI.Forms // mnuPowerCycle // 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.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); this.mnuPowerCycle.Size = new System.Drawing.Size(200, 22); @@ -427,13 +427,13 @@ namespace Mesen.GUI.Forms this.toolStripMenuItem24.Name = "toolStripMenuItem24"; this.toolStripMenuItem24.Size = new System.Drawing.Size(197, 6); // - // mnuEjectCartridge + // mnuPowerOff // - this.mnuEjectCartridge.Image = global::Mesen.GUI.Properties.Resources.Eject; - this.mnuEjectCartridge.Name = "mnuEjectCartridge"; - this.mnuEjectCartridge.Size = new System.Drawing.Size(200, 22); - this.mnuEjectCartridge.Text = "Eject Cartridge"; - this.mnuEjectCartridge.Click += new System.EventHandler(this.mnuEjectCartridge_Click); + this.mnuPowerOff.Image = global::Mesen.GUI.Properties.Resources.Stop; + this.mnuPowerOff.Name = "mnuPowerOff"; + this.mnuPowerOff.Size = new System.Drawing.Size(200, 22); + this.mnuPowerOff.Text = "Power Off"; + this.mnuPowerOff.Click += new System.EventHandler(this.mnuPowerOff_Click); // // sepFdsDisk // @@ -530,7 +530,7 @@ namespace Mesen.GUI.Forms this.mnuShowFPS}); this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.Speed; 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.DropDownOpening += new System.EventHandler(this.mnuEmulationSpeed_DropDownOpening); // @@ -632,7 +632,7 @@ namespace Mesen.GUI.Forms this.mnuFullscreen}); this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.Fullscreen; 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"; // // mnuScale1x @@ -746,8 +746,9 @@ namespace Mesen.GUI.Forms this.mnuPrescale10xFilter, this.toolStripMenuItem19, this.mnuBilinearInterpolation}); + this.mnuVideoFilter.Image = global::Mesen.GUI.Properties.Resources.VideoFilter; 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"; // // mnuNoneFilter @@ -977,7 +978,7 @@ namespace Mesen.GUI.Forms this.mnuRegionDendy}); this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.Globe; 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"; // // mnuRegionAuto @@ -1011,13 +1012,13 @@ namespace Mesen.GUI.Forms // toolStripMenuItem10 // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(132, 6); + this.toolStripMenuItem10.Size = new System.Drawing.Size(149, 6); // // mnuAudioConfig // this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio; 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.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.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.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.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.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.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.Click += new System.EventHandler(this.mnuEmulationConfig_Click); // // toolStripMenuItem11 // this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(132, 6); + this.toolStripMenuItem11.Size = new System.Drawing.Size(149, 6); // // mnuPreferences // this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog; 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.Click += new System.EventHandler(this.mnuPreferences_Click); // @@ -1666,7 +1667,7 @@ namespace Mesen.GUI.Forms private System.Windows.Forms.Label lblVersion; private Controls.ctrlRecentGames ctrlRecentGames; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem24; - private System.Windows.Forms.ToolStripMenuItem mnuEjectCartridge; + private System.Windows.Forms.ToolStripMenuItem mnuPowerOff; } } diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs index 3ee522c1..f665a045 100644 --- a/GUI.NET/Forms/frmMain.cs +++ b/GUI.NET/Forms/frmMain.cs @@ -653,7 +653,7 @@ namespace Mesen.GUI.Forms } else { panelInfo.Visible = _emuThread == null; ctrlRecentGames.Visible = _emuThread == null; - mnuEjectCartridge.Enabled = _emuThread != null; + mnuPowerOff.Enabled = _emuThread != null; ctrlLoading.Visible = (_romLoadCounter > 0); @@ -940,7 +940,7 @@ namespace Mesen.GUI.Forms InteropEmu.PowerCycle(); } - private void mnuEjectCartridge_Click(object sender, EventArgs e) + private void mnuPowerOff_Click(object sender, EventArgs e) { InteropEmu.Stop(); } diff --git a/GUI.NET/GUI.NET.csproj b/GUI.NET/GUI.NET.csproj index 9319bfc8..9ee4fd43 100644 --- a/GUI.NET/GUI.NET.csproj +++ b/GUI.NET/GUI.NET.csproj @@ -678,6 +678,9 @@ + + + ctrlHorizontalTrackbar.cs diff --git a/GUI.NET/Properties/Resources.Designer.cs b/GUI.NET/Properties/Resources.Designer.cs index ae967f5d..97c4e261 100644 --- a/GUI.NET/Properties/Resources.Designer.cs +++ b/GUI.NET/Properties/Resources.Designer.cs @@ -520,6 +520,16 @@ namespace Mesen.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PowerCycle { + get { + object obj = ResourceManager.GetObject("PowerCycle", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -640,6 +650,16 @@ namespace Mesen.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap VideoFilter { + get { + object obj = ResourceManager.GetObject("VideoFilter", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/GUI.NET/Properties/Resources.resx b/GUI.NET/Properties/Resources.resx index 1816f915..3b7ad090 100644 --- a/GUI.NET/Properties/Resources.resx +++ b/GUI.NET/Properties/Resources.resx @@ -298,4 +298,10 @@ ..\Resources\MesenIconSmall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PowerCycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\VideoFilter.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/Resources/PowerCycle.png b/GUI.NET/Resources/PowerCycle.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5f7b97edd288bb1c0b56f33f3c3e1a2fd2ffe7 GIT binary patch literal 775 zcmV+i1Ni)jP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RQ3 zF7ng=!vFvP8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)~90YwQ330%S=AVxe8NY})KnN?;!4xZ0EgZc&)^!N9H(bO#1Y_=1U z0Gs^+0nm{k0pRKwu*dGAc|>9A@gr!|)I*)>%#1>zsI0B6IrIm>(Rq;of^-0uSC>HF zq#=N8HUoJs54l_pLZKi`PCm@*4Z0oWX{AM}R2~xnU6&mMu>RE#i^~gOY;7ihWQu`Q zI!U~fN>g0m1doa(#>Ve!DJOMY z1h6bCM*+yJd~J2D#?fi#In+CuK|TjhrlX&c)Rx=`*9wEGOQHJxO4U4IRT*X zDE9`L^b(eXD|ly4aChqnMn~9bf5Or5I2oPN8V4tbM1XUGGdafY;jVKCQUOjwN&f}( ze+?j&yfA-j`= zh~Q$9$&^58DkGAJX)LzO<2c5jD4HXfwQ&+sQi2l_4OW|pIA~GxNNw885zN{Q)02iy xg%tQ%JbUo+zb;auM7oXJ^?H5b>-<-M0RXPuEzWw!vCIGf002ovPDHLkV1fp46B7Uc literal 0 HcmV?d00001 diff --git a/GUI.NET/Resources/view-refresh.png b/GUI.NET/Resources/view-refresh.png index 3fd71d6e5929ba0c40db1960e36e9acba9d7e525..8201255d75f86ced4688db0cad3bd75395e14f0f 100644 GIT binary patch delta 723 zcmV;^0xbQI2kQlpB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)~90YwQ330$WK$ zK~y+TZBspq6Hydh#ell5F4(BJl{RWG_yg>PwGhk~Au+HdU4JYR5{ncejUhooibWKg z7@I&k!H9@y1Un(!y1V(_Y$hL*$z&!ob3J#=3qf|^@ZP)ko^#LKd9y)8D>$9b9iPwl z4mfbT-7~M(+rs_};=6$3zuG9Uy&ibt@pxv%Vo^V891x?~KBn$ToAUYm6oMnvJmXrI z%k=_#04c)ur~;vH;c!@mhymVJTL9#JbT*mj z_xlM+f^{R8%gNI4lqT|+W;2C!T_?-3Kq1a+5ZJN>U|kM{LKFxDEF=^pUII6P#}NNj zC=?V;o0DmpHklvP>Bw)2S773zR4ToN#Wv1&I4*#*mw#QYKTCnjqQHp9oNPd*`jSJV;F#$TaWjx={wW3&JO002ovPDHLk FV1kq9OF#es delta 889 zcmV-<1BU$T1&{}jB!2{RLP=Bz2nYy#2xN!=000?uMObuGZ)S9NVRB^vcXxL#X>MzC zV_|S*E^l&Yo9;Xs0009bNkl9(U6g~HQ@0IzjGi?W3sJ04*5~iV|GmU@I zm_|3mU|6WUM2wJu@UvkD8w^bh5p-dq-~*#EOeL5!0XO^vA%Bw8!mDx7(2~^B#sNk< zv>oWowDaEkzU!j%l38$)o7}}cCnx7zVrKYAWwOsS=-Lqw-t?qu)r6QQ!notg696vQ zmg&~r9t3cLe1UW(yG7H)Ku^~yeO+g>(bg0Jm{BNJFfw+(d}sQhCl&9uE%R)8S2n|p z?*PPznUTt5*MA$j7}?s_9g4?-(239-4ImuQ5e*p#8Ui!LMI6r#R|>_79St?~J}y@c zW;78qJflJ+cNXEWnTH?+mBuvoh&n27H7 zZd`jNKQosCpaG}~01!k303C@CR=0%l<^H#+t$!tQ?3Fz~-%4e&>6*s&6^5?o^0No> zh2ra)My_p{u2^O4PBcd!cf(bhiuFI+Yk4DE>(7F6J^ZC P00000NkvXXu0mjfuBD^D