Skip to content

Commit

Permalink
Added PP donate button
Browse files Browse the repository at this point in the history
  • Loading branch information
@graham22
graham22 committed Jul 27, 2020
1 parent 9c78506 commit 7eb0dac
Show file tree
Hide file tree
Showing 15 changed files with 133 additions and 86 deletions.
18 changes: 18 additions & 0 deletions CommonControls/BaseForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,5 +731,23 @@ void dataTab_OnApply(object sender, EventArgs e)
_startAddress = address;
_dataLength = CurrentTab.DataLength;
}

private void donate_Click(object sender, EventArgs e)
{
string url = "";

string business = "[email protected]";
string description = "Support%20ModbusTool%20development";
string currency = "USD";

url += "https://www.paypal.com/cgi-bin/webscr" +
"?cmd=" + "_donations" +
"&business=" + business +
"&item_name=" + description +
"&currency_code=" + currency +
"&source=url";

System.Diagnostics.Process.Start(url);
}
}
}
119 changes: 66 additions & 53 deletions CommonControls/BaseForm.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions CommonControls/BaseForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,18 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="dataTab1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="dataTab2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>157, 17</value>
</metadata>
<metadata name="dataTab1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="dataTab2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down
3 changes: 3 additions & 0 deletions CommonControls/Modbus.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
<ItemGroup>
<None Include="Resources\close.ico" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\btn_donateCC_LG.gif" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
8 changes: 4 additions & 4 deletions CommonControls/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("CommonControls")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("SkyeTracker")]
[assembly: AssemblyCompany("ClassicDIY")]
[assembly: AssemblyProduct("CommonControls")]
[assembly: AssemblyCopyright("Copyright 2015 SkyeTracker (https://github.com/graham22/ModbusTool)")]
[assembly: AssemblyCopyright("Copyright 2020 ClassicDIY (https://github.com/ClassicDIY/ModbusTool)")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.1.1")]
[assembly: AssemblyFileVersion("2.0.1.1")]
[assembly: AssemblyVersion("2.0.2.1")]
[assembly: AssemblyFileVersion("2.0.2.1")]
12 changes: 11 additions & 1 deletion CommonControls/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions CommonControls/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,7 @@
<data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="btn_donateCC_LG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\btn_donateCC_LG.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added CommonControls/Resources/btn_donateCC_LG.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions ModbusLib/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("ModbusLib")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("SkyeTracker")]
[assembly: AssemblyCompany("ClassicDIY")]
[assembly: AssemblyProduct("ModbusLib")]
[assembly: AssemblyCopyright("Copyright 2015 SkyeTracker (https://github.com/graham22/ModbusTool)")]
[assembly: AssemblyCopyright("Copyright 2020 ClassicDIY (https://github.com/ClassicDIY/ModbusTool)")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.1.1")]
[assembly: AssemblyFileVersion("2.0.1.1")]
[assembly: AssemblyVersion("2.0.2.1")]
[assembly: AssemblyFileVersion("2.0.2.1")]
8 changes: 1 addition & 7 deletions ModbusMaster/MasterForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions ModbusMaster/MasterForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.IO.Ports;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using System.Windows.Forms;
using Modbus.Common;
using ModbusLib;
Expand All @@ -23,6 +24,7 @@ public partial class MasterForm : BaseForm
public MasterForm()
{
InitializeComponent();
this.Text += String.Format(" ({0})", Assembly.GetExecutingAssembly().GetName().Version.ToString());
}

private void MasterFormClosing(object sender, FormClosingEventArgs e)
Expand Down Expand Up @@ -273,5 +275,10 @@ private void pollTimer_Tick(object sender, EventArgs e)
if (_lastReadCommand != 0)
ExecuteReadCommand(_lastReadCommand);
}

private void MasterForm_Load(object sender, EventArgs e)
{

}
}
}
3 changes: 0 additions & 3 deletions ModbusMaster/MasterForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>150, 17</value>
</metadata>
<metadata name="pollTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>279, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down
Loading

0 comments on commit 7eb0dac

Please sign in to comment.