From feb9922b968aad01e9f40fc5832c4890abf0ece7 Mon Sep 17 00:00:00 2001 From: Alee14 Date: Sat, 19 May 2018 15:54:58 -0400 Subject: things --- PortEngine/PortEngine.csproj | 25 +++-- PortEngine/Properties/Settings.Designer.cs | 38 ++++++++ PortEngine/Properties/Settings.settings | 9 ++ PortEngine/WindowManager/WM.Designer.cs | 70 ------------- PortEngine/WindowManager/WM.cs | 40 -------- PortEngine/WindowManager/WM.resx | 120 ----------------------- PortEngine/WindowManager/WindowManager.cs | 28 ++++++ PortEngine/WindowManager/base.Designer.cs | 151 +++++++++++++++++++++++++++++ PortEngine/WindowManager/base.cs | 95 ++++++++++++++++++ PortEngine/WindowManager/base.resx | 126 ++++++++++++++++++++++++ PortEngine/app.config | 15 +++ Project Ports/DebugMode.Designer.cs | 46 ++++++--- Project Ports/DebugMode.cs | 7 +- Project Ports/MainMenu.Designer.cs | 4 +- Project Ports/MainMenu.cs | 3 +- Project Ports/Project Ports.csproj | 5 +- Project Ports/Terminal.Designer.cs | 35 ++----- Project Ports/Terminal.cs | 7 +- 18 files changed, 541 insertions(+), 283 deletions(-) create mode 100644 PortEngine/Properties/Settings.Designer.cs create mode 100644 PortEngine/Properties/Settings.settings delete mode 100644 PortEngine/WindowManager/WM.Designer.cs delete mode 100644 PortEngine/WindowManager/WM.cs delete mode 100644 PortEngine/WindowManager/WM.resx create mode 100644 PortEngine/WindowManager/WindowManager.cs create mode 100644 PortEngine/WindowManager/base.Designer.cs create mode 100644 PortEngine/WindowManager/base.cs create mode 100644 PortEngine/WindowManager/base.resx create mode 100644 PortEngine/app.config diff --git a/PortEngine/PortEngine.csproj b/PortEngine/PortEngine.csproj index d9c6351..22c80e6 100644 --- a/PortEngine/PortEngine.csproj +++ b/PortEngine/PortEngine.csproj @@ -43,17 +43,30 @@ - - UserControl + + True + True + Settings.settings - - WM.cs + + Form + + base.cs + + - - WM.cs + + base.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + \ No newline at end of file diff --git a/PortEngine/Properties/Settings.Designer.cs b/PortEngine/Properties/Settings.Designer.cs new file mode 100644 index 0000000..854463b --- /dev/null +++ b/PortEngine/Properties/Settings.Designer.cs @@ -0,0 +1,38 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace PortEngine.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool graphicsFriendly { + get { + return ((bool)(this["graphicsFriendly"])); + } + set { + this["graphicsFriendly"] = value; + } + } + } +} diff --git a/PortEngine/Properties/Settings.settings b/PortEngine/Properties/Settings.settings new file mode 100644 index 0000000..4c5f16f --- /dev/null +++ b/PortEngine/Properties/Settings.settings @@ -0,0 +1,9 @@ + + + + + + True + + + \ No newline at end of file diff --git a/PortEngine/WindowManager/WM.Designer.cs b/PortEngine/WindowManager/WM.Designer.cs deleted file mode 100644 index 3e6ef63..0000000 --- a/PortEngine/WindowManager/WM.Designer.cs +++ /dev/null @@ -1,70 +0,0 @@ -namespace PortEngine.WindowManager -{ - partial class WM - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.panel1 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); - this.SuspendLayout(); - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.DimGray; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(372, 36); - this.panel1.TabIndex = 0; - // - // panel2 - // - this.panel2.BackColor = System.Drawing.Color.White; - this.panel2.Location = new System.Drawing.Point(0, 35); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(372, 267); - this.panel2.TabIndex = 1; - // - // WM - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); - this.Name = "WM"; - this.Size = new System.Drawing.Size(372, 302); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; - } -} diff --git a/PortEngine/WindowManager/WM.cs b/PortEngine/WindowManager/WM.cs deleted file mode 100644 index 5c43be2..0000000 --- a/PortEngine/WindowManager/WM.cs +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************ - * - * PortEngine - * Copyright (C) 2018 AleeCorp - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - **************************************************************************/ -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; - -namespace PortEngine.WindowManager -{ - public partial class WM : UserControl - { - public WM() - { - InitializeComponent(); - } - - } -} diff --git a/PortEngine/WindowManager/WM.resx b/PortEngine/WindowManager/WM.resx deleted file mode 100644 index 1af7de1..0000000 --- a/PortEngine/WindowManager/WM.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/PortEngine/WindowManager/WindowManager.cs b/PortEngine/WindowManager/WindowManager.cs new file mode 100644 index 0000000..367f3df --- /dev/null +++ b/PortEngine/WindowManager/WindowManager.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Windows.Forms; + +namespace Amethyst +{ + class WindowManager + { + public void createWindow(UserControl program, String name, String rpcData, String rpcImage, Image icon) + { + @base window = new @base() + { + Height = program.Height + 30, + Width = program.Width + }; + program.Parent = window.pnlContent; + program.BringToFront(); + program.Dock = DockStyle.Fill; + window.lblProg.Text = name; + if (PortEngine.Properties.Settings.Default.graphicsFriendly == false) window.Opacity = 0; + window.TopMost = true; + window.rpcData = rpcData; + window.rpcImage = rpcImage; + window.Show(); + } + } +} diff --git a/PortEngine/WindowManager/base.Designer.cs b/PortEngine/WindowManager/base.Designer.cs new file mode 100644 index 0000000..78072d2 --- /dev/null +++ b/PortEngine/WindowManager/base.Designer.cs @@ -0,0 +1,151 @@ +namespace Amethyst +{ + partial class @base + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.pnlTitle = new System.Windows.Forms.Panel(); + this.btnMin = new System.Windows.Forms.Button(); + this.btnClose = new System.Windows.Forms.Button(); + this.lblProg = new System.Windows.Forms.Label(); + this.pnlContent = new System.Windows.Forms.Panel(); + this.tmClose = new System.Windows.Forms.Timer(this.components); + this.tmOpen = new System.Windows.Forms.Timer(this.components); + this.pnlTitle.SuspendLayout(); + this.SuspendLayout(); + // + // pnlTitle + // + this.pnlTitle.BackColor = System.Drawing.Color.DimGray; + this.pnlTitle.Controls.Add(this.btnMin); + this.pnlTitle.Controls.Add(this.btnClose); + this.pnlTitle.Controls.Add(this.lblProg); + this.pnlTitle.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTitle.Location = new System.Drawing.Point(0, 0); + this.pnlTitle.Name = "pnlTitle"; + this.pnlTitle.Size = new System.Drawing.Size(500, 30); + this.pnlTitle.TabIndex = 0; + this.pnlTitle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pnlTitle_MouseDown); + this.pnlTitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pnlTitle_MouseMove); + this.pnlTitle.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pnlTitle_MouseUp); + // + // btnMin + // + this.btnMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnMin.BackColor = System.Drawing.Color.Yellow; + this.btnMin.FlatAppearance.BorderSize = 0; + this.btnMin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnMin.Location = new System.Drawing.Point(440, 0); + this.btnMin.Name = "btnMin"; + this.btnMin.Size = new System.Drawing.Size(30, 30); + this.btnMin.TabIndex = 2; + this.btnMin.TabStop = false; + this.btnMin.Text = "-"; + this.btnMin.UseVisualStyleBackColor = false; + this.btnMin.Click += new System.EventHandler(this.btnMin_Click); + // + // btnClose + // + this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnClose.BackColor = System.Drawing.Color.Red; + this.btnClose.FlatAppearance.BorderSize = 0; + this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnClose.ForeColor = System.Drawing.SystemColors.ButtonHighlight; + this.btnClose.Location = new System.Drawing.Point(470, 0); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(30, 30); + this.btnClose.TabIndex = 1; + this.btnClose.TabStop = false; + this.btnClose.Text = "X"; + this.btnClose.UseVisualStyleBackColor = false; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // + // lblProg + // + this.lblProg.AutoSize = true; + this.lblProg.BackColor = System.Drawing.Color.DimGray; + this.lblProg.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.lblProg.Font = new System.Drawing.Font("Lucida Console", 12F); + this.lblProg.ForeColor = System.Drawing.Color.White; + this.lblProg.Location = new System.Drawing.Point(12, 7); + this.lblProg.Name = "lblProg"; + this.lblProg.Size = new System.Drawing.Size(118, 16); + this.lblProg.TabIndex = 0; + this.lblProg.Text = "ProgramName"; + this.lblProg.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pnlTitle_MouseDown); + this.lblProg.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pnlTitle_MouseMove); + this.lblProg.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pnlTitle_MouseUp); + // + // pnlContent + // + this.pnlContent.BackColor = System.Drawing.Color.White; + this.pnlContent.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlContent.Location = new System.Drawing.Point(0, 30); + this.pnlContent.Name = "pnlContent"; + this.pnlContent.Size = new System.Drawing.Size(500, 369); + this.pnlContent.TabIndex = 1; + // + // tmClose + // + this.tmClose.Interval = 1; + this.tmClose.Tick += new System.EventHandler(this.tmClose_Tick); + // + // tmOpen + // + this.tmOpen.Interval = 1; + this.tmOpen.Tick += new System.EventHandler(this.tmOpen_Tick); + // + // @base + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(500, 399); + this.Controls.Add(this.pnlContent); + this.Controls.Add(this.pnlTitle); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Name = "@base"; + this.Text = "base"; + this.Activated += new System.EventHandler(this.base_Activated); + this.Deactivate += new System.EventHandler(this.base_Deactivate); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.base_FormClosing); + this.Load += new System.EventHandler(this.base_Load); + this.pnlTitle.ResumeLayout(false); + this.pnlTitle.PerformLayout(); + this.ResumeLayout(false); + + } + private System.Windows.Forms.Panel pnlTitle; + private System.Windows.Forms.Button btnMin; + private System.Windows.Forms.Button btnClose; + public System.Windows.Forms.Label lblProg; + public System.Windows.Forms.Panel pnlContent; + private System.Windows.Forms.Timer tmClose; + private System.Windows.Forms.Timer tmOpen; + #endregion + } +} \ No newline at end of file diff --git a/PortEngine/WindowManager/base.cs b/PortEngine/WindowManager/base.cs new file mode 100644 index 0000000..6a2a469 --- /dev/null +++ b/PortEngine/WindowManager/base.cs @@ -0,0 +1,95 @@ +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace Amethyst +{ + public partial class @base : Form + { + bool drag; + int mousex; + int mousey; + public string rpcData; + public string rpcImage; + public @base() + { + InitializeComponent(); + } + + #region titlebar + private void btnMin_Click(object sender, EventArgs e) + { + WindowState = FormWindowState.Minimized; + } + + private void btnClose_Click(object sender, EventArgs e) + { + Close(); + } + + private void pnlTitle_MouseMove(object sender, MouseEventArgs e) + { + if (drag) + { + Top = Cursor.Position.Y - mousey; + Left = Cursor.Position.X - mousex; + } + } + + private void pnlTitle_MouseDown(object sender, MouseEventArgs e) + { + drag = true; + mousex = Cursor.Position.X - Left; + mousey = Cursor.Position.Y - Top; + } + + private void pnlTitle_MouseUp(object sender, MouseEventArgs e) + { + drag = false; + } + #endregion + #region timers + private void tmClose_Tick(object sender, EventArgs e) + { + Opacity -= 0.1; + if (Opacity == 0) Dispose(); + } + + private void tmOpen_Tick(object sender, EventArgs e) + { + Opacity += 0.1; + if (Opacity == 1) tmOpen.Enabled = false; + } + #endregion + #region closing + private void base_FormClosing(object sender, FormClosingEventArgs e) + { + if (PortEngine.Properties.Settings.Default.graphicsFriendly == true) Dispose(); + tmClose.Enabled = true; + e.Cancel = true; + } + + private void base_Load(object sender, EventArgs e) + { + tmOpen.Enabled = true; + } + #endregion + #region inactive titlebars + private void base_Activated(object sender, EventArgs e) + { + if (PortEngine.Properties.Settings.Default.graphicsFriendly == true) return; + pnlTitle.BackColor = Color.White; + lblProg.ForeColor = SystemColors.ControlText; + lblProg.BackColor = pnlTitle.BackColor; + } + + private void base_Deactivate(object sender, EventArgs e) + { + if (PortEngine.Properties.Settings.Default.graphicsFriendly == true) return; + pnlTitle.BackColor = Color.WhiteSmoke; + lblProg.ForeColor = SystemColors.ControlDark; + lblProg.BackColor = pnlTitle.BackColor; + } +#endregion + } +} diff --git a/PortEngine/WindowManager/base.resx b/PortEngine/WindowManager/base.resx new file mode 100644 index 0000000..9c6fc6e --- /dev/null +++ b/PortEngine/WindowManager/base.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 113, 17 + + \ No newline at end of file diff --git a/PortEngine/app.config b/PortEngine/app.config new file mode 100644 index 0000000..0baf1e4 --- /dev/null +++ b/PortEngine/app.config @@ -0,0 +1,15 @@ + + + + +
+ + + + + + True + + + + \ No newline at end of file diff --git a/Project Ports/DebugMode.Designer.cs b/Project Ports/DebugMode.Designer.cs index 88a26ff..ed2163c 100644 --- a/Project Ports/DebugMode.Designer.cs +++ b/Project Ports/DebugMode.Designer.cs @@ -28,27 +28,47 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.textBox2 = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // - // label1 + // textBox1 // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Consolas", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(34, 74); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(207, 34); - this.label1.TabIndex = 0; - this.label1.Text = "COMING SOON!"; + 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(293, 223); - this.Controls.Add(this.label1); + this.ClientSize = new System.Drawing.Size(530, 529); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.button1); + this.Controls.Add(this.textBox1); this.Name = "DebugMode"; this.Text = "DebugMode"; + this.Load += new System.EventHandler(this.DebugMode_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -56,6 +76,8 @@ #endregion - private System.Windows.Forms.Label label1; + 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/DebugMode.cs b/Project Ports/DebugMode.cs index dc25eca..e9e4e3a 100644 --- a/Project Ports/DebugMode.cs +++ b/Project Ports/DebugMode.cs @@ -16,5 +16,10 @@ namespace Project_Ports { InitializeComponent(); } + + private void DebugMode_Load(object sender, EventArgs e) + { + + } } -} +} \ No newline at end of file diff --git a/Project Ports/MainMenu.Designer.cs b/Project Ports/MainMenu.Designer.cs index 455b8fa..c333209 100644 --- a/Project Ports/MainMenu.Designer.cs +++ b/Project Ports/MainMenu.Designer.cs @@ -81,7 +81,7 @@ this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(542, 646); + this.label2.Location = new System.Drawing.Point(563, 621); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(252, 38); this.label2.TabIndex = 3; @@ -108,7 +108,7 @@ this.webBrowser1.Location = new System.Drawing.Point(300, 32); this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); this.webBrowser1.Name = "webBrowser1"; - this.webBrowser1.Size = new System.Drawing.Size(891, 571); + this.webBrowser1.Size = new System.Drawing.Size(876, 508); this.webBrowser1.TabIndex = 5; this.webBrowser1.Url = new System.Uri("https://aleecorp.github.io/project-ports", System.UriKind.Absolute); // diff --git a/Project Ports/MainMenu.cs b/Project Ports/MainMenu.cs index 89c91e9..17f1bff 100644 --- a/Project Ports/MainMenu.cs +++ b/Project Ports/MainMenu.cs @@ -55,7 +55,7 @@ namespace Project_Ports private void MainMenu_Load(object sender, EventArgs e) { - + } private void btnDebugMode_Click(object sender, EventArgs e) @@ -63,5 +63,6 @@ namespace Project_Ports DebugMode debugForm = new DebugMode(); debugForm.Show(); } + } } \ No newline at end of file diff --git a/Project Ports/Project Ports.csproj b/Project Ports/Project Ports.csproj index aa7085f..e1da9e0 100644 --- a/Project Ports/Project Ports.csproj +++ b/Project Ports/Project Ports.csproj @@ -32,6 +32,9 @@ 4 + + ..\PortEngine\bin\Debug\PortEngine.dll + @@ -72,7 +75,7 @@ - Form + UserControl Terminal.cs diff --git a/Project Ports/Terminal.Designer.cs b/Project Ports/Terminal.Designer.cs index 2d96296..d254912 100644 --- a/Project Ports/Terminal.Designer.cs +++ b/Project Ports/Terminal.Designer.cs @@ -2,12 +2,12 @@ { partial class Terminal { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -20,47 +20,26 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() { - this.txtTerminal = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // - // txtTerminal - // - this.txtTerminal.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtTerminal.BackColor = System.Drawing.Color.Black; - this.txtTerminal.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtTerminal.Font = new System.Drawing.Font("Lucida Console", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtTerminal.ForeColor = System.Drawing.Color.White; - this.txtTerminal.Location = new System.Drawing.Point(1, 0); - this.txtTerminal.Multiline = true; - this.txtTerminal.Name = "txtTerminal"; - this.txtTerminal.Size = new System.Drawing.Size(555, 320); - this.txtTerminal.TabIndex = 0; - // // Terminal // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(558, 321); - this.Controls.Add(this.txtTerminal); this.Name = "Terminal"; - this.Text = "Terminal"; + this.Size = new System.Drawing.Size(456, 337); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - - private System.Windows.Forms.TextBox txtTerminal; } -} \ No newline at end of file +} diff --git a/Project Ports/Terminal.cs b/Project Ports/Terminal.cs index ba51f3a..ff529d0 100644 --- a/Project Ports/Terminal.cs +++ b/Project Ports/Terminal.cs @@ -1,20 +1,23 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Data; 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 Terminal : Form + public partial class Terminal : UserControl { + public Terminal() { InitializeComponent(); } + // WindowManager wm = new WindowManager(); } } -- cgit v1.2.3