Skip to content

Commit

Permalink
Fix MscrmTools#241 Allows to close XrmToolBox without prompting when …
Browse files Browse the repository at this point in the history
…there is(are) opened plugin(s)
  • Loading branch information
MscrmTools committed Sep 17, 2015
1 parent 615e56d commit ad2e846
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 10 deletions.
13 changes: 13 additions & 0 deletions XrmToolBox/Forms/OptionsDialog.Designer.cs

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

2 changes: 2 additions & 0 deletions XrmToolBox/Forms/OptionsDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public OptionsDialog(Options option, PluginManagerExtended pManager)
rdbToolsListSmall.Checked = !option.DisplayLargeIcons;
chkDisplayMuFirst.Checked = option.DisplayMostUsedFirst;
chkAllowUsageStatistics.Checked = option.AllowLogUsage.HasValue && option.AllowLogUsage.Value;
chkClosePluginsSilently.Checked = option.CloseOpenedPluginsSilently;
}

public Options Option { get { return option; } }
Expand All @@ -40,6 +41,7 @@ private void BtnOkClick(object sender, EventArgs e)
option.AllowLogUsage = chkAllowUsageStatistics.Checked;
option.DisplayLargeIcons = rdbToolsListLarge.Checked;
option.DisplayMostUsedFirst = chkDisplayMuFirst.Checked;
option.CloseOpenedPluginsSilently = chkClosePluginsSilently.Checked;

option.HiddenPlugins =
lvPlugins.Items.Cast<ListViewItem>().Where(i => i.Checked == false).Select(i => i.Text).ToList();
Expand Down
21 changes: 12 additions & 9 deletions XrmToolBox/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,15 @@ protected override void OnResize(EventArgs e)
AdaptPluginControlSize();
}

private void ConnectUponApproval(object connectionParameter)
{
var info = new ConnectionParameterInfo
{
ConnectionParmater = connectionParameter
};
fHelper.AskForConnection(info, () => info.InfoPanel = InformationPanel.GetInformationPanel(this, "Connecting...", 340, 120));
}

private bool IsMessageValid(object sender, MessageBusEventArgs message)
{
if (message == null || sender == null || !(sender is UserControl) || !(sender is IXrmToolBoxPluginControl))
Expand Down Expand Up @@ -395,15 +404,6 @@ private void PluginClicked(object sender, EventArgs e)
}
}

private void ConnectUponApproval(object connectionParameter)
{
var info = new ConnectionParameterInfo
{
ConnectionParmater = connectionParameter
};
fHelper.AskForConnection(info, () => info.InfoPanel = InformationPanel.GetInformationPanel(this, "Connecting...", 340, 120));
}

private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
ProcessMenuItemsForPlugin();
Expand Down Expand Up @@ -531,6 +531,9 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
currentOptions.Save();

// Warn to close opened plugins
if (currentOptions.CloseOpenedPluginsSilently)
return;

var info = new PluginCloseInfo(e.CloseReason);
RequestCloseTabs(GetPluginPages(), info);
e.Cancel = info.Cancel;
Expand Down
4 changes: 3 additions & 1 deletion XrmToolBox/Options.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public Options()

public bool? AllowLogUsage { get; set; }
public bool CheckUpdateOnStartup { get; set; }
public bool CloseOpenedPluginsSilently { get; set; }
public bool DisplayLargeIcons { get; set; }
public bool DisplayMostUsedFirst { get; set; }
public List<string> HiddenPlugins { get; set; }
Expand Down Expand Up @@ -104,7 +105,8 @@ public object Clone()
LastAdvertisementDisplay = LastAdvertisementDisplay,
HiddenPlugins = HiddenPlugins,
LastUpdateCheck = LastUpdateCheck,
AllowLogUsage = AllowLogUsage
AllowLogUsage = AllowLogUsage,
CloseOpenedPluginsSilently = CloseOpenedPluginsSilently
};
}

Expand Down

0 comments on commit ad2e846

Please sign in to comment.