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

Inline Designer and resource files for LuaCanvas

This commit is contained in:
YoshiRulz 2020-12-04 22:26:05 +10:00
parent b541fe5b40
commit 30d9a8b458
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 36 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -460,8 +460,6 @@
<EmbeddedResource Update="tools/InputPrompt.resx" DependentUpon="InputPrompt.cs" SubType="Designer" />
<Compile Update="tools/Lua/LuaButton.cs" SubType="Component" />
<Compile Update="tools/Lua/LuaCanvas.cs" SubType="Form" />
<Compile Update="tools/Lua/LuaCanvas.Designer.cs" DependentUpon="LuaCanvas.cs" />
<EmbeddedResource Update="tools/Lua/LuaCanvas.resx" DependentUpon="LuaCanvas.cs" />
<Compile Update="tools/Lua/LuaCheckbox.cs" SubType="Component" />
<Compile Update="tools/Lua/LuaConsole.cs" SubType="Form" />
<Compile Update="tools/Lua/LuaConsole.Designer.cs" DependentUpon="LuaConsole.cs" />

66
src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.Designer.cs generated
View File

@ -1,66 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class LuaCanvas
{
/// <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.luaPictureBox = new BizHawk.Client.EmuHawk.LuaPictureBox();
((System.ComponentModel.ISupportInitialize)(this.luaPictureBox)).BeginInit();
this.SuspendLayout();
//
// luaPictureBox
//
this.luaPictureBox.Location = new System.Drawing.Point(0, 0);
this.luaPictureBox.Margin = new System.Windows.Forms.Padding(0);
this.luaPictureBox.Name = "luaPictureBox";
this.luaPictureBox.Size = new System.Drawing.Size(100, 50);
this.luaPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.luaPictureBox.TabIndex = 0;
this.luaPictureBox.TabStop = false;
//
// LuaCanvas
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ClientSize = new System.Drawing.Size(284, 261);
this.Controls.Add(this.luaPictureBox);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Name = "LuaCanvas";
this.Text = "LuaCanvas";
((System.ComponentModel.ISupportInitialize)(this.luaPictureBox)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private LuaPictureBox luaPictureBox;
}
}

43
src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs
View File

@ -11,19 +11,26 @@ using NLua;
namespace BizHawk.Client.EmuHawk
{
[Description("Represents a canvas object returned by the gui.createcanvas() method")]
public partial class LuaCanvas : Form
public sealed class LuaCanvas : Form
{
private readonly Action<string> LogOutputCallback;
private readonly LuaPictureBox luaPictureBox;
public LuaCanvas(int width, int height, int? x, int? y, NLuaTableHelper tableHelper, Action<string> logOutputCallback)
{
LogOutputCallback = logOutputCallback;
InitializeComponent();
luaPictureBox.TableHelper = tableHelper;
luaPictureBox.Image = Properties.Resources.LuaPictureBox;
luaPictureBox.Width = width;
luaPictureBox.Height = height;
luaPictureBox.Image = new Bitmap(width, height);
SuspendLayout();
AutoScaleDimensions = new SizeF(6F, 13F);
AutoScaleMode = AutoScaleMode.Font;
AutoSize = true;
AutoSizeMode = AutoSizeMode.GrowAndShrink;
ClientSize = new Size(284, 261);
FormBorderStyle = FormBorderStyle.FixedSingle;
Name = "LuaCanvas";
Text = "LuaCanvas";
if (x.HasValue)
{
@ -34,6 +41,28 @@ namespace BizHawk.Client.EmuHawk
Top = (int)y;
}
}
luaPictureBox = new LuaPictureBox
{
Image = Properties.Resources.LuaPictureBox,
Location = new Point(0, 0),
Margin = new Padding(0),
Name = "luaPictureBox",
Size = new Size(100, 50),
SizeMode = PictureBoxSizeMode.AutoSize,
TabIndex = 0,
TableHelper = tableHelper,
TabStop = false
};
Controls.Add(luaPictureBox);
ResumeLayout();
// was this done after reflow for a reason? --yoshi
luaPictureBox.Width = width;
luaPictureBox.Height = height;
luaPictureBox.Image = new Bitmap(width, height);
PerformLayout();
}
[LuaMethodExample(

120
src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.resx
View File

@ -1,120 +0,0 @@
<?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>