Skip to content
Snippets Groups Projects
Commit 068ae1af authored by TRITSCHBERGER ANTOINE's avatar TRITSCHBERGER ANTOINE
Browse files

Merge branch 'master' into 'master' 

Ajout du prof et retournement d'une trackbar

See merge request !30
parents 4ed75ba7 75d2999b
Branches
1 merge request!30Ajout du prof et retournement d'une trackbar
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 12 deletions
psychorientation/psychorientation/InterfaceClasse.Designer.cs
+ 16
− 0
View file @ 068ae1af
......@@ -43,9 +43,11 @@
this.lbl_barre_decisions = new System.Windows.Forms.Label();
this.lblCours = new System.Windows.Forms.Label();
this.lblNotation = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit();
this.pnlListeEleve.SuspendLayout();
this.pnlChoix.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// pb_action_suivante
......@@ -197,6 +199,17 @@
this.lblNotation.TabIndex = 0;
this.lblNotation.Text = "Coefficients de prise en compte de l\'effort et de la compétence pour noter :";
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
this.pictureBox1.Image = global::psychorientation.Properties.Resources.prof2;
this.pictureBox1.Location = new System.Drawing.Point(642, 234);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(71, 93);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 9;
this.pictureBox1.TabStop = false;
//
// InterfaceClasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
......@@ -205,6 +218,7 @@
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(1357, 783);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.pnlChoix);
this.Controls.Add(this.lblEffort);
this.Controls.Add(this.lblCompetence);
......@@ -226,6 +240,7 @@
this.pnlListeEleve.ResumeLayout(false);
this.pnlListeEleve.PerformLayout();
this.pnlChoix.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -248,6 +263,7 @@
private System.Windows.Forms.Label lblNotation;
private System.Windows.Forms.Label lblCours;
private System.Windows.Forms.Label lbl_barre_decisions;
private System.Windows.Forms.PictureBox pictureBox1;
}
}
psychorientation/psychorientation/InterfaceClasse.cs
+ 1
− 0
View file @ 068ae1af
......@@ -75,6 +75,7 @@ namespace psychorientation
tbNota.Value = 10;
tbNota.SmallChange = 1;
tbNota.LargeChange = 1;
tbNota.TickStyle = TickStyle.TopLeft;
tbNota.Scroll += new System.EventHandler(tbNota_Scroll);
pnlChoix.Controls.Add(tbNota);
lblNotation.Text = notaText;
......
psychorientation/psychorientation/InterfaceClasse.resx
+ 1
− 1
View file @ 068ae1af
......@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
mgEAAk1TRnQBSQFMAgEBBgEAAUgBAAFIAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
mgEAAk1TRnQBSQFMAgEBBgEAAWABAAFgAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA
AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA
A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA
......
psychorientation/psychorientation/Properties/Resources.Designer.cs
+ 11
− 1
View file @ 068ae1af
......@@ -19,7 +19,7 @@ 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", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......@@ -90,6 +90,16 @@ namespace psychorientation.Properties {
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap prof2 {
get {
object obj = ResourceManager.GetObject("prof2", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
......
psychorientation/psychorientation/Properties/Resources.resx
+ 13
− 10
View file @ 068ae1af
......@@ -118,22 +118,25 @@
<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="grp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<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>
<data name="salleV11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salleV11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<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="paternFeuille" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\bin\Debug\images\patern\paternFeuille.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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 name="grp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grp.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 name="salleV11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salleV11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="paternFeuille" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\bin\Debug\images\patern\paternFeuille.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="prof2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\prof2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
psychorientation/psychorientation/Resources/prof2.png 0 → 100644
+ 0
− 0
View file @ 068ae1af
psychorientation/psychorientation/Resources/prof2.png

5.01 KiB

psychorientation/psychorientation/psychorientation.csproj
+ 3
− 0
View file @ 068ae1af
......@@ -153,5 +153,8 @@
<ItemGroup>
<None Include="bin\Debug\images\patern\paternFeuille.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\prof2.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment