From 14e5f2d87714d91857b61671d688791dc26bff5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20F=C3=A9lix?= <felixantoine67@yahoo.fr>
Date: Wed, 1 Apr 2020 15:41:10 +0200
Subject: [PATCH] =?UTF-8?q?Mise=20en=20place=20du=20plein=20=C3=A9cran=20s?=
=?UTF-8?q?ur=20la=20fen=C3=AAtre=20de=20jeu=20principale.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InterfaceClasse.Designer.cs | 18 ++++++++++--------
.../psychorientation/InterfaceClasse.cs | 11 ++++++++---
psychorientation/psychorientation/Libelle.cs | 16 ++++++++--------
.../psychorientation/psychorientation.csproj | 2 +-
4 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index 471abfa..39039f5 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -41,9 +41,9 @@
this.pb_action_suivante.BackgroundImage = global::psychorientation.Properties.Resources.passer;
this.pb_action_suivante.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pb_action_suivante.InitialImage = null;
- this.pb_action_suivante.Location = new System.Drawing.Point(938, 473);
+ this.pb_action_suivante.Location = new System.Drawing.Point(1225, 651);
this.pb_action_suivante.Name = "pb_action_suivante";
- this.pb_action_suivante.Size = new System.Drawing.Size(74, 75);
+ this.pb_action_suivante.Size = new System.Drawing.Size(120, 120);
this.pb_action_suivante.TabIndex = 0;
this.pb_action_suivante.TabStop = false;
this.pb_action_suivante.Click += new System.EventHandler(this.Pb_action_suivante_Click);
@@ -52,7 +52,7 @@
//
this.pb_liste_eleves.Location = new System.Drawing.Point(12, 12);
this.pb_liste_eleves.Name = "pb_liste_eleves";
- this.pb_liste_eleves.Size = new System.Drawing.Size(90, 78);
+ this.pb_liste_eleves.Size = new System.Drawing.Size(100, 100);
this.pb_liste_eleves.TabIndex = 1;
this.pb_liste_eleves.TabStop = false;
this.pb_liste_eleves.Click += new System.EventHandler(this.Pb_liste_eleves_Click);
@@ -60,10 +60,10 @@
// lbl_date
//
this.lbl_date.AutoSize = true;
- this.lbl_date.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_date.Location = new System.Drawing.Point(108, 12);
+ this.lbl_date.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_date.Location = new System.Drawing.Point(118, 12);
this.lbl_date.Name = "lbl_date";
- this.lbl_date.Size = new System.Drawing.Size(142, 24);
+ this.lbl_date.Size = new System.Drawing.Size(163, 29);
this.lbl_date.TabIndex = 2;
this.lbl_date.Text = "Chargement...";
//
@@ -71,16 +71,18 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1024, 560);
+ this.ClientSize = new System.Drawing.Size(1357, 783);
this.Controls.Add(this.lbl_date);
this.Controls.Add(this.pb_liste_eleves);
this.Controls.Add(this.pb_action_suivante);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.MaximizeBox = false;
this.Name = "InterfaceClasse";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Psychorientation";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.Form1_Load);
+ this.SizeChanged += new System.EventHandler(this.InterfaceClasse_SizeChanged);
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pb_liste_eleves)).EndInit();
this.ResumeLayout(false);
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index 05adca4..245588f 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -26,9 +26,8 @@ namespace psychorientation
{
lbl_date.Text = libelle.Mois(moisActuel % 12) + " " + libelle.Niveau(anneeActuelle);
- TypeMessage tm = TypeMessage.INFORMATION;
- Message m = new Message(-1,"Bonjour apprenti prof, vous allez apprendre à éduquer des joueurs !! ", "Début", tm);
- m.ShowDialog();
+ Message m_accueil = new Message(-1, "Bonjour apprenti prof, vous allez apprendre à éduquer des joueurs !! ", "Début", TypeMessage.INFORMATION);
+ m_accueil.ShowDialog();
}
private void Pb_action_suivante_Click(object sender, EventArgs e)
@@ -72,5 +71,11 @@ namespace psychorientation
{
}
+
+ private void InterfaceClasse_SizeChanged(object sender, EventArgs e)
+ {
+ PictureBox pb = pb_action_suivante;
+ pb.Location = new Point(Size.Width - pb.Width - 32, Size.Height - pb.Height - 32);
+ }
}
}
diff --git a/psychorientation/psychorientation/Libelle.cs b/psychorientation/psychorientation/Libelle.cs
index fb5008c..4d18a09 100644
--- a/psychorientation/psychorientation/Libelle.cs
+++ b/psychorientation/psychorientation/Libelle.cs
@@ -6,26 +6,26 @@ using System.Threading.Tasks;
namespace psychorientation
{
- class Libele
+ class Libelle
{
private List<string> libele_mois = new List<string>()
{"Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"};
private List<string> libele_niveau = new List<string>()
{"Seconde", "Première", "Terminale"};
- private static Libele instance;
+ private static Libelle instance;
- public Libele() {}
+ public Libelle() {}
- public static Libele GetInstance()
+ public static Libelle GetInstance()
{
- if(Libele.instance == null)
+ if(Libelle.instance == null)
{
- Libele.instance = new Libele();
- return Libele.instance;
+ Libelle.instance = new Libelle();
+ return Libelle.instance;
}
else
{
- return Libele.instance;
+ return Libelle.instance;
}
}
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index e736d67..d25d7da 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -64,7 +64,7 @@
<Compile Include="InterfaceInfoEleve.Designer.cs">
<DependentUpon>InterfaceInfoEleve.cs</DependentUpon>
</Compile>
- <Compile Include="Libele.cs" />
+ <Compile Include="Libelle.cs" />
<Compile Include="Message.cs">
<SubType>Form</SubType>
</Compile>
--
GitLab