Skip to content

Commit dacbd86

Browse files
rappenrappen
committed
Easier to change result type #1071 plus more UI updates
1 parent 2cdf326 commit dacbd86

21 files changed

+358
-133
lines changed

‎FetchXmlBuilder/FXBGui.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,5 +917,40 @@ internal void ShowLayoutXML()
917917
{
918918
ShowContentControl(ref dockControlLayoutXml, ContentType.LayoutXML, SaveFormat.None, settings.DockStates.LayoutXML);
919919
}
920+
921+
internal static ResultOutput ResultItemToSettingResult(int selectedIndex)
922+
{
923+
switch (selectedIndex)
924+
{
925+
case 1: return ResultOutput.XML;
926+
case 2: return ResultOutput.JSON;
927+
case 3: return ResultOutput.JSONWebAPI;
928+
case 4: return ResultOutput.Raw;
929+
default: return ResultOutput.Grid;
930+
}
931+
}
932+
933+
private void SetResultTypeMenu(ResultOutput resultOutput)
934+
{
935+
tsmiResultXml.Checked = resultOutput == ResultOutput.XML;
936+
tsmiResultJson.Checked = resultOutput == ResultOutput.JSON;
937+
tsmiResultWebApi.Checked = resultOutput == ResultOutput.JSONWebAPI;
938+
tsmiResultRaw.Checked = resultOutput == ResultOutput.Raw;
939+
tsmiResultGridView.Checked = !tsmiResultXml.Checked && !tsmiResultJson.Checked && !tsmiResultWebApi.Checked && !tsmiResultRaw.Checked;
940+
}
941+
942+
private void tsmiResultType_Click(object sender = null, EventArgs e = null)
943+
{
944+
var result =
945+
sender is ToolStripMenuItem tsmi &&
946+
tsmi.Tag is string strtag &&
947+
int.TryParse(strtag, out int inttag) ? ResultItemToSettingResult(inttag) : ResultOutput.Grid;
948+
SetResultTypeMenu(result);
949+
if (settings.Results.ResultOutput != result)
950+
{
951+
settings.Results.ResultOutput = result;
952+
FetchResults();
953+
}
954+
}
920955
}
921956
}

‎FetchXmlBuilder/FXBInterfaces.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void OnIncomingMessage(MessageBusEventArgs message)
8888
tsbReturnToCaller.Image =
8989
callerArgs.SourcePlugin == "Bulk Data Updater" ? Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.logo_BDU :
9090
callerArgs.SourcePlugin == URLcaller ? Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.icon_web :
91-
Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.icon_return;
91+
Cinteros.Xrm.FetchXmlBuilder.Properties.Resources.icon_send_back;
9292
tsbReturnToCaller.ToolTipText = callerArgs.SourcePlugin == URLcaller ? "Show 'Sharing Queries' on my website." : "Return " + requestedType + " to " + callerArgs.SourcePlugin;
9393
LogUse("CalledBy." + callerArgs.SourcePlugin, ai2: true);
9494
if (callerArgs.SourcePlugin == "View Designer" && !connectionsettings.TipsAgainstOrViewDesignerToolShown)

‎FetchXmlBuilder/FetchXmlBuilder.Designer.cs‎

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

‎FetchXmlBuilder/FetchXmlBuilder.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ private void ApplySettings(bool reloadquery)
363363
tsbRepo.Visible = settings.ShowRepository;
364364
tsbBDU.Visible = settings.ShowBDU;
365365
tsmiShowOData.Visible = settings.ShowOData2;
366+
SetResultTypeMenu(settings.Results.ResultOutput);
366367
dockControlBuilder.lblQAExpander.GroupBoxSetState(null, settings.QueryOptions.ShowQuickActions);
367368
}
368369

