Skip to content

Commit 451c8df

Browse files
committed
Even more general using of UrlUtils.OpenUrl
1 parent 2788944 commit 451c8df

17 files changed

+37
-38
lines changed

FetchXmlBuilder/Controls/attributeControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private void EnableAggregateControls()
120120

121121
private void helpIcon_Click(object sender, EventArgs e)
122122
{
123-
UrlUtils.OpenUrl(sender);
123+
fxb.OpenUrl(sender);
124124
}
125125

126126
private void cmbAttribute_SelectedIndexChanged(object sender, EventArgs e)

FetchXmlBuilder/Controls/conditionControl.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -850,15 +850,15 @@ private void rbUseLookup_CheckedChanged(object sender, EventArgs e)
850850

851851
private void txtLookup_Click(object sender, EventArgs e)
852852
{
853-
if (UrlUtils.OpenUrl(xrmRecord.Record, fxb.ConnectionDetail))
853+
if (fxb.OpenUrl(xrmRecord.Record))
854854
{
855855
fxb.LogUse("OpenRecord");
856856
}
857857
}
858858

859859
private void helpIcon_Click(object sender, EventArgs e)
860860
{
861-
UrlUtils.OpenUrl(sender);
861+
fxb.OpenUrl(sender);
862862
}
863863

864864
private void cmbValue_KeyPress(object sender, KeyPressEventArgs e)
@@ -905,7 +905,7 @@ private void dtPicker_ValueChanged(object sender, EventArgs e)
905905

906906
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
907907
{
908-
UrlUtils.OpenUrl(sender);
908+
fxb.OpenUrl(sender);
909909
}
910910

911911
#endregion Private Event Handlers

FetchXmlBuilder/Controls/fetchControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected override ControlValidationResult ValidateControl(Control control)
6161

6262
private void helpIcon_Click(object sender, EventArgs e)
6363
{
64-
UrlUtils.OpenUrl(sender);
64+
fxb.OpenUrl(sender);
6565
}
6666

6767
public override void Focus()

FetchXmlBuilder/Controls/filterControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private void chkIsQF_CheckedChanged(object sender, System.EventArgs e)
4343

4444
private void helpIcon_Click(object sender, System.EventArgs e)
4545
{
46-
UrlUtils.OpenUrl(sender);
46+
fxb.OpenUrl(sender);
4747
}
4848
}
4949
}

FetchXmlBuilder/Controls/linkEntityControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ private void cmbEntity_Enter(object sender, EventArgs e)
458458

459459
private void helpIcon_Click(object sender, System.EventArgs e)
460460
{
461-
UrlUtils.OpenUrl(sender);
461+
fxb.OpenUrl(sender);
462462
}
463463

464464
public override void Focus()

FetchXmlBuilder/DockControls/FlowListControl.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@ private void Tm_Tick(object sender, EventArgs e)
9595

9696
private void LinkHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
9797
{
98-
UrlUtils.OpenUrl("https://learn.microsoft.com/en-us/connectors/commondataserviceforapps/#list-rows");
98+
fxb.OpenUrl("https://learn.microsoft.com/en-us/connectors/commondataserviceforapps/#list-rows");
9999
}
100100

101101
private void pictureBox1_Click(object sender, EventArgs e)
102102
{
103-
UrlUtils.OpenUrl("https://learn.microsoft.com/en-us/power-apps/maker/canvas-apps/working-with-flows");
103+
fxb.OpenUrl("https://learn.microsoft.com/en-us/power-apps/maker/canvas-apps/working-with-flows");
104104
}
105105

106106
private void helpIcon_Click(object sender, EventArgs e)
107107
{
108-
UrlUtils.OpenUrl(tt.GetToolTip(sender as Control));
108+
fxb.OpenUrl(tt.GetToolTip(sender as Control));
109109
}
110110
}
111111
}

