From 42b7fd4c4e88737dfc878cca4ae7e8435d72f9f6 Mon Sep 17 00:00:00 2001
From: "cesar.schaal" <cesar.schaal@etu.unistra.fr>
Date: Mon, 29 Mar 2021 16:49:27 +0200
Subject: [PATCH] Changement main menu
---
view/FormJeu.Designer.cs | 57 ++++++++++++++++++++--------------------
view/FormJeu.cs | 1 +
view/FormJeu.resx | 57 ++++++++++++++++++++--------------------
3 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs
index fb4d359..e59c638 100644
--- a/view/FormJeu.Designer.cs
+++ b/view/FormJeu.Designer.cs
@@ -48,10 +48,9 @@ namespace Wanderer.view
// pbAide
//
this.pbAide.Image = ((System.Drawing.Image)(resources.GetObject("pbAide.Image")));
- this.pbAide.Location = new System.Drawing.Point(14, 15);
- this.pbAide.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pbAide.Location = new System.Drawing.Point(12, 12);
this.pbAide.Name = "pbAide";
- this.pbAide.Size = new System.Drawing.Size(63, 61);
+ this.pbAide.Size = new System.Drawing.Size(56, 49);
this.pbAide.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbAide.TabIndex = 0;
this.pbAide.TabStop = false;
@@ -59,36 +58,35 @@ namespace Wanderer.view
//
// panel1
//
- this.panel1.Location = new System.Drawing.Point(123, 12);
- this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.panel1.Location = new System.Drawing.Point(109, 10);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(680, 70);
+ this.panel1.Size = new System.Drawing.Size(604, 56);
this.panel1.TabIndex = 1;
//
// lblPays1
//
this.lblPays1.AutoSize = true;
- this.lblPays1.Location = new System.Drawing.Point(83, 216);
+ this.lblPays1.Location = new System.Drawing.Point(74, 173);
this.lblPays1.Name = "lblPays1";
- this.lblPays1.Size = new System.Drawing.Size(52, 20);
+ this.lblPays1.Size = new System.Drawing.Size(47, 17);
this.lblPays1.TabIndex = 2;
this.lblPays1.Text = "Pays1";
//
// lblPays3
//
this.lblPays3.AutoSize = true;
- this.lblPays3.Location = new System.Drawing.Point(411, 355);
+ this.lblPays3.Location = new System.Drawing.Point(365, 284);
this.lblPays3.Name = "lblPays3";
- this.lblPays3.Size = new System.Drawing.Size(52, 20);
+ this.lblPays3.Size = new System.Drawing.Size(47, 17);
this.lblPays3.TabIndex = 3;
this.lblPays3.Text = "Pays3";
//
// lblPays2
//
this.lblPays2.AutoSize = true;
- this.lblPays2.Location = new System.Drawing.Point(638, 243);
+ this.lblPays2.Location = new System.Drawing.Point(567, 194);
this.lblPays2.Name = "lblPays2";
- this.lblPays2.Size = new System.Drawing.Size(52, 20);
+ this.lblPays2.Size = new System.Drawing.Size(47, 17);
this.lblPays2.TabIndex = 4;
this.lblPays2.Text = "Pays2";
//
@@ -96,9 +94,10 @@ namespace Wanderer.view
//
this.btnUsine.Image = ((System.Drawing.Image)(resources.GetObject("btnUsine.Image")));
this.btnUsine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.btnUsine.Location = new System.Drawing.Point(739, 450);
+ this.btnUsine.Location = new System.Drawing.Point(657, 360);
+ this.btnUsine.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnUsine.Name = "btnUsine";
- this.btnUsine.Size = new System.Drawing.Size(149, 77);
+ this.btnUsine.Size = new System.Drawing.Size(132, 62);
this.btnUsine.TabIndex = 5;
this.btnUsine.Text = "Usine";
this.btnUsine.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -109,9 +108,10 @@ namespace Wanderer.view
//
this.btnTrain.Image = ((System.Drawing.Image)(resources.GetObject("btnTrain.Image")));
this.btnTrain.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.btnTrain.Location = new System.Drawing.Point(198, 450);
+ this.btnTrain.Location = new System.Drawing.Point(176, 360);
+ this.btnTrain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnTrain.Name = "btnTrain";
- this.btnTrain.Size = new System.Drawing.Size(149, 77);
+ this.btnTrain.Size = new System.Drawing.Size(132, 62);
this.btnTrain.TabIndex = 6;
this.btnTrain.Text = "Train";
this.btnTrain.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -122,9 +122,10 @@ namespace Wanderer.view
//
this.btnRefuge.Image = ((System.Drawing.Image)(resources.GetObject("btnRefuge.Image")));
this.btnRefuge.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.btnRefuge.Location = new System.Drawing.Point(14, 450);
+ this.btnRefuge.Location = new System.Drawing.Point(12, 360);
+ this.btnRefuge.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnRefuge.Name = "btnRefuge";
- this.btnRefuge.Size = new System.Drawing.Size(149, 77);
+ this.btnRefuge.Size = new System.Drawing.Size(132, 62);
this.btnRefuge.TabIndex = 7;
this.btnRefuge.Text = "Refuge";
this.btnRefuge.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -134,9 +135,10 @@ namespace Wanderer.view
//
this.btnChemin.Image = ((System.Drawing.Image)(resources.GetObject("btnChemin.Image")));
this.btnChemin.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.btnChemin.Location = new System.Drawing.Point(387, 450);
+ this.btnChemin.Location = new System.Drawing.Point(344, 360);
+ this.btnChemin.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnChemin.Name = "btnChemin";
- this.btnChemin.Size = new System.Drawing.Size(149, 77);
+ this.btnChemin.Size = new System.Drawing.Size(132, 62);
this.btnChemin.TabIndex = 8;
this.btnChemin.Text = "Chemins";
this.btnChemin.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -146,9 +148,10 @@ namespace Wanderer.view
//
this.btnClub.Image = ((System.Drawing.Image)(resources.GetObject("btnClub.Image")));
this.btnClub.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.btnClub.Location = new System.Drawing.Point(567, 450);
+ this.btnClub.Location = new System.Drawing.Point(504, 360);
+ this.btnClub.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnClub.Name = "btnClub";
- this.btnClub.Size = new System.Drawing.Size(149, 77);
+ this.btnClub.Size = new System.Drawing.Size(132, 62);
this.btnClub.TabIndex = 9;
this.btnClub.Text = "Club";
this.btnClub.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -157,19 +160,18 @@ namespace Wanderer.view
// pbPersonnes
//
this.pbPersonnes.Image = ((System.Drawing.Image)(resources.GetObject("pbPersonnes.Image")));
- this.pbPersonnes.Location = new System.Drawing.Point(809, 16);
- this.pbPersonnes.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pbPersonnes.Location = new System.Drawing.Point(719, 13);
this.pbPersonnes.Name = "pbPersonnes";
- this.pbPersonnes.Size = new System.Drawing.Size(34, 35);
+ this.pbPersonnes.Size = new System.Drawing.Size(30, 28);
this.pbPersonnes.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbPersonnes.TabIndex = 10;
this.pbPersonnes.TabStop = false;
//
// FormJeu
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(900, 562);
+ this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.pbPersonnes);
this.Controls.Add(this.btnClub);
this.Controls.Add(this.btnChemin);
@@ -181,7 +183,6 @@ namespace Wanderer.view
this.Controls.Add(this.lblPays1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.pbAide);
- this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormJeu";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FormJeu";
diff --git a/view/FormJeu.cs b/view/FormJeu.cs
index fa58ea8..fbedc09 100644
--- a/view/FormJeu.cs
+++ b/view/FormJeu.cs
@@ -32,5 +32,6 @@ namespace Wanderer.view
{
}
+
}
}
diff --git a/view/FormJeu.resx b/view/FormJeu.resx
index 14dd791..899dfd9 100644
--- a/view/FormJeu.resx
+++ b/view/FormJeu.resx
@@ -1179,35 +1179,34 @@
</data>
<data name="pbPersonnes.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- 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
- gg==
+ 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
</value>
</data>
</root>
\ No newline at end of file
--
GitLab