Skip to content

Commit 9c3d345

Browse files
rappenrappen
authored
Merge pull request #1055 from rappen/supporting
Supporting
2 parents d593aab + 8ca6301 commit 9c3d345

13 files changed

+6217
-112
lines changed

‎FetchXmlBuilder/FXBInterfaces.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public void OnIncomingMessage(MessageBusEventArgs message)
8383
}
8484
dockControlBuilder.Init(fetchXml, layoutxml, fromview, $"called from {message.SourcePlugin}", false);
8585
attributesChecksum = dockControlBuilder.GetAttributesSignature();
86-
tsbReturnToCaller.Text = callerArgs.SourcePlugin == URLcaller ? "FetchXML from an URL" : "Return FetchXML";
86+
//tsbReturnToCaller.Text = callerArgs.SourcePlugin == URLcaller ? "FetchXML from an URL" : "Return FetchXML";
8787
tsbReturnToCaller.Image =
88-
callerArgs.SourcePlugin == "Bulk Data Updater" ? Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.BDU_2019_032_tsp :
88+
callerArgs.SourcePlugin == "Bulk Data Updater" ? Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.logo_BDU :
8989
callerArgs.SourcePlugin == URLcaller ? Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.icon_web :
9090
Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.icon_return;
9191
tsbReturnToCaller.ToolTipText = callerArgs.SourcePlugin == URLcaller ? "Show 'Sharing Queries' on my website." : "Return " + requestedType + " to " + callerArgs.SourcePlugin;
@@ -233,7 +233,10 @@ public void ShowSettings()
233233

234234
private bool CallerWantsResults()
235235
{
236-
return callerArgs != null;
236+
return
237+
callerArgs != null &&
238+
callerArgs.SourcePlugin != "Plugin Trace Viewer" &&
239+
callerArgs.SourcePlugin != URLcaller;
237240
}
238241

239242
private void ReturnToCaller()

‎FetchXmlBuilder/FetchXmlBuilder.Designer.cs‎

Lines changed: 30 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FetchXmlBuilder/FetchXmlBuilder.cs‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Rappen.XTB.FetchXmlBuilder.Extensions;
99
using Rappen.XTB.FetchXmlBuilder.Forms;
1010
using Rappen.XTB.FetchXmlBuilder.Settings;
11+
using Rappen.XTB.Helpers;
1112
using Rappen.XTB.XmlEditorUtils;
1213
using System;
1314
using System.Collections.Generic;
@@ -68,6 +69,7 @@ public FetchXmlBuilder()
6869
// Add the event handler for handling non-UI thread exceptions to the event.
6970
//AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(Error_UnhandledException);
7071

72+
UrlUtils.TOOL_NAME = "FetchXMLBuilder";
7173
tslAbout.ToolTipText = $"Version: {Assembly.GetExecutingAssembly().GetName().Version}";
7274

7375
ai1 = new AppInsights(aiEndpoint, aiKey1, Assembly.GetExecutingAssembly(), "FetchXML Builder");
@@ -379,17 +381,6 @@ private void ApplySettings(bool reloadquery)
379381
dockControlBuilder.Init(connectionsettings.FetchXML, connectionsettings.LayoutXML, false, "loaded from last session", false);
380382
}
381383
dockControlBuilder.lblQAExpander.GroupBoxSetState(null, settings.QueryOptions.ShowQuickActions);
382-
var ass = Assembly.GetExecutingAssembly().GetName();
383-
var version = ass.Version.ToString();
384-
if (!version.Equals(settings.CurrentVersion))
385-
{
386-
// Reset some settings when new version is deployed
387-
var oldversion = settings.CurrentVersion;
388-
settings.CurrentVersion = version;
389-
SaveSetting();
390-
LogUse("ShowWelcome", ai2: true);
391-
Welcome.ShowWelcome(this, oldversion);
392-
}
393384
}
394385

