From 67925b18bcc4d4bde135c90724fd8ff8686610e4 Mon Sep 17 00:00:00 2001
From: Emma Sattler <e.sattler@etu.unistra.fr>
Date: Mon, 29 Mar 2021 16:48:04 +0200
Subject: [PATCH] Ajouts graphiques
---
view/FormJeu.Designer.cs | 59 +-
view/FormJeu.resx | 138750 ++++++++++++++++++++++++++++++-
view/FormMainMenu.Designer.cs | 35 +-
3 files changed, 138779 insertions(+), 65 deletions(-)
diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs
index b6a0477..bce1bf6 100644
--- a/view/FormJeu.Designer.cs
+++ b/view/FormJeu.Designer.cs
@@ -40,16 +40,17 @@ namespace Wanderer.view
this.pbPersonnes = new System.Windows.Forms.PictureBox();
this.mapView1 = new Wanderer.view.Controls.MapView();
((System.ComponentModel.ISupportInitialize)(this.pbAide)).BeginInit();
+ this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).BeginInit();
this.SuspendLayout();
//
// pbAide
//
this.pbAide.Image = ((System.Drawing.Image)(resources.GetObject("pbAide.Image")));
- this.pbAide.Location = new System.Drawing.Point(14, 15);
+ this.pbAide.Location = new System.Drawing.Point(12, 15);
this.pbAide.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pbAide.Name = "pbAide";
- this.pbAide.Size = new System.Drawing.Size(63, 61);
+ this.pbAide.Size = new System.Drawing.Size(44, 45);
this.pbAide.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbAide.TabIndex = 0;
this.pbAide.TabStop = false;
@@ -57,79 +58,101 @@ namespace Wanderer.view
//
// panel1
//
- this.panel1.Location = new System.Drawing.Point(123, 12);
+ this.panel1.Controls.Add(this.pbAide);
+ this.panel1.Controls.Add(this.pbPersonnes);
+ this.panel1.Location = new System.Drawing.Point(31, 12);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(680, 70);
+ this.panel1.Size = new System.Drawing.Size(845, 64);
this.panel1.TabIndex = 1;
//
// btnUsine
//
+ this.btnUsine.BackColor = System.Drawing.Color.Transparent;
+ this.btnUsine.FlatAppearance.BorderSize = 2;
+ this.btnUsine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnUsine.ForeColor = System.Drawing.Color.White;
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(737, 473);
this.btnUsine.Name = "btnUsine";
this.btnUsine.Size = new System.Drawing.Size(149, 77);
this.btnUsine.TabIndex = 5;
this.btnUsine.Text = "Usine";
this.btnUsine.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.btnUsine.UseVisualStyleBackColor = true;
+ this.btnUsine.UseVisualStyleBackColor = false;
this.btnUsine.Click += new System.EventHandler(this.btnUsine_Click);
//
// btnTrain
//
+ this.btnTrain.BackColor = System.Drawing.Color.Transparent;
+ this.btnTrain.FlatAppearance.BorderSize = 2;
+ this.btnTrain.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnTrain.ForeColor = System.Drawing.Color.White;
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(196, 473);
this.btnTrain.Name = "btnTrain";
this.btnTrain.Size = new System.Drawing.Size(149, 77);
this.btnTrain.TabIndex = 6;
this.btnTrain.Text = "Train";
this.btnTrain.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.btnTrain.UseVisualStyleBackColor = true;
+ this.btnTrain.UseVisualStyleBackColor = false;
this.btnTrain.Click += new System.EventHandler(this.button1_Click);
//
// btnRefuge
//
+ this.btnRefuge.BackColor = System.Drawing.Color.Transparent;
+ this.btnRefuge.FlatAppearance.BorderSize = 2;
+ this.btnRefuge.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnRefuge.ForeColor = System.Drawing.Color.White;
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, 473);
this.btnRefuge.Name = "btnRefuge";
this.btnRefuge.Size = new System.Drawing.Size(149, 77);
this.btnRefuge.TabIndex = 7;
this.btnRefuge.Text = "Refuge";
this.btnRefuge.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.btnRefuge.UseVisualStyleBackColor = true;
+ this.btnRefuge.UseVisualStyleBackColor = false;
this.btnRefuge.Click += new System.EventHandler(this.btnRefuge_Click);
//
// btnChemin
//
+ this.btnChemin.BackColor = System.Drawing.Color.Transparent;
+ this.btnChemin.FlatAppearance.BorderSize = 2;
+ this.btnChemin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnChemin.ForeColor = System.Drawing.Color.White;
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(385, 473);
this.btnChemin.Name = "btnChemin";
this.btnChemin.Size = new System.Drawing.Size(149, 77);
this.btnChemin.TabIndex = 8;
this.btnChemin.Text = "Chemins";
this.btnChemin.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.btnChemin.UseVisualStyleBackColor = true;
+ this.btnChemin.UseVisualStyleBackColor = false;
//
// btnClub
//
+ this.btnClub.BackColor = System.Drawing.Color.Transparent;
+ this.btnClub.FlatAppearance.BorderSize = 2;
+ this.btnClub.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnClub.ForeColor = System.Drawing.Color.White;
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(565, 473);
this.btnClub.Name = "btnClub";
this.btnClub.Size = new System.Drawing.Size(149, 77);
this.btnClub.TabIndex = 9;
this.btnClub.Text = "Club";
this.btnClub.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.btnClub.UseVisualStyleBackColor = true;
+ this.btnClub.UseVisualStyleBackColor = false;
//
// pbPersonnes
//
this.pbPersonnes.Image = ((System.Drawing.Image)(resources.GetObject("pbPersonnes.Image")));
- this.pbPersonnes.Location = new System.Drawing.Point(809, 16);
+ this.pbPersonnes.Location = new System.Drawing.Point(708, 4);
this.pbPersonnes.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pbPersonnes.Name = "pbPersonnes";
this.pbPersonnes.Size = new System.Drawing.Size(34, 35);
@@ -147,7 +170,7 @@ namespace Wanderer.view
this.mapView1.RowCount = 2;
this.mapView1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.mapView1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.mapView1.Size = new System.Drawing.Size(874, 329);
+ this.mapView1.Size = new System.Drawing.Size(872, 347);
this.mapView1.TabIndex = 11;
this.mapView1.Paint += new System.Windows.Forms.PaintEventHandler(this.mapView1_Paint);
//
@@ -155,21 +178,21 @@ namespace Wanderer.view
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.ClientSize = new System.Drawing.Size(900, 562);
this.Controls.Add(this.mapView1);
- this.Controls.Add(this.pbPersonnes);
this.Controls.Add(this.btnClub);
this.Controls.Add(this.btnChemin);
this.Controls.Add(this.btnRefuge);
this.Controls.Add(this.btnTrain);
this.Controls.Add(this.btnUsine);
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";
((System.ComponentModel.ISupportInitialize)(this.pbAide)).EndInit();
+ this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).EndInit();
this.ResumeLayout(false);
diff --git a/view/FormJeu.resx b/view/FormJeu.resx
index 0c97d14..4631b38 100644
--- a/view/FormJeu.resx
+++ b/view/FormJeu.resx
@@ -958,6 +958,38 @@
/D/tWr5t2zZn2fncuXPlo48+cvbz6l7vZ5991tnfe++99zpdpUeNGuUsYb7sssvkkksucfaB62RU9wLr
kWK6J/ynGjRo4OwV/qmEhIQjJrca++Wf0//3l3+f/hv6b+m/qf+2HmWmP4v+TPqz6c+oP6v+zPqz6++g
v4v+Tl999ZXzO+rvqr+z9VkAAIDDMn73f7R2IWCvq4HWAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="pbPersonnes.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
</value>
</data>
<data name="btnUsine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1177,36 +1209,138696 @@
F9OjIVNr1BqNAAAAAElFTkSuQmCC
</value>
</data>
- <data name="pbPersonnes.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="$this.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>