diff --git a/CleanFlashInstaller/CleanFlashInstaller.csproj b/CleanFlashInstaller/CleanFlashInstaller.csproj index 91c0e89..8cb1da6 100644 --- a/CleanFlashInstaller/CleanFlashInstaller.csproj +++ b/CleanFlashInstaller/CleanFlashInstaller.csproj @@ -37,7 +37,6 @@ - diff --git a/CleanFlashInstaller/InstallForm.Designer.cs b/CleanFlashInstaller/InstallForm.Designer.cs index 9de73fd..7270eba 100644 --- a/CleanFlashInstaller/InstallForm.Designer.cs +++ b/CleanFlashInstaller/InstallForm.Designer.cs @@ -374,6 +374,7 @@ namespace CleanFlashInstaller { this.prevButton.Name = "prevButton"; this.prevButton.Size = new System.Drawing.Size(138, 31); this.prevButton.TabIndex = 3; + this.prevButton.TabStop = false; this.prevButton.Text = "QUIT"; this.prevButton.UseVisualStyleBackColor = false; this.prevButton.Click += new System.EventHandler(this.prevButton_Click); @@ -620,6 +621,7 @@ namespace CleanFlashInstaller { this.Name = "InstallForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Clean Flash Player Dev Installer"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.InstallForm_FormClosing); this.Load += new System.EventHandler(this.InstallForm_Load); ((System.ComponentModel.ISupportInitialize)(this.flashLogo)).EndInit(); this.disclaimerPanel.ResumeLayout(false); diff --git a/CleanFlashInstaller/InstallForm.cs b/CleanFlashInstaller/InstallForm.cs index 2dae8b0..a31f316 100644 --- a/CleanFlashInstaller/InstallForm.cs +++ b/CleanFlashInstaller/InstallForm.cs @@ -293,5 +293,35 @@ If you ever change your mind, check out Clean Flash Player's website!"; debugChosen = MessageBox.Show("Are you sure you want to install the debug version?\n\nThis version is only meant to be used by experienced developers!\nIf you are not sure, choose No.", "Clean Flash Installer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes; OpenBeforeInstall(); } + + private void InstallForm_FormClosing(object sender, FormClosingEventArgs e) + { + bool v1 = true; + // if installing + // note: msgbox not pauses the process + if (installPanel.Visible) + { + if (v1) + { + // hardlock, only force quit process + // follows current design since Back button is disabled + MessageBox.Show("Please, wait until process end", "Clean Flash Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning); + e.Cancel = true; + } + else + // soft alternative, expert mode, todo: better warning of consequences + if (MessageBox.Show("Are you sure you want to interrupt the process ?", "Clean Flash Installer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + e.Cancel = true; + } + else + { + // use cases ? + // uninstall, currently not implemented + } + + //todo: same for uninstaller: share same F + } + } } } diff --git a/CleanFlashUninstaller/UninstallForm.Designer.cs b/CleanFlashUninstaller/UninstallForm.Designer.cs index cebc39b..5f645cf 100644 --- a/CleanFlashUninstaller/UninstallForm.Designer.cs +++ b/CleanFlashUninstaller/UninstallForm.Designer.cs @@ -41,6 +41,7 @@ namespace CleanFlashUninstaller { this.completeLabel = new System.Windows.Forms.LinkLabel(); this.failurePanel = new System.Windows.Forms.Panel(); this.copyErrorButton = new CleanFlashCommon.GradientButton(); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.InstallForm_FormClosing); this.failureBox = new System.Windows.Forms.TextBox(); this.failureText = new System.Windows.Forms.Label(); this.nextButton = new CleanFlashCommon.GradientButton(); @@ -242,6 +243,7 @@ namespace CleanFlashUninstaller { // // prevButton // + prevButton.TabStop = false; this.prevButton.BackColor = System.Drawing.Color.Black; this.prevButton.Color1 = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(118)))), ((int)(((byte)(118))))); this.prevButton.Color2 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(81)))), ((int)(((byte)(81))))); diff --git a/CleanFlashUninstaller/UninstallForm.cs b/CleanFlashUninstaller/UninstallForm.cs index c3c5db5..99ef991 100644 --- a/CleanFlashUninstaller/UninstallForm.cs +++ b/CleanFlashUninstaller/UninstallForm.cs @@ -121,5 +121,36 @@ namespace CleanFlashUninstaller { Clipboard.SetText(failureBox.Text); MessageBox.Show("Copied error message to clipboard!", "Clean Flash Installer", MessageBoxButtons.OK, MessageBoxIcon.Information); } + + // note: copy pasted from installer; todo: single F for both + private void InstallForm_FormClosing(object sender, FormClosingEventArgs e) + { + bool v1 = true; + // if installing + // note: msgbox not pauses the process + if (installPanel.Visible) + { + if (v1) + { + // hardlock, only force quit process + // follows current design since Back button is disabled + MessageBox.Show("Please, wait until process end", "Clean Flash Installer", MessageBoxButtons.OK, MessageBoxIcon.Warning); + e.Cancel = true; + } + else + // soft alternative, expert mode, todo: better warning of consequences + if (MessageBox.Show("Are you sure you want to interrupt the process ?", "Clean Flash Installer", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + e.Cancel = true; + } + else + { + // use cases ? + // uninstall, currently not implemented + } + + //todo: same for uninstaller: share same F + } + } } } diff --git a/README.md b/README.md index d10c800..8b2ddc2 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ To keep using Flash Player on **Mozilla Firefox**, install [**Waterfox Classic** - [Otter Browser](https://otter-browser.org) - [roytam's XP-compatible browser builds](http://rtfreesoft.blogspot.com) - [Portable old browser versions (guide)](https://www.raymond.cc/blog/how-to-enable-flash-support-in-firefox-portable) +- [Mypal 29.3.0](https://www.mypal-browser.org/download.html)