diff --git a/view/FormJeu.Designer.cs b/view/FormJeu.Designer.cs index 7a138a925b2ff8fc310a60db617a5f0f42659e7a..4a06c09062a18371c4dea29d773ae20f01154787 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(9, 10); - this.pbAide.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + 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.Name = "pbAide"; - this.pbAide.Size = new System.Drawing.Size(42, 40); + this.pbAide.Size = new System.Drawing.Size(63, 61); this.pbAide.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbAide.TabIndex = 0; this.pbAide.TabStop = false; @@ -57,85 +58,84 @@ namespace Wanderer.view // // panel1 // - this.panel1.Location = new System.Drawing.Point(82, 8); - this.panel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.panel1.Location = new System.Drawing.Point(123, 12); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(453, 46); + this.panel1.Size = new System.Drawing.Size(680, 70); 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(493, 292); - this.btnUsine.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnUsine.Location = new System.Drawing.Point(737, 473); this.btnUsine.Name = "btnUsine"; this.btnUsine.Size = new System.Drawing.Size(99, 50); 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.Image = ((System.Drawing.Image) (resources.GetObject("btnTrain.Image"))); + this.btnTrain.Image = ((System.Drawing.Image)(resources.GetObject("btnTrain.Image"))); this.btnTrain.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnTrain.Location = new System.Drawing.Point(132, 292); - this.btnTrain.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnTrain.Location = new System.Drawing.Point(198, 450); this.btnTrain.Name = "btnTrain"; this.btnTrain.Size = new System.Drawing.Size(99, 50); 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.Image = ((System.Drawing.Image) (resources.GetObject("btnRefuge.Image"))); + this.btnRefuge.Image = ((System.Drawing.Image)(resources.GetObject("btnRefuge.Image"))); this.btnRefuge.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnRefuge.Location = new System.Drawing.Point(9, 292); - this.btnRefuge.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnRefuge.Location = new System.Drawing.Point(14, 450); this.btnRefuge.Name = "btnRefuge"; this.btnRefuge.Size = new System.Drawing.Size(99, 50); 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.Image = ((System.Drawing.Image) (resources.GetObject("btnChemin.Image"))); + this.btnChemin.Image = ((System.Drawing.Image)(resources.GetObject("btnChemin.Image"))); this.btnChemin.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnChemin.Location = new System.Drawing.Point(258, 292); - this.btnChemin.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnChemin.Location = new System.Drawing.Point(387, 450); this.btnChemin.Name = "btnChemin"; this.btnChemin.Size = new System.Drawing.Size(99, 50); 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.Image = ((System.Drawing.Image) (resources.GetObject("btnClub.Image"))); + this.btnClub.Image = ((System.Drawing.Image)(resources.GetObject("btnClub.Image"))); this.btnClub.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnClub.Location = new System.Drawing.Point(378, 292); - this.btnClub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnClub.Location = new System.Drawing.Point(567, 450); this.btnClub.Name = "btnClub"; this.btnClub.Size = new System.Drawing.Size(99, 50); 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(539, 10); - this.pbPersonnes.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + 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.Name = "pbPersonnes"; this.pbPersonnes.Size = new System.Drawing.Size(23, 23); this.pbPersonnes.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -153,7 +153,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(583, 214); + this.mapView1.Size = new System.Drawing.Size(874, 329); this.mapView1.TabIndex = 11; this.mapView1.Paint += new System.Windows.Forms.PaintEventHandler(this.mapView1_Paint); // @@ -161,9 +161,8 @@ namespace Wanderer.view // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(600, 365); + 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); @@ -171,13 +170,12 @@ namespace Wanderer.view this.Controls.Add(this.btnUsine); this.Controls.Add(this.panel1); this.Controls.Add(this.pbAide); - this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormJeu"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FormJeu"; - this.Load += new System.EventHandler(this.FormJeu_Load); - ((System.ComponentModel.ISupportInitialize) (this.pbAide)).EndInit(); - ((System.ComponentModel.ISupportInitialize) (this.pbPersonnes)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbAide)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbPersonnes)).EndInit(); this.ResumeLayout(false); } diff --git a/view/FormJeu.resx b/view/FormJeu.resx index 65113246ae51a41cdc1aedbc295323b28e322030..7409876710a1ad0e365c3bbe790a119b7b000025 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,10 +1209,10 @@ 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> iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAB - 1wAAAdcBjJIIaAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAYBSURBVHhe7ZlL + 2AAAAdgB+lymcgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAYBSURBVHhe7ZlL qFVVGMe3b/EthChkSANF0DQEJ4YDUTFq0EgaCBoEmahgOEgIrIGPhg0EySbOahDVoOgFkaggTYweox4W FERBNKig1+3/2/f7Tuus/Z3H9uxz8dD+ww/W+h5rr/Xde9bee+1iampqRpFWiWfEG+I7gza2VVHOOAmN 40LaL34UdCLw7Y9yx0VoHAfSKVskfCJOiB0GbWzuPxWNMQ5CY9NIW8QftrizYn4QM998dIjdkseMg9DY diff --git a/view/FormMainMenu.Designer.cs b/view/FormMainMenu.Designer.cs index 5275fc6f9f43213aac089861428b68ed02e3c7f2..5776477777a5a6a036f9b7af6dee86a371df2d25 100644 --- a/view/FormMainMenu.Designer.cs +++ b/view/FormMainMenu.Designer.cs @@ -42,12 +42,11 @@ this.btnPlay.FlatAppearance.BorderSize = 3; this.btnPlay.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Moccasin; this.btnPlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnPlay.Font = new System.Drawing.Font("DejaVu Sans Condensed", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnPlay.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnPlay.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.btnPlay.Location = new System.Drawing.Point(193, 87); - this.btnPlay.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnPlay.Location = new System.Drawing.Point(290, 134); this.btnPlay.Name = "btnPlay"; - this.btnPlay.Size = new System.Drawing.Size(219, 84); + this.btnPlay.Size = new System.Drawing.Size(328, 129); this.btnPlay.TabIndex = 0; this.btnPlay.Text = "Jouer"; this.btnPlay.UseVisualStyleBackColor = false; @@ -59,12 +58,12 @@ this.button1.FlatAppearance.BorderSize = 3; this.button1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Moccasin; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button1.Font = new System.Drawing.Font("DejaVu Sans Condensed", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button1.Location = new System.Drawing.Point(193, 269); - this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.button1.Location = new System.Drawing.Point(290, 414); + this.button1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(219, 84); + this.button1.Size = new System.Drawing.Size(328, 129); this.button1.TabIndex = 1; this.button1.Text = "Quitter"; this.button1.UseVisualStyleBackColor = false; @@ -76,12 +75,12 @@ this.btnAide.FlatAppearance.BorderSize = 3; this.btnAide.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Moccasin; this.btnAide.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnAide.Font = new System.Drawing.Font("DejaVu Sans Condensed", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnAide.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnAide.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.btnAide.Location = new System.Drawing.Point(193, 177); - this.btnAide.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAide.Location = new System.Drawing.Point(290, 272); + this.btnAide.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.btnAide.Name = "btnAide"; - this.btnAide.Size = new System.Drawing.Size(219, 84); + this.btnAide.Size = new System.Drawing.Size(328, 129); this.btnAide.TabIndex = 2; this.btnAide.Text = "Aide"; this.btnAide.UseVisualStyleBackColor = false; @@ -91,26 +90,26 @@ // this.lbltitre.AutoSize = true; this.lbltitre.BackColor = System.Drawing.Color.Transparent; - this.lbltitre.Font = new System.Drawing.Font("ISOCTEUR", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbltitre.Font = new System.Drawing.Font("OCR A Extended", 48F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbltitre.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.lbltitre.Location = new System.Drawing.Point(106, 6); + this.lbltitre.Location = new System.Drawing.Point(207, 18); + this.lbltitre.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbltitre.Name = "lbltitre"; - this.lbltitre.Size = new System.Drawing.Size(402, 79); + this.lbltitre.Size = new System.Drawing.Size(506, 99); this.lbltitre.TabIndex = 3; this.lbltitre.Text = "Wanderer"; // // FormMainMenu // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + 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.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(600, 358); + this.ClientSize = new System.Drawing.Size(900, 551); this.Controls.Add(this.lbltitre); this.Controls.Add(this.btnAide); this.Controls.Add(this.button1); this.Controls.Add(this.btnPlay); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "FormMainMenu"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "s";