‎FetchXmlBuilder/FetchXmlBuilder.csproj‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,9 +649,6 @@
649649
<ItemGroup>
650650
<None Include="Resources\icons8-internet-32.png" />
651651
</ItemGroup>
652-
<ItemGroup>
653-
<None Include="Resources\icons8-share-32.png" />
654-
</ItemGroup>
655652
<ItemGroup>
656653
<None Include="Resources\icons8-settings-16.png" />
657654
</ItemGroup>
@@ -685,6 +682,33 @@
685682
<ItemGroup>
686683
<None Include="Resources\icons8-excel-24.png" />
687684
</ItemGroup>
685+
<ItemGroup>
686+
<None Include="Resources\Integration-32.png" />
687+
</ItemGroup>
688+
<ItemGroup>
689+
<None Include="Resources\icons8-send-32 %285%29 flip.png" />
690+
</ItemGroup>
691+
<ItemGroup>
692+
<None Include="Resources\icons8-share-32 %284%29.png" />
693+
</ItemGroup>
694+
<ItemGroup>
695+
<None Include="Resources\icons8-grid-view-32.png" />
696+
</ItemGroup>
697+
<ItemGroup>
698+
<None Include="Resources\icons8-xml-32.png" />
699+
</ItemGroup>
700+
<ItemGroup>
701+
<None Include="Resources\icons8-json-download-32.png" />
702+
</ItemGroup>
703+
<ItemGroup>
704+
<None Include="Resources\icons8-placeholder-thumbnail-json-32.png" />
705+
</ItemGroup>
706+
<ItemGroup>
707+
<None Include="Resources\icons8-raw-32.png" />
708+
</ItemGroup>
709+
<ItemGroup>
710+
<None Include="Resources\icons8-result-32.png" />
711+
</ItemGroup>
688712
<Import Project="..\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI\MarkMpn.FetchXmlToWebAPI.projitems" Label="Shared" />
689713
<Import Project="..\FXBEditorUtils\FXBEditorUtils.projitems" Label="Shared" />
690714
<Import Project="..\MarkMpn.XmlSchemaAutocomplete\MarkMpn.XmlSchemaAutoComplete\MarkMpn.XmlSchemaAutoComplete.projitems" Label="Shared" />

‎FetchXmlBuilder/Forms/Settings.Designer.cs‎

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

‎FetchXmlBuilder/Forms/Settings.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ internal FXBSettings GetSettings()
9090
settings.QueryOptions.NewQueryTemplate = txtFetch.Text;
9191
settings.DoNotPromptToSave = chkAppNoSavePrompt.Checked;
9292
settings.Results.AlwaysNewWindow = chkAppResultsNewWindow.Checked;
93-
settings.Results.ResultOutput = ResultItemToSettingResult(cmbResult.SelectedIndex);
93+
settings.Results.ResultOutput = FetchXmlBuilder.ResultItemToSettingResult(cmbResult.SelectedIndex);
9494
settings.Results.RetrieveAllPages = chkResAllPages.Checked;
9595
settings.Results.ClickableLinks = chkClickableLinks.Checked;
9696
settings.Results.MaxColumnWidth = (int)numMaxColumnWidth.Value;
@@ -117,18 +117,6 @@ internal FXBSettings GetSettings()
117117
return settings;
118118
}
119119

120-
private ResultOutput ResultItemToSettingResult(int selectedIndex)
121-
{
122-
switch (selectedIndex)
123-
{
124-
case 1: return ResultOutput.XML;
125-
case 2: return ResultOutput.JSON;
126-
case 3: return ResultOutput.JSONWebAPI;
127-
case 4: return ResultOutput.Raw;
128-
default: return ResultOutput.Grid;
129-
}
130-
}
131-
132120
private void llShowWelcome_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
133121
{
134122
fxb.LogUse("ShowWelcome-Manual");
@@ -220,7 +208,7 @@ private void chkTryMetadataCache_CheckedChanged(object sender, EventArgs e)
220208

221209
private void cmbResult_SelectedIndexChanged(object sender, EventArgs e)
222210
{
223-
var resulttype = ResultItemToSettingResult(cmbResult.SelectedIndex);
211+
var resulttype = FetchXmlBuilder.ResultItemToSettingResult(cmbResult.SelectedIndex);
224212
panResultView.Enabled = resulttype == ResultOutput.Grid;
225213
linkDeprecatedExecFetchReq.Visible = resulttype == ResultOutput.Raw;
226214
}

‎FetchXmlBuilder/Properties/Resources.Designer.cs‎

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

0 commit comments

Comments
 (0)