Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-10 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Now have the console as a seperate window instead of a tabbed control

Browse source
This commit is contained in:
KillzXGaming 2019-04-30 18:00:08 -04:00
parent 8fbd734096
commit 8e68cc5606
16 changed files with 252 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

35
Switch_FileFormatsMain/GUI/BFRES/BfresEditor.Designer.cs generated
View file

@ -30,17 +30,16 @@
{
this.stPanel2 = new Switch_Toolbox.Library.Forms.STPanel();
this.stToolStrip1 = new Switch_Toolbox.Library.Forms.STToolStrip();
this.toggleViewportToolStripBtn = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.stPanel3 = new Switch_Toolbox.Library.Forms.STPanel();
this.splitter1 = new System.Windows.Forms.Splitter();
this.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
this.stTabControl2 = new Switch_Toolbox.Library.Forms.STTabControl();
this.timelineTabPage = new System.Windows.Forms.TabPage();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.textureLoader1 = new Forms.TextureLoader();
this.stPanel5 = new Switch_Toolbox.Library.Forms.STPanel();
this.toggleViewportToolStripBtn = new System.Windows.Forms.ToolStripButton();
this.stPanel2.SuspendLayout();
this.stToolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@ -72,6 +71,16 @@
this.stToolStrip1.TabIndex = 2;
this.stToolStrip1.Text = "stToolStrip1";
//
// toggleViewportToolStripBtn
//
this.toggleViewportToolStripBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toggleViewportToolStripBtn.Image = global::FirstPlugin.Properties.Resources.ViewportIcon;
this.toggleViewportToolStripBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toggleViewportToolStripBtn.Name = "toggleViewportToolStripBtn";
this.toggleViewportToolStripBtn.Size = new System.Drawing.Size(23, 22);
this.toggleViewportToolStripBtn.Text = "toolStripButton1";
this.toggleViewportToolStripBtn.Click += new System.EventHandler(this.toggleViewportToolStripBtn_Click);
//
// splitContainer1
//
this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -120,7 +129,6 @@
// stTabControl2
//
this.stTabControl2.Controls.Add(this.timelineTabPage);
this.stTabControl2.Controls.Add(this.tabPage4);
this.stTabControl2.Controls.Add(this.tabPage5);
this.stTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTabControl2.Location = new System.Drawing.Point(0, 0);
@ -140,16 +148,6 @@
this.timelineTabPage.Text = "Timeline";
this.timelineTabPage.UseVisualStyleBackColor = true;
//
// tabPage4
//
this.tabPage4.Location = new System.Drawing.Point(4, 25);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(432, 117);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "Console";
this.tabPage4.UseVisualStyleBackColor = true;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.textureLoader1);
@ -177,16 +175,6 @@
this.stPanel5.Size = new System.Drawing.Size(440, 515);
this.stPanel5.TabIndex = 2;
//
// toggleViewportToolStripBtn
//
this.toggleViewportToolStripBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toggleViewportToolStripBtn.Image = global::FirstPlugin.Properties.Resources.ViewportIcon;
this.toggleViewportToolStripBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toggleViewportToolStripBtn.Name = "toggleViewportToolStripBtn";
this.toggleViewportToolStripBtn.Size = new System.Drawing.Size(23, 22);
this.toggleViewportToolStripBtn.Text = "toolStripButton1";
this.toggleViewportToolStripBtn.Click += new System.EventHandler(this.toggleViewportToolStripBtn_Click);
//
// BfresEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -217,7 +205,6 @@
private Switch_Toolbox.Library.Forms.STPanel stPanel1;
private Switch_Toolbox.Library.Forms.STTabControl stTabControl2;
private System.Windows.Forms.TabPage timelineTabPage;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.TabPage tabPage5;
private Forms.TextureLoader textureLoader1;
private Switch_Toolbox.Library.Forms.STPanel stPanel5;

5
Switch_FileFormatsMain/GUI/BFRES/BfresEditor.cs
View file

