Skip to content

Commit 3ce5df8

Browse files
rappenrappen
committed
Added info-text + cleaning resources
1 parent 1935fe1 commit 3ce5df8

File tree

11 files changed

+4153
-4240
lines changed

11 files changed

+4153
-4240
lines changed

‎FetchXmlBuilder/FetchXmlBuilder.csproj‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -652,30 +652,15 @@
652652
<ItemGroup>
653653
<None Include="Resources\Power Platform Developer icon.png" />
654654
</ItemGroup>
655-
<ItemGroup>
656-
<None Include="Resources\bmc-32.png" />
657-
</ItemGroup>
658655
<ItemGroup>
659656
<None Include="Resources\Microsoft_logo.32.png" />
660657
</ItemGroup>
661658
<ItemGroup>
662659
<None Include="Resources\view.png" />
663660
</ItemGroup>
664-
<ItemGroup>
665-
<None Include="Resources\Corporate Supports Tools 2 narrow 200.png" />
666-
</ItemGroup>
667661
<ItemGroup>
668662
<None Include="Resources\I Support Tools narrow 200.png" />
669663
</ItemGroup>
670-
<ItemGroup>
671-
<None Include="Resources\icons8-info-24 %281%29.png" />
672-
</ItemGroup>
673-
<ItemGroup>
674-
<None Include="Resources\icons8-close-16.png" />
675-
</ItemGroup>
676-
<ItemGroup>
677-
<None Include="Resources\icons8-close-16-yellow.png" />
678-
</ItemGroup>
679664
<ItemGroup>
680665
<None Include="Resources\We Support Tools narrow 32h.png" />
681666
</ItemGroup>

‎FetchXmlBuilder/Forms/Supporting.Designer.cs‎

Lines changed: 95 additions & 105 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: 48 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ private Supporting(AppInsights appinsights, bool manual)
7070
{
7171
InitializeComponent();
7272
lblHeader.Text = tool.Name;
73-
helpTitle.Text = settings.HelpTitle;
74-
helpText.Text = settings.HelpText.Replace("\r\n", "\n").Replace("\n", "\r\n");
75-
helpLink.Text = settings.HelpLink;
76-
helpLink.Tag = settings.HelpLink;
77-
helpLink.Visible = !string.IsNullOrEmpty(settings.HelpLink);
73+
panInfo.Left = 32;
74+
panInfo.Top = 25;
7875
if (supporters.Any())
7976
{
8077
lblAlready.Text = lblAlready.Text.Replace("{tool}", tool.Name);
@@ -295,14 +292,38 @@ private void rbPersonalMonetary_CheckedChanged(object sender, EventArgs e)
295292

296293
private void linkHelping_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
297294
{
295+
TopMost = false;
298296
UrlUtils.OpenUrl(sender);
299297
}
300298

299+
private void helpText_LinkClicked(object sender, LinkClickedEventArgs e)
300+
{
301+
TopMost = false;
302+
UrlUtils.OpenUrl(e.LinkText);
303+
}
304+
305+
private void btnWhatWhy_Click(object sender, EventArgs e)
306+
{
307+
var visible = panInfo.Tag != sender || !panInfo.Visible;
308+
panInfo.Tag = sender;
309+
if (visible)
310+
{
311+
helpTitle.Text = settings.HelpWhyTitle;
312+
helpText.Text = settings.HelpWhyText.Replace("\r\n", "\n").Replace("\n", "\r\n");
313+
}
314+
panInfo.Visible = visible;
315+
}
316+
301317
private void btnInfo_Click(object sender, EventArgs e)
302318
{
303-
panInfo.Left = 50;
304-
panInfo.Top = 25;
305-
panInfo.Visible = !panInfo.Visible;
319+
var visible = panInfo.Tag != sender || !panInfo.Visible;
320+
panInfo.Tag = sender;
321+
if (visible)
322+
{
323+
helpTitle.Text = settings.HelpInfoTitle;
324+
helpText.Text = settings.HelpInfoText.Replace("\r\n", "\n").Replace("\n", "\r\n");
325+
}
326+
panInfo.Visible = visible;
306327
}
307328

308329
private void btnInfoClose_Click(object sender, EventArgs e)
@@ -454,10 +475,9 @@ public class ToolSettings
454475
public Color clrBgNormal => Color.FromArgb(int.Parse(ColorBgNormal, System.Globalization.NumberStyles.HexNumber));
455476
public Color clrBgInvalid => Color.FromArgb(int.Parse(ColorBgInvalid, System.Globalization.NumberStyles.HexNumber));
456477

457-
public string HelpTitle = "Community Tool is Conscienceware.";
458-
public string HelpLink = "https://jonasr.app/helping/";
478+
public string HelpWhyTitle = "Community Tool is Conscienceware.";
459479

460-
public string HelpText = @"Some in the Power Platform Community are creating tools.
480+
public string HelpWhyText = @"Some in the Power Platform Community are creating tools.
461481
Some contribute to the community with new ideas, find problems, write documentation, and even solve our bugs.
462482
Thousands and thousands in this community are mostly 'consumers'—only using open-source tools.
463483
To me, it's very similar to watching TV. Do you pay for channels, Netflix, Amazon Prime, Spotify, etc.?
@@ -475,13 +495,26 @@ You and your company can now more formally support tools rather than just donati
475495
476496
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.
477497
478-
Technicality:
498+
To read more about my thoughts, click here: https://jonasr.app/helping/
499+
500+
- Jonas Rapp";
501+
502+
public string HelpInfoTitle = "Technical Information";
503+
504+
public string HelpInfoText = @"Your entered name, company, country, email, and amount will not be stored in any system. The information will be saved in my personal Excel file. I do this to ensure you can get an invoice, and if so, we need to communicate if necessary.
505+
The email you share with me, only to me, will never be sold to any company.
506+
479507
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.
480-
The internal ID for your XrmToolBox installation is stored server-side, and the tool name is only to prevent this window from popping up. No identifying information is stored on any online service. For questions, contact me at jonasr.app/contact.
481508
482-
- Jonas Rapp
509+
When you click the big button here, the information you entered here will be included in the form on my website, jonasr.app, and a few hidden info: tool name, version, and your XrmToolBox 'InstallationId' (a random Guid generated the first time you use the toolbox). If you are curious, you can find your ID here: https://jonasr.app/xtb-finding-installationid.
510+
511+
Since I would like to be very clear and honest, we store your XrmToolBox InstallationId on a server to be able to know that you are supporting it in some way. There is nothing about the amount or contribution; I am not interested in hacking this info.
512+
513+
The button in the top-right corner opens this info. You can also right-click on it and find more options, especially:
514+
* I have already supported this tool — use this to tell me that you already support this tool in some way so that this prompt will not ask you again.
515+
* I will never support this tool — use it if you think it is a bad idea, and you will never use it again; it won't ask you again.
483516
484-
To read more about my thoughts, click the link below!";
517+
For questions, contact me at https://jonasr.app/contact.";
485518

486519
private ToolSettings()
487520
{ }

0 commit comments

Comments
 (0)