Skip to content

Commit

Permalink
A bit more fixes to the menues
Browse files Browse the repository at this point in the history
  • Loading branch information
rappen committed Feb 14, 2023
1 parent cdd2f13 commit b8d96f1
Show file tree
Hide file tree
Showing 6 changed files with 142 additions and 131 deletions.
2 changes: 1 addition & 1 deletion FetchXmlBuilder/FXBGui.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal void EnableControls(bool enabled)
// Main menu items
tsbExecute.Enabled = enabled && Service != null;
tsbAbort.Visible = settings.Results.RetrieveAllPages;
tsbBDU.Visible = bduexists && callerArgs?.SourcePlugin != "Bulk Data Updater";
tsbBDU.Visible = settings.ShowBDU && bduexists && callerArgs?.SourcePlugin != "Bulk Data Updater";
tsbBDU.Enabled = enabled && (dockControlBuilder?.IsFetchAggregate() == false);
tsbReturnToCaller.Visible = CallerWantsResults();

Expand Down
146 changes: 69 additions & 77 deletions FetchXmlBuilder/FetchXmlBuilder.Designer.cs

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

3 changes: 2 additions & 1 deletion FetchXmlBuilder/FetchXmlBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public FetchXmlBuilder()
// Add the event handler for handling non-UI thread exceptions to the event.
//AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(Error_UnhandledException);

tslAbout.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString() + " by Jonas Rapp";
//tslAbout.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString() + " by Jonas Rapp";

ai = new AppInsights(aiEndpoint, aiKey, Assembly.GetExecutingAssembly(), "FetchXML Builder");
var theme = new VS2015LightTheme();
Expand Down Expand Up @@ -360,6 +360,7 @@ private void ApplySettings(bool reloadquery)
{
toolStripMain.Items.OfType<ToolStripItem>().ToList().ForEach(i => i.DisplayStyle = settings.ShowButtonTexts ? ToolStripItemDisplayStyle.ImageAndText : ToolStripItemDisplayStyle.Image);
tsbRepo.Visible = settings.ShowRepository;
tsbBDU.Visible = settings.ShowBDU;
tsmiShowOData.Visible = settings.ShowOData2;
if (reloadquery && connectionsettings != null && !string.IsNullOrWhiteSpace(connectionsettings.FetchXML))
{
Expand Down
Loading

0 comments on commit b8d96f1

Please sign in to comment.