Skip to content

Commit

Permalink
Merge pull request #125 from solarwinds/td/preference-prompt-to-save
Browse files Browse the repository at this point in the history
Add a preference for whether or not to prompt for save on close
  • Loading branch information
tdanner authored Mar 9, 2018
2 parents 37e5725 + a1099bc commit c98155a
Show file tree
Hide file tree
Showing 6 changed files with 247 additions and 213 deletions.
24 changes: 17 additions & 7 deletions Src/SwqlStudio/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions Src/SwqlStudio/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ private void TextEditor_FormClosing(object sender, FormClosingEventArgs e)
// Ask user to save changes
foreach (var editor in this.filesDock.AllEditors)
{
if (editor.Modified)
if (editor.Modified && Settings.Default.PromptToSaveOnClose)
{
var r = MessageBox.Show(this, string.Format("Save changes to {0}?", editor.FileName ?? "new file"),
var r = MessageBox.Show(this, $"Save changes to {editor.FileName ?? "new file"}?",
"Save?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
if (r == DialogResult.Cancel)
e.Cancel = true;
Expand All @@ -259,8 +259,7 @@ private void TextEditor_FormClosing(object sender, FormClosingEventArgs e)
e.Cancel = true;
}

ConnectionInfo info = editor.Tag as ConnectionInfo;
if (info != null)
if (editor.Tag is ConnectionInfo info)
{
info.Dispose();
}
Expand Down Expand Up @@ -396,6 +395,7 @@ private void enableAutocompleteToolStripMenuItem_CheckedChanged(object sender, E
private void preferencesToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
{
enableAutocompleteToolStripMenuItem.Checked = Settings.Default.AutocompleteEnabled;
promptToSaveOnCloseToolStripMenuItem.Checked = Settings.Default.PromptToSaveOnClose;
}

private void searchInTreeHotKeyToolStripMenuItem_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -467,5 +467,11 @@ private void CopyQueryAs(Func<string, ConnectionInfo, string> formatter)
string command = formatter(query, connection);
Clipboard.SetText(command);
}

private void promptToSaveOnCloseToolStripMenuItem_Click(object sender, EventArgs e)
{
Settings.Default.PromptToSaveOnClose = !Settings.Default.PromptToSaveOnClose;
Settings.Default.Save();
}
}
}
Loading

0 comments on commit c98155a

Please sign in to comment.