395386
/// <summary>Repopulate the entire tree from the xml document containing the FetchXML</summary>
@@ -551,6 +542,21 @@ private void FetchXmlBuilder_Load(object sender, EventArgs e)
551542
CheckIntegrationTools();
552543
SetupDockControls();
553544
ApplySettings(true);
545+
var ass = Assembly.GetExecutingAssembly().GetName();
546+
var version = ass.Version.ToString();
547+
if (!version.Equals(settings.CurrentVersion))
548+
{
549+
// Reset some settings when new version is deployed
550+
var oldversion = settings.CurrentVersion;
551+
settings.CurrentVersion = version;
552+
SaveSetting();
553+
LogUse("ShowWelcome", ai2: true);
554+
Welcome.ShowWelcome(this, oldversion);
555+
}
556+
else
557+
{
558+
Supporting.ShowIf(this, false, true, ai2);
559+
}
554560
RebuildRepositoryMenu(null);
555561
TreeNodeHelper.AddContextMenu(null, dockControlBuilder, settings.QueryOptions);
556562
EnableControls(true);
@@ -878,6 +884,11 @@ private void tsbShare_Click(object sender, EventArgs e)
878884
ShareLink.Open(this, dockControlBuilder.GetFetchString(false, false));
879885
}
880886

887+
private void tsbSupporting_Click(object sender, EventArgs e)
888+
{
889+
Supporting.ShowIf(this, true, false, ai2);
890+
}
891+
881892
#endregion Private Event Handlers
882893
}
883894
}

‎FetchXmlBuilder/FetchXmlBuilder.csproj‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
<AssemblyName>Rappen.XTB.FXB</AssemblyName>
1212
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<SccProjectName>SAK</SccProjectName>
15-
<SccLocalPath>SAK</SccLocalPath>
16-
<SccAuxPath>SAK</SccAuxPath>
17-
<SccProvider>SAK</SccProvider>
14+
<SccProjectName>
15+
</SccProjectName>
16+
<SccLocalPath>
17+
</SccLocalPath>
18+
<SccAuxPath>
19+
</SccAuxPath>
20+
<SccProvider>
21+
</SccProvider>
1822
<TargetFrameworkProfile />
1923
<NuGetPackageImportStamp>
2024
</NuGetPackageImportStamp>
@@ -233,6 +237,12 @@
233237
<Compile Include="Forms\ShareLink.Designer.cs">
234238
<DependentUpon>ShareLink.cs</DependentUpon>
235239
</Compile>
240+
<Compile Include="Forms\Supporting.cs">
241+
<SubType>Form</SubType>
242+
</Compile>
243+
<Compile Include="Forms\Supporting.Designer.cs">
244+
<DependentUpon>Supporting.cs</DependentUpon>
245+
</Compile>
236246
<Compile Include="Properties\Resources.Designer.cs">
237247
<AutoGen>True</AutoGen>
238248
<DesignTime>True</DesignTime>
@@ -510,6 +520,9 @@
510520
<EmbeddedResource Include="Forms\ShowMetadataOptions.resx">
511521
<DependentUpon>ShowMetadataOptions.cs</DependentUpon>
512522
</EmbeddedResource>
523+
<EmbeddedResource Include="Forms\Supporting.resx">
524+
<DependentUpon>Supporting.cs</DependentUpon>
525+
</EmbeddedResource>
513526
<EmbeddedResource Include="Forms\Welcome.resx">
514527
<DependentUpon>Welcome.cs</DependentUpon>
515528
</EmbeddedResource>
@@ -582,9 +595,6 @@
582595
<ItemGroup>
583596
<None Include="Resources\Dataverse_scalable_32.png" />
584597
</ItemGroup>
585-
<ItemGroup>
586-
<None Include="Resources\Dataverse_scalable gray bg 32.png" />
587-
</ItemGroup>
588598
<ItemGroup>
589599
<None Include="Resources\PowerAutomate_scalable gray bg 32.png" />
590600
</ItemGroup>
@@ -639,14 +649,11 @@
639649
<ItemGroup>
640650
<None Include="Resources\Power Platform Developer icon.png" />
641651
</ItemGroup>
642-
<ItemGroup>
643-
<None Include="Resources\bmc-32.png" />
644-
</ItemGroup>
645652
<ItemGroup>
646653
<None Include="Resources\Microsoft_logo.32.png" />
647654
</ItemGroup>
648655
<ItemGroup>
649-
<None Include="Resources\view.png" />
656+
<None Include="Resources\Supporting Tools 32h frame.png" />
650657
</ItemGroup>
651658
<Import Project="..\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.projitems" Label="Shared" />
652659
<Import Project="..\FXBEditorUtils\FXBEditorUtils.projitems" Label="Shared" />

0 commit comments

Comments
 (0)