aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Project Ports/Desktop.Designer.cs12
-rw-r--r--Project Ports/Desktop.cs6
-rw-r--r--Project Ports/MainMenu.Designer.cs8
-rw-r--r--Project Ports/Programs/Settings.Designer.cs (renamed from Project Ports/Settings.Designer.cs)0
-rw-r--r--Project Ports/Programs/Settings.cs (renamed from Project Ports/Settings.cs)0
-rw-r--r--Project Ports/Programs/Settings.resx (renamed from Project Ports/Settings.resx)0
-rw-r--r--Project Ports/Programs/Terminal.Designer.cs (renamed from Project Ports/Terminal.Designer.cs)0
-rw-r--r--Project Ports/Programs/Terminal.cs (renamed from Project Ports/Terminal.cs)0
-rw-r--r--Project Ports/Programs/Terminal.resx (renamed from Project Ports/Terminal.resx)0
-rw-r--r--Project Ports/Programs/TestWindow.Designer.cs (renamed from Project Ports/TestWindow.Designer.cs)0
-rw-r--r--Project Ports/Programs/TestWindow.cs (renamed from Project Ports/TestWindow.cs)0
-rw-r--r--Project Ports/Programs/TestWindow.resx (renamed from Project Ports/TestWindow.resx)0
-rw-r--r--Project Ports/Project Ports.csproj27
13 files changed, 28 insertions, 25 deletions
diff --git a/Project Ports/Desktop.Designer.cs b/Project Ports/Desktop.Designer.cs
index 4cbf50a..80cf84a 100644
--- a/Project Ports/Desktop.Designer.cs
+++ b/Project Ports/Desktop.Designer.cs
@@ -78,32 +78,32 @@
// 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);
//
// testWindowToolStripMenuItem
//
this.testWindowToolStripMenuItem.Name = "testWindowToolStripMenuItem";
- this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+ this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.testWindowToolStripMenuItem.Text = "TestWindow";
this.testWindowToolStripMenuItem.Click += new System.EventHandler(this.testWindowToolStripMenuItem_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);
//
@@ -128,7 +128,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Black;
+ this.BackColor = System.Drawing.SystemColors.WindowFrame;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.ltime);
this.Controls.Add(this.appMenu);
diff --git a/Project Ports/Desktop.cs b/Project Ports/Desktop.cs
index 7de59f8..665674f 100644
--- a/Project Ports/Desktop.cs
+++ b/Project Ports/Desktop.cs
@@ -1,7 +1,7 @@
/************************************************************************
*
* Project Ports
- * Copyright (C) 2018 AleeCorp
+ * Copyright (C) 2018 UniverseDG
*
* 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
@@ -28,6 +28,7 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using PortEngine;
+
namespace Project_Ports
{
public partial class Desktop : Form
@@ -70,8 +71,7 @@ namespace Project_Ports
private void testWindowToolStripMenuItem_Click(object sender, EventArgs e)
{
- TestWindow testForm = new TestWindow();
- testForm.Show();
+ wm.createWindow(new TestWindow(), "TestWindow");
}
}
}
diff --git a/Project Ports/MainMenu.Designer.cs b/Project Ports/MainMenu.Designer.cs
index c333209..64fe6fb 100644
--- a/Project Ports/MainMenu.Designer.cs
+++ b/Project Ports/MainMenu.Designer.cs
@@ -47,7 +47,7 @@
this.btnPlay.Name = "btnPlay";
this.btnPlay.Size = new System.Drawing.Size(193, 44);
this.btnPlay.TabIndex = 0;
- this.btnPlay.Text = "Play";
+ this.btnPlay.Text = "Campaign";
this.btnPlay.UseVisualStyleBackColor = true;
this.btnPlay.Click += new System.EventHandler(this.btnPlay_Click);
//
@@ -83,9 +83,9 @@
this.label2.ForeColor = System.Drawing.Color.White;
this.label2.Location = new System.Drawing.Point(563, 621);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(252, 38);
+ this.label2.Size = new System.Drawing.Size(270, 38);
this.label2.TabIndex = 3;
- this.label2.Text = "Copyright (C) 2018 AleeCorp\r\nLicensed with: GPL 3.0";
+ this.label2.Text = "Copyright (C) 2018 UniverseDG\r\nLicensed with: GPL 3.0";
//
// btnAbout
//
@@ -133,7 +133,7 @@
this.btnDebugMode.Name = "btnDebugMode";
this.btnDebugMode.Size = new System.Drawing.Size(193, 44);
this.btnDebugMode.TabIndex = 7;
- this.btnDebugMode.Text = "Debug Mode";
+ this.btnDebugMode.Text = "Sandbox";
this.btnDebugMode.UseVisualStyleBackColor = true;
this.btnDebugMode.Click += new System.EventHandler(this.btnDebugMode_Click);
//
diff --git a/Project Ports/Settings.Designer.cs b/Project Ports/Programs/Settings.Designer.cs
index 6ebbbf9..6ebbbf9 100644
--- a/Project Ports/Settings.Designer.cs
+++ b/Project Ports/Programs/Settings.Designer.cs
diff --git a/Project Ports/Settings.cs b/Project Ports/Programs/Settings.cs
index a25d66f..a25d66f 100644
--- a/Project Ports/Settings.cs
+++ b/Project Ports/Programs/Settings.cs
diff --git a/Project Ports/Settings.resx b/Project Ports/Programs/Settings.resx
index 1af7de1..1af7de1 100644
--- a/Project Ports/Settings.resx
+++ b/Project Ports/Programs/Settings.resx
diff --git a/Project Ports/Terminal.Designer.cs b/Project Ports/Programs/Terminal.Designer.cs
index 48e3ee4..48e3ee4 100644
--- a/Project Ports/Terminal.Designer.cs
+++ b/Project Ports/Programs/Terminal.Designer.cs
diff --git a/Project Ports/Terminal.cs b/Project Ports/Programs/Terminal.cs
index c878c32..c878c32 100644
--- a/Project Ports/Terminal.cs
+++ b/Project Ports/Programs/Terminal.cs
diff --git a/Project Ports/Terminal.resx b/Project Ports/Programs/Terminal.resx
index 1af7de1..1af7de1 100644
--- a/Project Ports/Terminal.resx
+++ b/Project Ports/Programs/Terminal.resx
diff --git a/Project Ports/TestWindow.Designer.cs b/Project Ports/Programs/TestWindow.Designer.cs
index ff91e5a..ff91e5a 100644
--- a/Project Ports/TestWindow.Designer.cs
+++ b/Project Ports/Programs/TestWindow.Designer.cs
diff --git a/Project Ports/TestWindow.cs b/Project Ports/Programs/TestWindow.cs
index 8de01ec..8de01ec 100644
--- a/Project Ports/TestWindow.cs
+++ b/Project Ports/Programs/TestWindow.cs
diff --git a/Project Ports/TestWindow.resx b/Project Ports/Programs/TestWindow.resx
index 1af7de1..1af7de1 100644
--- a/Project Ports/TestWindow.resx
+++ b/Project Ports/Programs/TestWindow.resx
diff --git a/Project Ports/Project Ports.csproj b/Project Ports/Project Ports.csproj
index e5966b1..c78ebb4 100644
--- a/Project Ports/Project Ports.csproj
+++ b/Project Ports/Project Ports.csproj
@@ -32,9 +32,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="PortEngine">
- <HintPath>..\PortEngine\bin\Debug\PortEngine.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -79,22 +76,22 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="Settings.cs">
+ <Compile Include="Programs\Settings.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Settings.Designer.cs">
+ <Compile Include="Programs\Settings.Designer.cs">
<DependentUpon>Settings.cs</DependentUpon>
</Compile>
- <Compile Include="Terminal.cs">
+ <Compile Include="Programs\Terminal.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Terminal.Designer.cs">
+ <Compile Include="Programs\Terminal.Designer.cs">
<DependentUpon>Terminal.cs</DependentUpon>
</Compile>
- <Compile Include="TestWindow.cs">
+ <Compile Include="Programs\TestWindow.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="TestWindow.Designer.cs">
+ <Compile Include="Programs\TestWindow.Designer.cs">
<DependentUpon>TestWindow.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="About.resx">
@@ -114,13 +111,13 @@
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="Settings.resx">
+ <EmbeddedResource Include="Programs\Settings.resx">
<DependentUpon>Settings.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Terminal.resx">
+ <EmbeddedResource Include="Programs\Terminal.resx">
<DependentUpon>Terminal.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="TestWindow.resx">
+ <EmbeddedResource Include="Programs\TestWindow.resx">
<DependentUpon>TestWindow.cs</DependentUpon>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
@@ -139,5 +136,11 @@
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\PortEngine\PortEngine.csproj">
+ <Project>{c1b21b60-7ccc-42fc-83aa-b41644faa952}</Project>
+ <Name>PortEngine</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> \ No newline at end of file