diff --git a/HCI_Coursework_EVCHARGE/BaySelection.Designer.cs b/HCI_Coursework_EVCHARGE/BaySelection.Designer.cs
index 73cd0c3..da0ff73 100644
--- a/HCI_Coursework_EVCHARGE/BaySelection.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/BaySelection.Designer.cs
@@ -53,11 +53,15 @@
//
// button6
//
- this.button6.Dock = System.Windows.Forms.DockStyle.Left;
- this.button6.Location = new System.Drawing.Point(25, 769);
- this.button6.Margin = new System.Windows.Forms.Padding(25);
+ this.button6.AutoSize = true;
+ this.button6.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button6.Location = new System.Drawing.Point(30, 770);
+ this.button6.Margin = new System.Windows.Forms.Padding(30);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(911, 136);
+ this.button6.Padding = new System.Windows.Forms.Padding(21);
+ this.button6.Size = new System.Drawing.Size(899, 125);
this.button6.TabIndex = 9;
this.button6.Text = "Bay 10";
this.button6.UseVisualStyleBackColor = true;
@@ -65,11 +69,15 @@
//
// button8
//
- this.button8.Dock = System.Windows.Forms.DockStyle.Left;
- this.button8.Location = new System.Drawing.Point(25, 397);
- this.button8.Margin = new System.Windows.Forms.Padding(25);
+ this.button8.AutoSize = true;
+ this.button8.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button8.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button8.Location = new System.Drawing.Point(30, 400);
+ this.button8.Margin = new System.Windows.Forms.Padding(30);
this.button8.Name = "button8";
- this.button8.Size = new System.Drawing.Size(911, 136);
+ this.button8.Padding = new System.Windows.Forms.Padding(21);
+ this.button8.Size = new System.Drawing.Size(899, 125);
this.button8.TabIndex = 7;
this.button8.Text = "Bay 8";
this.button8.UseVisualStyleBackColor = true;
@@ -77,11 +85,15 @@
//
// button7
//
- this.button7.Dock = System.Windows.Forms.DockStyle.Left;
- this.button7.Location = new System.Drawing.Point(25, 583);
- this.button7.Margin = new System.Windows.Forms.Padding(25);
+ this.button7.AutoSize = true;
+ this.button7.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button7.Location = new System.Drawing.Point(30, 585);
+ this.button7.Margin = new System.Windows.Forms.Padding(30);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(911, 136);
+ this.button7.Padding = new System.Windows.Forms.Padding(21);
+ this.button7.Size = new System.Drawing.Size(899, 125);
this.button7.TabIndex = 8;
this.button7.Text = "Bay 9";
this.button7.UseVisualStyleBackColor = true;
@@ -89,11 +101,15 @@
//
// button10
//
- this.button10.Dock = System.Windows.Forms.DockStyle.Left;
- this.button10.Location = new System.Drawing.Point(25, 25);
- this.button10.Margin = new System.Windows.Forms.Padding(25);
+ this.button10.AutoSize = true;
+ this.button10.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button10.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button10.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button10.Location = new System.Drawing.Point(30, 30);
+ this.button10.Margin = new System.Windows.Forms.Padding(30);
this.button10.Name = "button10";
- this.button10.Size = new System.Drawing.Size(911, 136);
+ this.button10.Padding = new System.Windows.Forms.Padding(21);
+ this.button10.Size = new System.Drawing.Size(899, 125);
this.button10.TabIndex = 5;
this.button10.Text = "Bay 6";
this.button10.UseVisualStyleBackColor = true;
@@ -101,11 +117,15 @@
//
// button9
//
- this.button9.Dock = System.Windows.Forms.DockStyle.Left;
- this.button9.Location = new System.Drawing.Point(25, 211);
- this.button9.Margin = new System.Windows.Forms.Padding(25);
+ this.button9.AutoSize = true;
+ this.button9.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button9.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button9.Location = new System.Drawing.Point(30, 215);
+ this.button9.Margin = new System.Windows.Forms.Padding(30);
this.button9.Name = "button9";
- this.button9.Size = new System.Drawing.Size(911, 136);
+ this.button9.Padding = new System.Windows.Forms.Padding(21);
+ this.button9.Size = new System.Drawing.Size(899, 125);
this.button9.TabIndex = 6;
this.button9.Text = "Bay 7";
this.button9.UseVisualStyleBackColor = true;
@@ -167,7 +187,7 @@
this.tableLayoutPanel2.Controls.Add(this.button9, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.button7, 0, 3);
this.tableLayoutPanel2.Controls.Add(this.button6, 0, 4);
- this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Left;
+ this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tableLayoutPanel2.Location = new System.Drawing.Point(959, 0);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
@@ -177,7 +197,7 @@
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(959, 930);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(959, 925);
this.tableLayoutPanel2.TabIndex = 3;
//
// tableLayoutPanel1
@@ -191,7 +211,7 @@
this.tableLayoutPanel1.Controls.Add(this.button2, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.button4, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.button3, 0, 2);
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@@ -201,16 +221,20 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(959, 930);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(959, 925);
this.tableLayoutPanel1.TabIndex = 2;
//
// button1
//
- this.button1.Dock = System.Windows.Forms.DockStyle.Left;
- this.button1.Location = new System.Drawing.Point(25, 25);
- this.button1.Margin = new System.Windows.Forms.Padding(25);
+ this.button1.AutoSize = true;
+ this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button1.Location = new System.Drawing.Point(30, 30);
+ this.button1.Margin = new System.Windows.Forms.Padding(30);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(911, 136);
+ this.button1.Padding = new System.Windows.Forms.Padding(21);
+ this.button1.Size = new System.Drawing.Size(899, 125);
this.button1.TabIndex = 0;
this.button1.Text = "Bay 1";
this.button1.UseVisualStyleBackColor = true;
@@ -218,11 +242,15 @@
//
// button5
//
- this.button5.Dock = System.Windows.Forms.DockStyle.Left;
- this.button5.Location = new System.Drawing.Point(25, 769);
- this.button5.Margin = new System.Windows.Forms.Padding(25);
+ this.button5.AutoSize = true;
+ this.button5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button5.Location = new System.Drawing.Point(30, 770);
+ this.button5.Margin = new System.Windows.Forms.Padding(30);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(911, 136);
+ this.button5.Padding = new System.Windows.Forms.Padding(21);
+ this.button5.Size = new System.Drawing.Size(899, 125);
this.button5.TabIndex = 4;
this.button5.Text = "Bay 5";
this.button5.UseVisualStyleBackColor = true;
@@ -230,11 +258,15 @@
//
// button2
//
- this.button2.Dock = System.Windows.Forms.DockStyle.Left;
- this.button2.Location = new System.Drawing.Point(25, 211);
- this.button2.Margin = new System.Windows.Forms.Padding(25);
+ this.button2.AutoSize = true;
+ this.button2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button2.Location = new System.Drawing.Point(30, 215);
+ this.button2.Margin = new System.Windows.Forms.Padding(30);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(911, 136);
+ this.button2.Padding = new System.Windows.Forms.Padding(21);
+ this.button2.Size = new System.Drawing.Size(899, 125);
this.button2.TabIndex = 1;
this.button2.Text = "Bay 2";
this.button2.UseVisualStyleBackColor = true;
@@ -242,11 +274,15 @@
//
// button4
//
- this.button4.Dock = System.Windows.Forms.DockStyle.Left;
- this.button4.Location = new System.Drawing.Point(25, 583);
- this.button4.Margin = new System.Windows.Forms.Padding(25);
+ this.button4.AutoSize = true;
+ this.button4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button4.Location = new System.Drawing.Point(30, 585);
+ this.button4.Margin = new System.Windows.Forms.Padding(30);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(911, 136);
+ this.button4.Padding = new System.Windows.Forms.Padding(21);
+ this.button4.Size = new System.Drawing.Size(899, 125);
this.button4.TabIndex = 3;
this.button4.Text = "Bay 4";
this.button4.UseVisualStyleBackColor = true;
@@ -254,11 +290,15 @@
//
// button3
//
- this.button3.Dock = System.Windows.Forms.DockStyle.Left;
- this.button3.Location = new System.Drawing.Point(25, 397);
- this.button3.Margin = new System.Windows.Forms.Padding(25);
+ this.button3.AutoSize = true;
+ this.button3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.button3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.button3.Location = new System.Drawing.Point(30, 400);
+ this.button3.Margin = new System.Windows.Forms.Padding(30);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(911, 136);
+ this.button3.Padding = new System.Windows.Forms.Padding(21);
+ this.button3.Size = new System.Drawing.Size(899, 125);
this.button3.TabIndex = 2;
this.button3.Text = "Bay 3";
this.button3.UseVisualStyleBackColor = true;
@@ -306,7 +346,9 @@
this.tableLayoutPanel3.ResumeLayout(false);
this.tableLayoutPanel3.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false);
+ this.tableLayoutPanel2.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
+ this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/HCI_Coursework_EVCHARGE/Charging.Designer.cs b/HCI_Coursework_EVCHARGE/Charging.Designer.cs
index 02316f1..bf0ade5 100644
--- a/HCI_Coursework_EVCHARGE/Charging.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/Charging.Designer.cs
@@ -42,7 +42,7 @@
//
// button1
//
- this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F);
+ this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 38F);
this.button1.Location = new System.Drawing.Point(1544, 840);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(300, 150);
@@ -68,18 +68,18 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1144, 696);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1256, 696);
this.tableLayoutPanel1.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 50F);
this.label1.Location = new System.Drawing.Point(10, 10);
this.label1.Margin = new System.Windows.Forms.Padding(10, 10, 10, 30);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(552, 203);
+ this.label1.Size = new System.Drawing.Size(608, 203);
this.label1.TabIndex = 4;
this.label1.Text = "Charging...";
this.label1.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
@@ -88,11 +88,11 @@
//
this.timeRemainingLabel.AutoSize = true;
this.timeRemainingLabel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.timeRemainingLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.timeRemainingLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.timeRemainingLabel.Location = new System.Drawing.Point(50, 600);
this.timeRemainingLabel.Margin = new System.Windows.Forms.Padding(50, 10, 10, 10);
this.timeRemainingLabel.Name = "timeRemainingLabel";
- this.timeRemainingLabel.Size = new System.Drawing.Size(512, 86);
+ this.timeRemainingLabel.Size = new System.Drawing.Size(568, 86);
this.timeRemainingLabel.TabIndex = 3;
this.timeRemainingLabel.Text = "timeRemaining";
//
@@ -100,11 +100,11 @@
//
this.chargeRateLabel.AutoSize = true;
this.chargeRateLabel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.chargeRateLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
- this.chargeRateLabel.Location = new System.Drawing.Point(622, 496);
+ this.chargeRateLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
+ this.chargeRateLabel.Location = new System.Drawing.Point(678, 496);
this.chargeRateLabel.Margin = new System.Windows.Forms.Padding(50, 10, 10, 10);
this.chargeRateLabel.Name = "chargeRateLabel";
- this.chargeRateLabel.Size = new System.Drawing.Size(512, 84);
+ this.chargeRateLabel.Size = new System.Drawing.Size(568, 84);
this.chargeRateLabel.TabIndex = 2;
this.chargeRateLabel.Text = "chargeRate";
//
@@ -115,7 +115,7 @@
this.progressBar1.Location = new System.Drawing.Point(25, 268);
this.progressBar1.Margin = new System.Windows.Forms.Padding(25);
this.progressBar1.Name = "progressBar1";
- this.progressBar1.Size = new System.Drawing.Size(1094, 193);
+ this.progressBar1.Size = new System.Drawing.Size(1206, 193);
this.progressBar1.Step = 1;
this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.progressBar1.TabIndex = 0;
@@ -125,11 +125,11 @@
//
this.chargeCapacityLabel.AutoSize = true;
this.chargeCapacityLabel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.chargeCapacityLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.chargeCapacityLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.chargeCapacityLabel.Location = new System.Drawing.Point(50, 496);
this.chargeCapacityLabel.Margin = new System.Windows.Forms.Padding(50, 10, 10, 10);
this.chargeCapacityLabel.Name = "chargeCapacityLabel";
- this.chargeCapacityLabel.Size = new System.Drawing.Size(512, 84);
+ this.chargeCapacityLabel.Size = new System.Drawing.Size(568, 84);
this.chargeCapacityLabel.TabIndex = 1;
this.chargeCapacityLabel.Text = "chargeCapacity";
//
diff --git a/HCI_Coursework_EVCHARGE/Charging.cs b/HCI_Coursework_EVCHARGE/Charging.cs
index 63a6ac9..18abc4b 100644
--- a/HCI_Coursework_EVCHARGE/Charging.cs
+++ b/HCI_Coursework_EVCHARGE/Charging.cs
@@ -25,7 +25,7 @@ namespace HCI_Coursework_EVCHARGE
var details = new ChargingDetails(Convert.ToInt16(bay)).getCarInfo(vehicle);
label1.Text = $"{System.Threading.Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(vehicle)} Charging...";
chargeRateLabel.Text = $"Charging Rate: {details[0]} kW";
- chargeCapacityLabel.Text = $" Total Charge: {Convert.ToString(decimal.Round( (Convert.ToDecimal(details[0]) / Convert.ToInt16(duration)), 2, MidpointRounding.ToEven))} kWh";
+ chargeCapacityLabel.Text = $" Total Charge: {Convert.ToString(decimal.Round( (Convert.ToDecimal(details[0]) * Convert.ToInt16(duration)), 2, MidpointRounding.ToEven))} kWh";
}
private void Charging_Load(object sender, EventArgs e)
diff --git a/HCI_Coursework_EVCHARGE/ChargingDetails.Designer.cs b/HCI_Coursework_EVCHARGE/ChargingDetails.Designer.cs
index 503d196..783558c 100644
--- a/HCI_Coursework_EVCHARGE/ChargingDetails.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/ChargingDetails.Designer.cs
@@ -89,6 +89,7 @@
// backButton
//
this.backButton.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.backButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.backButton.Location = new System.Drawing.Point(20, 938);
this.backButton.Margin = new System.Windows.Forms.Padding(20);
this.backButton.Name = "backButton";
@@ -102,11 +103,11 @@
//
this.label1.AutoSize = true;
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 40F);
this.label1.Location = new System.Drawing.Point(30, 30);
- this.label1.Margin = new System.Windows.Forms.Padding(30);
+ this.label1.Margin = new System.Windows.Forms.Padding(30, 30, 30, 10);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(586, 48);
+ this.label1.Size = new System.Drawing.Size(586, 68);
this.label1.TabIndex = 3;
this.label1.Text = "Select Vehicle Type";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -115,6 +116,7 @@
//
this.scooterButton.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.scooterButton.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.scooterButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
this.scooterButton.Location = new System.Drawing.Point(30, 678);
this.scooterButton.Margin = new System.Windows.Forms.Padding(30);
this.scooterButton.Name = "scooterButton";
@@ -128,6 +130,7 @@
//
this.carButton.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.carButton.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.carButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
this.carButton.Location = new System.Drawing.Point(30, 138);
this.carButton.Margin = new System.Windows.Forms.Padding(30);
this.carButton.Name = "carButton";
@@ -141,6 +144,7 @@
//
this.bikeButton.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.bikeButton.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.bikeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
this.bikeButton.Location = new System.Drawing.Point(30, 408);
this.bikeButton.Margin = new System.Windows.Forms.Padding(30);
this.bikeButton.Name = "bikeButton";
@@ -181,11 +185,11 @@
//
// label6
//
- this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.label6.Location = new System.Drawing.Point(20, 720);
- this.label6.Margin = new System.Windows.Forms.Padding(20, 20, 20, 5);
+ this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.label6.Location = new System.Drawing.Point(30, 715);
+ this.label6.Margin = new System.Windows.Forms.Padding(30, 15, 30, 10);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(1234, 68);
+ this.label6.Size = new System.Drawing.Size(1214, 75);
this.label6.TabIndex = 11;
this.label6.Text = "Charging Duration ( Hours )";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -193,30 +197,30 @@
// textBox1
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
- this.textBox1.Location = new System.Drawing.Point(500, 830);
- this.textBox1.Margin = new System.Windows.Forms.Padding(500, 30, 500, 30);
+ this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
+ this.textBox1.Location = new System.Drawing.Point(500, 820);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(500, 20, 500, 30);
this.textBox1.MaxLength = 1;
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(274, 45);
+ this.textBox1.Size = new System.Drawing.Size(274, 60);
this.textBox1.TabIndex = 12;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.textBox1.Enter += new System.EventHandler(this.accountPin_Focus);
//
// label2
//
- this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.label2.Location = new System.Drawing.Point(0, 0);
- this.label2.Margin = new System.Windows.Forms.Padding(0);
+ this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.label2.Location = new System.Drawing.Point(30, 10);
+ this.label2.Margin = new System.Windows.Forms.Padding(30, 10, 30, 10);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(1264, 63);
+ this.label2.Size = new System.Drawing.Size(1214, 78);
this.label2.TabIndex = 4;
this.label2.Text = "Charging Information";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// durationLabel
//
- this.durationLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
+ this.durationLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.durationLabel.Location = new System.Drawing.Point(30, 605);
this.durationLabel.Margin = new System.Windows.Forms.Padding(30, 5, 30, 30);
this.durationLabel.Name = "durationLabel";
@@ -227,29 +231,29 @@
//
// label5
//
- this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.label5.Location = new System.Drawing.Point(20, 120);
- this.label5.Margin = new System.Windows.Forms.Padding(20, 20, 20, 5);
+ this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.label5.Location = new System.Drawing.Point(20, 110);
+ this.label5.Margin = new System.Windows.Forms.Padding(20, 10, 20, 5);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(1234, 63);
+ this.label5.Size = new System.Drawing.Size(1234, 74);
this.label5.TabIndex = 7;
this.label5.Text = "Charging Bay";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label4
//
- this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.label4.Location = new System.Drawing.Point(20, 520);
- this.label4.Margin = new System.Windows.Forms.Padding(20, 20, 20, 5);
+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.label4.Location = new System.Drawing.Point(30, 520);
+ this.label4.Margin = new System.Windows.Forms.Padding(30, 20, 30, 10);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(1234, 63);
+ this.label4.Size = new System.Drawing.Size(1214, 63);
this.label4.TabIndex = 6;
this.label4.Text = "Maximum Duration";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// powerLabel
//
- this.powerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
+ this.powerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.powerLabel.Location = new System.Drawing.Point(30, 405);
this.powerLabel.Margin = new System.Windows.Forms.Padding(30, 5, 30, 30);
this.powerLabel.Name = "powerLabel";
@@ -260,7 +264,7 @@
//
// bayLabel
//
- this.bayLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F);
+ this.bayLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.bayLabel.Location = new System.Drawing.Point(30, 205);
this.bayLabel.Margin = new System.Windows.Forms.Padding(30, 5, 30, 30);
this.bayLabel.Name = "bayLabel";
@@ -271,11 +275,11 @@
//
// label3
//
- this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.label3.Location = new System.Drawing.Point(20, 320);
- this.label3.Margin = new System.Windows.Forms.Padding(20, 20, 20, 5);
+ this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
+ this.label3.Location = new System.Drawing.Point(30, 320);
+ this.label3.Margin = new System.Windows.Forms.Padding(30, 20, 30, 10);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(1234, 63);
+ this.label3.Size = new System.Drawing.Size(1214, 64);
this.label3.TabIndex = 5;
this.label3.Text = "Maximum Power";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -296,6 +300,7 @@
// confirmDetailsButton
//
this.confirmDetailsButton.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.confirmDetailsButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
this.confirmDetailsButton.Location = new System.Drawing.Point(20, 20);
this.confirmDetailsButton.Margin = new System.Windows.Forms.Padding(20);
this.confirmDetailsButton.Name = "confirmDetailsButton";
diff --git a/HCI_Coursework_EVCHARGE/HCI_Coursework_EVCHARGE.csproj b/HCI_Coursework_EVCHARGE/HCI_Coursework_EVCHARGE.csproj
index 01606f3..0f153e2 100644
--- a/HCI_Coursework_EVCHARGE/HCI_Coursework_EVCHARGE.csproj
+++ b/HCI_Coursework_EVCHARGE/HCI_Coursework_EVCHARGE.csproj
@@ -178,7 +178,9 @@
-
+
+ PreserveNewest
+
\ No newline at end of file
diff --git a/HCI_Coursework_EVCHARGE/Keyboard.Designer.cs b/HCI_Coursework_EVCHARGE/Keyboard.Designer.cs
index 7f75dce..e31ebbd 100644
--- a/HCI_Coursework_EVCHARGE/Keyboard.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/Keyboard.Designer.cs
@@ -77,7 +77,7 @@
this.buttonQ.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonQ.FlatAppearance.BorderSize = 4;
this.buttonQ.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonQ.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonQ.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonQ.Location = new System.Drawing.Point(24, 96);
this.buttonQ.Name = "buttonQ";
this.buttonQ.Size = new System.Drawing.Size(50, 50);
@@ -91,7 +91,7 @@
this.buttonW.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonW.FlatAppearance.BorderSize = 4;
this.buttonW.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonW.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonW.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonW.Location = new System.Drawing.Point(108, 96);
this.buttonW.Name = "buttonW";
this.buttonW.Size = new System.Drawing.Size(50, 50);
@@ -105,7 +105,7 @@
this.buttonE.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonE.FlatAppearance.BorderSize = 4;
this.buttonE.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonE.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonE.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonE.Location = new System.Drawing.Point(192, 96);
this.buttonE.Name = "buttonE";
this.buttonE.Size = new System.Drawing.Size(50, 50);
@@ -119,7 +119,7 @@
this.buttonR.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonR.FlatAppearance.BorderSize = 4;
this.buttonR.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonR.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonR.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonR.Location = new System.Drawing.Point(276, 96);
this.buttonR.Name = "buttonR";
this.buttonR.Size = new System.Drawing.Size(50, 50);
@@ -133,7 +133,7 @@
this.buttonT.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonT.FlatAppearance.BorderSize = 4;
this.buttonT.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonT.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonT.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonT.Location = new System.Drawing.Point(360, 96);
this.buttonT.Name = "buttonT";
this.buttonT.Size = new System.Drawing.Size(50, 50);
@@ -147,7 +147,7 @@
this.buttonY.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonY.FlatAppearance.BorderSize = 4;
this.buttonY.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonY.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonY.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonY.Location = new System.Drawing.Point(444, 96);
this.buttonY.Name = "buttonY";
this.buttonY.Size = new System.Drawing.Size(50, 50);
@@ -161,7 +161,7 @@
this.buttonU.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonU.FlatAppearance.BorderSize = 4;
this.buttonU.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonU.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonU.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonU.Location = new System.Drawing.Point(528, 96);
this.buttonU.Name = "buttonU";
this.buttonU.Size = new System.Drawing.Size(50, 50);
@@ -175,7 +175,7 @@
this.buttonI.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonI.FlatAppearance.BorderSize = 4;
this.buttonI.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonI.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonI.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonI.Location = new System.Drawing.Point(612, 96);
this.buttonI.Name = "buttonI";
this.buttonI.Size = new System.Drawing.Size(50, 50);
@@ -189,7 +189,7 @@
this.buttonO.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonO.FlatAppearance.BorderSize = 4;
this.buttonO.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonO.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonO.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonO.Location = new System.Drawing.Point(696, 96);
this.buttonO.Name = "buttonO";
this.buttonO.Size = new System.Drawing.Size(50, 50);
@@ -203,7 +203,7 @@
this.buttonP.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonP.FlatAppearance.BorderSize = 4;
this.buttonP.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonP.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonP.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonP.Location = new System.Drawing.Point(780, 96);
this.buttonP.Name = "buttonP";
this.buttonP.Size = new System.Drawing.Size(50, 50);
@@ -217,7 +217,7 @@
this.buttonL.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonL.FlatAppearance.BorderSize = 4;
this.buttonL.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonL.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonL.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonL.Location = new System.Drawing.Point(738, 168);
this.buttonL.Name = "buttonL";
this.buttonL.Size = new System.Drawing.Size(50, 50);
@@ -231,7 +231,7 @@
this.buttonK.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonK.FlatAppearance.BorderSize = 4;
this.buttonK.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonK.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonK.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonK.Location = new System.Drawing.Point(654, 168);
this.buttonK.Name = "buttonK";
this.buttonK.Size = new System.Drawing.Size(50, 50);
@@ -245,7 +245,7 @@
this.buttonJ.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonJ.FlatAppearance.BorderSize = 4;
this.buttonJ.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonJ.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonJ.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonJ.Location = new System.Drawing.Point(570, 168);
this.buttonJ.Name = "buttonJ";
this.buttonJ.Size = new System.Drawing.Size(50, 50);
@@ -259,7 +259,7 @@
this.buttonH.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonH.FlatAppearance.BorderSize = 4;
this.buttonH.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonH.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonH.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonH.Location = new System.Drawing.Point(486, 168);
this.buttonH.Name = "buttonH";
this.buttonH.Size = new System.Drawing.Size(50, 50);
@@ -273,7 +273,7 @@
this.buttonG.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonG.FlatAppearance.BorderSize = 4;
this.buttonG.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonG.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonG.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonG.Location = new System.Drawing.Point(402, 168);
this.buttonG.Name = "buttonG";
this.buttonG.Size = new System.Drawing.Size(50, 50);
@@ -287,7 +287,7 @@
this.buttonF.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonF.FlatAppearance.BorderSize = 4;
this.buttonF.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonF.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonF.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonF.Location = new System.Drawing.Point(318, 168);
this.buttonF.Name = "buttonF";
this.buttonF.Size = new System.Drawing.Size(50, 50);
@@ -301,7 +301,7 @@
this.buttonD.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonD.FlatAppearance.BorderSize = 4;
this.buttonD.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonD.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonD.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonD.Location = new System.Drawing.Point(234, 168);
this.buttonD.Name = "buttonD";
this.buttonD.Size = new System.Drawing.Size(50, 50);
@@ -315,7 +315,7 @@
this.buttonS.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonS.FlatAppearance.BorderSize = 4;
this.buttonS.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonS.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonS.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonS.Location = new System.Drawing.Point(150, 168);
this.buttonS.Name = "buttonS";
this.buttonS.Size = new System.Drawing.Size(50, 50);
@@ -329,7 +329,7 @@
this.buttonA.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonA.FlatAppearance.BorderSize = 4;
this.buttonA.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonA.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonA.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonA.Location = new System.Drawing.Point(66, 168);
this.buttonA.Name = "buttonA";
this.buttonA.Size = new System.Drawing.Size(50, 50);
@@ -343,7 +343,7 @@
this.buttonM.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonM.FlatAppearance.BorderSize = 4;
this.buttonM.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonM.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonM.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonM.Location = new System.Drawing.Point(612, 240);
this.buttonM.Name = "buttonM";
this.buttonM.Size = new System.Drawing.Size(50, 50);
@@ -357,7 +357,7 @@
this.buttonN.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonN.FlatAppearance.BorderSize = 4;
this.buttonN.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonN.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonN.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonN.Location = new System.Drawing.Point(528, 240);
this.buttonN.Name = "buttonN";
this.buttonN.Size = new System.Drawing.Size(50, 50);
@@ -371,7 +371,7 @@
this.buttonB.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonB.FlatAppearance.BorderSize = 4;
this.buttonB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonB.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonB.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonB.Location = new System.Drawing.Point(444, 240);
this.buttonB.Name = "buttonB";
this.buttonB.Size = new System.Drawing.Size(50, 50);
@@ -385,7 +385,7 @@
this.buttonV.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonV.FlatAppearance.BorderSize = 4;
this.buttonV.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonV.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonV.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonV.Location = new System.Drawing.Point(360, 240);
this.buttonV.Name = "buttonV";
this.buttonV.Size = new System.Drawing.Size(50, 50);
@@ -399,7 +399,7 @@
this.buttonC.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonC.FlatAppearance.BorderSize = 4;
this.buttonC.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonC.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonC.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonC.Location = new System.Drawing.Point(276, 240);
this.buttonC.Name = "buttonC";
this.buttonC.Size = new System.Drawing.Size(50, 50);
@@ -413,7 +413,7 @@
this.buttonX.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonX.FlatAppearance.BorderSize = 4;
this.buttonX.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonX.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonX.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonX.Location = new System.Drawing.Point(192, 240);
this.buttonX.Name = "buttonX";
this.buttonX.Size = new System.Drawing.Size(50, 50);
@@ -427,7 +427,7 @@
this.buttonZ.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonZ.FlatAppearance.BorderSize = 4;
this.buttonZ.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonZ.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonZ.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonZ.Location = new System.Drawing.Point(108, 240);
this.buttonZ.Name = "buttonZ";
this.buttonZ.Size = new System.Drawing.Size(50, 50);
@@ -441,7 +441,7 @@
this.buttonSpace.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonSpace.FlatAppearance.BorderSize = 4;
this.buttonSpace.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonSpace.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.buttonSpace.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.buttonSpace.Location = new System.Drawing.Point(210, 312);
this.buttonSpace.Name = "buttonSpace";
this.buttonSpace.Size = new System.Drawing.Size(368, 50);
@@ -469,7 +469,7 @@
this.buttonConfirm.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonConfirm.FlatAppearance.BorderSize = 4;
this.buttonConfirm.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonConfirm.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F);
+ this.buttonConfirm.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F);
this.buttonConfirm.Location = new System.Drawing.Point(696, 312);
this.buttonConfirm.Name = "buttonConfirm";
this.buttonConfirm.Size = new System.Drawing.Size(128, 50);
@@ -548,7 +548,7 @@
this.button0.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button0.FlatAppearance.BorderSize = 4;
this.button0.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button0.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button0.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button0.Location = new System.Drawing.Point(780, 24);
this.button0.Name = "button0";
this.button0.Size = new System.Drawing.Size(50, 50);
@@ -562,7 +562,7 @@
this.button9.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button9.FlatAppearance.BorderSize = 4;
this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button9.Location = new System.Drawing.Point(696, 24);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(50, 50);
@@ -576,7 +576,7 @@
this.button8.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button8.FlatAppearance.BorderSize = 4;
this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button8.Location = new System.Drawing.Point(612, 24);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(50, 50);
@@ -590,7 +590,7 @@
this.button7.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button7.FlatAppearance.BorderSize = 4;
this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button7.Location = new System.Drawing.Point(528, 24);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(50, 50);
@@ -604,7 +604,7 @@
this.button6.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button6.FlatAppearance.BorderSize = 4;
this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button6.Location = new System.Drawing.Point(444, 24);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(50, 50);
@@ -618,7 +618,7 @@
this.button5.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button5.FlatAppearance.BorderSize = 4;
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button5.Location = new System.Drawing.Point(360, 24);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(50, 50);
@@ -632,7 +632,7 @@
this.button4.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button4.FlatAppearance.BorderSize = 4;
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button4.Location = new System.Drawing.Point(276, 24);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(50, 50);
@@ -646,7 +646,7 @@
this.button3.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button3.FlatAppearance.BorderSize = 4;
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button3.Location = new System.Drawing.Point(192, 24);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(50, 50);
@@ -660,7 +660,7 @@
this.button2.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button2.FlatAppearance.BorderSize = 4;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button2.Location = new System.Drawing.Point(108, 24);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(50, 50);
@@ -674,7 +674,7 @@
this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button1.FlatAppearance.BorderSize = 4;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button1.Location = new System.Drawing.Point(24, 24);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(50, 50);
diff --git a/HCI_Coursework_EVCHARGE/LoginForm.Designer.cs b/HCI_Coursework_EVCHARGE/LoginForm.Designer.cs
index 25cb148..7bdb793 100644
--- a/HCI_Coursework_EVCHARGE/LoginForm.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/LoginForm.Designer.cs
@@ -58,26 +58,27 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F);
- this.label1.Location = new System.Drawing.Point(88, 256);
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
+ this.label1.Location = new System.Drawing.Point(88, 240);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(49, 26);
+ this.label1.Size = new System.Drawing.Size(81, 44);
this.label1.TabIndex = 6;
this.label1.Text = "PIN";
//
// accountIDLabel
//
this.accountIDLabel.AutoSize = true;
- this.accountIDLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F);
- this.accountIDLabel.Location = new System.Drawing.Point(88, 152);
+ this.accountIDLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
+ this.accountIDLabel.Location = new System.Drawing.Point(88, 136);
this.accountIDLabel.Name = "accountIDLabel";
- this.accountIDLabel.Size = new System.Drawing.Size(119, 26);
+ this.accountIDLabel.Size = new System.Drawing.Size(203, 44);
this.accountIDLabel.TabIndex = 5;
this.accountIDLabel.Text = "Account ID";
//
// cancelLoginButton
//
this.cancelLoginButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cancelLoginButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.cancelLoginButton.Location = new System.Drawing.Point(264, 392);
this.cancelLoginButton.Name = "cancelLoginButton";
this.cancelLoginButton.Size = new System.Drawing.Size(150, 75);
@@ -89,6 +90,7 @@
// confirmLoginButton
//
this.confirmLoginButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.confirmLoginButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.confirmLoginButton.Location = new System.Drawing.Point(40, 392);
this.confirmLoginButton.Name = "confirmLoginButton";
this.confirmLoginButton.Size = new System.Drawing.Size(150, 75);
@@ -116,10 +118,10 @@
//
this.loginLabel.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.loginLabel.AutoSize = true;
- this.loginLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F);
- this.loginLabel.Location = new System.Drawing.Point(120, 72);
+ this.loginLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 35F);
+ this.loginLabel.Location = new System.Drawing.Point(64, 40);
this.loginLabel.Name = "loginLabel";
- this.loginLabel.Size = new System.Drawing.Size(208, 36);
+ this.loginLabel.Size = new System.Drawing.Size(319, 54);
this.loginLabel.TabIndex = 1;
this.loginLabel.Text = "Account Login";
//
diff --git a/HCI_Coursework_EVCHARGE/LoginForm.cs b/HCI_Coursework_EVCHARGE/LoginForm.cs
index 7a9be62..d2be144 100644
--- a/HCI_Coursework_EVCHARGE/LoginForm.cs
+++ b/HCI_Coursework_EVCHARGE/LoginForm.cs
@@ -72,7 +72,7 @@ namespace HCI_Coursework_EVCHARGE
private void login_Click(object sender, EventArgs e)
{
- if ( accountNoTextBox.Text == "" )
+ if ( accountNoTextBox.Text == "AB12345678" )
{
if ( accountPinTextBox.Text == "" )
{
diff --git a/HCI_Coursework_EVCHARGE/Payment.Designer.cs b/HCI_Coursework_EVCHARGE/Payment.Designer.cs
index c8a3ded..ad1ba69 100644
--- a/HCI_Coursework_EVCHARGE/Payment.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/Payment.Designer.cs
@@ -32,18 +32,22 @@
this.qrCodeButton = new System.Windows.Forms.Button();
this.accountNoButton = new System.Windows.Forms.Button();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.label1 = new System.Windows.Forms.Label();
+ this.confirmAccountButton = new System.Windows.Forms.Button();
+ this.panel1 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// loginLabel
//
this.loginLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
this.loginLabel.AutoSize = true;
- this.loginLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 34F);
+ this.loginLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 48F);
this.loginLabel.Location = new System.Drawing.Point(0, 456);
this.loginLabel.MinimumSize = new System.Drawing.Size(1920, 0);
this.loginLabel.Name = "loginLabel";
- this.loginLabel.Size = new System.Drawing.Size(1920, 53);
+ this.loginLabel.Size = new System.Drawing.Size(1920, 73);
this.loginLabel.TabIndex = 3;
this.loginLabel.Text = "Choose a Payment Method";
this.loginLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -51,11 +55,11 @@
// qrCodeButton
//
this.qrCodeButton.Dock = System.Windows.Forms.DockStyle.Left;
- this.qrCodeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.qrCodeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.qrCodeButton.Location = new System.Drawing.Point(1042, 3);
this.qrCodeButton.Margin = new System.Windows.Forms.Padding(90, 3, 3, 3);
this.qrCodeButton.Name = "qrCodeButton";
- this.qrCodeButton.Size = new System.Drawing.Size(144, 114);
+ this.qrCodeButton.Size = new System.Drawing.Size(254, 114);
this.qrCodeButton.TabIndex = 5;
this.qrCodeButton.Text = "Tap Payment Card";
this.qrCodeButton.UseVisualStyleBackColor = true;
@@ -64,14 +68,15 @@
// accountNoButton
//
this.accountNoButton.Dock = System.Windows.Forms.DockStyle.Right;
- this.accountNoButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
- this.accountNoButton.Location = new System.Drawing.Point(718, 3);
+ this.accountNoButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
+ this.accountNoButton.Location = new System.Drawing.Point(608, 3);
this.accountNoButton.Margin = new System.Windows.Forms.Padding(3, 3, 90, 3);
this.accountNoButton.Name = "accountNoButton";
- this.accountNoButton.Size = new System.Drawing.Size(144, 114);
+ this.accountNoButton.Size = new System.Drawing.Size(254, 114);
this.accountNoButton.TabIndex = 4;
this.accountNoButton.Text = "Account Credit";
this.accountNoButton.UseVisualStyleBackColor = true;
+ this.accountNoButton.Click += new System.EventHandler(this.account_Click);
//
// tableLayoutPanel1
//
@@ -88,11 +93,44 @@
this.tableLayoutPanel1.Size = new System.Drawing.Size(1904, 120);
this.tableLayoutPanel1.TabIndex = 6;
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F);
+ this.label1.Location = new System.Drawing.Point(8, 16);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(349, 36);
+ this.label1.TabIndex = 7;
+ this.label1.Text = "Account Balance: £28.30";
+ //
+ // confirmAccountButton
+ //
+ this.confirmAccountButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
+ this.confirmAccountButton.Location = new System.Drawing.Point(104, 88);
+ this.confirmAccountButton.Name = "confirmAccountButton";
+ this.confirmAccountButton.Size = new System.Drawing.Size(168, 56);
+ this.confirmAccountButton.TabIndex = 8;
+ this.confirmAccountButton.Text = "Confirm";
+ this.confirmAccountButton.UseVisualStyleBackColor = true;
+ this.confirmAccountButton.Click += new System.EventHandler(this.confirmAccount_Click);
+ //
+ // panel1
+ //
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.confirmAccountButton);
+ this.panel1.Location = new System.Drawing.Point(544, 760);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(368, 160);
+ this.panel1.TabIndex = 9;
+ this.panel1.Visible = false;
+ //
// Payment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1904, 1041);
+ this.Controls.Add(this.panel1);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.loginLabel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -101,6 +139,8 @@
this.TopMost = true;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.tableLayoutPanel1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -112,5 +152,8 @@
private System.Windows.Forms.Button qrCodeButton;
private System.Windows.Forms.Button accountNoButton;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button confirmAccountButton;
+ private System.Windows.Forms.Panel panel1;
}
}
\ No newline at end of file
diff --git a/HCI_Coursework_EVCHARGE/Payment.cs b/HCI_Coursework_EVCHARGE/Payment.cs
index 7af9322..f5a4b95 100644
--- a/HCI_Coursework_EVCHARGE/Payment.cs
+++ b/HCI_Coursework_EVCHARGE/Payment.cs
@@ -33,5 +33,18 @@ namespace HCI_Coursework_EVCHARGE
tapCard = null;
};
}
+ private void account_Click(object sender, EventArgs e)
+ {
+ panel1.Visible = true;
+ }
+ private void confirmAccount_Click(object sender, EventArgs e)
+ {
+ Charging charging = new Charging( bay, vehicle, duration );
+ charging.Show();
+ charging.FormClosed += delegate
+ {
+ charging = null;
+ };
+ }
}
}
diff --git a/HCI_Coursework_EVCHARGE/Pinpad.Designer.cs b/HCI_Coursework_EVCHARGE/Pinpad.Designer.cs
index 21b477a..5ce71f6 100644
--- a/HCI_Coursework_EVCHARGE/Pinpad.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/Pinpad.Designer.cs
@@ -48,7 +48,7 @@
this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button1.FlatAppearance.BorderSize = 4;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button1.Location = new System.Drawing.Point(16, 16);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(50, 50);
@@ -62,7 +62,7 @@
this.button2.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button2.FlatAppearance.BorderSize = 4;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button2.Location = new System.Drawing.Point(88, 16);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(50, 50);
@@ -76,7 +76,7 @@
this.button3.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button3.FlatAppearance.BorderSize = 4;
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button3.Location = new System.Drawing.Point(160, 16);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(50, 50);
@@ -90,7 +90,7 @@
this.button4.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button4.FlatAppearance.BorderSize = 4;
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button4.Location = new System.Drawing.Point(16, 88);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(50, 50);
@@ -104,7 +104,7 @@
this.button5.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button5.FlatAppearance.BorderSize = 4;
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button5.Location = new System.Drawing.Point(88, 88);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(50, 50);
@@ -118,7 +118,7 @@
this.button6.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button6.FlatAppearance.BorderSize = 4;
this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button6.Location = new System.Drawing.Point(160, 88);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(50, 50);
@@ -132,7 +132,7 @@
this.button7.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button7.FlatAppearance.BorderSize = 4;
this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button7.Location = new System.Drawing.Point(16, 160);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(50, 50);
@@ -146,7 +146,7 @@
this.button8.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button8.FlatAppearance.BorderSize = 4;
this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button8.Location = new System.Drawing.Point(88, 160);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(50, 50);
@@ -160,7 +160,7 @@
this.button9.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button9.FlatAppearance.BorderSize = 4;
this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button9.Location = new System.Drawing.Point(160, 160);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(50, 50);
@@ -174,7 +174,7 @@
this.button0.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.button0.FlatAppearance.BorderSize = 4;
this.button0.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.button0.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
+ this.button0.Font = new System.Drawing.Font("Microsoft Sans Serif", 28F);
this.button0.Location = new System.Drawing.Point(88, 232);
this.button0.Name = "button0";
this.button0.Size = new System.Drawing.Size(50, 50);
@@ -188,7 +188,7 @@
this.buttonConfirm.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonConfirm.FlatAppearance.BorderSize = 4;
this.buttonConfirm.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonConfirm.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
+ this.buttonConfirm.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F);
this.buttonConfirm.Location = new System.Drawing.Point(16, 304);
this.buttonConfirm.Name = "buttonConfirm";
this.buttonConfirm.Size = new System.Drawing.Size(192, 50);
@@ -202,7 +202,7 @@
this.buttonBack.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonBack.FlatAppearance.BorderSize = 4;
this.buttonBack.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.buttonBack.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
+ this.buttonBack.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
this.buttonBack.Location = new System.Drawing.Point(160, 232);
this.buttonBack.Name = "buttonBack";
this.buttonBack.Size = new System.Drawing.Size(48, 50);
diff --git a/HCI_Coursework_EVCHARGE/QRReader.Designer.cs b/HCI_Coursework_EVCHARGE/QRReader.Designer.cs
index 2b0d22c..3861090 100644
--- a/HCI_Coursework_EVCHARGE/QRReader.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/QRReader.Designer.cs
@@ -79,7 +79,7 @@
//
this.cancelButton.BackColor = System.Drawing.Color.LightGray;
this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cancelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 17F);
+ this.cancelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F);
this.cancelButton.ForeColor = System.Drawing.Color.Black;
this.cancelButton.Location = new System.Drawing.Point(312, 424);
this.cancelButton.Name = "cancelButton";
@@ -99,7 +99,7 @@
this.Cursor = System.Windows.Forms.Cursors.Default;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "QRReader";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Form1";
this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
diff --git a/HCI_Coursework_EVCHARGE/TapCard.Designer.cs b/HCI_Coursework_EVCHARGE/TapCard.Designer.cs
index 2f4e810..57b7439 100644
--- a/HCI_Coursework_EVCHARGE/TapCard.Designer.cs
+++ b/HCI_Coursework_EVCHARGE/TapCard.Designer.cs
@@ -33,18 +33,20 @@
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.button1 = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.panel1 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F);
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 26F);
this.label1.Location = new System.Drawing.Point(3, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(378, 92);
+ this.label1.Size = new System.Drawing.Size(376, 91);
this.label1.TabIndex = 0;
this.label1.Text = "Present Payment Card";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -65,16 +67,17 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(384, 461);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(382, 459);
this.tableLayoutPanel1.TabIndex = 1;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.button1.Location = new System.Drawing.Point(10, 378);
+ this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 26F);
+ this.button1.Location = new System.Drawing.Point(10, 374);
this.button1.Margin = new System.Windows.Forms.Padding(10);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(364, 73);
+ this.button1.Size = new System.Drawing.Size(362, 75);
this.button1.TabIndex = 1;
this.button1.Text = "Cancel";
this.button1.UseVisualStyleBackColor = true;
@@ -83,30 +86,45 @@
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
+ this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage")));
+ this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.ErrorImage = null;
this.pictureBox1.ImageLocation = "contactless.png";
- this.pictureBox1.Location = new System.Drawing.Point(3, 187);
+ this.pictureBox1.InitialImage = null;
+ this.pictureBox1.Location = new System.Drawing.Point(3, 185);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(378, 86);
+ this.pictureBox1.Size = new System.Drawing.Size(376, 85);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
this.pictureBox1.Click += new System.EventHandler(this.pictureBox_Click);
//
+ // panel1
+ //
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.tableLayoutPanel1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(384, 461);
+ this.panel1.TabIndex = 2;
+ //
// TapCard
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(384, 461);
- this.Controls.Add(this.tableLayoutPanel1);
+ this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "TapCard";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "TapCard";
this.TopMost = true;
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -117,5 +135,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Panel panel1;
}
}
\ No newline at end of file
diff --git a/HCI_Coursework_EVCHARGE/TapCard.resx b/HCI_Coursework_EVCHARGE/TapCard.resx
index e9d5b8b..b1871f1 100644
--- a/HCI_Coursework_EVCHARGE/TapCard.resx
+++ b/HCI_Coursework_EVCHARGE/TapCard.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
iVBORw0KGgoAAAANSUhEUgAAANIAAAEACAYAAADGGCjSAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5QUGFgQIFcpiyQAAI0JJREFU