ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

N64 - add video config dialog that can load/save video size

This commit is contained in:
adelikat 2013-05-04 02:19:12 +00:00
parent 079255b29f
commit e95c4e40c0
7 changed files with 642 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -328,6 +328,12 @@
<DependentUpon>SubtitleMaker.cs</DependentUpon>
</Compile>
<Compile Include="MruStack.cs" />
<Compile Include="N64tools\N64VideoConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="N64tools\N64VideoConfig.Designer.cs">
<DependentUpon>N64VideoConfig.cs</DependentUpon>
</Compile>
<Compile Include="NameStateForm.cs">
<SubType>Form</SubType>
</Compile>
@ -595,6 +601,9 @@
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="N64tools\N64VideoConfig.resx">
<DependentUpon>N64VideoConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="NameStateForm.resx">
<DependentUpon>NameStateForm.cs</DependentUpon>
<SubType>Designer</SubType>

4
BizHawk.MultiClient/Config.cs
View File

@ -260,6 +260,10 @@ namespace BizHawk.MultiClient
public string FFMpegPath = "%exe%/dll/ffmpeg.exe";
//N64 Config Settings
public int N64VideoSizeX = 320;
public int N64VideoSizeY = 240;
// General Client Settings
public int Input_Hotkey_OverrideOptions = 0;
public bool StackOSDMessages = true;

628
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

14
BizHawk.MultiClient/MainForm.cs
View File

@ -1785,7 +1785,8 @@ namespace BizHawk.MultiClient
atariToolStripMenuItem.Visible = false;
sNESToolStripMenuItem.Visible = false;
colecoToolStripMenuItem.Visible = false;
n64ToolStripMenuItem.Visible = false;
switch (system)
{
case "TI83":
@ -1833,6 +1834,9 @@ namespace BizHawk.MultiClient
case "Coleco":
colecoToolStripMenuItem.Visible = true;
break;
case "N64":
n64ToolStripMenuItem.Visible = true;
break;
}
}
@ -5089,7 +5093,7 @@ namespace BizHawk.MultiClient
}
}
private void FlagNeedsReboot()
public void FlagNeedsReboot()
{
NeedsReboot = true;
SetRebootIconStatus();
@ -5382,6 +5386,10 @@ namespace BizHawk.MultiClient
Global.Sound.StartSound();
}
private void videoConfigToolStripMenuItem_Click(object sender, EventArgs e)
{
new N64VideoConfig().ShowDialog();
;
}
}
}

119
BizHawk.MultiClient/N64tools/N64VideoConfig.Designer.cs generated Normal file
View File

@ -0,0 +1,119 @@
namespace BizHawk.MultiClient
{
partial class N64VideoConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.OK = new System.Windows.Forms.Button();
this.Cancel = new System.Windows.Forms.Button();
this.VideoResolutionComboBox = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// OK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.Location = new System.Drawing.Point(287, 360);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 0;
this.OK.Text = "&Ok";
this.OK.UseVisualStyleBackColor = true;
this.OK.Click += new System.EventHandler(this.OK_Click);
//
// Cancel
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(368, 360);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 1;
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
//
// VideoResolutionComboBox
//
this.VideoResolutionComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.VideoResolutionComboBox.FormattingEnabled = true;
this.VideoResolutionComboBox.Items.AddRange(new object[] {
"320 x 240",
"400 x 300",
"480 x 360",
"512 x 384",
"640 x 480",
"800 x 600",
"1024 x 768",
"1152 x 864",
"1280 x 960",
"1400 x 1050",
"1600 x 1200",
"1920 x 1440",
"2048 x 1536"});
this.VideoResolutionComboBox.Location = new System.Drawing.Point(16, 29);
this.VideoResolutionComboBox.Name = "VideoResolutionComboBox";
this.VideoResolutionComboBox.Size = new System.Drawing.Size(136, 21);
this.VideoResolutionComboBox.TabIndex = 10;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(13, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(87, 13);
this.label1.TabIndex = 11;
this.label1.Text = "Video Resolution";
//
// N64VideoConfig
//
this.AcceptButton = this.OK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(455, 395);
this.Controls.Add(this.label1);
this.Controls.Add(this.VideoResolutionComboBox);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.OK);
this.Name = "N64VideoConfig";
this.ShowIcon = false;
this.Text = "Video Configuration";
this.Load += new System.EventHandler(this.N64VideoConfig_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button OK;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.ComboBox VideoResolutionComboBox;
private System.Windows.Forms.Label label1;
}
}

55
BizHawk.MultiClient/N64tools/N64VideoConfig.cs Normal file
View File

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace BizHawk.MultiClient
{
public partial class N64VideoConfig : Form
{
public N64VideoConfig()
{
InitializeComponent();
}
private void N64VideoConfig_Load(object sender, EventArgs e)
{
string video_setting = Global.Config.N64VideoSizeX.ToString()
+ " x "
+ Global.Config.N64VideoSizeY.ToString();
int index = VideoResolutionComboBox.Items.IndexOf(video_setting);
if (index > 0)
{
VideoResolutionComboBox.SelectedIndex = index;
}
}
private void OK_Click(object sender, EventArgs e)
{
SaveSettings();
Global.OSD.AddMessage("Video settings saved.");
Close();
}
private void Cancel_Click(object sender, EventArgs e)
{
Global.OSD.AddMessage("Video config cancelled.");
Close();
}
private void SaveSettings()
{
string video_settings = VideoResolutionComboBox.SelectedItem.ToString();
string[] strArr = video_settings.Split('x');
Global.Config.N64VideoSizeX = Int32.Parse(strArr[0].Trim());
Global.Config.N64VideoSizeY = Int32.Parse(strArr[1].Trim());
Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
}
}
}

120
BizHawk.MultiClient/N64tools/N64VideoConfig.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>