From 085f0d63526df01e7dbf7ece68ffd8b844ef2498 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Tue, 26 Jun 2012 00:54:57 +0000
Subject: [PATCH]
---
source2/Demos/Guess/Guess.Cosmos | 4 +-
.../Cosmos.VS.Package.csproj.user | 2 +-
.../Cosmos.VS.Package/CosmosPage.Designer.cs | 41 +++++++++++++++++++
source2/VSIP/Cosmos.VS.Package/CosmosPage.cs | 4 --
4 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/source2/Demos/Guess/Guess.Cosmos b/source2/Demos/Guess/Guess.Cosmos
index 6ffc75121..598436da9 100644
--- a/source2/Demos/Guess/Guess.Cosmos
+++ b/source2/Demos/Guess/Guess.Cosmos
@@ -21,7 +21,7 @@
False
Source
User
- ISO
+ PXE
Player
false
Player
@@ -36,7 +36,7 @@
False
Source
User
- ISO
+ PXE
Player
false
Player
diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj.user b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj.user
index cba87b046..ff00c2448 100644
--- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj.user
+++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj.user
@@ -15,7 +15,7 @@
Program
- C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe
+ C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe
d:\source\Cosmos\source2\Guess.sln
\ No newline at end of file
diff --git a/source2/VSIP/Cosmos.VS.Package/CosmosPage.Designer.cs b/source2/VSIP/Cosmos.VS.Package/CosmosPage.Designer.cs
index 41df7ac14..9de1a8e4e 100644
--- a/source2/VSIP/Cosmos.VS.Package/CosmosPage.Designer.cs
+++ b/source2/VSIP/Cosmos.VS.Package/CosmosPage.Designer.cs
@@ -60,12 +60,18 @@
this.tabUSB = new System.Windows.Forms.TabPage();
this.tabISO = new System.Windows.Forms.TabPage();
this.tabSlave = new System.Windows.Forms.TabPage();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
this.TabControl1.SuspendLayout();
this.tabDeploy.SuspendLayout();
this.tabCompile.SuspendLayout();
this.tabAssembler.SuspendLayout();
this.tabDebug.SuspendLayout();
this.tabVMware.SuspendLayout();
+ this.tabPXE.SuspendLayout();
+ this.tabUSB.SuspendLayout();
+ this.tabISO.SuspendLayout();
this.SuspendLayout();
//
// TabControl1
@@ -396,6 +402,7 @@
//
// tabPXE
//
+ this.tabPXE.Controls.Add(this.label6);
this.tabPXE.Location = new System.Drawing.Point(4, 22);
this.tabPXE.Name = "tabPXE";
this.tabPXE.Padding = new System.Windows.Forms.Padding(3);
@@ -406,6 +413,7 @@
//
// tabUSB
//
+ this.tabUSB.Controls.Add(this.label7);
this.tabUSB.Location = new System.Drawing.Point(4, 22);
this.tabUSB.Name = "tabUSB";
this.tabUSB.Padding = new System.Windows.Forms.Padding(3);
@@ -416,6 +424,7 @@
//
// tabISO
//
+ this.tabISO.Controls.Add(this.label8);
this.tabISO.Location = new System.Drawing.Point(4, 22);
this.tabISO.Name = "tabISO";
this.tabISO.Padding = new System.Windows.Forms.Padding(3);
@@ -434,6 +443,32 @@
this.tabSlave.Text = "Slave";
this.tabSlave.UseVisualStyleBackColor = true;
//
+ // label6
+ //
+ this.label6.Location = new System.Drawing.Point(23, 22);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(375, 102);
+ this.label6.TabIndex = 0;
+ this.label6.Text = "Currently PXE is locked to 192.168.42.1 to avoid configuration conflicts among Co" +
+ "smos developers. For now please use this configuation.";
+ //
+ // label7
+ //
+ this.label7.Location = new System.Drawing.Point(16, 15);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(375, 102);
+ this.label7.TabIndex = 1;
+ this.label7.Text = "There are no current USB options. The target drive will be asked when you run the" +
+ " project.";
+ //
+ // label8
+ //
+ this.label8.Location = new System.Drawing.Point(17, 16);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(375, 102);
+ this.label8.TabIndex = 1;
+ this.label8.Text = "There are currently no ISO options.";
+ //
// CosmosPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -453,6 +488,9 @@
this.tabDebug.PerformLayout();
this.tabVMware.ResumeLayout(false);
this.tabVMware.PerformLayout();
+ this.tabPXE.ResumeLayout(false);
+ this.tabUSB.ResumeLayout(false);
+ this.tabISO.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -491,6 +529,9 @@
private System.Windows.Forms.ComboBox comboTraceMode;
private System.Windows.Forms.CheckBox checkEnableGDB;
private System.Windows.Forms.CheckBox checkStartCosmosGDB;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label8;
diff --git a/source2/VSIP/Cosmos.VS.Package/CosmosPage.cs b/source2/VSIP/Cosmos.VS.Package/CosmosPage.cs
index d4bc46c04..9392e6654 100644
--- a/source2/VSIP/Cosmos.VS.Package/CosmosPage.cs
+++ b/source2/VSIP/Cosmos.VS.Package/CosmosPage.cs
@@ -121,10 +121,6 @@ namespace Cosmos.VS.Package {
lablDeployText.Text = "Oops. What the frak did you click?";
}
- // Nothing exists on these pages yet.
- mShowTabUSB = false;
- mShowTabISO = false;
-
UpdateTabs();
}