diff --git a/COURS01/FAccueil.Designer.cs b/COURS01/FAccueil.Designer.cs index 10a4f92..9b39e6b 100644 --- a/COURS01/FAccueil.Designer.cs +++ b/COURS01/FAccueil.Designer.cs @@ -90,7 +90,6 @@ this.MinimizeBox = false; this.Name = "EcranAccueil"; this.Text = "Bienvenue, welcome,..."; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EcranAccueil_FormClosing); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/COURS01/FAccueil.cs b/COURS01/FAccueil.cs index 52b77d5..35a29e9 100644 --- a/COURS01/FAccueil.cs +++ b/COURS01/FAccueil.cs @@ -35,23 +35,9 @@ namespace COURS01 } } - private void EcranAccueil_FormClosing(object sender, FormClosingEventArgs e) - { - if (MessageBox.Show("Voulez-vous vraiment quiter ?", "Souhait", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) - { - e.Cancel = false; - } - else - { - e.Cancel = true; - } - } - private void btnEntrez_Click(object sender, EventArgs e) { - EcranPrincipal f = new EcranPrincipal(this); - this.Hide(); - f.ShowDialog();//Bloque la fenetre parrent alors que show ne bloque pas le parent + Close(); } } } diff --git a/COURS01/FPrincipal.Designer.cs b/COURS01/FPrincipal.Designer.cs index 312695e..02dc883 100644 --- a/COURS01/FPrincipal.Designer.cs +++ b/COURS01/FPrincipal.Designer.cs @@ -109,7 +109,7 @@ this.MinimizeBox = false; this.Name = "EcranPrincipal"; this.Text = "Ecran Principal"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.mQuitter_Click); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EcranAccueil_FormClosing); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.ResumeLayout(false); diff --git a/COURS01/FPrincipal.cs b/COURS01/FPrincipal.cs index c956692..074fbce 100644 --- a/COURS01/FPrincipal.cs +++ b/COURS01/FPrincipal.cs @@ -27,35 +27,29 @@ namespace COURS01 } private void mQuitter_Click(object sender, EventArgs e) { - if(parentToCloseF) - { - parentToClose.Close(); - if (parentToClose.IsDisposed) - Close(); - } - else - Close(); + Close(); } private void mQuitter_Click(object sender, FormClosingEventArgs e) { - if (parentToCloseF) - { - parentToClose.Close(); - if (parentToClose.IsDisposed) - { - e.Cancel = false; - } - else - e.Cancel = true; - } - else - e.Cancel = false; + Close(); } private void mNDef_Click(object sender, EventArgs e) { MessageBox.Show("Fonctionnalité non implémentée"); } + + private void EcranAccueil_FormClosing(object sender, FormClosingEventArgs e) + { + if (MessageBox.Show("Voulez-vous vraiment quiter ?", "Souhait", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + e.Cancel = false; + } + else + { + e.Cancel = true; + } + } } } diff --git a/COURS01/Program.cs b/COURS01/Program.cs index bbce60e..f625534 100644 --- a/COURS01/Program.cs +++ b/COURS01/Program.cs @@ -17,6 +17,7 @@ namespace COURS01 Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new EcranAccueil()); + Application.Run(new EcranPrincipal()); } } } diff --git a/COURS01/bin/Debug/COURS01.exe b/COURS01/bin/Debug/COURS01.exe index 4b3dc29..3c88a43 100644 Binary files a/COURS01/bin/Debug/COURS01.exe and b/COURS01/bin/Debug/COURS01.exe differ diff --git a/COURS01/bin/Debug/COURS01.pdb b/COURS01/bin/Debug/COURS01.pdb index 134d772..4ba1f06 100644 Binary files a/COURS01/bin/Debug/COURS01.pdb and b/COURS01/bin/Debug/COURS01.pdb differ diff --git a/COURS01/obj/Debug/COURS01.csproj.FileListAbsolute.txt b/COURS01/obj/Debug/COURS01.csproj.FileListAbsolute.txt index 067861b..5b6d983 100644 --- a/COURS01/obj/Debug/COURS01.csproj.FileListAbsolute.txt +++ b/COURS01/obj/Debug/COURS01.csproj.FileListAbsolute.txt @@ -8,3 +8,4 @@ C:\Users\Adrien\source\repos\COURS01\COURS01\obj\Debug\COURS01.csproj.CoreCompil C:\Users\Adrien\source\repos\COURS01\COURS01\obj\Debug\COURS01.exe C:\Users\Adrien\source\repos\COURS01\COURS01\obj\Debug\COURS01.pdb C:\Users\Adrien\source\repos\COURS01\COURS01\obj\Debug\COURS01.EcranPrincipal.resources +C:\Users\Adrien\source\repos\COURS01\COURS01\obj\Debug\COURS01.csprojResolveAssemblyReference.cache diff --git a/COURS01/obj/Debug/COURS01.csproj.GenerateResource.Cache b/COURS01/obj/Debug/COURS01.csproj.GenerateResource.Cache index 761827a..42dae26 100644 Binary files a/COURS01/obj/Debug/COURS01.csproj.GenerateResource.Cache and b/COURS01/obj/Debug/COURS01.csproj.GenerateResource.Cache differ diff --git a/COURS01/obj/Debug/COURS01.exe b/COURS01/obj/Debug/COURS01.exe index 4b3dc29..3c88a43 100644 Binary files a/COURS01/obj/Debug/COURS01.exe and b/COURS01/obj/Debug/COURS01.exe differ diff --git a/COURS01/obj/Debug/COURS01.pdb b/COURS01/obj/Debug/COURS01.pdb index 134d772..4ba1f06 100644 Binary files a/COURS01/obj/Debug/COURS01.pdb and b/COURS01/obj/Debug/COURS01.pdb differ