Added logout button in doctor and patient form

Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.Designer.cs

@@ -31,6 +31,7 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DoctorForm));
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.archiefToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadUsersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PatientBox = new System.Windows.Forms.ToolStripComboBox();
             this.sessionsBox = new System.Windows.Forms.ToolStripComboBox();
             this.selectSessionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -41,7 +42,7 @@
             this.doctorTabControl = new System.Windows.Forms.TabControl();
             this.tabPageSummary = new System.Windows.Forms.TabPage();
             this.doctorSummaryUC1 = new FietsClient.Forms.DoctorSummaryUC();
-            this.loadUsersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.logoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.chatArea.SuspendLayout();
             this.doctorTabControl.SuspendLayout();
@@ -52,11 +53,11 @@
             // 
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.archiefToolStripMenuItem});
+            this.archiefToolStripMenuItem,
+            this.logoutToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
-            this.menuStrip1.Size = new System.Drawing.Size(1445, 28);
+            this.menuStrip1.Size = new System.Drawing.Size(1084, 24);
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -68,43 +69,48 @@
             this.sessionsBox,
             this.selectSessionToolStripMenuItem});
             this.archiefToolStripMenuItem.Name = "archiefToolStripMenuItem";
-            this.archiefToolStripMenuItem.Size = new System.Drawing.Size(70, 24);
+            this.archiefToolStripMenuItem.Size = new System.Drawing.Size(59, 20);
             this.archiefToolStripMenuItem.Text = "Archive";
             // 
+            // loadUsersToolStripMenuItem
+            // 
+            this.loadUsersToolStripMenuItem.Name = "loadUsersToolStripMenuItem";
+            this.loadUsersToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+            this.loadUsersToolStripMenuItem.Text = "Load users";
+            this.loadUsersToolStripMenuItem.Click += new System.EventHandler(this.loadUsersToolStripMenuItem_Click);
+            // 
             // PatientBox
             // 
             this.PatientBox.Name = "PatientBox";
-            this.PatientBox.Size = new System.Drawing.Size(121, 28);
+            this.PatientBox.Size = new System.Drawing.Size(121, 23);
             this.PatientBox.SelectedIndexChanged += new System.EventHandler(this.PatientBox_SelectedIndexChanged);
             // 
             // sessionsBox
             // 
             this.sessionsBox.Name = "sessionsBox";
-            this.sessionsBox.Size = new System.Drawing.Size(121, 28);
+            this.sessionsBox.Size = new System.Drawing.Size(121, 23);
             // 
             // selectSessionToolStripMenuItem
             // 
             this.selectSessionToolStripMenuItem.Name = "selectSessionToolStripMenuItem";
-            this.selectSessionToolStripMenuItem.Size = new System.Drawing.Size(187, 26);
+            this.selectSessionToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
             this.selectSessionToolStripMenuItem.Text = "Select session";
             this.selectSessionToolStripMenuItem.Click += new System.EventHandler(this.selectSessionToolStripMenuItem_Click);
             // 
             // chatBox
             // 
-            this.chatBox.Location = new System.Drawing.Point(0, 16);
-            this.chatBox.Margin = new System.Windows.Forms.Padding(4);
+            this.chatBox.Location = new System.Drawing.Point(0, 13);
             this.chatBox.Multiline = true;
             this.chatBox.Name = "chatBox";
             this.chatBox.ReadOnly = true;
-            this.chatBox.Size = new System.Drawing.Size(303, 688);
+            this.chatBox.Size = new System.Drawing.Size(228, 560);
             this.chatBox.TabIndex = 3;
             // 
             // messageBox
             // 
-            this.messageBox.Location = new System.Drawing.Point(0, 713);
-            this.messageBox.Margin = new System.Windows.Forms.Padding(4);
+            this.messageBox.Location = new System.Drawing.Point(0, 579);
             this.messageBox.Name = "messageBox";
-            this.messageBox.Size = new System.Drawing.Size(303, 22);
+            this.messageBox.Size = new System.Drawing.Size(228, 20);
             this.messageBox.TabIndex = 6;
             this.messageBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.messageBox_KeyPress);
             // 
@@ -113,21 +119,18 @@
             this.chatArea.Controls.Add(this.messageButton);
             this.chatArea.Controls.Add(this.chatBox);
             this.chatArea.Controls.Add(this.messageBox);
-            this.chatArea.Location = new System.Drawing.Point(1132, 62);
-            this.chatArea.Margin = new System.Windows.Forms.Padding(4);
+            this.chatArea.Location = new System.Drawing.Point(849, 50);
             this.chatArea.Name = "chatArea";
-            this.chatArea.Padding = new System.Windows.Forms.Padding(4);
-            this.chatArea.Size = new System.Drawing.Size(304, 789);
+            this.chatArea.Size = new System.Drawing.Size(228, 641);
             this.chatArea.TabIndex = 5;
             this.chatArea.TabStop = false;
             this.chatArea.Text = "Chat:";
             // 
             // messageButton
             // 