FetchXmlBuilder/DockControls/ODataControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private void menuODataExecute_Click(object sender, EventArgs e)
5151
{
5252
if (linkOData.Links.Count > 0 && linkOData.Links[0].Enabled)
5353
{
54-
UrlUtils.OpenUrl(linkOData, fxb.ConnectionDetail);
54+
fxb.OpenUrl(linkOData);
5555
fxb.LogUse("ExecuteOData" + version);
5656
}
5757
else
@@ -77,7 +77,7 @@ private void linkOData_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
7777
{
7878
if (e.Button == MouseButtons.Left && e.Link.Enabled)
7979
{
80-
UrlUtils.OpenUrl(e.Link, fxb.ConnectionDetail);
80+
fxb.OpenUrl(e.Link);
8181
fxb.LogUse("ExecuteOData" + version);
8282
}
8383
}

FetchXmlBuilder/DockControls/ResultGrid.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,11 @@ internal void SetQueryChanged(bool changed)
142142
Text = "Result View" + (changed ? " *" : "");
143143
crmGridView1.DefaultCellStyle.BackColor = changed ? System.Drawing.Color.LightGray : System.Drawing.Color.White;
144144
crmGridView1.DefaultCellStyle.ForeColor = changed ? System.Drawing.Color.Gray : System.Drawing.SystemColors.ControlText;
145-
if (changed)
146-
{
147-
mnuExcel.Visible = false;
148-
mnuRetrieveTime.Visible = false;
149-
mnuPage.Visible = false;
150-
mnuPageMinus.Visible = false;
151-
mnuPagePlus.Visible = false;
152-
}
145+
mnuExcel.Enabled = !changed;
146+
mnuRetrieveTime.Enabled = !changed;
147+
mnuPage.Enabled = !changed;
148+
mnuPageMinus.Enabled = !changed;
149+
mnuPagePlus.Enabled = !changed;
153150
}
154151

155152
internal void SetLayoutToGrid()
@@ -329,12 +326,12 @@ private void crmGridView1_RecordDoubleClick(object sender, Rappen.XTB.Helpers.Co
329326
if (e.Value is EntityReference entref)
330327
{
331328
form.LogUse("OpenParentRecord");
332-
UrlUtils.OpenUrl(entref, form.ConnectionDetail);
329+
form.OpenUrl(entref);
333330
}
334331
else if (e.Entity != null)
335332
{
336333
form.LogUse("OpenRecord");
337-
UrlUtils.OpenUrl(e.Entity);
334+
form.OpenUrl(e.Entity);
338335
}
339336
}
340337

@@ -432,7 +429,7 @@ private void crmGridView1_RecordEnter(object sender, Rappen.XTB.Helpers.Controls
432429

433430
private void ctxOpen_Click(object sender, EventArgs e)
434431
{
435-
if (UrlUtils.OpenUrl(sender))
432+
if (form.OpenUrl(sender))
436433
{
437434
form.LogUse("OpenRecord");
438435
}

FetchXmlBuilder/DockControls/TreeBuilderControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ private void TreeBuilderControl_Enter(object sender, EventArgs e)
10131013

10141014
private void lblWarning_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
10151015
{
1016-
UrlUtils.OpenUrl(sender);
1016+
fxb.OpenUrl(sender);
10171017
}
10181018
}
10191019
}

FetchXmlBuilder/DockControls/XmlContentControl.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private void FormatAsXML()
278278
"Would you like to submit an issue to FetchXML Builder to be able to handle this?",
279279
"Decode " + Text, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes)
280280
{
281-
UrlUtils.OpenUrl("https://github.com/rappen/FetchXMLBuilder/issues/new");
281+
fxb.OpenUrl("https://github.com/rappen/FetchXMLBuilder/issues/new");
282282
}
283283
return;
284284
}
@@ -956,12 +956,12 @@ private void chkQExComments_CheckedChanged(object sender, EventArgs e)
956956

957957
private void linkEBG_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
958958
{
959-
UrlUtils.OpenUrl("https://www.xrmtoolbox.com/plugins/DLaB.Xrm.EarlyBoundGenerator/");
959+
fxb.OpenUrl("https://www.xrmtoolbox.com/plugins/DLaB.Xrm.EarlyBoundGenerator/");
960960
}
961961

962962
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
963963
{
964-
UrlUtils.OpenUrl("https://github.com/rappen/FetchXMLBuilder/issues/822");
964+
fxb.OpenUrl("https://github.com/rappen/FetchXMLBuilder/issues/822");
965965
}
966966

967967
private void cmbQExStyle_SelectedIndexChanged(object sender, EventArgs e)
@@ -1074,13 +1074,13 @@ private void numQExIndent_ValueChanged(object sender, EventArgs e)
10741074
private void linkFlavorHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
10751075
{
10761076
var url = (cmbQExFlavor.SelectedItem is QExFlavor flavor) ? flavor.HelpUrl : string.Empty;
1077-
UrlUtils.OpenUrl(url);
1077+
fxb.OpenUrl(url);
10781078
}
10791079

10801080
private void linkStyleHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
10811081
{
10821082
var url = (cmbQExStyle.SelectedItem is QExStyle style) ? style.HelpUrl : string.Empty;
1083-
UrlUtils.OpenUrl(url);
1083+
fxb.OpenUrl(url);
10841084
}
10851085

10861086
private void btnQExFlavorSettings_Click(object sender, EventArgs e)

0 commit comments

Comments
 (0)