@ -79,11 +79,6 @@ namespace FirstPlugin.Forms
{
InitializeComponent();
STConsole stConsole = STConsole.Instance;
stConsole.BorderStyle = BorderStyle.None;
stConsole.Dock = DockStyle.Fill;
tabPage4.Controls.Add(stConsole);
animationPanel = new AnimationPanel();
animationPanel.CurrentAnimation = null;
animationPanel.Dock = DockStyle.Fill;

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

4
Switch_Toolbox_Library/Forms/Custom/STForm.cs
View file

@ -23,6 +23,10 @@ namespace Switch_Toolbox.Library.Forms
}
}
public void AddControl(Control control) {
contentContainer.Controls.Add(control);
}
public override string Text
{
get

3
Switch_Toolbox_Library/Forms/STConsole.cs
View file

@ -15,6 +15,9 @@ namespace Switch_Toolbox.Library
public STConsole()
{
BorderStyle = BorderStyle.None;
Dock = DockStyle.Fill;
BackColor = FormThemes.BaseTheme.ConsoleEditorBackColor;
ForeColor = FormThemes.BaseTheme.TextForeColor;

64
Switch_Toolbox_Library/Forms/STConsoleForm.Designer.cs generated Normal file
View file

@ -0,0 +1,64 @@
namespace Switch_Toolbox.Library.Forms
{
partial class STConsoleForm
{
/// <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.stPanel1 = new Switch_Toolbox.Library.Forms.STPanel();
this.contentContainer.SuspendLayout();
this.SuspendLayout();
//
// contentContainer
//
this.contentContainer.Controls.Add(this.stPanel1);
this.contentContainer.Controls.SetChildIndex(this.stPanel1, 0);
//
// stPanel1
//
this.stPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.stPanel1.Location = new System.Drawing.Point(0, 25);
this.stPanel1.Name = "stPanel1";
this.stPanel1.Size = new System.Drawing.Size(543, 368);
this.stPanel1.TabIndex = 11;
//
// STConsoleForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(549, 398);
this.Name = "STConsoleForm";
this.Text = "STConsoleForm";
this.contentContainer.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private STPanel stPanel1;
}
}

23
Switch_Toolbox_Library/Forms/STConsoleForm.cs Normal file
View file

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Switch_Toolbox.Library.Forms
{
public partial class STConsoleForm : STForm
{
public STConsoleForm()
{
InitializeComponent();
stPanel1.Controls.Add(STConsole.Instance);
Text = "Console";
}
}
}

120
Switch_Toolbox_Library/Forms/STConsoleForm.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>

9
Switch_Toolbox_Library/Switch_Toolbox_Library.csproj
View file

@ -438,6 +438,12 @@
<Compile Include="Forms\STConsole.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Forms\STConsoleForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\STConsoleForm.Designer.cs">
<DependentUpon>STConsoleForm.cs</DependentUpon>
</Compile>
<Compile Include="Forms\TrackbarKeyEditor.cs" />
<Compile Include="Forms\TrackbarKeyEditor.Designer.cs">
<DependentUpon>TrackbarKeyEditor.cs</DependentUpon>
@ -733,6 +739,9 @@
<EmbeddedResource Include="Forms\GL\GLControl2D.resx">
<DependentUpon>GLControl2D.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\STConsoleForm.resx">
<DependentUpon>STConsoleForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Viewport.resx">
<DependentUpon>Viewport.cs</DependentUpon>
</EmbeddedResource>

14
Toolbox/MainForm.Designer.cs generated
View file

@ -65,6 +65,7 @@
this.stToolStrip1 = new Switch_Toolbox.Library.Forms.STToolStrip();
this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
this.updateToolstrip = new System.Windows.Forms.ToolStripButton();
this.consoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.stPanel1.SuspendLayout();
this.tabControlContextMenuStrip.SuspendLayout();
@ -86,7 +87,8 @@
this.experimentalToolStripMenuItem,
this.windowsToolStripMenuItem,
this.settingsToolStripMenuItem,
this.aboutToolStripMenuItem});
this.aboutToolStripMenuItem,
this.consoleToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1108, 25);
@ -265,7 +267,7 @@
// creditsToolStripMenuItem
//
this.creditsToolStripMenuItem.Name = "creditsToolStripMenuItem";
this.creditsToolStripMenuItem.Size = new System.Drawing.Size(111, 22);
this.creditsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.creditsToolStripMenuItem.Text = "Credits";
this.creditsToolStripMenuItem.Click += new System.EventHandler(this.creditsToolStripMenuItem_Click);
//
@ -398,6 +400,13 @@
this.updateToolstrip.ToolTipText = "Update Tool";
this.updateToolstrip.Click += new System.EventHandler(this.updateToolstrip_Click);
//
// consoleToolStripMenuItem
//
this.consoleToolStripMenuItem.Name = "consoleToolStripMenuItem";
this.consoleToolStripMenuItem.Size = new System.Drawing.Size(62, 21);
this.consoleToolStripMenuItem.Text = "Console";
this.consoleToolStripMenuItem.Click += new System.EventHandler(this.consoleToolStripMenuItem_Click);
//
// MainForm
//
this.AllowDrop = true;
@ -471,6 +480,7 @@
private System.Windows.Forms.PictureBox BtnMdiMinMax;
private System.Windows.Forms.PictureBox BtnMdiClose;
private System.Windows.Forms.ToolStripButton saveToolStripButton;
private System.Windows.Forms.ToolStripMenuItem consoleToolStripMenuItem;
}
}

6
Toolbox/MainForm.cs
View file

@ -1140,5 +1140,11 @@ namespace Toolbox
this.tabControlContextMenuStrip.Show(this.tabForms, e.Location);
}
}
private void consoleToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = new STConsoleForm();
form.Show(this);
}
}
}