App menu changes

3 files changed, 68 insertions, 69 deletions

diff --git a/Project Ports/Desktop.Designer.cs b/Project Ports/Desktop.Designer.cs
index 360fa51..c7ce437 100644
--- a/Project Ports/Desktop.Designer.cs
+++ b/Project Ports/Desktop.Designer.cs
@@ -34,21 +34,20 @@
             this.textgen = new System.Windows.Forms.Timer(this.components);
             this.appMenu = new System.Windows.Forms.Panel();
             this.programStrip = new System.Windows.Forms.ToolStrip();
+            this.programButton = new System.Windows.Forms.ToolStripDropDownButton();
+            this.terminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.testWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.chatterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.quantumNetBrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.panel2 = new System.Windows.Forms.Panel();
             this.shutdownButton = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
             this.playerName = new System.Windows.Forms.Label();
             this.taskBar = new System.Windows.Forms.Panel();
             this.appButton = new System.Windows.Forms.Button();
-            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
-            this.terminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.testWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.chatterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.quantumNetBrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.appMenu.SuspendLayout();
             this.programStrip.SuspendLayout();
-            this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.taskBar.SuspendLayout();
             this.SuspendLayout();
@@ -86,18 +85,70 @@
             // 
             this.programStrip.Dock = System.Windows.Forms.DockStyle.None;
             this.programStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripDropDownButton1});
+            this.programButton});
             this.programStrip.Location = new System.Drawing.Point(9, 349);
             this.programStrip.Name = "programStrip";
             this.programStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.programStrip.Size = new System.Drawing.Size(88, 25);
+            this.programStrip.Size = new System.Drawing.Size(110, 25);
             this.programStrip.TabIndex = 2;
             this.programStrip.Text = "toolStrip1";
             // 
+            // programButton
+            // 
+            this.programButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.programButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.terminalToolStripMenuItem,
+            this.testWindowToolStripMenuItem,
+            this.chatterToolStripMenuItem,
+            this.settingsToolStripMenuItem,
+            this.quantumNetBrowserToolStripMenuItem});
+            this.programButton.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.programButton.ForeColor = System.Drawing.Color.Black;
+            this.programButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.programButton.Name = "programButton";
+            this.programButton.ShowDropDownArrow = false;
+            this.programButton.Size = new System.Drawing.Size(67, 22);
+            this.programButton.Text = "Programs";
+            this.programButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
+            // 
+            // terminalToolStripMenuItem
+            // 
+            this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
+            this.terminalToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+            this.terminalToolStripMenuItem.Text = "Terminal";
+            this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click_1);
+            // 
+            // testWindowToolStripMenuItem
+            // 
+            this.testWindowToolStripMenuItem.Name = "testWindowToolStripMenuItem";
+            this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+            this.testWindowToolStripMenuItem.Text = "TestWindow";
+            this.testWindowToolStripMenuItem.Click += new System.EventHandler(this.testWindowToolStripMenuItem_Click_1);
+            // 
+            // chatterToolStripMenuItem
+            // 
+            this.chatterToolStripMenuItem.Name = "chatterToolStripMenuItem";
+            this.chatterToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+            this.chatterToolStripMenuItem.Text = "Chatter";
+            this.chatterToolStripMenuItem.Click += new System.EventHandler(this.chatterToolStripMenuItem_Click_1);
+            // 
+            // settingsToolStripMenuItem
+            // 
+            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+            this.settingsToolStripMenuItem.Text = "Settings";
+            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click_1);
+            // 
+            // quantumNetBrowserToolStripMenuItem
+            // 
+            this.quantumNetBrowserToolStripMenuItem.Name = "quantumNetBrowserToolStripMenuItem";
+            this.quantumNetBrowserToolStripMenuItem.Size = new System.Drawing.Size(200, 22);
+            this.quantumNetBrowserToolStripMenuItem.Text = "QuantumNet Browser";
+            this.quantumNetBrowserToolStripMenuItem.Click += new System.EventHandler(this.quantumNetBrowserToolStripMenuItem_Click_1);
+            // 
             // panel2
             // 
             this.panel2.BackColor = System.Drawing.Color.Gray;
-            this.panel2.Controls.Add(this.shutdownButton);
             this.panel2.Location = new System.Drawing.Point(0, 377);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(376, 52);
@@ -108,7 +159,7 @@
             this.shutdownButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.shutdownButton.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.shutdownButton.ForeColor = System.Drawing.Color.White;
-            this.shutdownButton.Location = new System.Drawing.Point(284, 14);
+            this.shutdownButton.Location = new System.Drawing.Point(283, 12);
             this.shutdownButton.Name = "shutdownButton";
             this.shutdownButton.Size = new System.Drawing.Size(79, 27);
             this.shutdownButton.TabIndex = 0;
