From 7eb0dac6be4b38a32ef1fe0c1cdd989023cf73f6 Mon Sep 17 00:00:00 2001 From: Graham Date: Mon, 27 Jul 2020 09:20:24 -0400 Subject: [PATCH] Added PP donate button --- CommonControls/BaseForm.cs | 18 +++ CommonControls/BaseForm.designer.cs | 119 ++++++++++-------- CommonControls/BaseForm.resx | 12 +- CommonControls/Modbus.Common.csproj | 3 + CommonControls/Properties/AssemblyInfo.cs | 8 +- .../Properties/Resources.Designer.cs | 12 +- CommonControls/Properties/Resources.resx | 3 + CommonControls/Resources/btn_donateCC_LG.gif | Bin 0 -> 2993 bytes ModbusLib/Properties/AssemblyInfo.cs | 8 +- ModbusMaster/MasterForm.Designer.cs | 8 +- ModbusMaster/MasterForm.cs | 7 ++ ModbusMaster/MasterForm.resx | 3 - ModbusMaster/Properties/AssemblyInfo.cs | 8 +- ModbusSlave/Properties/AssemblyInfo.cs | 8 +- ModbusSlave/SlaveForm.cs | 2 + 15 files changed, 133 insertions(+), 86 deletions(-) create mode 100644 CommonControls/Resources/btn_donateCC_LG.gif diff --git a/CommonControls/BaseForm.cs b/CommonControls/BaseForm.cs index 6705249..3c08ce4 100644 --- a/CommonControls/BaseForm.cs +++ b/CommonControls/BaseForm.cs @@ -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 = "graham.a.ross@gmail.com"; + string description = "Support%20ModbusTool%20development"; + string currency = "USD"; + + url += "https://www.paypal.com/cgi-bin/webscr" + + "?cmd=" + "_donations" + + "&business=" + business + + "&item_name=" + description + + "¤cy_code=" + currency + + "&source=url"; + + System.Diagnostics.Process.Start(url); + } } } diff --git a/CommonControls/BaseForm.designer.cs b/CommonControls/BaseForm.designer.cs index f06898a..05efa5c 100644 --- a/CommonControls/BaseForm.designer.cs +++ b/CommonControls/BaseForm.designer.cs @@ -31,8 +31,6 @@ protected void InitializeComponent() Modbus.Common.DataTab dataTab1; Modbus.Common.DataTab dataTab2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseForm)); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tabPage2 = new System.Windows.Forms.TabPage(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.buttonPauseLog = new System.Windows.Forms.Button(); this.listBoxCommLog = new System.Windows.Forms.ListBox(); @@ -73,11 +71,12 @@ protected void InitializeComponent() this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.grpExchange = new System.Windows.Forms.GroupBox(); + this.donate = new System.Windows.Forms.Button(); this.tabControl1 = new Modbus.Common.TabControlEx(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); dataTab1 = new Modbus.Common.DataTab(); dataTab2 = new Modbus.Common.DataTab(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox3.SuspendLayout(); this.grpStart.SuspendLayout(); @@ -86,55 +85,10 @@ protected void InitializeComponent() this.groupBoxTCP.SuspendLayout(); this.grpExchange.SuspendLayout(); this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); this.SuspendLayout(); // - // dataTab1 - // - dataTab1.DataLength = ((ushort)(127)); - dataTab1.DisplayFormat = Modbus.Common.DisplayFormat.Integer; - dataTab1.Location = new System.Drawing.Point(3, 3); - dataTab1.Name = "dataTab1"; - dataTab1.RegisterData = new ushort[0]; - dataTab1.ShowDataLength = false; - dataTab1.Size = new System.Drawing.Size(839, 406); - dataTab1.StartAddress = ((ushort)(4100)); - dataTab1.TabIndex = 0; - // - // dataTab2 - // - dataTab2.DataLength = ((ushort)(127)); - dataTab2.DisplayFormat = Modbus.Common.DisplayFormat.LED; - dataTab2.Location = new System.Drawing.Point(3, 3); - dataTab2.Name = "dataTab2"; - dataTab2.RegisterData = new ushort[] { - ((ushort)(0))}; - dataTab2.ShowDataLength = false; - dataTab2.Size = new System.Drawing.Size(839, 406); - dataTab2.StartAddress = ((ushort)(4100)); - dataTab2.TabIndex = 0; - // - // tabPage1 - // - this.tabPage1.Controls.Add(dataTab1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(851, 411); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Address1"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // tabPage2 - // - this.tabPage2.Controls.Add(dataTab2); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(851, 411); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "..."; - this.tabPage2.UseVisualStyleBackColor = true; - // // groupBox4 // this.groupBox4.Controls.Add(this.buttonPauseLog); @@ -558,6 +512,16 @@ protected void InitializeComponent() this.grpExchange.TabIndex = 36; this.grpExchange.TabStop = false; // + // donate + // + this.donate.Image = global::Modbus.Common.Properties.Resources.btn_donateCC_LG; + this.donate.Location = new System.Drawing.Point(691, 77); + this.donate.Name = "donate"; + this.donate.Size = new System.Drawing.Size(154, 61); + this.donate.TabIndex = 37; + this.donate.UseVisualStyleBackColor = true; + this.donate.Click += new System.EventHandler(this.donate_Click); + // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -571,11 +535,59 @@ protected void InitializeComponent() this.tabControl1.TabIndex = 35; this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl1_Selected); // + // tabPage1 + // + this.tabPage1.Controls.Add(dataTab1); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(851, 411); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Address1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // dataTab1 + // + dataTab1.DataLength = ((ushort)(127)); + dataTab1.DisplayFormat = Modbus.Common.DisplayFormat.Integer; + dataTab1.Location = new System.Drawing.Point(3, 3); + dataTab1.Name = "dataTab1"; + dataTab1.RegisterData = new ushort[0]; + dataTab1.ShowDataLength = false; + dataTab1.Size = new System.Drawing.Size(839, 406); + dataTab1.StartAddress = ((ushort)(4100)); + dataTab1.TabIndex = 0; + // + // tabPage2 + // + this.tabPage2.Controls.Add(dataTab2); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(851, 411); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "..."; + this.tabPage2.UseVisualStyleBackColor = true; + // + // dataTab2 + // + dataTab2.DataLength = ((ushort)(127)); + dataTab2.DisplayFormat = Modbus.Common.DisplayFormat.LED; + dataTab2.Location = new System.Drawing.Point(3, 3); + dataTab2.Name = "dataTab2"; + dataTab2.RegisterData = new ushort[] { + ((ushort)(0))}; + dataTab2.ShowDataLength = false; + dataTab2.Size = new System.Drawing.Size(839, 406); + dataTab2.StartAddress = ((ushort)(4100)); + dataTab2.TabIndex = 0; + // // BaseForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(869, 901); + this.Controls.Add(this.donate); this.Controls.Add(this.grpExchange); this.Controls.Add(this.tabControl1); this.Controls.Add(this.groupBox4); @@ -586,8 +598,6 @@ protected void InitializeComponent() this.Text = "Modbus Slave"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BaseFormClosing); this.Load += new System.EventHandler(this.BaseFormLoading); - this.tabPage1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); this.groupBox4.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.grpStart.ResumeLayout(false); @@ -600,6 +610,8 @@ protected void InitializeComponent() this.grpExchange.ResumeLayout(false); this.grpExchange.PerformLayout(); this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); this.ResumeLayout(false); } @@ -649,5 +661,6 @@ protected void InitializeComponent() protected System.Windows.Forms.RadioButton radioButtonReverseFloat; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Button donate; } } \ No newline at end of file diff --git a/CommonControls/BaseForm.resx b/CommonControls/BaseForm.resx index 0568b09..6cd4879 100644 --- a/CommonControls/BaseForm.resx +++ b/CommonControls/BaseForm.resx @@ -117,18 +117,18 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - False - 17, 17 157, 17 + + False + + + False + diff --git a/CommonControls/Modbus.Common.csproj b/CommonControls/Modbus.Common.csproj index 9e2e1b6..fe47681 100644 --- a/CommonControls/Modbus.Common.csproj +++ b/CommonControls/Modbus.Common.csproj @@ -100,6 +100,9 @@ + + +