aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/WindowsFormsApplication1/Apps/Terminal.cs3
-rw-r--r--source/WindowsFormsApplication1/CreditScroller.Designer.cs37
-rw-r--r--source/WindowsFormsApplication1/CreditScroller.cs5
3 files changed, 27 insertions, 18 deletions
diff --git a/source/WindowsFormsApplication1/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
index f00efd8..4b3af12 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.cs
@@ -61,6 +61,9 @@ namespace ShiftOS
WriteLine("ShiftOS v" + ProductVersion + "");
WriteLine("Copyright 2014-2016 ShiftOS Developers.");
WriteLine("Type 'credits' in terminal to show credits.");
+ WriteLine(" ");
+ WriteLine("SHIFTOS IS IN EARLY ALPHA.");
+ WriteLine("THIS SOFTWARE DOES NOT PROVIDE A WARRANTY OF ANY KIND.");
WriteLine(prefix);
}
txtterm.Select(txtterm.TextLength, 0);
diff --git a/source/WindowsFormsApplication1/CreditScroller.Designer.cs b/source/WindowsFormsApplication1/CreditScroller.Designer.cs
index f453b50..f137e27 100644
--- a/source/WindowsFormsApplication1/CreditScroller.Designer.cs
+++ b/source/WindowsFormsApplication1/CreditScroller.Designer.cs
@@ -33,8 +33,6 @@
this.pnlscroll = new System.Windows.Forms.Panel();
this.btnclose = new System.Windows.Forms.Button();
this.lbcreditstext = new System.Windows.Forms.Label();
- this.lbgametitle = new System.Windows.Forms.Label();
- this.tmrredraw = new System.Windows.Forms.Timer(this.components);
this.pgcontents = new System.Windows.Forms.Panel();
this.lblcountdown = new System.Windows.Forms.Label();
this.ball = new System.Windows.Forms.Panel();
@@ -43,6 +41,8 @@
this.lbllevelandtime = new System.Windows.Forms.Label();
this.lblstatsY = new System.Windows.Forms.Label();
this.lblstatsX = new System.Windows.Forms.Label();
+ this.lbgametitle = new System.Windows.Forms.Label();
+ this.tmrredraw = new System.Windows.Forms.Timer(this.components);
this.pongGameTimer = new System.Windows.Forms.Timer(this.components);
this.counter = new System.Windows.Forms.Timer(this.components);
this.tmrcountdown = new System.Windows.Forms.Timer(this.components);
@@ -100,22 +100,6 @@
this.lbcreditstext.TabIndex = 0;
this.lbcreditstext.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
- // lbgametitle
- //
- this.lbgametitle.Dock = System.Windows.Forms.DockStyle.Top;
- this.lbgametitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
- this.lbgametitle.Location = new System.Drawing.Point(0, 0);
- this.lbgametitle.Name = "lbgametitle";
- this.lbgametitle.Size = new System.Drawing.Size(916, 66);
- this.lbgametitle.TabIndex = 0;
- this.lbgametitle.Text = "ShiftOS Credits";
- this.lbgametitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // tmrredraw
- //
- this.tmrredraw.Enabled = true;
- this.tmrredraw.Tick += new System.EventHandler(this.tmrredraw_Tick);
- //
// pgcontents
//
this.pgcontents.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -205,6 +189,23 @@
this.lblstatsX.Text = "Xspeed: ";
this.lblstatsX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // lbgametitle
+ //
+ this.lbgametitle.Dock = System.Windows.Forms.DockStyle.Top;
+ this.lbgametitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
+ this.lbgametitle.Location = new System.Drawing.Point(0, 0);
+ this.lbgametitle.Name = "lbgametitle";
+ this.lbgametitle.Size = new System.Drawing.Size(916, 66);
+ this.lbgametitle.TabIndex = 0;
+ this.lbgametitle.Text = "ShiftOS Credits";
+ this.lbgametitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbgametitle.Click += new System.EventHandler(this.lbgametitle_Click);
+ //
+ // tmrredraw
+ //
+ this.tmrredraw.Enabled = true;
+ this.tmrredraw.Tick += new System.EventHandler(this.tmrredraw_Tick);
+ //
// pongGameTimer
//
this.pongGameTimer.Interval = 30;
diff --git a/source/WindowsFormsApplication1/CreditScroller.cs b/source/WindowsFormsApplication1/CreditScroller.cs
index ff0a206..e0c5547 100644
--- a/source/WindowsFormsApplication1/CreditScroller.cs
+++ b/source/WindowsFormsApplication1/CreditScroller.cs
@@ -269,5 +269,10 @@ namespace ShiftOS
xVel = Math.Abs(xVel);
lbllevelandtime.Text = "Level: " + level + " - " + secondsleft + " Seconds Left";
}
+
+ private void lbgametitle_Click(object sender, EventArgs e)
+ {
+
+ }
}
}