-            this.messageButton.Location = new System.Drawing.Point(0, 745);
-            this.messageButton.Margin = new System.Windows.Forms.Padding(4);
+            this.messageButton.Location = new System.Drawing.Point(0, 605);
             this.messageButton.Name = "messageButton";
-            this.messageButton.Size = new System.Drawing.Size(304, 37);
+            this.messageButton.Size = new System.Drawing.Size(228, 30);
             this.messageButton.TabIndex = 7;
             this.messageButton.Text = "send";
             this.messageButton.UseVisualStyleBackColor = true;
@@ -136,21 +139,19 @@
             // doctorTabControl
             // 
             this.doctorTabControl.Controls.Add(this.tabPageSummary);
-            this.doctorTabControl.Location = new System.Drawing.Point(17, 34);
-            this.doctorTabControl.Margin = new System.Windows.Forms.Padding(4);
+            this.doctorTabControl.Location = new System.Drawing.Point(13, 28);
             this.doctorTabControl.Name = "doctorTabControl";
             this.doctorTabControl.SelectedIndex = 0;
-            this.doctorTabControl.Size = new System.Drawing.Size(1107, 820);
+            this.doctorTabControl.Size = new System.Drawing.Size(830, 666);
             this.doctorTabControl.TabIndex = 6;
             // 
             // tabPageSummary
             // 
             this.tabPageSummary.BackColor = System.Drawing.Color.Transparent;
             this.tabPageSummary.Controls.Add(this.doctorSummaryUC1);
-            this.tabPageSummary.Location = new System.Drawing.Point(4, 25);
-            this.tabPageSummary.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPageSummary.Location = new System.Drawing.Point(4, 22);
             this.tabPageSummary.Name = "tabPageSummary";
-            this.tabPageSummary.Size = new System.Drawing.Size(1099, 791);
+            this.tabPageSummary.Size = new System.Drawing.Size(822, 640);
             this.tabPageSummary.TabIndex = 0;
             this.tabPageSummary.Text = "Summary";
             // 
@@ -158,31 +159,30 @@
             // 
             this.doctorSummaryUC1.BackColor = System.Drawing.SystemColors.Control;
             this.doctorSummaryUC1.Location = new System.Drawing.Point(0, 0);
-            this.doctorSummaryUC1.Margin = new System.Windows.Forms.Padding(5);
+            this.doctorSummaryUC1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.doctorSummaryUC1.Name = "doctorSummaryUC1";
-            this.doctorSummaryUC1.Size = new System.Drawing.Size(1096, 788);
+            this.doctorSummaryUC1.Size = new System.Drawing.Size(822, 640);
             this.doctorSummaryUC1.TabIndex = 0;
             // 
-            // loadUsersToolStripMenuItem
+            // logoutToolStripMenuItem
             // 
-            this.loadUsersToolStripMenuItem.Name = "loadUsersToolStripMenuItem";
-            this.loadUsersToolStripMenuItem.Size = new System.Drawing.Size(187, 26);
-            this.loadUsersToolStripMenuItem.Text = "Load users";
-            this.loadUsersToolStripMenuItem.Click += new System.EventHandler(this.loadUsersToolStripMenuItem_Click);
+            this.logoutToolStripMenuItem.Name = "logoutToolStripMenuItem";
+            this.logoutToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+            this.logoutToolStripMenuItem.Text = "Logout";
+            this.logoutToolStripMenuItem.Click += new System.EventHandler(this.logoutToolStripMenuItem_Click);
             // 
             // DoctorForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(1445, 875);
+            this.ClientSize = new System.Drawing.Size(1084, 711);
             this.Controls.Add(this.doctorTabControl);
             this.Controls.Add(this.chatArea);
             this.Controls.Add(this.menuStrip1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.Name = "DoctorForm";
             this.Text = "Doctor";
@@ -214,6 +214,7 @@
         public System.Windows.Forms.ToolStripComboBox sessionsBox;
         private System.Windows.Forms.ToolStripMenuItem selectSessionToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem loadUsersToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem logoutToolStripMenuItem;
     }
 }
 

Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.cs

@@ -18,10 +18,13 @@ namespace FietsClient
     {
         private DoctorModel doctorModel;
         public Forms.DoctorSummaryUC summaryUserControl { get; private set; }
+        public TcpConnection _connection { get; private set; }
+
 
         public DoctorForm(TcpConnection connection)
         {
             InitializeComponent();
+            this._connection = connection;
             doctorModel = DoctorModel.doctorModel;
             doctorModel.doctorform = this;
             doctorModel.tcpConnection = connection;
@@ -213,5 +216,19 @@ namespace FietsClient
                 PatientBox.Items.Add(user.id);
             }
         }
+
+        private void logoutToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Form activeForm = Form.ActiveForm;
+            if (activeForm != null)
+            {
+                activeForm.Invoke((MethodInvoker)delegate ()
+                {
+                    Login login = new Login(_connection);
+                    activeForm.Hide();
+                    login.Show();
+                });
+            }
+        }
     }
 }

Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.cs

@@ -257,5 +257,19 @@ namespace FietsClient
         {
             _connection.StopSessoin();
         }
