Log Window: Localized fr/ja, added icon

GUI.NET/Dependencies/resources.fr.xml

@@ -82,11 +82,15 @@
       <Control ID="mnuTestStopRecording">Stop recording</Control>
       <Control ID="mnuRunAllTests">Run all tests</Control>
       <Control ID="mnuDebugger">Débogueur</Control>
+      <Control ID="mnuLogWindow">Fenêtre de log</Control>
       <Control ID="mnuTakeScreenshot">Capture d'écran</Control>
       <Control ID="mnuHelp">Aide</Control>
       <Control ID="mnuCheckForUpdates">Recherche de mises-à-jour</Control>
       <Control ID="mnuAbout">À propos de...</Control>
     </Form>
+    <Form ID="frmLogWindow" Title="Fenêtre de log">
+      <Control ID="btnClose">Fermer</Control>
+    </Form>
     <Form ID="frmAudioConfig" Title="Options audio">
       <Control ID="tpgGeneral">Général</Control>
       <Control ID="tpgAdvanced">Avancé</Control>

GUI.NET/Dependencies/resources.ja.xml

@@ -82,11 +82,15 @@
       <Control ID="mnuTestStopRecording">Stop recording</Control>
       <Control ID="mnuRunAllTests">Run all tests</Control>
       <Control ID="mnuDebugger">デバッガ</Control>
+      <Control ID="mnuLogWindow">ログウィンドウ</Control>      
       <Control ID="mnuTakeScreenshot">スクリーンショットを撮る</Control>
       <Control ID="mnuHelp">ヘルプ</Control>
       <Control ID="mnuCheckForUpdates">アップデートの確認</Control>
       <Control ID="mnuAbout">Mesenとは</Control>
     </Form>
+    <Form ID="frmLogWindow" Title="ログウィンドウ">
+      <Control ID="btnClose">閉じる</Control>
+    </Form>
     <Form ID="frmAudioConfig" Title="音声設定">
       <Control ID="tpgGeneral">全般</Control>
       <Control ID="tpgAdvanced">詳細設定</Control>

GUI.NET/Forms/frmMain.Designer.cs

@@ -415,7 +415,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(152, 22);
+			this.mnuEmulationSpeed.Size = new System.Drawing.Size(135, 22);
 			this.mnuEmulationSpeed.Text = "Speed";
 			// 
 			// mnuEmuSpeedNormal
@@ -516,7 +516,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(152, 22);
+			this.mnuVideoScale.Size = new System.Drawing.Size(135, 22);
 			this.mnuVideoScale.Text = "Video Size";
 			// 
 			// mnuScale1x
@@ -620,7 +620,7 @@ namespace Mesen.GUI.Forms
             this.toolStripMenuItem19,
             this.mnuBilinearInterpolation});
 			this.mnuVideoFilter.Name = "mnuVideoFilter";
-			this.mnuVideoFilter.Size = new System.Drawing.Size(152, 22);
+			this.mnuVideoFilter.Size = new System.Drawing.Size(135, 22);
 			this.mnuVideoFilter.Text = "Video Filter";
 			// 
 			// mnuNoneFilter
@@ -777,7 +777,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(152, 22);
+			this.mnuRegion.Size = new System.Drawing.Size(135, 22);
 			this.mnuRegion.Text = "Region";
 			// 
 			// mnuRegionAuto
@@ -811,13 +811,13 @@ namespace Mesen.GUI.Forms
 			// toolStripMenuItem10
 			// 
 			this.toolStripMenuItem10.Name = "toolStripMenuItem10";
-			this.toolStripMenuItem10.Size = new System.Drawing.Size(149, 6);
+			this.toolStripMenuItem10.Size = new System.Drawing.Size(132, 6);
 			// 
 			// mnuAudioConfig
 			// 
 			this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio;
 			this.mnuAudioConfig.Name = "mnuAudioConfig";
-			this.mnuAudioConfig.Size = new System.Drawing.Size(152, 22);
+			this.mnuAudioConfig.Size = new System.Drawing.Size(135, 22);
 			this.mnuAudioConfig.Text = "Audio";
 			this.mnuAudioConfig.Click += new System.EventHandler(this.mnuAudioConfig_Click);
 			// 
@@ -825,7 +825,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(152, 22);
+			this.mnuInput.Size = new System.Drawing.Size(135, 22);
 			this.mnuInput.Text = "Input";
 			this.mnuInput.Click += new System.EventHandler(this.mnuInput_Click);
 			// 
@@ -833,7 +833,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(152, 22);
+			this.mnuVideoConfig.Size = new System.Drawing.Size(135, 22);
 			this.mnuVideoConfig.Text = "Video";
 			this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click);
 			// 
@@ -841,20 +841,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(152, 22);
+			this.mnuEmulationConfig.Size = new System.Drawing.Size(135, 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(149, 6);
+			this.toolStripMenuItem11.Size = new System.Drawing.Size(132, 6);
 			// 
 			// mnuPreferences
 			// 
 			this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog;
 			this.mnuPreferences.Name = "mnuPreferences";
-			this.mnuPreferences.Size = new System.Drawing.Size(152, 22);
+			this.mnuPreferences.Size = new System.Drawing.Size(135, 22);
 			this.mnuPreferences.Text = "Preferences";
 			this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click);
 			// 
@@ -1147,6 +1147,7 @@ namespace Mesen.GUI.Forms
 			// 
 			// mnuLogWindow
 			// 
+			this.mnuLogWindow.Image = global::Mesen.GUI.Properties.Resources.LogWindow;
 			this.mnuLogWindow.Name = "mnuLogWindow";
 			this.mnuLogWindow.Size = new System.Drawing.Size(185, 22);
 			this.mnuLogWindow.Text = "Log Window";

GUI.NET/Forms/frmMain.cs

@@ -1338,7 +1338,7 @@ namespace Mesen.GUI.Forms
 				_logWindow.StartPosition = FormStartPosition.Manual;
 				_logWindow.Left = this.Left + (this.Width - _logWindow.Width) / 2;
 				_logWindow.Top = this.Top + (this.Height - _logWindow.Height) / 2;
-				_logWindow.Show();
+				_logWindow.Show(sender, null);
 				_logWindow.FormClosed += (object a, FormClosedEventArgs b) => {
 					_logWindow = null;
 				};

GUI.NET/GUI.NET.csproj

@@ -715,6 +715,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Icon.ico" />
+    <None Include="Resources\LogWindow.png" />
+    <None Include="Resources\format-justify-fill.png" />
     <None Include="Resources\Record.png" />
     <None Include="Resources\microphone.png" />
     <None Include="Resources\DownArrow.png" />

GUI.NET/Properties/Resources.Designer.cs

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

GUI.NET/Properties/Resources.resx

@@ -211,4 +211,7 @@
   <data name="Record" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Record.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="LogWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LogWindow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>