diff --git a/psychorientation/images/icones/passer.png b/psychorientation/images/icones/passer.png
new file mode 100644
index 0000000000000000000000000000000000000000..47df9dba42ad7dd3760c31d2b94c980540208333
Binary files /dev/null and b/psychorientation/images/icones/passer.png differ
diff --git a/psychorientation/images/icones/suivant.png b/psychorientation/images/icones/suivant.png
new file mode 100644
index 0000000000000000000000000000000000000000..bedeffeeafa6ba766a651516a0a582429f4d3fbf
Binary files /dev/null and b/psychorientation/images/icones/suivant.png differ
diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index fbd748f616543491239c6dd6386c76b505582c18..32b648a11f5e8df1fc224ac66f2efb33477d7e3a 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -37,10 +37,13 @@
//
// pb_action_suivante
//
- this.pb_action_suivante.BackColor = System.Drawing.SystemColors.ControlDark;
- this.pb_action_suivante.Location = new System.Drawing.Point(922, 471);
+ this.pb_action_suivante.BackColor = System.Drawing.SystemColors.Control;
+ 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(1225, 651);
this.pb_action_suivante.Name = "pb_action_suivante";
- this.pb_action_suivante.Size = new System.Drawing.Size(90, 77);
+ 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);
@@ -49,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);
@@ -57,10 +60,11 @@
// 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.BackColor = System.Drawing.Color.Transparent;
+ 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...";
//
@@ -68,16 +72,22 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1024, 560);
+ this.BackColor = System.Drawing.SystemColors.Control;
+ this.BackgroundImage = global::psychorientation.Properties.Resources.salleV1;
+ this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ 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.DoubleBuffered = true;
+ 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 dc85503f882b2057fd3ef9331dfab0686ed9f504..245588fa525c59390383fa43092bc7b2e3d7d8ca 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -12,12 +12,9 @@ namespace psychorientation
{
public partial class InterfaceClasse : Form
{
- 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 int mois_actuel = 8;
- private int annee_actuelle = 0;
+ private Libelle libelle = Libelle.GetInstance();
+ private int moisActuel = 8;
+ private int anneeActuelle = 0;
public InterfaceClasse()
{
@@ -27,11 +24,10 @@ namespace psychorientation
private void Form1_Load(object sender, EventArgs e)
{
- lbl_date.Text = libele_mois[(mois_actuel % 12)] + " " + libele_niveau[annee_actuelle];
+ 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)
@@ -44,28 +40,42 @@ namespace psychorientation
}
// Passe au mois suivant.
- mois_actuel++;
- switch(mois_actuel)
+ moisActuel++;
+ switch(moisActuel)
{
case 17: // Fin de la 1ère année : Début Juin.
- mois_actuel = 20;
- annee_actuelle = 1;
+ moisActuel = 20;
+ anneeActuelle = 1;
break;
case 29: // Fin de la 2nde année : Début Juin.
- mois_actuel = 32;
- annee_actuelle = 2;
+ moisActuel = 32;
+ anneeActuelle = 2;
break;
case 42: // Fin de la 3ème année : Debut Juillet.
// Fin de la partie.
+ Message m_fin = new Message(-1, "Vous avez fini la phase bêta de ce jeu !\n" +
+ "Bravo à vous et n'hésitez pas à essayer à nouveau pour " +
+ "améliorer votre compréhension du monde extérieur.",
+ "Félicitations",
+ TypeMessage.INFORMATION
+ );
+ m_fin.ShowDialog();
+ Close();
break;
}
- lbl_date.Text = libele_mois[(mois_actuel % 12)] + " " + libele_niveau[annee_actuelle];
+ lbl_date.Text = libelle.Mois(moisActuel % 12) + " " + libelle.Niveau(anneeActuelle);
}
private void Pb_liste_eleves_Click(object sender, EventArgs e)
{
}
+
+ 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
new file mode 100644
index 0000000000000000000000000000000000000000..4d18a09dfcf4796a3185b04ca39874fa649d6ba2
--- /dev/null
+++ b/psychorientation/psychorientation/Libelle.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace psychorientation
+{
+ 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 Libelle instance;
+
+ public Libelle() {}
+
+ public static Libelle GetInstance()
+ {
+ if(Libelle.instance == null)
+ {
+ Libelle.instance = new Libelle();
+ return Libelle.instance;
+ }
+ else
+ {
+ return Libelle.instance;
+ }
+ }
+
+ public string Mois(int n)
+ {
+ return this.libele_mois[n];
+ }
+
+ public string Niveau(int n)
+ {
+ return this.libele_niveau[n];
+ }
+ }
+}
diff --git a/psychorientation/psychorientation/Properties/Resources.Designer.cs b/psychorientation/psychorientation/Properties/Resources.Designer.cs
index 8a4f17a80ff0d1a6b5f563ed46ebb6a50714b75d..c94656df38b45e13beac46c0cfa28eb826f96cf2 100644
--- a/psychorientation/psychorientation/Properties/Resources.Designer.cs
+++ b/psychorientation/psychorientation/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
// </auto-generated>
//------------------------------------------------------------------------------
-namespace psychorientation.Properties
-{
-
-
+namespace psychorientation.Properties {
+ using System;
+
+
/// <summary>
/// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
/// </summary>
@@ -19,53 +19,65 @@ namespace psychorientation.Properties
// Ã l'aide d'un outil, tel que ResGen ou Visual Studio.
// Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
// avec l'option /str ou régénérez votre projet VS.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ internal class Resources {
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
+ internal Resources() {
}
-
+
/// <summary>
/// Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("psychorientation.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
-
+
/// <summary>
/// Remplace la propriété CurrentUICulture du thread actuel pour toutes
/// les recherches de ressources à l'aide de cette classe de ressource fortement typée.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
+
+ /// <summary>
+ /// Recherche une ressource localisée de type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap passer {
+ get {
+ object obj = ResourceManager.GetObject("passer", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Recherche une ressource localisée de type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap salleV1 {
+ get {
+ object obj = ResourceManager.GetObject("salleV1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/psychorientation/psychorientation/Properties/Resources.resx b/psychorientation/psychorientation/Properties/Resources.resx
index af7dbebbacef595e3089c01c05671016c21a8304..883a18036ccf14c67d61d71fd433abd4156f5d52 100644
--- a/psychorientation/psychorientation/Properties/Resources.resx
+++ b/psychorientation/psychorientation/Properties/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
@@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
@@ -109,9 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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="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="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>
</root>
\ No newline at end of file
diff --git a/psychorientation/psychorientation/Resources/passer.png b/psychorientation/psychorientation/Resources/passer.png
new file mode 100644
index 0000000000000000000000000000000000000000..47df9dba42ad7dd3760c31d2b94c980540208333
Binary files /dev/null and b/psychorientation/psychorientation/Resources/passer.png differ
diff --git a/psychorientation/psychorientation/Resources/salleV1.png b/psychorientation/psychorientation/Resources/salleV1.png
new file mode 100644
index 0000000000000000000000000000000000000000..36d783c845a3c54b111afdff6ec804edabeb8c84
Binary files /dev/null and b/psychorientation/psychorientation/Resources/salleV1.png differ
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index cfef8325f01dda2089c6519a93f9cbd61a243e61..16f7cf56cedd4caa0ad068a8c8f194510a9fd518 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -70,6 +70,7 @@
<Compile Include="InterfaceInfoEleve.Designer.cs">
<DependentUpon>InterfaceInfoEleve.cs</DependentUpon>
</Compile>
+ <Compile Include="Libelle.cs" />
<Compile Include="Message.cs">
<SubType>Form</SubType>
</Compile>
@@ -99,6 +100,7 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
+ <DesignTime>True</DesignTime>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
@@ -114,5 +116,11 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\passer.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\salleV1.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file