From 7a43f25d53f79de49f499bb56b65bbe824f340af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20F=C3=A9lix?= <felixantoine67@yahoo.fr>
Date: Thu, 2 Apr 2020 22:00:37 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9ajustement=20des=20=C3=A9l=C3=A9ments=20?=
=?UTF-8?q?graphiques=20et=20linguistiques=20pour=20s'accorder=20entre=20e?=
=?UTF-8?q?ux.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InterfaceClasse.Designer.cs | 47 +++++++++++++------
.../psychorientation/InterfaceClasse.cs | 12 +++--
.../psychorientation/InterfaceClasse.resx | 2 +-
.../InterfaceInfoCompletEleve.Designer.cs | 33 +++++++------
.../InterfaceInfoCompletEleve.cs | 6 +--
.../InterfaceInfoEleve.Designer.cs | 21 ++++-----
.../psychorientation/InterfaceInfoEleve.cs | 2 +-
.../psychorientation/Menu.Designer.cs | 33 ++++++++++---
.../Properties/Resources.Designer.cs | 10 ++++
.../Properties/Resources.resx | 13 +++--
.../psychorientation/psychorientation.csproj | 3 ++
11 files changed, 119 insertions(+), 63 deletions(-)
diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index 3b8cfdc..e25458d 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -40,6 +40,7 @@
this.lblListeEleve = new System.Windows.Forms.Label();
this.imgListPerso = new System.Windows.Forms.ImageList(this.components);
this.pnlChoix = new System.Windows.Forms.Panel();
+ this.lbl_barre_decisions = new System.Windows.Forms.Label();
this.lblCours = new System.Windows.Forms.Label();
this.lblNotation = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit();
@@ -64,11 +65,11 @@
//
this.lblDate.AutoSize = true;
this.lblDate.BackColor = System.Drawing.Color.Transparent;
- this.lblDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblDate.Font = new System.Drawing.Font("Consolas", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblDate.ForeColor = System.Drawing.Color.White;
- this.lblDate.Location = new System.Drawing.Point(269, 171);
+ this.lblDate.Location = new System.Drawing.Point(277, 171);
this.lblDate.Name = "lblDate";
- this.lblDate.Size = new System.Drawing.Size(129, 24);
+ this.lblDate.Size = new System.Drawing.Size(140, 22);
this.lblDate.TabIndex = 2;
this.lblDate.Text = "Chargement...";
//
@@ -76,11 +77,11 @@
//
this.lblClasse.AutoSize = true;
this.lblClasse.BackColor = System.Drawing.Color.Transparent;
- this.lblClasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblClasse.Font = new System.Drawing.Font("Consolas", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblClasse.ForeColor = System.Drawing.Color.White;
- this.lblClasse.Location = new System.Drawing.Point(943, 171);
+ this.lblClasse.Location = new System.Drawing.Point(951, 171);
this.lblClasse.Name = "lblClasse";
- this.lblClasse.Size = new System.Drawing.Size(129, 24);
+ this.lblClasse.Size = new System.Drawing.Size(140, 22);
this.lblClasse.TabIndex = 4;
this.lblClasse.Text = "Chargement...";
//
@@ -127,14 +128,16 @@
this.pnlListeEleve.Controls.Add(this.lblListeEleve);
this.pnlListeEleve.Location = new System.Drawing.Point(0, -1);
this.pnlListeEleve.Name = "pnlListeEleve";
- this.pnlListeEleve.Size = new System.Drawing.Size(241, 783);
+ this.pnlListeEleve.Size = new System.Drawing.Size(245, 783);
this.pnlListeEleve.TabIndex = 5;
//
// lblListeEleve
//
this.lblListeEleve.AutoSize = true;
+ this.lblListeEleve.BackColor = System.Drawing.Color.Transparent;
this.lblListeEleve.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblListeEleve.Location = new System.Drawing.Point(3, 0);
+ this.lblListeEleve.ForeColor = System.Drawing.Color.Black;
+ this.lblListeEleve.Location = new System.Drawing.Point(10, 4);
this.lblListeEleve.Name = "lblListeEleve";
this.lblListeEleve.Size = new System.Drawing.Size(217, 29);
this.lblListeEleve.TabIndex = 0;
@@ -153,30 +156,45 @@
//
// pnlChoix
//
+ this.pnlChoix.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.pnlChoix.Controls.Add(this.lbl_barre_decisions);
this.pnlChoix.Controls.Add(this.lblCours);
this.pnlChoix.Controls.Add(this.lblNotation);
this.pnlChoix.Location = new System.Drawing.Point(1107, 99);
this.pnlChoix.Name = "pnlChoix";
- this.pnlChoix.Size = new System.Drawing.Size(189, 528);
+ this.pnlChoix.Size = new System.Drawing.Size(189, 323);
this.pnlChoix.TabIndex = 8;
//
+ // lbl_barre_decisions
+ //
+ this.lbl_barre_decisions.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.lbl_barre_decisions.Location = new System.Drawing.Point(-1, 185);
+ this.lbl_barre_decisions.Name = "lbl_barre_decisions";
+ this.lbl_barre_decisions.Size = new System.Drawing.Size(189, 10);
+ this.lbl_barre_decisions.TabIndex = 2;
+ this.lbl_barre_decisions.Text = " ";
+ //
// lblCours
//
+ this.lblCours.BackColor = System.Drawing.Color.Transparent;
this.lblCours.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
- this.lblCours.Location = new System.Drawing.Point(13, 282);
+ this.lblCours.ForeColor = System.Drawing.Color.Black;
+ this.lblCours.Location = new System.Drawing.Point(13, 204);
this.lblCours.Name = "lblCours";
this.lblCours.Size = new System.Drawing.Size(164, 59);
this.lblCours.TabIndex = 1;
- this.lblCours.Text = "Type de cours visant à aider les eleves de competence :";
+ this.lblCours.Text = "Type de cours visant à aider les élèves de compétence :";
//
// lblNotation
//
+ this.lblNotation.BackColor = System.Drawing.Color.Transparent;
this.lblNotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
- this.lblNotation.Location = new System.Drawing.Point(13, 87);
+ this.lblNotation.ForeColor = System.Drawing.Color.Black;
+ this.lblNotation.Location = new System.Drawing.Point(13, 20);
this.lblNotation.Name = "lblNotation";
- this.lblNotation.Size = new System.Drawing.Size(164, 59);
+ this.lblNotation.Size = new System.Drawing.Size(164, 74);
this.lblNotation.TabIndex = 0;
- this.lblNotation.Text = "Type de notation visant à aider les eleves de competence :";
+ this.lblNotation.Text = "Coefficients de prise en compte de l\'effort et de la compétence pour noter :";
//
// InterfaceClasse
//
@@ -228,6 +246,7 @@
private System.Windows.Forms.Panel pnlChoix;
private System.Windows.Forms.Label lblNotation;
private System.Windows.Forms.Label lblCours;
+ private System.Windows.Forms.Label lbl_barre_decisions;
}
}
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index e7f9505..4944213 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -21,8 +21,8 @@ namespace psychorientation
private int[] positionElevex = { 322, 571, 698, 951, 322, 571, 698, 951 };
private int[] positionElevey = { 398, 398, 398, 398, 505, 505, 505, 505 };
- private string notaText = "Notation suivant les coefficients : ";
- private string coursText = "Type de cours visant à aider les eleves de competence : ";
+ private string notaText = "Coefficients de prise en compte de l'effort et de la compétence pour noter :";
+ private string coursText = "Type de cours visant à aider les élèves de compétence : ";
private double valCours = 5.0;
private double valNotation = 10.0;
@@ -57,12 +57,12 @@ namespace psychorientation
lblMoyenne.Text = "Moyenne de la classe : " + Math.Round(gestEleve.GetMoyenneClasse(), 1).ToString();
Libelle lib = new Libelle();
- int y = 20;
+ int y = 40;
foreach (Eleve eleve in gestEleve.GetListeEleves())
{
InterfaceInfoEleve ii = new InterfaceInfoEleve();
ii.setParam(eleve);
- ii.Location = new Point(0, y);
+ ii.Location = new Point(6, y);
pnlListeEleve.Controls.Add(ii);
y += 220;
}
@@ -73,6 +73,8 @@ namespace psychorientation
tbNota.Size = new System.Drawing.Size(184, 45);
tbNota.Maximum = 20;
tbNota.Value = 10;
+ tbNota.SmallChange = 1;
+ tbNota.LargeChange = 1;
tbNota.Scroll += new System.EventHandler(tbNota_Scroll);
pnlChoix.Controls.Add(tbNota);
lblNotation.Text = notaText;
@@ -90,6 +92,8 @@ namespace psychorientation
tbCours.Location = new System.Drawing.Point(0, 10 + lblCours.Location.Y + lblCours.Size.Height);
tbCours.Size = new System.Drawing.Size(184, 45);
tbCours.Value = 5;
+ tbCours.SmallChange = 1;
+ tbCours.LargeChange = 1;
tbCours.Scroll += new System.EventHandler(tbCours_Scroll);
pnlChoix.Controls.Add(tbCours);
lblCours.Text = coursText + tbCours.Value.ToString();
diff --git a/psychorientation/psychorientation/InterfaceClasse.resx b/psychorientation/psychorientation/InterfaceClasse.resx
index 67c43d9..13fdb0c 100644
--- a/psychorientation/psychorientation/InterfaceClasse.resx
+++ b/psychorientation/psychorientation/InterfaceClasse.resx
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
- mgEAAk1TRnQBSQFMAgEBBgEAATABAAEwAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ mgEAAk1TRnQBSQFMAgEBBgEAAUgBAAFIAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA
AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA
A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
index ff11861..7dbead6 100755
--- a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
@@ -50,7 +50,7 @@
//
this.lblNomEleve.AutoSize = true;
this.lblNomEleve.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
- this.lblNomEleve.Location = new System.Drawing.Point(253, 14);
+ this.lblNomEleve.Location = new System.Drawing.Point(125, 17);
this.lblNomEleve.Name = "lblNomEleve";
this.lblNomEleve.Size = new System.Drawing.Size(118, 24);
this.lblNomEleve.TabIndex = 0;
@@ -60,7 +60,7 @@
//
this.lblClasse.AutoSize = true;
this.lblClasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
- this.lblClasse.Location = new System.Drawing.Point(254, 71);
+ this.lblClasse.Location = new System.Drawing.Point(126, 74);
this.lblClasse.Name = "lblClasse";
this.lblClasse.Size = new System.Drawing.Size(70, 18);
this.lblClasse.TabIndex = 2;
@@ -70,7 +70,7 @@
//
this.lblEffort.AutoSize = true;
this.lblEffort.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.lblEffort.Location = new System.Drawing.Point(225, 126);
+ this.lblEffort.Location = new System.Drawing.Point(97, 129);
this.lblEffort.Name = "lblEffort";
this.lblEffort.Size = new System.Drawing.Size(44, 15);
this.lblEffort.TabIndex = 3;
@@ -80,7 +80,7 @@
//
this.lblCompetence.AutoSize = true;
this.lblCompetence.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.lblCompetence.Location = new System.Drawing.Point(183, 160);
+ this.lblCompetence.Location = new System.Drawing.Point(55, 163);
this.lblCompetence.Name = "lblCompetence";
this.lblCompetence.Size = new System.Drawing.Size(86, 15);
this.lblCompetence.TabIndex = 4;
@@ -90,17 +90,17 @@
//
this.lblMoyenne.AutoSize = true;
this.lblMoyenne.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.lblMoyenne.Location = new System.Drawing.Point(186, 195);
+ this.lblMoyenne.Location = new System.Drawing.Point(22, 198);
this.lblMoyenne.Name = "lblMoyenne";
- this.lblMoyenne.Size = new System.Drawing.Size(112, 15);
+ this.lblMoyenne.Size = new System.Drawing.Size(119, 15);
this.lblMoyenne.TabIndex = 10;
- this.lblMoyenne.Text = "Moyenne général : ";
+ this.lblMoyenne.Text = "Moyenne générale : ";
//
// lblNiveau
//
this.lblNiveau.AutoSize = true;
this.lblNiveau.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
- this.lblNiveau.Location = new System.Drawing.Point(330, 71);
+ this.lblNiveau.Location = new System.Drawing.Point(202, 74);
this.lblNiveau.Name = "lblNiveau";
this.lblNiveau.Size = new System.Drawing.Size(67, 18);
this.lblNiveau.TabIndex = 11;
@@ -111,7 +111,7 @@
//
this.panel1.BackColor = System.Drawing.Color.Silver;
this.panel1.Controls.Add(this.pnlEffort);
- this.panel1.Location = new System.Drawing.Point(320, 121);
+ this.panel1.Location = new System.Drawing.Point(192, 124);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(139, 26);
this.panel1.TabIndex = 12;
@@ -128,7 +128,7 @@
//
this.panel2.BackColor = System.Drawing.Color.Silver;
this.panel2.Controls.Add(this.pnlCompetence);
- this.panel2.Location = new System.Drawing.Point(320, 156);
+ this.panel2.Location = new System.Drawing.Point(192, 159);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(139, 26);
this.panel2.TabIndex = 13;
@@ -145,7 +145,7 @@
//
this.lblMoyenneNote.AutoSize = true;
this.lblMoyenneNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
- this.lblMoyenneNote.Location = new System.Drawing.Point(317, 195);
+ this.lblMoyenneNote.Location = new System.Drawing.Point(189, 198);
this.lblMoyenneNote.Name = "lblMoyenneNote";
this.lblMoyenneNote.Size = new System.Drawing.Size(97, 15);
this.lblMoyenneNote.TabIndex = 14;
@@ -153,25 +153,25 @@
//
// pcbEleve
//
- this.pcbEleve.Location = new System.Drawing.Point(32, 24);
+ this.pcbEleve.Location = new System.Drawing.Point(12, 12);
this.pcbEleve.Name = "pcbEleve";
- this.pcbEleve.Size = new System.Drawing.Size(109, 97);
+ this.pcbEleve.Size = new System.Drawing.Size(100, 88);
this.pcbEleve.TabIndex = 15;
this.pcbEleve.TabStop = false;
//
// pnlNote
//
this.pnlNote.AutoScroll = true;
- this.pnlNote.Location = new System.Drawing.Point(85, 243);
+ this.pnlNote.Location = new System.Drawing.Point(12, 253);
this.pnlNote.Name = "pnlNote";
- this.pnlNote.Size = new System.Drawing.Size(448, 143);
+ this.pnlNote.Size = new System.Drawing.Size(328, 143);
this.pnlNote.TabIndex = 16;
//
// InterfaceInfoCompletEleve
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(579, 408);
+ this.ClientSize = new System.Drawing.Size(351, 408);
this.Controls.Add(this.pnlNote);
this.Controls.Add(this.pcbEleve);
this.Controls.Add(this.lblMoyenneNote);
@@ -186,7 +186,6 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.MaximizeBox = false;
this.Name = "InterfaceInfoCompletEleve";
- this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "InterfaceInfoCompletEleve";
this.TopMost = true;
this.Load += new System.EventHandler(this.InterfaceInfoCompletEleve_Load);
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
index 0c595f6..de2f7e3 100755
--- a/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
@@ -40,7 +40,7 @@ namespace psychorientation
lblEffort.Text = "Effort : " + Math.Round(eleve.GetEffort(),1);
lblCompetence.Text = "Compétence : " + Math.Round(eleve.GetCompetence(),1);
Libelle lib = new Libelle();
- string nom = "Eleve n°" + eleve.GetId();
+ string nom = "Élève n°" + eleve.GetId();
this.Text = nom;
lblNomEleve.Text = nom;
lblNiveau.Text = lib.Niveau(eleve.GetClasse());
@@ -97,7 +97,7 @@ namespace psychorientation
tlp.Controls.Add(CreerLabel(Math.Round(note.GetEffort(), 2).ToString()), 3, i);
}
- tlp.Size = new System.Drawing.Size(413, largeurLigne* tlp.RowCount+1);
+ tlp.Size = new System.Drawing.Size(320, largeurLigne * tlp.RowCount + 10);
tlp.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
pnlNote.Controls.Add(tlp);
}
@@ -108,7 +108,5 @@ namespace psychorientation
lbl.Text = contenu;
return lbl;
}
-
-
}
}
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index 82289e7..ff774a7 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -100,7 +100,6 @@
//
this.panel1.BackColor = System.Drawing.Color.Silver;
this.panel1.Controls.Add(this.pnlEffort);
- this.panel1.Controls.Add(this.lblEffort);
this.panel1.Location = new System.Drawing.Point(110, 95);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(92, 26);
@@ -116,6 +115,14 @@
this.pnlEffort.TabIndex = 6;
this.pnlEffort.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
+ // lblEffort
+ //
+ this.lblEffort.AutoSize = true;
+ this.lblEffort.Location = new System.Drawing.Point(53, 104);
+ this.lblEffort.Name = "lblEffort";
+ this.lblEffort.Size = new System.Drawing.Size(0, 13);
+ this.lblEffort.TabIndex = 7;
+ //
// panel2
//
this.panel2.BackColor = System.Drawing.Color.Silver;
@@ -135,14 +142,6 @@
this.pnlCompetence.TabIndex = 7;
this.pnlCompetence.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
- // lblEffort
- //
- this.lblEffort.AutoSize = true;
- this.lblEffort.Location = new System.Drawing.Point(53, 104);
- this.lblEffort.Name = "lblEffort";
- this.lblEffort.Size = new System.Drawing.Size(0, 13);
- this.lblEffort.TabIndex = 7;
- //
// lblCompetence
//
this.lblCompetence.AutoSize = true;
@@ -176,6 +175,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
+ this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Controls.Add(this.lblMoyenne);
this.Controls.Add(this.label4);
this.Controls.Add(this.lblCompetence);
@@ -188,10 +188,9 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.lblEleve);
this.Name = "InterfaceInfoEleve";
- this.Size = new System.Drawing.Size(216, 216);
+ this.Size = new System.Drawing.Size(214, 214);
this.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.cs b/psychorientation/psychorientation/InterfaceInfoEleve.cs
index 5bbc6f0..8f6ac3c 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.cs
@@ -27,7 +27,7 @@ namespace psychorientation
public void actualiser()
{
Libelle lib = new Libelle();
- lblEleve.Text = "Eleve n°" + eleve.GetId();
+ lblEleve.Text = "Élève n°" + eleve.GetId();
lblClasse.Text = lib.Niveau(eleve.GetClasse());
lblEffort.Text = Math.Round(eleve.GetEffort(), 2).ToString() ;
lblCompetence.Text = Math.Round(eleve.GetCompetence(), 2).ToString();
diff --git a/psychorientation/psychorientation/Menu.Designer.cs b/psychorientation/psychorientation/Menu.Designer.cs
index 8500763..93f6262 100644
--- a/psychorientation/psychorientation/Menu.Designer.cs
+++ b/psychorientation/psychorientation/Menu.Designer.cs
@@ -30,40 +30,60 @@
{
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
+ this.lbl_ou = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// button1
//
- this.button1.Location = new System.Drawing.Point(102, 207);
+ this.button1.Font = new System.Drawing.Font("Consolas", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.button1.Location = new System.Drawing.Point(77, 31);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(178, 84);
+ this.button1.Size = new System.Drawing.Size(242, 84);
this.button1.TabIndex = 0;
- this.button1.Text = "Partie scénarisé";
+ this.button1.Text = "Partie scénarisée";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
- this.button2.Location = new System.Drawing.Point(478, 207);
+ this.button2.Font = new System.Drawing.Font("Consolas", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.button2.Location = new System.Drawing.Point(453, 31);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(178, 84);
+ this.button2.Size = new System.Drawing.Size(242, 84);
this.button2.TabIndex = 1;
this.button2.Text = "Partie classique";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
+ // lbl_ou
+ //
+ this.lbl_ou.AutoSize = true;
+ this.lbl_ou.BackColor = System.Drawing.Color.Transparent;
+ this.lbl_ou.Font = new System.Drawing.Font("Consolas", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_ou.ForeColor = System.Drawing.Color.White;
+ this.lbl_ou.Location = new System.Drawing.Point(358, 57);
+ this.lbl_ou.Name = "lbl_ou";
+ this.lbl_ou.Size = new System.Drawing.Size(53, 37);
+ this.lbl_ou.TabIndex = 2;
+ this.lbl_ou.Text = "OU";
+ //
// Menu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 450);
+ this.BackgroundImage = global::psychorientation.Properties.Resources.paternFeuille;
+ this.ClientSize = new System.Drawing.Size(770, 157);
+ this.Controls.Add(this.lbl_ou);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
+ this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
this.Name = "Menu";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Menu";
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -71,5 +91,6 @@
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Label lbl_ou;
}
}
\ No newline at end of file
diff --git a/psychorientation/psychorientation/Properties/Resources.Designer.cs b/psychorientation/psychorientation/Properties/Resources.Designer.cs
index c38eb90..f5120e9 100644
--- a/psychorientation/psychorientation/Properties/Resources.Designer.cs
+++ b/psychorientation/psychorientation/Properties/Resources.Designer.cs
@@ -80,6 +80,16 @@ namespace psychorientation.Properties {
}
}
+ /// <summary>
+ /// Recherche une ressource localisée de type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap paternFeuille {
+ get {
+ object obj = ResourceManager.GetObject("paternFeuille", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
diff --git a/psychorientation/psychorientation/Properties/Resources.resx b/psychorientation/psychorientation/Properties/Resources.resx
index 0501c1e..d70fd28 100644
--- a/psychorientation/psychorientation/Properties/Resources.resx
+++ b/psychorientation/psychorientation/Properties/Resources.resx
@@ -118,19 +118,22 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="salleV1" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\salleV1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="grp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="salleV11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\salleV11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="sortir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="passer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\passer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="salleV11" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\salleV11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="salleV1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\salleV1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="paternFeuille" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\bin\Debug\images\patern\paternFeuille.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index 535e29a..f35a81d 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -150,5 +150,8 @@
<ItemGroup>
<None Include="Resources\salleV11.png" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="bin\Debug\images\patern\paternFeuille.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
GitLab