Fixed bug when after file locking was able to open settings

This commit is contained in:
Alexander 2021-04-07 02:27:16 +03:00
parent 00d20db932
commit eced4a332b
No known key found for this signature in database
GPG key ID: F68D8C9B429E6FF6

View file

@ -81,6 +81,7 @@ private async Task DecryptAES()
openFileDialog.FileName = filePath;
mainMenu.Enabled = true;
toolbarPanel.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
richTextBox.ReadOnly = false;
UseWaitCursor = false;
richTextBox.ResumeDrawing();
@ -96,6 +97,7 @@ private async Task DecryptAES()
{
mainMenu.Enabled = false;
toolbarPanel.Enabled = false;
settingsToolStripMenuItem.Enabled = false;
richTextBox.ReadOnly = true;
string openedFileText = await reader.ReadToEndAsync();
if (string.IsNullOrEmpty(settings.TheSalt))
@ -113,6 +115,7 @@ private async Task DecryptAES()
PublicVar.openFileName = Path.GetFileName(filePath);
PublicVar.metadataCorrupt = false;
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
richTextBox.ReadOnly = false;
UseWaitCursor = false;
@ -130,6 +133,7 @@ private async Task DecryptAES()
TypedPassword.Value = null;
StatusPanelFileInfo();
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
richTextBox.ReadOnly = false;
UseWaitCursor = false;
@ -156,6 +160,7 @@ private async Task DecryptAES()
{
PublicVar.openFileName = Path.GetFileName(filePath);
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
richTextBox.ReadOnly = false;
UseWaitCursor = false;
@ -501,6 +506,7 @@ private async Task UnlockFile()
fileLockedPanel.Enabled = false;
TypedPassword.Value = fileLockedKeyTextBox.Text;
mainMenu.Enabled = false;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = false;
using (StreamReader reader = File.OpenText(openFileDialog.FileName))
{
@ -519,6 +525,7 @@ private async Task UnlockFile()
UseWaitCursor = false;
fileLockedPanel.Enabled = true;
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = true;
}
catch (Exception ex)
@ -1266,6 +1273,7 @@ private async void SaveMainMenu_Click(object sender, EventArgs e)
return;
}
mainMenu.Enabled = false;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = false;
richTextBox.ReadOnly = true;
richTextBox.SuspendDrawing();
@ -1283,6 +1291,7 @@ private async void SaveMainMenu_Click(object sender, EventArgs e)
richTextBox.ResumeDrawing();
UseWaitCursor = false;
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
richTextBox.ReadOnly = false;
}
@ -1324,6 +1333,7 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e)
PublicVar.password.Set(TypedPassword.Value);
filePath = saveFileDialog.FileName;
mainMenu.Enabled = false;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = false;
richTextBox.ReadOnly = true;
richTextBox.SuspendDrawing();
@ -1337,6 +1347,7 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e)
richTextBox.ResumeDrawing();
UseWaitCursor = false;
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
richTextBox.ReadOnly = false;
richTextBox.Modified = false;
@ -1350,6 +1361,7 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e)
private async void SaveCloseFileMainMenu_Click(object sender, EventArgs e)
{
mainMenu.Enabled = false;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = false;
richTextBox.SuspendDrawing();
UseWaitCursor = true;
@ -1362,6 +1374,7 @@ private async void SaveCloseFileMainMenu_Click(object sender, EventArgs e)
richTextBox.ResumeDrawing();
UseWaitCursor = false;
mainMenu.Enabled = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
richTextBox.ReadOnly = false;
PublicVar.password.Set(null);
@ -1645,6 +1658,7 @@ private async void LockMainMenu_Click(object sender, EventArgs e)
}
mainMenu.Enabled = false;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = false;
richTextBox.SuspendDrawing();
UseWaitCursor = true;
@ -2052,6 +2066,7 @@ private void FileLockedPanel_VisibleChanged(object sender, EventArgs e)
PublicVar.password.Set(null);
caretPos = richTextBox.SelectionStart;
richTextBox.Visible = false;
settingsToolStripMenuItem.Enabled = false;
toolbarPanel.Enabled = false;
mainMenu.Enabled = false;
richTextBox.Clear();
@ -2073,6 +2088,7 @@ private void FileLockedPanel_VisibleChanged(object sender, EventArgs e)
}
richTextBox.Visible = true;
settingsToolStripMenuItem.Enabled = true;
toolbarPanel.Enabled = true;
searchPanel.Enabled = true;
mainMenu.Enabled = true;
@ -2153,7 +2169,10 @@ private void TrayIcon_MouseDoubleClick(object sender, MouseEventArgs e)
{
Show();
WindowState = currentWindowState;
richTextBox.Visible = true;
if (!fileLockedPanel.Visible)
{
richTextBox.Visible = true;
}
}
}
}
@ -2169,7 +2188,10 @@ private void ShowWindowTrayMenu_Click(object sender, EventArgs e)
{
Show();
WindowState = currentWindowState;
richTextBox.Visible = true;
if (!fileLockedPanel.Visible)
{
richTextBox.Visible = true;
}
}
}
private void ExitTrayMenu_Click(object sender, EventArgs e)