Commit 6d1fba5e authored by AMOCA OKKES's avatar AMOCA OKKES
Browse files

last commit (jespere)

parent b2e57afe
This diff is collapsed.
......@@ -50,8 +50,8 @@ namespace _20School
listeEtu4 = new List<int>() { 1, 2, 3 };
listeEtu5 = new List<int>() { 1, 2, 3 };
timeTb1 = timerTickCours - 2;
timeTb2 = timeTb1 - 2;
timeTb1 = timerTickCours - 8;
timeTb2 = timeTb1 - 4;
timeTb3 = timeTb2 - 2;
timeTb4 = timeTb3 - 2;
timeTb5 = timeTb4 - 2;
......@@ -422,7 +422,7 @@ namespace _20School
{
fmPlay.coursParticulier = false;
//Fermeture du formulaire actuelle et ouverture d'un nouveau
this.Hide();
this.Dispose();
}
/// <summary>
......
......@@ -48,19 +48,19 @@ namespace _20School
// pnlGraph
//
this.pnlGraph.Controls.Add(this.graphRecap);
this.pnlGraph.Location = new System.Drawing.Point(18, 132);
this.pnlGraph.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pnlGraph.Location = new System.Drawing.Point(24, 162);
this.pnlGraph.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pnlGraph.Name = "pnlGraph";
this.pnlGraph.Size = new System.Drawing.Size(994, 444);
this.pnlGraph.Size = new System.Drawing.Size(1325, 546);
this.pnlGraph.TabIndex = 0;
//
// graphRecap
//
this.graphRecap.ForeColor = System.Drawing.Color.White;
this.graphRecap.Location = new System.Drawing.Point(0, 2);
this.graphRecap.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.graphRecap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.graphRecap.Name = "graphRecap";
this.graphRecap.Size = new System.Drawing.Size(992, 439);
this.graphRecap.Size = new System.Drawing.Size(1323, 540);
this.graphRecap.TabIndex = 0;
this.graphRecap.Text = "Graphique récapitulatif";
//
......@@ -71,8 +71,9 @@ namespace _20School
this.pnlHead.Controls.Add(this.lblGame);
this.pnlHead.Controls.Add(this.lblWelcome);
this.pnlHead.Location = new System.Drawing.Point(0, 0);
this.pnlHead.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pnlHead.Name = "pnlHead";
this.pnlHead.Size = new System.Drawing.Size(1030, 99);
this.pnlHead.Size = new System.Drawing.Size(1373, 117);
this.pnlHead.TabIndex = 11;
//
// lblGame
......@@ -80,13 +81,10 @@ namespace _20School
this.lblGame.BackColor = System.Drawing.Color.Transparent;
this.lblGame.Font = new System.Drawing.Font("Segoe UI Black", 36F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblGame.ForeColor = System.Drawing.Color.White;
this.lblGame.Location = new System.Drawing.Point(44, 24);
this.lblGame.Location = new System.Drawing.Point(59, 30);
this.lblGame.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblGame.Name = "lblGame";
<<<<<<< HEAD
this.lblGame.Size = new System.Drawing.Size(375, 81);
=======
this.lblGame.Size = new System.Drawing.Size(258, 66);
>>>>>>> 8398d4e3bf35d42ea7e4b89bb8f5bb2fd876cada
this.lblGame.Size = new System.Drawing.Size(445, 81);
this.lblGame.TabIndex = 5;
this.lblGame.Text = "20School";
//
......@@ -97,29 +95,25 @@ namespace _20School
this.lblWelcome.BackColor = System.Drawing.Color.Transparent;
this.lblWelcome.Font = new System.Drawing.Font("Segoe UI", 24F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblWelcome.ForeColor = System.Drawing.Color.White;
<<<<<<< HEAD
this.lblWelcome.Location = new System.Drawing.Point(758, 52);
this.lblWelcome.Location = new System.Drawing.Point(635, 38);
this.lblWelcome.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblWelcome.Name = "lblWelcome";
this.lblWelcome.Size = new System.Drawing.Size(601, 54);
=======
this.lblWelcome.Location = new System.Drawing.Point(585, 42);
this.lblWelcome.Name = "lblWelcome";
this.lblWelcome.Size = new System.Drawing.Size(405, 44);
>>>>>>> 8398d4e3bf35d42ea7e4b89bb8f5bb2fd876cada
this.lblWelcome.Size = new System.Drawing.Size(685, 78);
this.lblWelcome.TabIndex = 8;
this.lblWelcome.Text = "Graphique Recapitulatif";
this.lblWelcome.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnJury
//
this.btnJury.BackColor = System.Drawing.Color.WhiteSmoke;
this.btnJury.BackColor = System.Drawing.Color.Bisque;
this.btnJury.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnJury.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnJury.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnJury.Location = new System.Drawing.Point(448, 100);
this.btnJury.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnJury.ForeColor = System.Drawing.Color.Black;
this.btnJury.Location = new System.Drawing.Point(597, 116);
this.btnJury.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnJury.Name = "btnJury";
this.btnJury.Size = new System.Drawing.Size(195, 29);
this.btnJury.Size = new System.Drawing.Size(260, 43);
this.btnJury.TabIndex = 13;
this.btnJury.Text = "Décisions du jury";
this.btnJury.UseVisualStyleBackColor = false;
......@@ -132,9 +126,9 @@ namespace _20School
this.pnlMain.Controls.Add(this.btnClose);
this.pnlMain.Dock = System.Windows.Forms.DockStyle.Top;
this.pnlMain.Location = new System.Drawing.Point(0, 0);
this.pnlMain.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pnlMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pnlMain.Name = "pnlMain";
this.pnlMain.Size = new System.Drawing.Size(1030, 27);
this.pnlMain.Size = new System.Drawing.Size(1373, 37);
this.pnlMain.TabIndex = 14;
//
// btnRed
......@@ -144,10 +138,10 @@ namespace _20School
this.btnRed.Dock = System.Windows.Forms.DockStyle.Right;
this.btnRed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRed.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnRed.Location = new System.Drawing.Point(952, 0);
this.btnRed.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnRed.Location = new System.Drawing.Point(1226, 0);
this.btnRed.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnRed.Name = "btnRed";
this.btnRed.Size = new System.Drawing.Size(39, 27);
this.btnRed.Size = new System.Drawing.Size(72, 37);
this.btnRed.TabIndex = 8;
this.btnRed.Text = "__";
this.btnRed.UseVisualStyleBackColor = false;
......@@ -160,27 +154,29 @@ namespace _20School
this.btnClose.Dock = System.Windows.Forms.DockStyle.Right;
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnClose.Location = new System.Drawing.Point(991, 0);
this.btnClose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnClose.Location = new System.Drawing.Point(1298, 0);
this.btnClose.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(39, 27);
this.btnClose.Size = new System.Drawing.Size(75, 37);
this.btnClose.TabIndex = 7;
this.btnClose.Text = "X";
this.btnClose.UseVisualStyleBackColor = false;
this.btnClose.Click += new System.EventHandler(this.btnJury_Click);
this.btnClose.MouseEnter += new System.EventHandler(this.btnClose_MouseEnter);
this.btnClose.MouseLeave += new System.EventHandler(this.btnClose_MouseLeave);
//
// fmGraphFinal
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1030, 600);
this.ClientSize = new System.Drawing.Size(1373, 738);
this.Controls.Add(this.pnlMain);
this.Controls.Add(this.btnJury);
this.Controls.Add(this.pnlHead);
this.Controls.Add(this.pnlGraph);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "fmGraphFinal";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Graphique récapitulatif";
......
......@@ -8,6 +8,8 @@ using System.Windows.Forms;
using System.Windows.Media;
using Brushes = System.Windows.Media.Brushes;
using System.Drawing;
namespace _20School
{
public partial class fmGraphFinal : Form
......@@ -63,7 +65,7 @@ namespace _20School
graphRecap.LegendLocation = LiveCharts.LegendLocation.Right;
// Axe X du graphique
graphRecap.Background = new SolidColorBrush(System.Windows.Media.Color.FromRgb(55, 32, 49));
graphRecap.Background = new SolidColorBrush(System.Windows.Media.Color.FromRgb(134, 72, 81));
graphRecap.AxisX.Add(new Axis
{
IsMerged = true,
......@@ -248,6 +250,28 @@ namespace _20School
this.WindowState = FormWindowState.Minimized;
}
/// <summary>
/// Effet de changement de couleur du bouton quitter (en rentrant dans le champ).
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void btnClose_MouseEnter(object sender, EventArgs e)
{
Button btn = (Button)sender;
btn.BackColor = System.Drawing.Color.OrangeRed;
}
/// <summary>
/// Effet de changement de couleur du bouton quitter (en rentrant dans le champ).
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void btnClose_MouseLeave(object sender, EventArgs e)
{
Button btn = (Button)sender;
btn.BackColor = System.Drawing.Color.Gainsboro;
}
/// <summary>
/// Procedure : Initialise les INE pour chaque élèves afin d'identifier les valeurs graphiques.
/// </summary>
......
......@@ -135,9 +135,9 @@
this.btnRed.Dock = System.Windows.Forms.DockStyle.Right;
this.btnRed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRed.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnRed.Location = new System.Drawing.Point(1097, 0);
this.btnRed.Location = new System.Drawing.Point(1087, 0);
this.btnRed.Name = "btnRed";
this.btnRed.Size = new System.Drawing.Size(52, 33);
this.btnRed.Size = new System.Drawing.Size(56, 33);
this.btnRed.TabIndex = 8;
this.btnRed.Text = "__";
this.btnRed.UseVisualStyleBackColor = false;
......@@ -151,9 +151,9 @@
this.btnClose.Dock = System.Windows.Forms.DockStyle.Right;
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnClose.Location = new System.Drawing.Point(1149, 0);
this.btnClose.Location = new System.Drawing.Point(1143, 0);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(52, 33);
this.btnClose.Size = new System.Drawing.Size(58, 33);
this.btnClose.TabIndex = 7;
this.btnClose.Text = "X";
this.btnClose.UseVisualStyleBackColor = false;
......@@ -168,7 +168,7 @@
this.lblEchelleEffort.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleEffort.Location = new System.Drawing.Point(6, 131);
this.lblEchelleEffort.Name = "lblEchelleEffort";
this.lblEchelleEffort.Size = new System.Drawing.Size(42, 13);
this.lblEchelleEffort.Size = new System.Drawing.Size(54, 19);
this.lblEchelleEffort.TabIndex = 23;
this.lblEchelleEffort.Text = "Effort :";
//
......@@ -179,7 +179,7 @@
this.lblEchelleComp.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleComp.Location = new System.Drawing.Point(6, 81);
this.lblEchelleComp.Name = "lblEchelleComp";
this.lblEchelleComp.Size = new System.Drawing.Size(78, 13);
this.lblEchelleComp.Size = new System.Drawing.Size(101, 19);
this.lblEchelleComp.TabIndex = 22;
this.lblEchelleComp.Text = "Compétence :";
//
......@@ -315,9 +315,9 @@
this.btnQuestNormal.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnQuestNormal.Dock = System.Windows.Forms.DockStyle.Fill;
this.btnQuestNormal.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnQuestNormal.Location = new System.Drawing.Point(3, 51);
this.btnQuestNormal.Location = new System.Drawing.Point(3, 55);
this.btnQuestNormal.Name = "btnQuestNormal";
this.btnQuestNormal.Size = new System.Drawing.Size(508, 33);
this.btnQuestNormal.Size = new System.Drawing.Size(508, 29);
this.btnQuestNormal.TabIndex = 2;
this.btnQuestNormal.Text = "btnQuestNormal";
this.btnQuestNormal.UseVisualStyleBackColor = true;
......@@ -341,7 +341,7 @@
this.btnQuestEasy.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnQuestEasy.Dock = System.Windows.Forms.DockStyle.Top;
this.btnQuestEasy.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnQuestEasy.Location = new System.Drawing.Point(3, 22);
this.btnQuestEasy.Location = new System.Drawing.Point(3, 26);
this.btnQuestEasy.Name = "btnQuestEasy";
this.btnQuestEasy.Size = new System.Drawing.Size(508, 29);
this.btnQuestEasy.TabIndex = 0;
......@@ -390,9 +390,9 @@
this.pnlGood.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pnlGood.Cursor = System.Windows.Forms.Cursors.Hand;
this.pnlGood.Dock = System.Windows.Forms.DockStyle.Left;
this.pnlGood.Location = new System.Drawing.Point(3, 22);
this.pnlGood.Location = new System.Drawing.Point(3, 26);
this.pnlGood.Name = "pnlGood";
this.pnlGood.Size = new System.Drawing.Size(161, 114);
this.pnlGood.Size = new System.Drawing.Size(161, 110);
this.pnlGood.TabIndex = 2;
this.pnlGood.Click += new System.EventHandler(this.pnlGood_Click);
this.pnlGood.MouseEnter += new System.EventHandler(this.pnlGood_MouseEnter);
......@@ -406,9 +406,9 @@
this.pnlNeutral.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pnlNeutral.Cursor = System.Windows.Forms.Cursors.Hand;
this.pnlNeutral.Dock = System.Windows.Forms.DockStyle.Right;
this.pnlNeutral.Location = new System.Drawing.Point(161, 22);
this.pnlNeutral.Location = new System.Drawing.Point(161, 26);
this.pnlNeutral.Name = "pnlNeutral";
this.pnlNeutral.Size = new System.Drawing.Size(155, 114);
this.pnlNeutral.Size = new System.Drawing.Size(155, 110);
this.pnlNeutral.TabIndex = 1;
this.pnlNeutral.Click += new System.EventHandler(this.pnlNeutral_Click);
this.pnlNeutral.MouseEnter += new System.EventHandler(this.pnlNeutral_MouseEnter);
......@@ -422,9 +422,9 @@
this.pnlBad.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pnlBad.Cursor = System.Windows.Forms.Cursors.Hand;
this.pnlBad.Dock = System.Windows.Forms.DockStyle.Right;
this.pnlBad.Location = new System.Drawing.Point(316, 22);
this.pnlBad.Location = new System.Drawing.Point(316, 26);
this.pnlBad.Name = "pnlBad";
this.pnlBad.Size = new System.Drawing.Size(152, 114);
this.pnlBad.Size = new System.Drawing.Size(152, 110);
this.pnlBad.TabIndex = 0;
this.pnlBad.Click += new System.EventHandler(this.pnlBad_Click);
this.pnlBad.MouseEnter += new System.EventHandler(this.pnlBad_MouseEnter);
......@@ -461,7 +461,7 @@
this.lblInstruction.ForeColor = System.Drawing.Color.DarkRed;
this.lblInstruction.Location = new System.Drawing.Point(6, 68);
this.lblInstruction.Name = "lblInstruction";
this.lblInstruction.Size = new System.Drawing.Size(81, 15);
this.lblInstruction.Size = new System.Drawing.Size(103, 20);
this.lblInstruction.TabIndex = 1;
this.lblInstruction.Text = "lblInstruction";
//
......@@ -471,7 +471,7 @@
this.lblCurrentQuestion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblCurrentQuestion.Location = new System.Drawing.Point(6, 26);
this.lblCurrentQuestion.Name = "lblCurrentQuestion";
this.lblCurrentQuestion.Size = new System.Drawing.Size(108, 15);
this.lblCurrentQuestion.Size = new System.Drawing.Size(133, 20);
this.lblCurrentQuestion.TabIndex = 0;
this.lblCurrentQuestion.Text = "lblCurrentQuestion";
//
......@@ -534,7 +534,7 @@
this.lblEchelleEffort2.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleEffort2.Location = new System.Drawing.Point(6, 131);
this.lblEchelleEffort2.Name = "lblEchelleEffort2";
this.lblEchelleEffort2.Size = new System.Drawing.Size(42, 13);
this.lblEchelleEffort2.Size = new System.Drawing.Size(54, 19);
this.lblEchelleEffort2.TabIndex = 23;
this.lblEchelleEffort2.Text = "Effort :";
//
......@@ -554,7 +554,7 @@
this.lblEchelleComp2.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleComp2.Location = new System.Drawing.Point(6, 81);
this.lblEchelleComp2.Name = "lblEchelleComp2";
this.lblEchelleComp2.Size = new System.Drawing.Size(78, 13);
this.lblEchelleComp2.Size = new System.Drawing.Size(101, 19);
this.lblEchelleComp2.TabIndex = 22;
this.lblEchelleComp2.Text = "Compétence :";
//
......@@ -600,7 +600,7 @@
this.lblEchelleEffort3.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleEffort3.Location = new System.Drawing.Point(6, 131);
this.lblEchelleEffort3.Name = "lblEchelleEffort3";
this.lblEchelleEffort3.Size = new System.Drawing.Size(42, 13);
this.lblEchelleEffort3.Size = new System.Drawing.Size(54, 19);
this.lblEchelleEffort3.TabIndex = 23;
this.lblEchelleEffort3.Text = "Effort :";
//
......@@ -620,7 +620,7 @@
this.lblEchelleComp3.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleComp3.Location = new System.Drawing.Point(6, 81);
this.lblEchelleComp3.Name = "lblEchelleComp3";
this.lblEchelleComp3.Size = new System.Drawing.Size(78, 13);
this.lblEchelleComp3.Size = new System.Drawing.Size(101, 19);
this.lblEchelleComp3.TabIndex = 22;
this.lblEchelleComp3.Text = "Compétence :";
//
......@@ -666,7 +666,7 @@
this.lblEchelleEffort4.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleEffort4.Location = new System.Drawing.Point(6, 131);
this.lblEchelleEffort4.Name = "lblEchelleEffort4";
this.lblEchelleEffort4.Size = new System.Drawing.Size(42, 13);
this.lblEchelleEffort4.Size = new System.Drawing.Size(54, 19);
this.lblEchelleEffort4.TabIndex = 23;
this.lblEchelleEffort4.Text = "Effort :";
//
......@@ -686,7 +686,7 @@
this.lblEchelleComp4.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleComp4.Location = new System.Drawing.Point(6, 81);
this.lblEchelleComp4.Name = "lblEchelleComp4";
this.lblEchelleComp4.Size = new System.Drawing.Size(78, 13);
this.lblEchelleComp4.Size = new System.Drawing.Size(101, 19);
this.lblEchelleComp4.TabIndex = 22;
this.lblEchelleComp4.Text = "Compétence :";
//
......@@ -732,7 +732,7 @@
this.lblEchelleEffort5.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleEffort5.Location = new System.Drawing.Point(6, 131);
this.lblEchelleEffort5.Name = "lblEchelleEffort5";
this.lblEchelleEffort5.Size = new System.Drawing.Size(42, 13);
this.lblEchelleEffort5.Size = new System.Drawing.Size(54, 19);
this.lblEchelleEffort5.TabIndex = 23;
this.lblEchelleEffort5.Text = "Effort :";
//
......@@ -752,7 +752,7 @@
this.lblEchelleComp5.Font = new System.Drawing.Font("Segoe UI", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblEchelleComp5.Location = new System.Drawing.Point(6, 81);
this.lblEchelleComp5.Name = "lblEchelleComp5";
this.lblEchelleComp5.Size = new System.Drawing.Size(78, 13);
this.lblEchelleComp5.Size = new System.Drawing.Size(101, 19);
this.lblEchelleComp5.TabIndex = 22;
this.lblEchelleComp5.Text = "Compétence :";
//
......@@ -833,7 +833,7 @@
this.lblTxtTimer.ForeColor = System.Drawing.Color.White;
this.lblTxtTimer.Location = new System.Drawing.Point(530, 150);
this.lblTxtTimer.Name = "lblTxtTimer";
this.lblTxtTimer.Size = new System.Drawing.Size(109, 20);
this.lblTxtTimer.Size = new System.Drawing.Size(135, 25);
this.lblTxtTimer.TabIndex = 43;
this.lblTxtTimer.Text = "Temps restant";
this.lblTxtTimer.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -910,13 +910,12 @@
//
// lblGame
//
this.lblGame.AutoSize = true;
this.lblGame.BackColor = System.Drawing.Color.Transparent;
this.lblGame.Font = new System.Drawing.Font("Segoe UI Black", 36F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblGame.ForeColor = System.Drawing.Color.White;
this.lblGame.Location = new System.Drawing.Point(69, 0);
this.lblGame.Location = new System.Drawing.Point(59, 0);
this.lblGame.Name = "lblGame";
this.lblGame.Size = new System.Drawing.Size(238, 65);
this.lblGame.Size = new System.Drawing.Size(462, 65);
this.lblGame.TabIndex = 5;
this.lblGame.Text = "20School";
//
......@@ -924,13 +923,12 @@
//
this.lblWelcome.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWelcome.AutoSize = true;
this.lblWelcome.BackColor = System.Drawing.Color.Transparent;
this.lblWelcome.Font = new System.Drawing.Font("Segoe UI", 24F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblWelcome.ForeColor = System.Drawing.Color.White;
this.lblWelcome.Location = new System.Drawing.Point(698, 16);
this.lblWelcome.Location = new System.Drawing.Point(693, 6);
this.lblWelcome.Name = "lblWelcome";
this.lblWelcome.Size = new System.Drawing.Size(269, 45);
this.lblWelcome.Size = new System.Drawing.Size(415, 63);
this.lblWelcome.TabIndex = 8;
this.lblWelcome.Text = "A vous de jouer !";
//
......@@ -991,7 +989,6 @@
((System.ComponentModel.ISupportInitialize)(this.epTrueEtu)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.epFalseEtu)).EndInit();
this.pnlHead.ResumeLayout(false);
this.pnlHead.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
......
......@@ -237,7 +237,7 @@ namespace _20School
fmCoursParticulier fmCoursParticulier = new fmCoursParticulier(); //Génération du formulaire de partie "fmCoursParticulier"
fmCoursParticulier.ShowDialog(); //Affichage du formulaire "fmCoursParticulier"
//coursParticulier = false;
coursParticulier = false;
}
/// <summary>
......@@ -1233,7 +1233,7 @@ namespace _20School
lblTimer.Text = timerTick.ToString();
timerTick--;
if (repetCoursParticulier >= 2)
if (repetCoursParticulier == 2)
{
btnCoursParticulier.Visible = false;
}
......@@ -1522,32 +1522,6 @@ namespace _20School
tiktac.Start();
pnlMainTimer.Visible = true;
pnlPause.Visible = true;
/*//Pop-up d'averstissement de lancement de la partie
DialogResult dialogResult = MessageBox.Show("Tout au long de la simulation, vous allez faire face à des choix importants, " +
"parfois couteux, qui influeront le déroulement de la simulation.", "Avertissement");
if (dialogResult == DialogResult.OK)
{
this.StartPosition = FormStartPosition.CenterParent; //Pop-up centré au milieu du form principale
for (int i = 1; i <= 5; i++)
{
affichageInfo(i); //Affichage des infos élèves
}
//Affichage des boutons
btnQuestion.Visible = true;
ableAllPnlEtu(); //Activation des zones cliquables
showAllGbEtu(); //Affichage des panel d'infos des élèves
tiktac.Interval = 1000;
lblTimer.Text = tiktac.ToString();
tiktac.Start();
pnlMainTimer.Visible = true;
}
*/
}
}
/// <summary>
......
......@@ -73,6 +73,10 @@ namespace _20School
this.cbEffort5 = new System.Windows.Forms.ComboBox();
this.cbComp5 = new System.Windows.Forms.ComboBox();
this.btnEnvoyer = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbEleve2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbEleve3)).BeginInit();
......@@ -321,10 +325,12 @@ namespace _20School
//
// gpbEleve1
//
this.gpbEleve1.BackColor = System.Drawing.Color.OldLace;
this.gpbEleve1.Controls.Add(this.label2);
this.gpbEleve1.Controls.Add(this.label1);
this.gpbEleve1.Controls.Add(this.cbEffort1);
this.gpbEleve1.Controls.Add(this.cbComp1);
this.gpbEleve1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.gpbEleve1.Location = new System.Drawing.Point(15, 497);
this.gpbEleve1.Name = "gpbEleve1";
this.gpbEleve1.Size = new System.Drawing.Size(257, 237);
......@@ -335,7 +341,7 @@ namespace _20School
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(45, 126);
this.label2.Location = new System.Drawing.Point(33, 126);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 17);
this.label2.TabIndex = 11;
......@@ -344,7 +350,7 @@ namespace _20School
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(45, 41);
this.label1.Location = new System.Drawing.Point(33, 41);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(102, 17);
this.label1.TabIndex = 10;
......@@ -362,10 +368,12 @@ namespace _20School
//
// gpbEleve2
//
this.gpbEleve2.BackColor = System.Drawing.Color.OldLace;
this.gpbEleve2.Controls.Add(this.label4);
this.gpbEleve2.Controls.Add(this.label3);
this.gpbEleve2.Controls.Add(this.cbEffort2);
this.gpbEleve2.Controls.Add(this.cbComp2);
this.gpbEleve2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.gpbEleve2.Location = new System.Drawing.Point(323, 497);