@@ -119,6 +170,7 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Gray;
+            this.panel1.Controls.Add(this.shutdownButton);
             this.panel1.Controls.Add(this.playerName);
             this.panel1.ForeColor = System.Drawing.Color.Gray;
             this.panel1.Location = new System.Drawing.Point(0, 1);
@@ -129,10 +181,11 @@
             // playerName
             // 
             this.playerName.AutoSize = true;
+            this.playerName.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.playerName.ForeColor = System.Drawing.Color.White;
-            this.playerName.Location = new System.Drawing.Point(24, 18);
+            this.playerName.Location = new System.Drawing.Point(20, 18);
             this.playerName.Name = "playerName";
-            this.playerName.Size = new System.Drawing.Size(63, 13);
+            this.playerName.Size = new System.Drawing.Size(77, 15);
             this.playerName.TabIndex = 0;
             this.playerName.Text = "playerName";
             // 
@@ -161,57 +214,6 @@
             this.appButton.UseVisualStyleBackColor = true;
             this.appButton.Click += new System.EventHandler(this.appButton_Click);
             // 
-            // toolStripDropDownButton1
-            // 
-            this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.terminalToolStripMenuItem,
-            this.testWindowToolStripMenuItem,
-            this.chatterToolStripMenuItem,
-            this.settingsToolStripMenuItem,
-            this.quantumNetBrowserToolStripMenuItem});
-            this.toolStripDropDownButton1.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.toolStripDropDownButton1.ForeColor = System.Drawing.Color.Black;
-            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            this.toolStripDropDownButton1.Size = new System.Drawing.Size(76, 22);
-            this.toolStripDropDownButton1.Text = "Programs";
-            // 
-            // terminalToolStripMenuItem
-            // 
-            this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
-            this.terminalToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
-            this.terminalToolStripMenuItem.Text = "Terminal";
-            this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click_1);
-            // 
-            // testWindowToolStripMenuItem
-            // 
-            this.testWindowToolStripMenuItem.Name = "testWindowToolStripMenuItem";
-            this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
-            this.testWindowToolStripMenuItem.Text = "TestWindow";
-            this.testWindowToolStripMenuItem.Click += new System.EventHandler(this.testWindowToolStripMenuItem_Click_1);
-            // 
-            // chatterToolStripMenuItem
-            // 
-            this.chatterToolStripMenuItem.Name = "chatterToolStripMenuItem";
-            this.chatterToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
-            this.chatterToolStripMenuItem.Text = "Chatter";
-            this.chatterToolStripMenuItem.Click += new System.EventHandler(this.chatterToolStripMenuItem_Click_1);
-            // 
-            // settingsToolStripMenuItem
-            // 
-            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
-            this.settingsToolStripMenuItem.Text = "Settings";
-            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click_1);
-            // 
-            // quantumNetBrowserToolStripMenuItem
-            // 
-            this.quantumNetBrowserToolStripMenuItem.Name = "quantumNetBrowserToolStripMenuItem";
-            this.quantumNetBrowserToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
-            this.quantumNetBrowserToolStripMenuItem.Text = "QuantumNet Browser";
-            this.quantumNetBrowserToolStripMenuItem.Click += new System.EventHandler(this.quantumNetBrowserToolStripMenuItem_Click_1);
-            // 
             // Desktop
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -231,7 +233,6 @@
             this.appMenu.PerformLayout();
             this.programStrip.ResumeLayout(false);
             this.programStrip.PerformLayout();
-            this.panel2.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.taskBar.ResumeLayout(false);
@@ -252,7 +253,7 @@
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Button shutdownButton;
         private System.Windows.Forms.ToolStrip programStrip;
-        private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
+        private System.Windows.Forms.ToolStripDropDownButton programButton;
         private System.Windows.Forms.ToolStripMenuItem terminalToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem testWindowToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem chatterToolStripMenuItem;
diff --git a/Project Ports/Desktop.cs b/Project Ports/Desktop.cs
index da91fa7..8f37a51 100644
--- a/Project Ports/Desktop.cs
+++ b/Project Ports/Desktop.cs
@@ -56,6 +56,7 @@ namespace Project_Ports
             dclock.Start();
             appMenu.Hide();
             //TODO: Display player name in app menu
+            //playerName.Text = PortEngine.Properties.Settings.
 
         }
         
diff --git a/Project Ports/Desktop.resx b/Project Ports/Desktop.resx
index deea24b..6dedbbe 100644
--- a/Project Ports/Desktop.resx
+++ b/Project Ports/Desktop.resx
@@ -126,9 +126,6 @@
   <metadata name="programStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>21, 15</value>
   </metadata>
-  <metadata name="programStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>21, 15</value>
-  </metadata>
   <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>