+
+        private void logoutToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Form activeForm = Form.ActiveForm;
+            if (activeForm != null)
+            {
+                activeForm.Invoke((MethodInvoker)delegate ()
+                {
+                    Login login = new Login(_connection);
+                    activeForm.Hide();
+                    login.Show();
+                });
+            }
+        }
     }
 }

Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.designer.cs

@@ -104,6 +104,7 @@ namespace FietsClient
             this.messageBox = new System.Windows.Forms.TextBox();
             this.chatArea = new System.Windows.Forms.GroupBox();
             this.sendButton = new System.Windows.Forms.Button();
+            this.logoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.speedBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.speedChart)).BeginInit();
@@ -121,11 +122,11 @@ namespace FietsClient
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.archiefToolStripMenuItem,
             this.bicycleToolStripMenuItem,
-            this.startTrainingToolStripMenuItem});
+            this.startTrainingToolStripMenuItem,
+            this.logoutToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
-            this.menuStrip1.Size = new System.Drawing.Size(1419, 28);
+            this.menuStrip1.Size = new System.Drawing.Size(1064, 24);
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -134,13 +135,13 @@ namespace FietsClient
             this.archiefToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.selectSessionToolStripMenuItem});
             this.archiefToolStripMenuItem.Name = "archiefToolStripMenuItem";
-            this.archiefToolStripMenuItem.Size = new System.Drawing.Size(70, 24);
+            this.archiefToolStripMenuItem.Size = new System.Drawing.Size(59, 20);
             this.archiefToolStripMenuItem.Text = "Archive";
             // 
             // selectSessionToolStripMenuItem
             // 
             this.selectSessionToolStripMenuItem.Name = "selectSessionToolStripMenuItem";
-            this.selectSessionToolStripMenuItem.Size = new System.Drawing.Size(177, 26);
+            this.selectSessionToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
             this.selectSessionToolStripMenuItem.Text = "Select Session";
             // 
             // bicycleToolStripMenuItem
@@ -148,7 +149,7 @@ namespace FietsClient
             this.bicycleToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.selectPortToolStripMenuItem});
             this.bicycleToolStripMenuItem.Name = "bicycleToolStripMenuItem";
-            this.bicycleToolStripMenuItem.Size = new System.Drawing.Size(67, 24);
+            this.bicycleToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
             this.bicycleToolStripMenuItem.Text = "Bicycle";
             // 
             // selectPortToolStripMenuItem
@@ -159,19 +160,19 @@ namespace FietsClient
             this.requestDataToolStripMenuItem,
             this.closePortToolStripMenuItem});
             this.selectPortToolStripMenuItem.Name = "selectPortToolStripMenuItem";
-            this.selectPortToolStripMenuItem.Size = new System.Drawing.Size(156, 26);
+            this.selectPortToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
             this.selectPortToolStripMenuItem.Text = "Select port";
             // 
             // toolStripComboBox1
             // 
             this.toolStripComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.toolStripComboBox1.Name = "toolStripComboBox1";
-            this.toolStripComboBox1.Size = new System.Drawing.Size(121, 28);
+            this.toolStripComboBox1.Size = new System.Drawing.Size(121, 23);
             // 
             // openPortToolStripMenuItem
             // 
             this.openPortToolStripMenuItem.Name = "openPortToolStripMenuItem";
-            this.openPortToolStripMenuItem.Size = new System.Drawing.Size(187, 26);
+            this.openPortToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
             this.openPortToolStripMenuItem.Text = "Open port";
             this.openPortToolStripMenuItem.Click += new System.EventHandler(this.openPortToolStripMenuItem_Click);
             // 
@@ -179,7 +180,7 @@ namespace FietsClient
             // 
             this.requestDataToolStripMenuItem.Enabled = false;
             this.requestDataToolStripMenuItem.Name = "requestDataToolStripMenuItem";
-            this.requestDataToolStripMenuItem.Size = new System.Drawing.Size(187, 26);
+            this.requestDataToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
             this.requestDataToolStripMenuItem.Text = "Request data";
             this.requestDataToolStripMenuItem.Click += new System.EventHandler(this.requestDataToolStripMenuItem_Click);
             // 
@@ -187,7 +188,7 @@ namespace FietsClient
             // 
             this.closePortToolStripMenuItem.Enabled = false;
             this.closePortToolStripMenuItem.Name = "closePortToolStripMenuItem";
-            this.closePortToolStripMenuItem.Size = new System.Drawing.Size(187, 26);
+            this.closePortToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
             this.closePortToolStripMenuItem.Text = "Close port";
             this.closePortToolStripMenuItem.Click += new System.EventHandler(this.closePortToolStripMenuItem_Click);
             // 
@@ -199,7 +200,7 @@ namespace FietsClient
             this.setToolStripMenuItem,
             this.energyBox});
             this.startTrainingToolStripMenuItem.Name = "startTrainingToolStripMenuItem";
