aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlee14 <Alee14498@gmail.com>2018-05-20 00:13:37 -0400
committerAlee14 <Alee14498@gmail.com>2018-05-20 00:13:37 -0400
commitcb9965e6d0b6169937bb6e7daf2514a5e509fd0f (patch)
tree1a07fe98637d6ee9a716d2a035c554ec86890785
parente3f1bad5eb58debc504d90b1413f299949b8e987 (diff)
downloadProject-Silicon-cb9965e6d0b6169937bb6e7daf2514a5e509fd0f.tar.gz
Project-Silicon-cb9965e6d0b6169937bb6e7daf2514a5e509fd0f.tar.bz2
Project-Silicon-cb9965e6d0b6169937bb6e7daf2514a5e509fd0f.zip
great.... it did nothing
-rw-r--r--PortEngine/WindowManager/WindowManager.cs4
-rw-r--r--PortEngine/WindowManager/base.cs2
-rw-r--r--Project Ports/DebugMode.Designer.cs38
-rw-r--r--Project Ports/Desktop.Designer.cs24
-rw-r--r--Project Ports/Desktop.cs6
-rw-r--r--Project Ports/Project Ports.csproj9
-rw-r--r--Project Ports/Terminal.Designer.cs1
-rw-r--r--Project Ports/Terminal.cs7
-rw-r--r--Project Ports/TestWindow.Designer.cs69
-rw-r--r--Project Ports/TestWindow.cs26
-rw-r--r--Project Ports/TestWindow.resx120
11 files changed, 257 insertions, 49 deletions
diff --git a/PortEngine/WindowManager/WindowManager.cs b/PortEngine/WindowManager/WindowManager.cs
index 53ae73c..68aabee 100644
--- a/PortEngine/WindowManager/WindowManager.cs
+++ b/PortEngine/WindowManager/WindowManager.cs
@@ -5,7 +5,7 @@ using System.Windows.Forms;
namespace PortEngine
{
- class WindowManager
+ public class WindowManager
{
public void createWindow(UserControl program, String name, String rpcData, String rpcImage, Image icon)
{
@@ -25,4 +25,4 @@ namespace PortEngine
window.Show();
}
}
-}
+} \ No newline at end of file
diff --git a/PortEngine/WindowManager/base.cs b/PortEngine/WindowManager/base.cs
index 0550666..c529f90 100644
--- a/PortEngine/WindowManager/base.cs
+++ b/PortEngine/WindowManager/base.cs
@@ -92,4 +92,4 @@ namespace PortEngine
}
#endregion
}
-}
+} \ No newline at end of file
diff --git a/Project Ports/DebugMode.Designer.cs b/Project Ports/DebugMode.Designer.cs
index ed2163c..27a4398 100644
--- a/Project Ports/DebugMode.Designer.cs
+++ b/Project Ports/DebugMode.Designer.cs
@@ -28,56 +28,20 @@
/// </summary>
private void InitializeComponent()
{
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.button1 = new System.Windows.Forms.Button();
- this.textBox2 = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
- // textBox1
- //
- this.textBox1.Location = new System.Drawing.Point(12, 12);
- this.textBox1.Multiline = true;
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(506, 368);
- this.textBox1.TabIndex = 0;
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(441, 397);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 120);
- this.button1.TabIndex = 1;
- this.button1.Text = "button1";
- this.button1.UseVisualStyleBackColor = true;
- //
- // textBox2
- //
- this.textBox2.Location = new System.Drawing.Point(12, 397);
- this.textBox2.Multiline = true;
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(423, 120);
- this.textBox2.TabIndex = 2;
- //
// DebugMode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(530, 529);
- this.Controls.Add(this.textBox2);
- this.Controls.Add(this.button1);
- this.Controls.Add(this.textBox1);
+ this.ClientSize = new System.Drawing.Size(405, 312);
this.Name = "DebugMode";
this.Text = "DebugMode";
this.Load += new System.EventHandler(this.DebugMode_Load);
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
-
- private System.Windows.Forms.TextBox textBox1;
- private System.Windows.Forms.Button button1;
- private System.Windows.Forms.TextBox textBox2;
}
} \ No newline at end of file
diff --git a/Project Ports/Desktop.Designer.cs b/Project Ports/Desktop.Designer.cs
index 7455470..697f1d5 100644
--- a/Project Ports/Desktop.Designer.cs
+++ b/Project Ports/Desktop.Designer.cs
@@ -39,6 +39,7 @@
this.shutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ltime = new System.Windows.Forms.Label();
this.dclock = new System.Windows.Forms.Timer(this.components);
+ this.testWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.appMenu.SuspendLayout();
this.SuspendLayout();
//
@@ -70,39 +71,40 @@
//
this.programsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.noProgramsToolStripMenuItem,
- this.terminalToolStripMenuItem});
+ this.terminalToolStripMenuItem,
+ this.testWindowToolStripMenuItem});
this.programsToolStripMenuItem.Name = "programsToolStripMenuItem";
- this.programsToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
+ this.programsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.programsToolStripMenuItem.Text = "Programs";
//
// noProgramsToolStripMenuItem
//
this.noProgramsToolStripMenuItem.Name = "noProgramsToolStripMenuItem";
- this.noProgramsToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+ this.noProgramsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.noProgramsToolStripMenuItem.Text = "No programs :(";
//
// terminalToolStripMenuItem
//
this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
- this.terminalToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+ this.terminalToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.terminalToolStripMenuItem.Text = "Terminal";
this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click);
//
// settingsToolStripMenuItem
//
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
- this.settingsToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
+ this.settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.settingsToolStripMenuItem.Text = "Settings";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(128, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// shutdownToolStripMenuItem
//
this.shutdownToolStripMenuItem.Name = "shutdownToolStripMenuItem";
- this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
+ this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.shutdownToolStripMenuItem.Text = "Shutdown";
this.shutdownToolStripMenuItem.Click += new System.EventHandler(this.shutdownToolStripMenuItem_Click);
//
@@ -123,6 +125,13 @@
//
this.dclock.Tick += new System.EventHandler(this.dclock_Tick);
//
+ // testWindowToolStripMenuItem
+ //
+ this.testWindowToolStripMenuItem.Name = "testWindowToolStripMenuItem";
+ this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.testWindowToolStripMenuItem.Text = "TestWindow";
+ this.testWindowToolStripMenuItem.Click += new System.EventHandler(this.testWindowToolStripMenuItem_Click);
+ //
// Desktop
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -157,5 +166,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem terminalToolStripMenuItem;
private System.Windows.Forms.Timer dclock;
+ private System.Windows.Forms.ToolStripMenuItem testWindowToolStripMenuItem;
}
} \ No newline at end of file
diff --git a/Project Ports/Desktop.cs b/Project Ports/Desktop.cs
index a02a0e8..06e121f 100644
--- a/Project Ports/Desktop.cs
+++ b/Project Ports/Desktop.cs
@@ -65,5 +65,11 @@ namespace Project_Ports
Terminal terminalForm = new Terminal();
terminalForm.Show();
}
+
+ private void testWindowToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ TestWindow testForm = new TestWindow();
+ testForm.Show();
+ }
}
}
diff --git a/Project Ports/Project Ports.csproj b/Project Ports/Project Ports.csproj
index e1da9e0..0ceef20 100644
--- a/Project Ports/Project Ports.csproj
+++ b/Project Ports/Project Ports.csproj
@@ -80,6 +80,12 @@
<Compile Include="Terminal.Designer.cs">
<DependentUpon>Terminal.cs</DependentUpon>
</Compile>
+ <Compile Include="TestWindow.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="TestWindow.Designer.cs">
+ <DependentUpon>TestWindow.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="About.resx">
<DependentUpon>About.cs</DependentUpon>
</EmbeddedResource>
@@ -104,6 +110,9 @@
<EmbeddedResource Include="Terminal.resx">
<DependentUpon>Terminal.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="TestWindow.resx">
+ <DependentUpon>TestWindow.cs</DependentUpon>
+ </EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Project Ports/Terminal.Designer.cs b/Project Ports/Terminal.Designer.cs
index 9da4629..48e3ee4 100644
--- a/Project Ports/Terminal.Designer.cs
+++ b/Project Ports/Terminal.Designer.cs
@@ -54,6 +54,7 @@
this.Controls.Add(this.textBox1);
this.Name = "Terminal";
this.Size = new System.Drawing.Size(456, 337);
+ this.Load += new System.EventHandler(this.Terminal_Load);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/Project Ports/Terminal.cs b/Project Ports/Terminal.cs
index e955a27..c878c32 100644
--- a/Project Ports/Terminal.cs
+++ b/Project Ports/Terminal.cs
@@ -17,8 +17,11 @@ namespace Project_Ports
public Terminal()
{
InitializeComponent();
+ }
+
+ private void Terminal_Load(object sender, EventArgs e)
+ {
+ WindowManager wm = new WindowManager();
}
- WindowManager wm = new PortEngine.WindowManager();
-
}
}
diff --git a/Project Ports/TestWindow.Designer.cs b/Project Ports/TestWindow.Designer.cs
new file mode 100644
index 0000000..e95c631
--- /dev/null
+++ b/Project Ports/TestWindow.Designer.cs
@@ -0,0 +1,69 @@
+namespace Project_Ports
+{
+ partial class TestWindow
+ {
+ /// <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 Component 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.button1 = new System.Windows.Forms.Button();
+ this.progressBar1 = new System.Windows.Forms.ProgressBar();
+ this.SuspendLayout();
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(24, 35);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(75, 23);
+ this.button1.TabIndex = 0;
+ this.button1.Text = "button1";
+ this.button1.UseVisualStyleBackColor = true;
+ //
+ // progressBar1
+ //
+ this.progressBar1.Location = new System.Drawing.Point(24, 77);
+ this.progressBar1.Name = "progressBar1";
+ this.progressBar1.Size = new System.Drawing.Size(100, 23);
+ this.progressBar1.TabIndex = 1;
+ //
+ // TestWindow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.progressBar1);
+ this.Controls.Add(this.button1);
+ this.Name = "TestWindow";
+ this.Size = new System.Drawing.Size(459, 380);
+ this.Load += new System.EventHandler(this.TestWindow_Load);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.ProgressBar progressBar1;
+ }
+}
diff --git a/Project Ports/TestWindow.cs b/Project Ports/TestWindow.cs
new file mode 100644
index 0000000..acbaacc
--- /dev/null
+++ b/Project Ports/TestWindow.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using PortEngine;
+
+namespace Project_Ports
+{
+ public partial class TestWindow : UserControl
+ {
+ public TestWindow()
+ {
+ InitializeComponent();
+ }
+
+ private void TestWindow_Load(object sender, EventArgs e)
+ {
+ WindowManager wm = new WindowManager();
+ }
+ }
+}
diff --git a/Project Ports/TestWindow.resx b/Project Ports/TestWindow.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Project Ports/TestWindow.resx
@@ -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> \ No newline at end of file