Skip to content

Commit 8e3f99b

Browse files
rappenrappen
committed
Smallfixes
1 parent d507119 commit 8e3f99b

File tree

3 files changed

+54
-24
lines changed

3 files changed

+54
-24
lines changed

‎FetchXmlBuilder/Forms/Supporting.Designer.cs‎

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

‎FetchXmlBuilder/Forms/Supporting.cs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ private Supporting(AppInsights appinsights, bool manual)
107107
InitializeComponent();
108108
lblHeader.Text = tool.ToolName;
109109
helpTitle.Text = settings.HelpTitle;
110-
helpText.Text = settings.HelpText;
110+
helpText.Text = settings.HelpText.Replace("\r\n", "\n").Replace("\n", "\r\n");
111111
helpLink.Text = settings.HelpLink;
112112
helpLink.Tag = settings.HelpLink;
113+
helpLink.Visible = !string.IsNullOrEmpty(settings.HelpLink);
113114
if (supporters.Any())
114115
{
115116
lblAlready.Text = lblAlready.Text.Replace("{tool}", tool.ToolName);
@@ -150,7 +151,7 @@ private static bool ShowSupporting(string toolname)
150151
tool.VersionRunDate = DateTime.Now;
151152
tools.Save();
152153
}
153-
var supporters = Supporters.DownloadMy(tools.InstallationId, toolname, settings.ContributionCounts);
154+
supporters = Supporters.DownloadMy(tools.InstallationId, toolname, settings.ContributionCounts);
154155
if (supporters.Count > 0)
155156
{ // I have supportings!
156157
return false;
@@ -365,24 +366,28 @@ private void linkHelping_LinkClicked(object sender, LinkLabelLinkClickedEventArg
365366
private void btnInfo_Click(object sender, EventArgs e)
366367
{
367368
panInfo.Left = 50;
368-
panInfo.Top = 10;
369+
panInfo.Top = 25;
369370
panInfo.Visible = !panInfo.Visible;
371+
}
372+
373+
private void btnInfoClose_Click(object sender, EventArgs e)
374+
{
375+
panInfo.Visible = false;
376+
}
377+
378+
private void panInfo_VisibleChanged(object sender, EventArgs e)
379+
{
370380
if (panInfo.Visible)
371381
{
372382
swInfo.Restart();
373383
}
374384
else
375385
{
376-
sw.Stop();
386+
swInfo.Stop();
377387
appinsights?.WriteEvent("Supporting-Info", duration: swInfo.ElapsedMilliseconds);
378388
}
379389
}
380390

381-
private void btnInfoClose_Click(object sender, EventArgs e)
382-
{
383-
panInfo.Visible = false;
384-
}
385-
386391
private void laterToolStripMenuItem_Click(object sender, EventArgs e)
387392
{
388393
DialogResult = DialogResult.Retry;
@@ -454,8 +459,9 @@ public class ToolSettings
454459
public string HelpTitle { get; set; } = "This is a Community Thing.";
455460
public string HelpLink { get; set; } = "https://jonasr.app/helping/";
456461

457-
public string HelpText { get; set; } = @"Some of us in the community are creating tools. Some contribute by sharing new ideas, finding and reporting problems, and solving our problems; some are documentation for us.
458-
Thousands and thousands in this community are only consumers. It's very similar to just watching TV. Do you pay for channels, Netflix, Amazon Prime etc...?
462+
public string HelpText { get; set; } = @"Some of us in the Power Platform Community are creating tools.
463+
Some contribute by sharing new ideas, finding problems, and documenting; some are even solving our bugs.
464+
Thousands and thousands in this community are only consumers. Just using open-source tools. It's very similar to just watching TV. Do you pay for channels, Netflix, Amazon Prime, Spotify etc...?
459465
To be part of the community, you can now pay instead.
460466
461467
Especially when you work in a big corporation, exploiting free tools only to increase your income, you have a responsibility to participate actively in the community - or pay.
@@ -472,8 +478,7 @@ You and your company can now more formally support tools rather than just donati
472478
473479
You will receive an official receipt immediately and, if needed, an invoice. Supporting can be done with a credit card. Other options will be available depending on your location. Stripe handles the payment.
474480
475-
To read more about my thoughts, click the link below!
476-
";
481+
To read more about my thoughts, click the link below!";
477482

478483
private ToolSettings()
479484
{ }

‎FetchXmlBuilder/Forms/Supporting.resx‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
129129
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
130130
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
131-
/gMAAk1TRnQBSQFMAgEBAwEAAcgBAAHIAQAByAEAAToBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAEg
131+
/gMAAk1TRnQBSQFMAgEBAwEAAeABAAHgAQAByAEAAToBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAEg
132132
AQMCAAE6AwABAQEAASAGAAHVAQIRAAGtAUIBAAH/Aa0BQgEAAf8BrQFCAQAB/wGtAUIBAAH/Aa0BQgEA
133133
Af8BrQFCAQAB/wGtAUIBAAH/Aa0BQgEAAf8BrQFCAQAB/wGtAUIBAAH/Aa0BQgEAAf8BrQFCAQAB/wGt
134134
AUIBAAH/Aa0BQgEAAf8BrQFCAQAB/wGtAUIBAAH/Aa0BQgEAAf8BrQFCAQAB/wGtAUIBAAH/Aa0BQgEA
@@ -4525,13 +4525,25 @@
45254525
</value>
45264526
</data>
45274527
<data name="helpText.Text" xml:space="preserve">
4528-
<value>You and your company can support tools more formally rather than just donating via PayPal or 'Buy Me a Coffee.'
4528+
<value>Some of us in the community are creating tools. Some contribute by sharing new ideas, finding and reporting problems, and solving our problems; some are documentation for us.
4529+
Thousands and thousands in this community are only consumers. It's very similar to just watching TV. Do you pay for channels, Netflix, Amazon Prime etc...?
4530+
To be part of the community, you can now pay instead.
4531+
4532+
Especially when you work in a big corporation, exploiting free tools only to increase your income, you have a responsibility to participate actively in the community - or pay.
4533+
It's good to be able to sleep with a good conscience. Right?
4534+
4535+
There should be a license called ""Conscienceware"".
4536+
But technically, it is simply free to use them.
4537+
4538+
If you say that you are not part of the community, that is incorrect—just using these tools makes you a part of it.
4539+
4540+
You and your company can now more formally support tools rather than just donating via PayPal or 'Buy Me a Coffee.'
45294541

45304542
Supporting is not just giving money; it means that you or your company know you have gained in time and improved your quality by using these tools. If you get something and want to give back—support the development and maintenance of the tools.
45314543

4532-
You will receive an official receipt automatically and, if needed, an invoice. Supporting can be done with a credit card. Other options will be available depending on your location. Stripe handles the payment.
4544+
You will receive an official receipt immediately and, if needed, an invoice. Supporting can be done with a credit card. Other options will be available depending on your location. Stripe handles the payment.
45334545

4534-
If you want to read about my thoughts, click the link below!</value>
4546+
To read more about my thoughts, click the link below!</value>
45354547
</data>
45364548
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
45374549
<value>37</value>

0 commit comments

Comments
 (0)