-            this.startTrainingToolStripMenuItem.Size = new System.Drawing.Size(107, 24);
+            this.startTrainingToolStripMenuItem.Size = new System.Drawing.Size(87, 20);
             this.startTrainingToolStripMenuItem.Text = "Start training";
             // 
             // distanceToolStripMenuItem
@@ -208,7 +209,7 @@ namespace FietsClient
             this.distanceTraining,
             this.setTimeToolStripMenuItem});
             this.distanceToolStripMenuItem.Name = "distanceToolStripMenuItem";
-            this.distanceToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+            this.distanceToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.distanceToolStripMenuItem.Text = "Select training";
             // 
             // distanceTraining
@@ -217,18 +218,18 @@ namespace FietsClient
             this.distanceBox,
             this.confirmDistanceBox});
             this.distanceTraining.Name = "distanceTraining";
-            this.distanceTraining.Size = new System.Drawing.Size(181, 26);
+            this.distanceTraining.Size = new System.Drawing.Size(138, 22);
             this.distanceTraining.Text = "Set Distance";
             // 
             // distanceBox
             // 
             this.distanceBox.Name = "distanceBox";
-            this.distanceBox.Size = new System.Drawing.Size(100, 27);
+            this.distanceBox.Size = new System.Drawing.Size(100, 23);
             // 
             // confirmDistanceBox
             // 
             this.confirmDistanceBox.Name = "confirmDistanceBox";
-            this.confirmDistanceBox.Size = new System.Drawing.Size(196, 26);
+            this.confirmDistanceBox.Size = new System.Drawing.Size(165, 22);
             this.confirmDistanceBox.Text = "Confirm distance";
             this.confirmDistanceBox.Click += new System.EventHandler(this.confirmDistanceBox_Click);
             // 
@@ -239,32 +240,32 @@ namespace FietsClient
             this.secondBox,
             this.confirmTimeBox});
             this.setTimeToolStripMenuItem.Name = "setTimeToolStripMenuItem";
-            this.setTimeToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+            this.setTimeToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.setTimeToolStripMenuItem.Text = "Set Time";
             // 
             // minuteBox
             // 
             this.minuteBox.Name = "minuteBox";
-            this.minuteBox.Size = new System.Drawing.Size(100, 27);
+            this.minuteBox.Size = new System.Drawing.Size(100, 23);
             this.minuteBox.Text = "MM";
             // 
             // secondBox
             // 
             this.secondBox.Name = "secondBox";
-            this.secondBox.Size = new System.Drawing.Size(160, 27);
+            this.secondBox.Size = new System.Drawing.Size(160, 23);
             this.secondBox.Text = "SS";
             // 
             // confirmTimeBox
             // 
             this.confirmTimeBox.Name = "confirmTimeBox";
-            this.confirmTimeBox.Size = new System.Drawing.Size(226, 26);
+            this.confirmTimeBox.Size = new System.Drawing.Size(220, 22);
             this.confirmTimeBox.Text = "Confirm time";
             this.confirmTimeBox.Click += new System.EventHandler(this.confirmTimeBox_Click);
             // 
             // stopTrainingToolStripMenuItem
             // 
             this.stopTrainingToolStripMenuItem.Name = "stopTrainingToolStripMenuItem";
-            this.stopTrainingToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+            this.stopTrainingToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.stopTrainingToolStripMenuItem.Text = "Reset training";
             this.stopTrainingToolStripMenuItem.Click += new System.EventHandler(this.stopTrainingToolStripMenuItem_Click);
             // 
@@ -274,18 +275,18 @@ namespace FietsClient
             this.powerBox,
             this.setPower});
             this.setToolStripMenuItem.Name = "setToolStripMenuItem";
-            this.setToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+            this.setToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.setToolStripMenuItem.Text = "Power";
             // 
             // powerBox
             // 
             this.powerBox.Name = "powerBox";
-            this.powerBox.Size = new System.Drawing.Size(100, 27);
+            this.powerBox.Size = new System.Drawing.Size(100, 23);
             // 
             // setPower
             // 
             this.setPower.Name = "setPower";
-            this.setPower.Size = new System.Drawing.Size(166, 26);
+            this.setPower.Size = new System.Drawing.Size(160, 22);
             this.setPower.Text = "Set power";
             this.setPower.Click += new System.EventHandler(this.setPower_Click);
             // 
@@ -295,28 +296,26 @@ namespace FietsClient
             this.toolStripTextBox3,
             this.toolStripMenuItem1});
             this.energyBox.Name = "energyBox";
-            this.energyBox.Size = new System.Drawing.Size(181, 26);
+            this.energyBox.Size = new System.Drawing.Size(149, 22);
             this.energyBox.Text = "Energy";
             // 
             // toolStripTextBox3
             // 
             this.toolStripTextBox3.Name = "toolStripTextBox3";
-            this.toolStripTextBox3.Size = new System.Drawing.Size(100, 27);
+            this.toolStripTextBox3.Size = new System.Drawing.Size(100, 23);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(166, 26);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(160, 22);
             this.toolStripMenuItem1.Text = "Set energy";
             // 
             // speedBox
             // 
             this.speedBox.Controls.Add(this.speedChart);
