From fc46234d85f0491f9ed32447f993eaf2b911ec6b Mon Sep 17 00:00:00 2001
From: Emma Sattler <e.sattler@etu.unistra.fr>
Date: Tue, 30 Mar 2021 12:41:00 +0200
Subject: [PATCH] Scrollbar ?
---
view/FormJeu.Designer.cs | 97 ++++++++++++++++++++--------------------
view/FormJeu.resx | 46 +++++++++----------
2 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs
index a4f40e8..358884c 100644
--- a/view/FormJeu.Designer.cs
+++ b/view/FormJeu.Designer.cs
@@ -32,6 +32,10 @@ namespace Wanderer.view
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormJeu));
this.pbAide = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
+ this.lblMarcheur = new System.Windows.Forms.Label();
+ this.lblArgent = new System.Windows.Forms.Label();
+ this.lblJoueur = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pbPersonnes = new System.Windows.Forms.PictureBox();
this.btnUsine = new System.Windows.Forms.Button();
this.btnTrain = new System.Windows.Forms.Button();
@@ -39,14 +43,10 @@ namespace Wanderer.view
this.btnChemin = new System.Windows.Forms.Button();
this.btnClub = new System.Windows.Forms.Button();
this.mapView1 = new Wanderer.view.Controls.MapView();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.lblJoueur = new System.Windows.Forms.Label();
- this.lblArgent = new System.Windows.Forms.Label();
- this.lblMarcheur = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pbAide)).BeginInit();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).BeginInit();
this.SuspendLayout();
//
// pbAide
@@ -75,6 +75,48 @@ namespace Wanderer.view
this.panel1.Size = new System.Drawing.Size(1218, 60);
this.panel1.TabIndex = 1;
//
+ // lblMarcheur
+ //
+ this.lblMarcheur.AutoSize = true;
+ this.lblMarcheur.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblMarcheur.Location = new System.Drawing.Point(1085, 24);
+ this.lblMarcheur.Name = "lblMarcheur";
+ this.lblMarcheur.Size = new System.Drawing.Size(105, 25);
+ this.lblMarcheur.TabIndex = 14;
+ this.lblMarcheur.Text = "Marcheurs";
+ //
+ // lblArgent
+ //
+ this.lblArgent.AutoSize = true;
+ this.lblArgent.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+ this.lblArgent.Location = new System.Drawing.Point(868, 24);
+ this.lblArgent.Name = "lblArgent";
+ this.lblArgent.Size = new System.Drawing.Size(70, 25);
+ this.lblArgent.TabIndex = 13;
+ this.lblArgent.Text = "Argent";
+ //
+ // lblJoueur
+ //
+ this.lblJoueur.AutoSize = true;
+ this.lblJoueur.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
+ this.lblJoueur.Location = new System.Drawing.Point(541, 10);
+ this.lblJoueur.Name = "lblJoueur";
+ this.lblJoueur.Size = new System.Drawing.Size(142, 46);
+ this.lblJoueur.TabIndex = 12;
+ this.lblJoueur.Text = "Joueur";
+ this.lblJoueur.Click += new System.EventHandler(this.label1_Click);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.Location = new System.Drawing.Point(831, 19);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(32, 33);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 11;
+ this.pictureBox1.TabStop = false;
+ //
// pbPersonnes
//
this.pbPersonnes.Image = ((System.Drawing.Image)(resources.GetObject("pbPersonnes.Image")));
@@ -181,6 +223,7 @@ namespace Wanderer.view
//
// mapView1
//
+ this.mapView1.AutoScroll = true;
this.mapView1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("mapView1.BackgroundImage")));
this.mapView1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.mapView1.ColumnCount = 2;
@@ -196,48 +239,6 @@ namespace Wanderer.view
this.mapView1.TabIndex = 11;
this.mapView1.Paint += new System.Windows.Forms.PaintEventHandler(this.mapView1_Paint);
//
- // pictureBox1
- //
- this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(831, 19);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(32, 33);
- this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pictureBox1.TabIndex = 11;
- this.pictureBox1.TabStop = false;
- //
- // lblJoueur
- //
- this.lblJoueur.AutoSize = true;
- this.lblJoueur.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F);
- this.lblJoueur.Location = new System.Drawing.Point(541, 10);
- this.lblJoueur.Name = "lblJoueur";
- this.lblJoueur.Size = new System.Drawing.Size(142, 46);
- this.lblJoueur.TabIndex = 12;
- this.lblJoueur.Text = "Joueur";
- this.lblJoueur.Click += new System.EventHandler(this.label1_Click);
- //
- // lblArgent
- //
- this.lblArgent.AutoSize = true;
- this.lblArgent.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- this.lblArgent.Location = new System.Drawing.Point(868, 24);
- this.lblArgent.Name = "lblArgent";
- this.lblArgent.Size = new System.Drawing.Size(70, 25);
- this.lblArgent.TabIndex = 13;
- this.lblArgent.Text = "Argent";
- //
- // lblMarcheur
- //
- this.lblMarcheur.AutoSize = true;
- this.lblMarcheur.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
- this.lblMarcheur.Location = new System.Drawing.Point(1085, 24);
- this.lblMarcheur.Name = "lblMarcheur";
- this.lblMarcheur.Size = new System.Drawing.Size(105, 25);
- this.lblMarcheur.TabIndex = 14;
- this.lblMarcheur.Text = "Marcheurs";
- //
// FormJeu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -260,8 +261,8 @@ namespace Wanderer.view
((System.ComponentModel.ISupportInitialize)(this.pbAide)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).EndInit();
this.ResumeLayout(false);
}
diff --git a/view/FormJeu.resx b/view/FormJeu.resx
index a213a09..2dda7f0 100644
--- a/view/FormJeu.resx
+++ b/view/FormJeu.resx
@@ -958,6 +958,29 @@
/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="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAA
+ 3QAAAN0BcFOiBwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAPGSURBVFhHxZdb
+ yE5ZGMdfp3BDThM3YtS4IKcLE3KKJEpyuDBlxA25kJIbNc2UQ1GUIqeIC0KSqEnK6UKMZiaKwo1QDjk0
+ LqRx+vx+q7W25W19h9fFZ9Vvf89+Dv9nv2uvvfb+ak1NTd+VorM9KToTjB4wALqW4i1hTaztUYonvhi1
+ Wl9YCkfhIfwPBhKv4SZshRnQMavtGH3GzDE3r1VLTbXt0TerDcUr4b/IFdgLq2AaDIf58Dsch9vwHv6C
+ ERFtfcbMMdcaa9VQS021Ux972rv2GzyDxdAhXVlLMJytHWBT0a5+VUswOoC97GnvYKwoJbcG45qUYq1h
+ T7B3uEd/w5BSYnMwFsC7yIJSTnMwhoA9w4mHR+BCOQ0b4Rfw3obVz+gDk8H7thP+BRs/jWjrM2aOuX1i
+ rU+DWmqqbQ972bO6gCkwGw7Bk+iTD/AiO/8E/8Am+BEORrT1GTMn5VurRjpX2x72sqe+cFicTY+LRMFx
+ MAcWgY/YaAi/Kss9L3U+Z8tca6xVQy01q0XOcCEGw8O3PgWeyLc+BcHh4Qy8gUb2gbtwI6LdyD5gL3tW
+ F+D96AeN7ISdIK0B7UZ2Qnt9tQbWNTNd1bsA3LVGgdO3Bc5C2tW09Rkzx9wW3wWMdVBdwEfYD2OgWyF5
+ GFwFTx7DRdgDayLa+oyZY+6wgk43sIe97BmcHtbD9WgbuAcnQf9mcApPQP960XrMibnWWKuGWmqmpvbS
+ X13A1FjcEyaBi+YAeD8NNLxVWxNr1VBLTbV7xvhUCIaHI9C5IDIoxjfUx1rDmlg7qBDrDPYMJx6cmjuw
+ GlydvWJiugB3t0uwHMZD+BV1os6eMXPMTTtiuABGL1DbHvb6ag0sBFex+3l6/B7AhWhPBLfa5/FcfKz+
+ jGgnvznmWuO5Gmppq20Pe9lTX+0tzMp+SRfw5fEruLp1jowxV/HPYLGrf3tEW5+x8BQxRoKGGmqp2SXr
+ MwvsXdsHxdcxI92CWxBuS1swN9Z4UloD6XVs77AruX06PafgD5gLgyFdwEtw+/RxWgK9C6K9Y8wcc60J
+ FwBqqam2Pex1DPrlAtNhG3jPXoFOhfz7E8yEXeBmcx9cyfMi2vqM7QZzrck11FTbHtOrvsmohzEQFPdj
+ Y0Lm9232Q7T91WE29EH+up0A1qoxMPnrKTpzGIfBt13YrNqCubHmcCmeU3TmMLpDevf7RXMOnMZlMDai
+ rc9Y+qKypntJM6foLMEYCmvhMvgdmH9qaeszZs7QkkaJorMtMHzl+mUk1X9JjVJ0tidFZ/vRVPsM7D6m
+ 7cJQgWkAAAAASUVORK5CYII=
</value>
</data>
<data name="pbPersonnes.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -49865,29 +49888,6 @@
dg8REoLUht53LAw23PjVw58ob+cPHjowfu6gQ2nA11uVcFGnn86jMTGxu55laadMcv5uMKa+lfjMvHOF
xV8XmEDYvIX3uYE1XFH7lh0Af+jGc8BGx+Yem5+D3mKyZcW8hCRZkCZnKJFoXzEBYqjOX9mGTSgEHZ7D
ap6o1eF9jmjVLFp//9k=
-</value>
- </data>
- <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAAN0AAADdAXBTogcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwa
- AAADxklEQVRYR8WXW8hOWRjHX6dwQ04TN2LUuCCnCxNyiiRKcrgwZcQNuZCSGzXNlENRlCKniAtCkqhJ
- yulCjGYmisKNUA45NC6kcfr8fqu1tuVtfYfXxWfVb3/Pfg7/Z79rr732/mpNTU3flaKzPSk6E4weMAC6
- luItYU2s7VGKJ74YtVpfWApH4SH8DwYSr+EmbIUZ0DGr7Rh9xswxN69VS0217dE3qw3FK+G/yBXYC6tg
- GgyH+fA7HIfb8B7+ghERbX3GzDHXGmvVUEtNtVMfe9q79hs8g8XQIV1ZSzCcrR1gU9GuflVLMDqAvexp
- 72CsKCW3BuOalGKtYU+wd7hHf8OQUmJzMBbAu8iCUk5zMIaAPcOJh0fgQjkNG+EX8N6G1c/oA5PB+7YT
- /gUbP41o6zNmjrl9Yq1Pg1pqqm0Pe9mzuoApMBsOwZPokw/wIjv/BP/AJvgRDka09RkzJ+Vbq0Y6V9se
- 9rKnvnBYnE2Pi0TBcTAHFoGP2GgIvyrLPS91PmfLXGusVUMtNatFznAhBsPDtz4Fnsi3PgXB4eEMvIFG
- 9oG7cCOi3cg+YC97Vhfg/egHjeyEnSCtAe1GdkJ7fbUG1jUzXdW7ANy1RoHTtwXOQtrVtPUZM8fcFt8F
- jHVQXcBH2A9joFsheRhcBU8ew0XYA2si2vqMmWPusIJON7CHvewZnB7Ww/VoG7gHJ0H/ZnAKT0D/etF6
- zIm51lirhlpqpqb20l9dwNRY3BMmgYvmAHg/DTS8VVsTa9VQS021e8b4VAiGhyPQuSAyKMY31Mdaw5pY
- O6gQ6wz2DCcenJo7sBpcnb1iYroAd7dLsBzGQ/gVdaLOnjFzzE07YrgARi9Q2x72+moNLARXsft5evwe
- wIVoTwS32ufxXHys/oxoJ7855lrjuRpqaattD3vZU1/tLczKfkkX8OXxK7i6dY6MMVfxz2Cxq397RFuf
- sfAUMUaChhpqqdkl6zML7F3bB8XXMSPdglsQbktbMDfWeFJaA+l1bO+wK7l9Oj2n4A+YC4MhXcBLcPv0
- cVoCvQuivWPMHHOtCRcAaqmptj3sdQz65QLTYRt4z16BToX8+xPMhF3gZnMfXMnzItr6jO0Gc63JNdRU
- 2x7Tq77JqIcxEBT3Y2NC5vdt9kO0/dVhNvRB/rqdANaqMTD56yk6cxiHwbdd2Kzagrmx5nApnlN05jC6
- Q3r3+0VzDpzGZTA2oq3PWPqisqZ7STOn6CzBGApr4TL4HZh/amnrM2bO0JJGiaKzLTB85fplJNV/SY1S
- dLYnRWf70VT7DOw+pu3CUIFpAAAAAElFTkSuQmCC
</value>
</data>
<data name="$this.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--
GitLab