-            this.speedBox.Location = new System.Drawing.Point(16, 33);
-            this.speedBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.speedBox.Location = new System.Drawing.Point(12, 27);
             this.speedBox.Name = "speedBox";
-            this.speedBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.speedBox.Size = new System.Drawing.Size(533, 382);
+            this.speedBox.Size = new System.Drawing.Size(400, 310);
             this.speedBox.TabIndex = 2;
             this.speedBox.TabStop = false;
             this.speedBox.Text = "Kilometers per hour:";
@@ -325,8 +324,7 @@ namespace FietsClient
             // 
             chartArea1.Name = "ChartArea1";
             this.speedChart.ChartAreas.Add(chartArea1);
-            this.speedChart.Location = new System.Drawing.Point(8, 23);
-            this.speedChart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.speedChart.Location = new System.Drawing.Point(6, 19);
             this.speedChart.Name = "speedChart";
             series1.BorderWidth = 10;
             series1.ChartArea = "ChartArea1";
@@ -336,18 +334,16 @@ namespace FietsClient
             series1.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Time;
             series1.YValueMembers = "Speed";
             this.speedChart.Series.Add(series1);
-            this.speedChart.Size = new System.Drawing.Size(517, 351);
+            this.speedChart.Size = new System.Drawing.Size(388, 285);
             this.speedChart.TabIndex = 0;
             this.speedChart.Text = "Speed chart";
             // 
             // bpmBox
             // 
             this.bpmBox.Controls.Add(this.bpmChart);
-            this.bpmBox.Location = new System.Drawing.Point(16, 422);
-            this.bpmBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bpmBox.Location = new System.Drawing.Point(12, 343);
             this.bpmBox.Name = "bpmBox";
-            this.bpmBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.bpmBox.Size = new System.Drawing.Size(533, 382);
+            this.bpmBox.Size = new System.Drawing.Size(400, 310);
             this.bpmBox.TabIndex = 3;
             this.bpmBox.TabStop = false;
             this.bpmBox.Text = "Beats per minute:";
@@ -356,8 +352,7 @@ namespace FietsClient
             // 
             chartArea2.Name = "ChartArea1";
             this.bpmChart.ChartAreas.Add(chartArea2);
-            this.bpmChart.Location = new System.Drawing.Point(8, 23);
-            this.bpmChart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.bpmChart.Location = new System.Drawing.Point(6, 19);
             this.bpmChart.Name = "bpmChart";
             series2.BorderWidth = 10;
             series2.ChartArea = "ChartArea1";
@@ -367,7 +362,7 @@ namespace FietsClient
             series2.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Time;
             series2.YValueMembers = "Beats per minutes";
             this.bpmChart.Series.Add(series2);
-            this.bpmChart.Size = new System.Drawing.Size(517, 351);
+            this.bpmChart.Size = new System.Drawing.Size(388, 285);
             this.bpmChart.TabIndex = 1;
             this.bpmChart.Text = "beats per second";
             // 
@@ -404,11 +399,9 @@ namespace FietsClient
             this.sessionInfoBox.Controls.Add(this.label3);
             this.sessionInfoBox.Controls.Add(this.label2);
             this.sessionInfoBox.Controls.Add(this.label1);
-            this.sessionInfoBox.Location = new System.Drawing.Point(557, 33);
-            this.sessionInfoBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sessionInfoBox.Location = new System.Drawing.Point(418, 27);
             this.sessionInfoBox.Name = "sessionInfoBox";
-            this.sessionInfoBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.sessionInfoBox.Size = new System.Drawing.Size(533, 382);
+            this.sessionInfoBox.Size = new System.Drawing.Size(400, 310);
             this.sessionInfoBox.TabIndex = 4;
             this.sessionInfoBox.TabStop = false;
             this.sessionInfoBox.Text = "Session info:";
@@ -416,18 +409,16 @@ namespace FietsClient
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(263, 352);
-            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label19.Location = new System.Drawing.Point(197, 286);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(0, 17);
+            this.label19.Size = new System.Drawing.Size(0, 13);
             this.label19.TabIndex = 40;
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(132, 346);
-            this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.button2.Location = new System.Drawing.Point(99, 281);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(100, 28);
+            this.button2.Size = new System.Drawing.Size(75, 23);
             this.button2.TabIndex = 39;
             this.button2.Text = "Stop sessie";
             this.button2.UseVisualStyleBackColor = true;
@@ -435,10 +426,9 @@ namespace FietsClient
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(12, 346);
-            this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.button1.Location = new System.Drawing.Point(9, 281);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(100, 28);
+            this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 38;
             this.button1.Text = "Start sessie";
             this.button1.UseVisualStyleBackColor = true;
@@ -446,282 +436,252 @@ namespace FietsClient
             // 
             // requestedBox
             // 
-            this.requestedBox.Location = new System.Drawing.Point(132, 272);
-            this.requestedBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.requestedBox.Location = new System.Drawing.Point(99, 221);
             this.requestedBox.Name = "requestedBox";
             this.requestedBox.ReadOnly = true;
-            this.requestedBox.Size = new System.Drawing.Size(79, 22);
+            this.requestedBox.Size = new System.Drawing.Size(60, 20);
             this.requestedBox.TabIndex = 37;
             // 
             // actualBox
             // 
-            this.actualBox.Location = new System.Drawing.Point(132, 304);
-            this.actualBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.actualBox.Location = new System.Drawing.Point(99, 247);
             this.actualBox.Name = "actualBox";
             this.actualBox.ReadOnly = true;
-            this.actualBox.Size = new System.Drawing.Size(79, 22);
+            this.actualBox.Size = new System.Drawing.Size(60, 20);
             this.actualBox.TabIndex = 36;
             // 
             // nameBox
             // 
-            this.nameBox.Location = new System.Drawing.Point(132, 16);
-            this.nameBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.nameBox.Location = new System.Drawing.Point(99, 13);
             this.nameBox.Name = "nameBox";
             this.nameBox.ReadOnly = true;
-            this.nameBox.Size = new System.Drawing.Size(79, 22);
+            this.nameBox.Size = new System.Drawing.Size(60, 20);
             this.nameBox.TabIndex = 35;
             // 
             // sessionBox
             // 
-            this.sessionBox.Location = new System.Drawing.Point(132, 48);
-            this.sessionBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sessionBox.Location = new System.Drawing.Point(99, 39);
             this.sessionBox.Name = "sessionBox";
             this.sessionBox.ReadOnly = true;
-            this.sessionBox.Size = new System.Drawing.Size(79, 22);
+            this.sessionBox.Size = new System.Drawing.Size(60, 20);
             this.sessionBox.TabIndex = 34;
             // 
             // timeBox
             // 
-            this.timeBox.Location = new System.Drawing.Point(132, 240);
-            this.timeBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.timeBox.Location = new System.Drawing.Point(99, 195);
             this.timeBox.Name = "timeBox";
             this.timeBox.ReadOnly = true;
-            this.timeBox.Size = new System.Drawing.Size(79, 22);
+            this.timeBox.Size = new System.Drawing.Size(60, 20);
             this.timeBox.TabIndex = 33;
             // 
             // pulseBox
             // 
-            this.pulseBox.Location = new System.Drawing.Point(132, 80);
-            this.pulseBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pulseBox.Location = new System.Drawing.Point(99, 65);
             this.pulseBox.Name = "pulseBox";
             this.pulseBox.ReadOnly = true;
-            this.pulseBox.Size = new System.Drawing.Size(79, 22);
+            this.pulseBox.Size = new System.Drawing.Size(60, 20);
             this.pulseBox.TabIndex = 32;
             // 
             // rpmInfoBox
             // 
-            this.rpmInfoBox.Location = new System.Drawing.Point(132, 112);
-            this.rpmInfoBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rpmInfoBox.Location = new System.Drawing.Point(99, 91);
             this.rpmInfoBox.Name = "rpmInfoBox";
             this.rpmInfoBox.ReadOnly = true;
-            this.rpmInfoBox.Size = new System.Drawing.Size(79, 22);
+            this.rpmInfoBox.Size = new System.Drawing.Size(60, 20);
             this.rpmInfoBox.TabIndex = 31;
             // 
             // energyInfoBox
             // 
-            this.energyInfoBox.Location = new System.Drawing.Point(132, 208);
-            this.energyInfoBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.energyInfoBox.Location = new System.Drawing.Point(99, 169);
             this.energyInfoBox.Name = "energyInfoBox";
             this.energyInfoBox.ReadOnly = true;
-            this.energyInfoBox.Size = new System.Drawing.Size(79, 22);
+            this.energyInfoBox.Size = new System.Drawing.Size(60, 20);
             this.energyInfoBox.TabIndex = 30;
             // 
             // distanceInfoBox
             // 
-            this.distanceInfoBox.Location = new System.Drawing.Point(132, 176);
-            this.distanceInfoBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.distanceInfoBox.Location = new System.Drawing.Point(99, 143);
             this.distanceInfoBox.Name = "distanceInfoBox";
             this.distanceInfoBox.ReadOnly = true;
-            this.distanceInfoBox.Size = new System.Drawing.Size(79, 22);
+            this.distanceInfoBox.Size = new System.Drawing.Size(60, 20);
             this.distanceInfoBox.TabIndex = 29;
             // 
             // speedInfoBox
             // 
-            this.speedInfoBox.Location = new System.Drawing.Point(132, 144);
-            this.speedInfoBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.speedInfoBox.Location = new System.Drawing.Point(99, 117);
             this.speedInfoBox.Name = "speedInfoBox";
             this.speedInfoBox.ReadOnly = true;
-            this.speedInfoBox.Size = new System.Drawing.Size(79, 22);
+            this.speedInfoBox.Size = new System.Drawing.Size(60, 20);
             this.speedInfoBox.TabIndex = 28;
             // 
             // label18
             // 
             this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(220, 249);
-            this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label18.Location = new System.Drawing.Point(165, 202);
             this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(52, 17);
+            this.label18.Size = new System.Drawing.Size(42, 13);
             this.label18.TabIndex = 27;
             this.label18.Text = "MM:SS";
             // 
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(220, 281);
-            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label17.Location = new System.Drawing.Point(165, 228);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(37, 17);
+            this.label17.Size = new System.Drawing.Size(30, 13);
             this.label17.TabIndex = 26;
             this.label17.Text = "Watt";
             // 
             // label16
             // 
             this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(220, 313);
-            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label16.Location = new System.Drawing.Point(165, 254);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(37, 17);
+            this.label16.Size = new System.Drawing.Size(30, 13);
             this.label16.TabIndex = 25;
             this.label16.Text = "Watt";
             // 
             // label15
             // 
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(220, 217);
-            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Location = new System.Drawing.Point(165, 176);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(37, 17);
+            this.label15.Size = new System.Drawing.Size(30, 13);
             this.label15.TabIndex = 24;
             this.label15.Text = "Watt";
             // 
             // label14
             // 
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(220, 185);
-            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label14.Location = new System.Drawing.Point(165, 150);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(72, 17);
+            this.label14.Size = new System.Drawing.Size(54, 13);
             this.label14.TabIndex = 23;
             this.label14.Text = "kilometers";
             // 
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(220, 153);
-            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label13.Location = new System.Drawing.Point(165, 124);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(130, 17);
+            this.label13.Size = new System.Drawing.Size(96, 13);
             this.label13.TabIndex = 22;
             this.label13.Text = "kilometers per hour";
             // 
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(220, 121);
-            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label12.Location = new System.Drawing.Point(165, 98);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(123, 17);
+            this.label12.Size = new System.Drawing.Size(91, 13);
             this.label12.TabIndex = 21;
             this.label12.Text = "rounds per minute";
             // 
             // label11
             // 
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(220, 89);
-            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label11.Location = new System.Drawing.Point(165, 72);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(115, 17);
+            this.label11.Size = new System.Drawing.Size(86, 13);
             this.label11.TabIndex = 20;
             this.label11.Text = "Beats per minute";
             // 
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(8, 313);
-            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label10.Location = new System.Drawing.Point(6, 254);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(89, 17);
+            this.label10.Size = new System.Drawing.Size(69, 13);
             this.label10.TabIndex = 9;
             this.label10.Text = "Actual power";
             // 
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(8, 281);
-            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Location = new System.Drawing.Point(6, 228);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(123, 17);
+            this.label9.Size = new System.Drawing.Size(94, 13);
             this.label9.TabIndex = 8;
             this.label9.Text = "Requested power:";
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(8, 249);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Location = new System.Drawing.Point(6, 202);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(43, 17);
+            this.label8.Size = new System.Drawing.Size(33, 13);
             this.label8.TabIndex = 7;
             this.label8.Text = "Time:";
             // 
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(8, 217);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Location = new System.Drawing.Point(6, 176);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(57, 17);
+            this.label7.Size = new System.Drawing.Size(43, 13);
             this.label7.TabIndex = 6;
             this.label7.Text = "Energy:";
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(8, 185);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(6, 150);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(67, 17);
+            this.label6.Size = new System.Drawing.Size(52, 13);
             this.label6.TabIndex = 5;
             this.label6.Text = "Distance:";
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(8, 153);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(6, 124);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(53, 17);
+            this.label5.Size = new System.Drawing.Size(41, 13);
             this.label5.TabIndex = 4;
             this.label5.Text = "Speed:";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(8, 121);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(6, 98);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(42, 17);
+            this.label4.Size = new System.Drawing.Size(34, 13);
             this.label4.TabIndex = 3;
             this.label4.Text = "RPM:";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(8, 57);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Location = new System.Drawing.Point(6, 46);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 17);
+            this.label3.Size = new System.Drawing.Size(47, 13);
             this.label3.TabIndex = 2;
             this.label3.Text = "Session:";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(8, 89);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(6, 72);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(47, 17);
+            this.label2.Size = new System.Drawing.Size(36, 13);
             this.label2.TabIndex = 1;
             this.label2.Text = "Pulse:";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(8, 25);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(6, 20);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(49, 17);
+            this.label1.Size = new System.Drawing.Size(87, 13);
             this.label1.TabIndex = 0;
-            this.label1.Text = "Naam:";
+            this.label1.Text = "Gebruikersnaam:";
             // 
             // rpmBox
             // 
             this.rpmBox.Controls.Add(this.rpmChart);
-            this.rpmBox.Location = new System.Drawing.Point(557, 422);
-            this.rpmBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rpmBox.Location = new System.Drawing.Point(418, 343);
             this.rpmBox.Name = "rpmBox";
-            this.rpmBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.rpmBox.Size = new System.Drawing.Size(533, 382);
+            this.rpmBox.Size = new System.Drawing.Size(400, 310);
             this.rpmBox.TabIndex = 5;
             this.rpmBox.TabStop = false;
             this.rpmBox.Text = "Rounds per minute:";
@@ -730,8 +690,7 @@ namespace FietsClient
             // 
             chartArea3.Name = "ChartArea1";
             this.rpmChart.ChartAreas.Add(chartArea3);
-            this.rpmChart.Location = new System.Drawing.Point(8, 23);
-            this.rpmChart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rpmChart.Location = new System.Drawing.Point(6, 19);
             this.rpmChart.Name = "rpmChart";
             series3.BorderWidth = 10;
             series3.ChartArea = "ChartArea1";
@@ -741,26 +700,24 @@ namespace FietsClient
             series3.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Time;
             series3.YValueMembers = "Rounds per minutes";
             this.rpmChart.Series.Add(series3);
-            this.rpmChart.Size = new System.Drawing.Size(517, 351);
+            this.rpmChart.Size = new System.Drawing.Size(388, 285);
             this.rpmChart.TabIndex = 2;
             this.rpmChart.Text = "rounds per minute";
             // 
             // chatBox
             // 
-            this.chatBox.Location = new System.Drawing.Point(0, 23);
-            this.chatBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.chatBox.Location = new System.Drawing.Point(0, 19);
             this.chatBox.Multiline = true;
             this.chatBox.Name = "chatBox";
             this.chatBox.ReadOnly = true;
-            this.chatBox.Size = new System.Drawing.Size(303, 671);
+            this.chatBox.Size = new System.Drawing.Size(228, 546);
             this.chatBox.TabIndex = 3;
             // 
             // messageBox
             // 
-            this.messageBox.Location = new System.Drawing.Point(0, 703);
-            this.messageBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.messageBox.Location = new System.Drawing.Point(0, 571);
             this.messageBox.Name = "messageBox";
-            this.messageBox.Size = new System.Drawing.Size(303, 22);
+            this.messageBox.Size = new System.Drawing.Size(228, 20);
             this.messageBox.TabIndex = 6;
             this.messageBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.messageBox_KeyPress);
             // 
@@ -769,32 +726,36 @@ namespace FietsClient
             this.chatArea.Controls.Add(this.sendButton);
             this.chatArea.Controls.Add(this.chatBox);
             this.chatArea.Controls.Add(this.messageBox);
-            this.chatArea.Location = new System.Drawing.Point(1099, 33);
-            this.chatArea.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.chatArea.Location = new System.Drawing.Point(824, 27);
             this.chatArea.Name = "chatArea";
-            this.chatArea.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.chatArea.Size = new System.Drawing.Size(304, 770);
+            this.chatArea.Size = new System.Drawing.Size(228, 626);
             this.chatArea.TabIndex = 5;
             this.chatArea.TabStop = false;
             this.chatArea.Text = "Chat:";
             // 
             // sendButton
             // 
-            this.sendButton.Location = new System.Drawing.Point(0, 735);
-            this.sendButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sendButton.Location = new System.Drawing.Point(0, 597);
             this.sendButton.Name = "sendButton";
-            this.sendButton.Size = new System.Drawing.Size(304, 28);
+            this.sendButton.Size = new System.Drawing.Size(228, 23);
             this.sendButton.TabIndex = 7;
             this.sendButton.Text = "send";
             this.sendButton.UseVisualStyleBackColor = true;
             this.sendButton.Click += new System.EventHandler(this.sendButton_Click);
             // 
+            // logoutToolStripMenuItem
+            // 
+            this.logoutToolStripMenuItem.Name = "logoutToolStripMenuItem";
+            this.logoutToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+            this.logoutToolStripMenuItem.Text = "Logout";
+            this.logoutToolStripMenuItem.Click += new System.EventHandler(this.logoutToolStripMenuItem_Click);
+            // 
             // PatientForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(1419, 838);
+            this.ClientSize = new System.Drawing.Size(1064, 681);
             this.Controls.Add(this.chatArea);
             this.Controls.Add(this.sessionInfoBox);
             this.Controls.Add(this.rpmBox);
@@ -804,7 +765,6 @@ namespace FietsClient
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.MaximizeBox = false;
             this.Name = "PatientForm";
             this.Text = "Patient";
@@ -896,6 +856,7 @@ namespace FietsClient
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.ToolStripMenuItem logoutToolStripMenuItem;
     }
 }
 

Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.resx

@@ -117,14 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.Locked" type="System.Boolean, mscorlib">
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
-  </data>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>
@@ -1795,4 +1793,4 @@
         AAAAAAAAAAAAAAAAAAAAAAAA
 </value>
   </data>
-</root>
+</root>

Proftaak Remote Healthcare/FietsSimulator/FietsSimulator.cs

@@ -98,7 +98,7 @@ namespace FietsSimulator
                 if (curmode == Mode.CONSOLE && message.Split().Length == 2)
                 {
                     string time = message.Split(' ')[1];
-                    maxtime = Int32.Parse(time.Substring(0,2)) * 60000 + Int32.Parse(time.Substring(3,2)) * 1000;
+                    maxtime = Int32.Parse(time.Substring(0,2)) * 60000 + Int32.Parse(time.Substring(2,2)) * 1000;
                     curmode = Mode.TIME;
                     stopwatch.Reset();
                     stopwatch.Start();