From 42076309071614ea1ecf65223559b643b5479049 Mon Sep 17 00:00:00 2001 From: Zemrys Date: Fri, 19 Jan 2018 15:34:31 -0500 Subject: [PATCH] Added backup p2pool scanners, sped up scanner latency checkers, updated intensity presets, minor grammar fix in alert message, minor settings menu design alterations. --- Vertminer/P2Pool.resx | 6 + Vertminer/P2Pool.vb | 44 +++-- Vertminer/settings.Designer.vb | 287 +++++++++++++-------------------- Vertminer/settings.resx | 3 + Vertminer/settings.vb | 27 +++- Vertminer/variables.vb | 8 +- 6 files changed, 171 insertions(+), 204 deletions(-) diff --git a/Vertminer/P2Pool.resx b/Vertminer/P2Pool.resx index 6b33602..989b3b6 100644 --- a/Vertminer/P2Pool.resx +++ b/Vertminer/P2Pool.resx @@ -123,6 +123,12 @@ 180, 17 + + 206, 46 + + + 39, 47 + True diff --git a/Vertminer/P2Pool.vb b/Vertminer/P2Pool.vb index ca45e7a..a0f4387 100755 --- a/Vertminer/P2Pool.vb +++ b/Vertminer/P2Pool.vb @@ -437,6 +437,7 @@ Public Class P2Pool Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + stopthread = False BeginInvoke(New MethodInvoker(AddressOf Loading_Start)) BeginInvoke(New MethodInvoker(AddressOf Get_P2Pool_API)) @@ -450,6 +451,13 @@ Public Class P2Pool Private Sub PictureBox15_Click(sender As Object, e As EventArgs) Handles PictureBox15.Click + Cursor.Current = Cursors.WaitCursor + stopthread = True + Do Until (scanner1worker.ThreadState = ThreadState.Stopped) + Loop + Do Until (scanner2worker.ThreadState = ThreadState.Stopped) + Loop + Cursor.Current = Cursors.Arrow Me.Close() End Sub @@ -460,16 +468,16 @@ Public Class P2Pool Private Sub Panel1_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Panel1.MouseDown, Panel2.MouseDown, PictureBox11.MouseDown, Label6.MouseDown drag = True - mousex = Windows.Forms.Cursor.Position.X - Me.Left - mousey = Windows.Forms.Cursor.Position.Y - Me.Top + mousex = Cursor.Position.X - Me.Left + mousey = Cursor.Position.Y - Me.Top End Sub Private Sub Panel1_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Panel1.MouseMove, Panel2.MouseMove, PictureBox11.MouseMove, Label6.MouseMove If drag Then - Me.Left = Windows.Forms.Cursor.Position.X - mousex - Me.Top = Windows.Forms.Cursor.Position.Y - mousey + Me.Left = Cursor.Position.X - mousex + Me.Top = Cursor.Position.Y - mousey End If End Sub @@ -491,18 +499,6 @@ Public Class P2Pool End Sub - 'Private Sub dataGridView1_HeaderRowClicked(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles DataGridView1.ColumnHeaderMouseClick, DataGridView1.ColumnHeaderMouseDoubleClick, DataGridView1.RowHeaderMouseClick, DataGridView1.RowHeaderMouseDoubleClick - - ' scanner1worker.Abort() - - 'End Sub - - 'Private Sub dataGridView2_HeaderRowClicked(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles DataGridView2.ColumnHeaderMouseClick, DataGridView2.ColumnHeaderMouseDoubleClick, DataGridView2.RowHeaderMouseClick, DataGridView2.RowHeaderMouseDoubleClick - - ' scanner2worker.Abort() - - 'End Sub - Private Sub DataGridView_DataError(ByVal sender As Object, ByVal e As DataGridViewDataErrorEventArgs) Handles DataGridView1.DataError, DataGridView2.DataError 'do nothing to ignore error @@ -512,30 +508,28 @@ Public Class P2Pool Sub Scanner1Thread() 'Network 1 - Dim count As Integer = 0 For x As Integer = 0 To scanner1.nodes.Count - 1 Dim clientSocket As New Net.Sockets.TcpClient() + Dim result = clientSocket.BeginConnect(scanner1.nodes(x).ip, "9171", Nothing, Nothing) Dim stopWatch As New Stopwatch() Dim StopWatchTimeMs As Int32 Try If stopthread = False And scanner1worker.ThreadState = ThreadState.Running Then Try stopWatch.Start() - clientSocket.Connect(scanner1.nodes(x).ip, "9171") + result.AsyncWaitHandle.WaitOne(TimeSpan.FromMilliseconds(999)) clientSocket.Close() stopWatch.Stop() StopWatchTimeMs = stopWatch.ElapsedMilliseconds DataGridView1.Rows(x).Cells(6).Value = StopWatchTimeMs - Catch ex As Exception + Catch ex As IOException DataGridView1.Rows(x).Cells(6).Value = 999 End Try Else - stopthread = False Exit Sub End If Catch ex As Exception End Try - count = x Next End Sub @@ -543,16 +537,16 @@ Public Class P2Pool Sub Scanner2Thread() 'Network 2 - Dim count As Integer = 0 - For x = 0 To scanner2.nodes.Count - 1 + For x As Integer = 0 To scanner2.nodes.Count - 1 Dim clientSocket As New Net.Sockets.TcpClient() + Dim result = clientSocket.BeginConnect(scanner2.nodes(x).ip, "9181", Nothing, Nothing) Dim stopWatch As New Stopwatch() Dim StopWatchTimeMs As Int32 Try If stopthread = False And scanner2worker.ThreadState = ThreadState.Running Then Try stopWatch.Start() - clientSocket.Connect(scanner2.nodes(x).ip, "9181") + result.AsyncWaitHandle.WaitOne(TimeSpan.FromMilliseconds(999)) clientSocket.Close() stopWatch.Stop() StopWatchTimeMs = stopWatch.ElapsedMilliseconds @@ -561,12 +555,10 @@ Public Class P2Pool DataGridView2.Rows(x).Cells(6).Value = 999 End Try Else - stopthread = False Exit Sub End If Catch ex As Exception End Try - count = x Next End Sub diff --git a/Vertminer/settings.Designer.vb b/Vertminer/settings.Designer.vb index b7a670a..85069a7 100644 --- a/Vertminer/settings.Designer.vb +++ b/Vertminer/settings.Designer.vb @@ -108,10 +108,9 @@ Partial Class settings ' Me.CheckBox3.AutoSize = True Me.CheckBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox3.Location = New System.Drawing.Point(58, 225) - Me.CheckBox3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox3.Location = New System.Drawing.Point(29, 117) Me.CheckBox3.Name = "CheckBox3" - Me.CheckBox3.Size = New System.Drawing.Size(203, 30) + Me.CheckBox3.Size = New System.Drawing.Size(102, 17) Me.CheckBox3.TabIndex = 7 Me.CheckBox3.Text = "Minimize to Tray" Me.ToolTip.SetToolTip(Me.CheckBox3, "Toggle to minimize the OCM into your system tray whenever minimize is clicked.") @@ -120,10 +119,9 @@ Partial Class settings 'CheckBox4 ' Me.CheckBox4.AutoSize = True - Me.CheckBox4.Location = New System.Drawing.Point(58, 185) - Me.CheckBox4.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox4.Location = New System.Drawing.Point(29, 96) Me.CheckBox4.Name = "CheckBox4" - Me.CheckBox4.Size = New System.Drawing.Size(143, 29) + Me.CheckBox4.Size = New System.Drawing.Size(76, 17) Me.CheckBox4.TabIndex = 5 Me.CheckBox4.Text = "Use UPnP" Me.ToolTip.SetToolTip(Me.CheckBox4, "Toggle to enable UPnP. This will automatically set up port forwarding for P2Pool" & @@ -133,10 +131,9 @@ Partial Class settings 'CheckBox6 ' Me.CheckBox6.AutoSize = True - Me.CheckBox6.Location = New System.Drawing.Point(328, 265) - Me.CheckBox6.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox6.Location = New System.Drawing.Point(164, 138) Me.CheckBox6.Name = "CheckBox6" - Me.CheckBox6.Size = New System.Drawing.Size(207, 29) + Me.CheckBox6.Size = New System.Drawing.Size(106, 17) Me.CheckBox6.TabIndex = 10 Me.CheckBox6.Text = "Keep Miner Alive" Me.ToolTip.SetToolTip(Me.CheckBox6, "Periodically checks to see if miner is still running. If miner is not detected, " & @@ -146,10 +143,9 @@ Partial Class settings 'PictureBox9 ' Me.PictureBox9.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox9.Location = New System.Drawing.Point(18, 144) - Me.PictureBox9.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox9.Location = New System.Drawing.Point(9, 75) Me.PictureBox9.Name = "PictureBox9" - Me.PictureBox9.Size = New System.Drawing.Size(30, 29) + Me.PictureBox9.Size = New System.Drawing.Size(15, 15) Me.PictureBox9.TabIndex = 15 Me.PictureBox9.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox9, "Toggle to start the OCM when Windows starts.") @@ -158,10 +154,9 @@ Partial Class settings ' Me.CheckBox9.AutoSize = True Me.CheckBox9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox9.Location = New System.Drawing.Point(58, 144) - Me.CheckBox9.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox9.Location = New System.Drawing.Point(29, 75) Me.CheckBox9.Name = "CheckBox9" - Me.CheckBox9.Size = New System.Drawing.Size(230, 30) + Me.CheckBox9.Size = New System.Drawing.Size(117, 17) Me.CheckBox9.TabIndex = 3 Me.CheckBox9.Text = "Start with Windows" Me.ToolTip.SetToolTip(Me.CheckBox9, "Toggle to start the OCM when Windows starts." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)) @@ -170,10 +165,9 @@ Partial Class settings 'PictureBox6 ' Me.PictureBox6.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox6.Location = New System.Drawing.Point(286, 225) - Me.PictureBox6.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox6.Location = New System.Drawing.Point(143, 117) Me.PictureBox6.Name = "PictureBox6" - Me.PictureBox6.Size = New System.Drawing.Size(30, 29) + Me.PictureBox6.Size = New System.Drawing.Size(15, 15) Me.PictureBox6.TabIndex = 11 Me.PictureBox6.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox6, "Periodically checks to see if P2Pool is still running. If P2Pool is not detected" & @@ -182,10 +176,9 @@ Partial Class settings 'CheckBox5 ' Me.CheckBox5.AutoSize = True - Me.CheckBox5.Location = New System.Drawing.Point(328, 225) - Me.CheckBox5.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox5.Location = New System.Drawing.Point(164, 117) Me.CheckBox5.Name = "CheckBox5" - Me.CheckBox5.Size = New System.Drawing.Size(222, 29) + Me.CheckBox5.Size = New System.Drawing.Size(114, 17) Me.CheckBox5.TabIndex = 8 Me.CheckBox5.Text = "Keep P2Pool Alive" Me.ToolTip.SetToolTip(Me.CheckBox5, "Periodically checks to see if P2Pool is still running. If P2Pool is not detected" & @@ -195,10 +188,9 @@ Partial Class settings 'PictureBox4 ' Me.PictureBox4.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox4.Location = New System.Drawing.Point(286, 265) - Me.PictureBox4.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox4.Location = New System.Drawing.Point(143, 138) Me.PictureBox4.Name = "PictureBox4" - Me.PictureBox4.Size = New System.Drawing.Size(30, 29) + Me.PictureBox4.Size = New System.Drawing.Size(15, 15) Me.PictureBox4.TabIndex = 9 Me.PictureBox4.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox4, "Periodically checks to see if miner is still running. If miner is not detected, " & @@ -207,10 +199,9 @@ Partial Class settings 'PictureBox3 ' Me.PictureBox3.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox3.Location = New System.Drawing.Point(18, 185) - Me.PictureBox3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox3.Location = New System.Drawing.Point(9, 96) Me.PictureBox3.Name = "PictureBox3" - Me.PictureBox3.Size = New System.Drawing.Size(30, 29) + Me.PictureBox3.Size = New System.Drawing.Size(15, 15) Me.PictureBox3.TabIndex = 8 Me.PictureBox3.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox3, "Toggle to enable UPnP. This will automatically set up port forwarding for P2Pool" & @@ -219,20 +210,18 @@ Partial Class settings 'PictureBox1 ' Me.PictureBox1.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox1.Location = New System.Drawing.Point(18, 225) - Me.PictureBox1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox1.Location = New System.Drawing.Point(9, 117) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(30, 29) + Me.PictureBox1.Size = New System.Drawing.Size(15, 15) Me.PictureBox1.TabIndex = 6 Me.PictureBox1.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox1, "Toggle to minimize the OCM into your system tray whenever minimize is clicked." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)) ' 'Fee_Address_Text ' - Me.Fee_Address_Text.Location = New System.Drawing.Point(30, 277) - Me.Fee_Address_Text.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Fee_Address_Text.Location = New System.Drawing.Point(15, 144) Me.Fee_Address_Text.Name = "Fee_Address_Text" - Me.Fee_Address_Text.Size = New System.Drawing.Size(484, 31) + Me.Fee_Address_Text.Size = New System.Drawing.Size(244, 20) Me.Fee_Address_Text.TabIndex = 6 Me.Fee_Address_Text.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.ToolTip.SetToolTip(Me.Fee_Address_Text, "Address that the mining fee % will be sent to.") @@ -241,10 +230,9 @@ Partial Class settings ' Me.Label14.AutoSize = True Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(208, 246) - Me.Label14.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label14.Location = New System.Drawing.Point(104, 128) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(135, 26) + Me.Label14.Size = New System.Drawing.Size(66, 13) Me.Label14.TabIndex = 40 Me.Label14.Text = "Fee Address" ' @@ -252,10 +240,9 @@ Partial Class settings ' Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(42, 96) - Me.Label4.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label4.Location = New System.Drawing.Point(21, 50) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(128, 26) + Me.Label4.Size = New System.Drawing.Size(63, 13) Me.Label4.TabIndex = 37 Me.Label4.Text = "Mining Port:" ' @@ -263,20 +250,18 @@ Partial Class settings ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(64, 62) - Me.Label5.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label5.Location = New System.Drawing.Point(32, 32) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(106, 26) + Me.Label5.Size = New System.Drawing.Size(52, 13) Me.Label5.TabIndex = 36 Me.Label5.Text = "P2P Port:" ' 'TextBox4 ' Me.TextBox4.BackColor = System.Drawing.Color.White - Me.TextBox4.Location = New System.Drawing.Point(176, 56) - Me.TextBox4.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.TextBox4.Location = New System.Drawing.Point(88, 29) Me.TextBox4.Name = "TextBox4" - Me.TextBox4.Size = New System.Drawing.Size(96, 31) + Me.TextBox4.Size = New System.Drawing.Size(50, 20) Me.TextBox4.TabIndex = 0 Me.TextBox4.Text = "9346" Me.TextBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center @@ -285,10 +270,9 @@ Partial Class settings 'TextBox5 ' Me.TextBox5.BackColor = System.Drawing.Color.White - Me.TextBox5.Location = New System.Drawing.Point(176, 92) - Me.TextBox5.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.TextBox5.Location = New System.Drawing.Point(88, 48) Me.TextBox5.Name = "TextBox5" - Me.TextBox5.Size = New System.Drawing.Size(96, 31) + Me.TextBox5.Size = New System.Drawing.Size(50, 20) Me.TextBox5.TabIndex = 1 Me.TextBox5.Text = "9171" Me.TextBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center @@ -298,10 +282,9 @@ Partial Class settings ' Me.Label15.AutoSize = True Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label15.Location = New System.Drawing.Point(62, 181) - Me.Label15.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label15.Location = New System.Drawing.Point(31, 94) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(105, 26) + Me.Label15.Size = New System.Drawing.Size(53, 13) Me.Label15.TabIndex = 33 Me.Label15.Text = "Donation:" ' @@ -309,20 +292,18 @@ Partial Class settings ' Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.Location = New System.Drawing.Point(112, 144) - Me.Label16.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label16.Location = New System.Drawing.Point(56, 75) Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(55, 26) + Me.Label16.Size = New System.Drawing.Size(28, 13) Me.Label16.TabIndex = 32 Me.Label16.Text = "Fee:" ' 'Node_Fee ' Me.Node_Fee.BackColor = System.Drawing.Color.White - Me.Node_Fee.Location = New System.Drawing.Point(176, 138) - Me.Node_Fee.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Node_Fee.Location = New System.Drawing.Point(88, 72) Me.Node_Fee.Name = "Node_Fee" - Me.Node_Fee.Size = New System.Drawing.Size(96, 31) + Me.Node_Fee.Size = New System.Drawing.Size(50, 20) Me.Node_Fee.TabIndex = 2 Me.Node_Fee.Text = "%" Me.Node_Fee.TextAlign = System.Windows.Forms.HorizontalAlignment.Center @@ -332,10 +313,9 @@ Partial Class settings 'Node_Donation ' Me.Node_Donation.BackColor = System.Drawing.Color.White - Me.Node_Donation.Location = New System.Drawing.Point(176, 175) - Me.Node_Donation.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Node_Donation.Location = New System.Drawing.Point(88, 91) Me.Node_Donation.Name = "Node_Donation" - Me.Node_Donation.Size = New System.Drawing.Size(96, 31) + Me.Node_Donation.Size = New System.Drawing.Size(50, 20) Me.Node_Donation.TabIndex = 3 Me.Node_Donation.Text = "%" Me.Node_Donation.TextAlign = System.Windows.Forms.HorizontalAlignment.Center @@ -346,20 +326,18 @@ Partial Class settings ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(336, 62) - Me.Label3.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label3.Location = New System.Drawing.Point(168, 32) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(180, 26) + Me.Label3.Size = New System.Drawing.Size(89, 13) Me.Label3.TabIndex = 21 Me.Label3.Text = "Max Connections" ' 'TextBox3 ' Me.TextBox3.BackColor = System.Drawing.SystemColors.Window - Me.TextBox3.Location = New System.Drawing.Point(374, 92) - Me.TextBox3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.TextBox3.Location = New System.Drawing.Point(187, 48) Me.TextBox3.Name = "TextBox3" - Me.TextBox3.Size = New System.Drawing.Size(96, 31) + Me.TextBox3.Size = New System.Drawing.Size(50, 20) Me.TextBox3.TabIndex = 4 Me.TextBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.ToolTip.SetToolTip(Me.TextBox3, "Select the maximum amount of connections you would like to limit P2Pool to.") @@ -367,10 +345,9 @@ Partial Class settings 'PictureBox10 ' Me.PictureBox10.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox10.Location = New System.Drawing.Point(158, 96) - Me.PictureBox10.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox10.Location = New System.Drawing.Point(79, 50) Me.PictureBox10.Name = "PictureBox10" - Me.PictureBox10.Size = New System.Drawing.Size(30, 29) + Me.PictureBox10.Size = New System.Drawing.Size(15, 15) Me.PictureBox10.TabIndex = 43 Me.PictureBox10.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox10, resources.GetString("PictureBox10.ToolTip")) @@ -378,11 +355,10 @@ Partial Class settings 'Intensity_Text ' Me.Intensity_Text.BackColor = System.Drawing.SystemColors.Window - Me.Intensity_Text.Location = New System.Drawing.Point(50, 187) - Me.Intensity_Text.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Intensity_Text.Location = New System.Drawing.Point(25, 97) Me.Intensity_Text.MaxLength = 5 Me.Intensity_Text.Name = "Intensity_Text" - Me.Intensity_Text.Size = New System.Drawing.Size(120, 31) + Me.Intensity_Text.Size = New System.Drawing.Size(62, 20) Me.Intensity_Text.TabIndex = 4 Me.Intensity_Text.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.ToolTip.SetToolTip(Me.Intensity_Text, resources.GetString("Intensity_Text.ToolTip")) @@ -390,10 +366,9 @@ Partial Class settings 'PictureBox12 ' Me.PictureBox12.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox12.Location = New System.Drawing.Point(410, 142) - Me.PictureBox12.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox12.Location = New System.Drawing.Point(205, 74) Me.PictureBox12.Name = "PictureBox12" - Me.PictureBox12.Size = New System.Drawing.Size(30, 29) + Me.PictureBox12.Size = New System.Drawing.Size(15, 15) Me.PictureBox12.TabIndex = 46 Me.PictureBox12.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox12, resources.GetString("PictureBox12.ToolTip")) @@ -403,10 +378,9 @@ Partial Class settings Me.Button1.BackColor = System.Drawing.Color.DarkGreen Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button1.Location = New System.Drawing.Point(380, 65) - Me.Button1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Button1.Location = New System.Drawing.Point(190, 34) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(162, 44) + Me.Button1.Size = New System.Drawing.Size(81, 23) Me.Button1.TabIndex = 2 Me.Button1.Text = "OCM Settings" Me.ToolTip.SetToolTip(Me.Button1, "Resets the Vertcoin Data Directory to the default value." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "If the One-Click Miner " & @@ -419,10 +393,9 @@ Partial Class settings Me.Button5.BackColor = System.Drawing.Color.DarkGreen Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button5.Location = New System.Drawing.Point(32, 65) - Me.Button5.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Button5.Location = New System.Drawing.Point(16, 34) Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(162, 44) + Me.Button5.Size = New System.Drawing.Size(81, 23) Me.Button5.TabIndex = 0 Me.Button5.Text = "VTC Data Dir" Me.ToolTip.SetToolTip(Me.Button5, "Resets the Vertcoin Data Directory to the default value." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "If the One-Click Miner " & @@ -433,10 +406,9 @@ Partial Class settings 'PictureBox5 ' Me.PictureBox5.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox5.Location = New System.Drawing.Point(286, 185) - Me.PictureBox5.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox5.Location = New System.Drawing.Point(143, 96) Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(30, 29) + Me.PictureBox5.Size = New System.Drawing.Size(15, 15) Me.PictureBox5.TabIndex = 48 Me.PictureBox5.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox5, "Toggle to autostart P2Pool when the OCM launches.") @@ -444,10 +416,9 @@ Partial Class settings 'CheckBox1 ' Me.CheckBox1.AutoSize = True - Me.CheckBox1.Location = New System.Drawing.Point(328, 185) - Me.CheckBox1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox1.Location = New System.Drawing.Point(164, 96) Me.CheckBox1.Name = "CheckBox1" - Me.CheckBox1.Size = New System.Drawing.Size(205, 29) + Me.CheckBox1.Size = New System.Drawing.Size(105, 17) Me.CheckBox1.TabIndex = 6 Me.CheckBox1.Text = "Autostart P2Pool" Me.ToolTip.SetToolTip(Me.CheckBox1, "Toggle to autostart P2Pool when the OCM launches." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)) @@ -456,10 +427,9 @@ Partial Class settings 'PictureBox8 ' Me.PictureBox8.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox8.Location = New System.Drawing.Point(286, 144) - Me.PictureBox8.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox8.Location = New System.Drawing.Point(143, 75) Me.PictureBox8.Name = "PictureBox8" - Me.PictureBox8.Size = New System.Drawing.Size(30, 29) + Me.PictureBox8.Size = New System.Drawing.Size(15, 15) Me.PictureBox8.TabIndex = 51 Me.PictureBox8.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox8, "Toggle to autostart mining when the OCM launches.") @@ -467,10 +437,9 @@ Partial Class settings 'CheckBox7 ' Me.CheckBox7.AutoSize = True - Me.CheckBox7.Location = New System.Drawing.Point(328, 144) - Me.CheckBox7.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox7.Location = New System.Drawing.Point(164, 75) Me.CheckBox7.Name = "CheckBox7" - Me.CheckBox7.Size = New System.Drawing.Size(200, 29) + Me.CheckBox7.Size = New System.Drawing.Size(102, 17) Me.CheckBox7.TabIndex = 4 Me.CheckBox7.Text = "Autostart Mining" Me.ToolTip.SetToolTip(Me.CheckBox7, "Toggle to autostart mining when the OCM launches." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)) @@ -479,10 +448,9 @@ Partial Class settings 'PictureBox2 ' Me.PictureBox2.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox2.Location = New System.Drawing.Point(410, 27) - Me.PictureBox2.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox2.Location = New System.Drawing.Point(205, 14) Me.PictureBox2.Name = "PictureBox2" - Me.PictureBox2.Size = New System.Drawing.Size(30, 29) + Me.PictureBox2.Size = New System.Drawing.Size(15, 15) Me.PictureBox2.TabIndex = 47 Me.PictureBox2.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox2, "Select the maximum amount of connections you would like to limit P2Pool to.") @@ -491,20 +459,18 @@ Partial Class settings ' Me.ComboBox1.FormattingEnabled = True Me.ComboBox1.Items.AddRange(New Object() {"1", "2"}) - Me.ComboBox1.Location = New System.Drawing.Point(384, 208) - Me.ComboBox1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ComboBox1.Location = New System.Drawing.Point(192, 108) Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(76, 33) + Me.ComboBox1.Size = New System.Drawing.Size(40, 21) Me.ComboBox1.TabIndex = 5 Me.ToolTip.SetToolTip(Me.ComboBox1, "Select the network in which p2pool will connect.") ' 'PictureBox7 ' Me.PictureBox7.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox7.Location = New System.Drawing.Point(28, 277) - Me.PictureBox7.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox7.Location = New System.Drawing.Point(14, 144) Me.PictureBox7.Name = "PictureBox7" - Me.PictureBox7.Size = New System.Drawing.Size(30, 29) + Me.PictureBox7.Size = New System.Drawing.Size(15, 15) Me.PictureBox7.TabIndex = 46 Me.PictureBox7.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox7, resources.GetString("PictureBox7.ToolTip")) @@ -512,11 +478,10 @@ Partial Class settings 'Devices_Text ' Me.Devices_Text.BackColor = System.Drawing.SystemColors.Window - Me.Devices_Text.Location = New System.Drawing.Point(70, 271) - Me.Devices_Text.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.Devices_Text.MaxLength = 5 + Me.Devices_Text.Location = New System.Drawing.Point(35, 141) + Me.Devices_Text.MaxLength = 250 Me.Devices_Text.Name = "Devices_Text" - Me.Devices_Text.Size = New System.Drawing.Size(120, 31) + Me.Devices_Text.Size = New System.Drawing.Size(62, 20) Me.Devices_Text.TabIndex = 5 Me.Devices_Text.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.ToolTip.SetToolTip(Me.Devices_Text, resources.GetString("Devices_Text.ToolTip")) @@ -524,10 +489,9 @@ Partial Class settings 'PictureBox13 ' Me.PictureBox13.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.help_small - Me.PictureBox13.Location = New System.Drawing.Point(18, 265) - Me.PictureBox13.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox13.Location = New System.Drawing.Point(9, 138) Me.PictureBox13.Name = "PictureBox13" - Me.PictureBox13.Size = New System.Drawing.Size(30, 29) + Me.PictureBox13.Size = New System.Drawing.Size(15, 15) Me.PictureBox13.TabIndex = 53 Me.PictureBox13.TabStop = False Me.ToolTip.SetToolTip(Me.PictureBox13, "Toggle to allow Mining and P2Pool Node CLI windows to be viewed while running." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "M" & @@ -537,10 +501,9 @@ Partial Class settings ' Me.CheckBox2.AutoSize = True Me.CheckBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox2.Location = New System.Drawing.Point(58, 265) - Me.CheckBox2.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox2.Location = New System.Drawing.Point(29, 138) Me.CheckBox2.Name = "CheckBox2" - Me.CheckBox2.Size = New System.Drawing.Size(139, 30) + Me.CheckBox2.Size = New System.Drawing.Size(72, 17) Me.CheckBox2.TabIndex = 9 Me.CheckBox2.Text = "Show CLI" Me.ToolTip.SetToolTip(Me.CheckBox2, "Toggle to minimize the OCM into your system tray whenever minimize is clicked.") @@ -549,10 +512,9 @@ Partial Class settings 'CheckBox10 ' Me.CheckBox10.AutoSize = True - Me.CheckBox10.Location = New System.Drawing.Point(22, 48) - Me.CheckBox10.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.CheckBox10.Location = New System.Drawing.Point(11, 25) Me.CheckBox10.Name = "CheckBox10" - Me.CheckBox10.Size = New System.Drawing.Size(188, 29) + Me.CheckBox10.Size = New System.Drawing.Size(98, 17) Me.CheckBox10.TabIndex = 0 Me.CheckBox10.Text = "Mine when Idle" Me.ToolTip.SetToolTip(Me.CheckBox10, "*In BETA*" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Periodically checks CPU/GPU utilization. " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "When enabled, it will auto" & @@ -564,10 +526,9 @@ Partial Class settings Me.Button2.BackColor = System.Drawing.Color.DarkGreen Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button2.Location = New System.Drawing.Point(14, 133) - Me.Button2.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Button2.Location = New System.Drawing.Point(7, 69) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(58, 44) + Me.Button2.Size = New System.Drawing.Size(29, 23) Me.Button2.TabIndex = 1 Me.Button2.Text = "L" Me.ToolTip.SetToolTip(Me.Button2, resources.GetString("Button2.ToolTip")) @@ -578,10 +539,9 @@ Partial Class settings Me.Button3.BackColor = System.Drawing.Color.DarkGreen Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button3.Location = New System.Drawing.Point(84, 133) - Me.Button3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Button3.Location = New System.Drawing.Point(42, 69) Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(58, 44) + Me.Button3.Size = New System.Drawing.Size(29, 23) Me.Button3.TabIndex = 2 Me.Button3.Text = "M" Me.ToolTip.SetToolTip(Me.Button3, resources.GetString("Button3.ToolTip")) @@ -592,10 +552,9 @@ Partial Class settings Me.Button4.BackColor = System.Drawing.Color.DarkGreen Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button4.Location = New System.Drawing.Point(154, 133) - Me.Button4.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Button4.Location = New System.Drawing.Point(77, 69) Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(58, 44) + Me.Button4.Size = New System.Drawing.Size(29, 23) Me.Button4.TabIndex = 3 Me.Button4.Text = "H" Me.ToolTip.SetToolTip(Me.Button4, resources.GetString("Button4.ToolTip")) @@ -606,10 +565,9 @@ Partial Class settings Me.Button6.BackColor = System.Drawing.Color.DarkGreen Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button6.Location = New System.Drawing.Point(206, 65) - Me.Button6.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Button6.Location = New System.Drawing.Point(103, 34) Me.Button6.Name = "Button6" - Me.Button6.Size = New System.Drawing.Size(162, 44) + Me.Button6.Size = New System.Drawing.Size(81, 23) Me.Button6.TabIndex = 1 Me.Button6.Text = "OCM Data Dir" Me.ToolTip.SetToolTip(Me.Button6, "Resets the Vertcoin Data Directory to the default value." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "If the One-Click Miner " & @@ -621,10 +579,9 @@ Partial Class settings ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(142, 33) - Me.Label6.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label6.Location = New System.Drawing.Point(71, 17) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(116, 26) + Me.Label6.Size = New System.Drawing.Size(57, 13) Me.Label6.TabIndex = 45 Me.Label6.Text = "Directories" ' @@ -632,10 +589,9 @@ Partial Class settings ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(378, 177) - Me.Label9.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label9.Location = New System.Drawing.Point(189, 92) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(92, 26) + Me.Label9.Size = New System.Drawing.Size(47, 13) Me.Label9.TabIndex = 45 Me.Label9.Text = "Network" ' @@ -643,10 +599,9 @@ Partial Class settings ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(64, 100) - Me.Label7.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label7.Location = New System.Drawing.Point(32, 52) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(93, 26) + Me.Label7.Size = New System.Drawing.Size(46, 13) Me.Label7.TabIndex = 42 Me.Label7.Text = "Intensity" ' @@ -659,19 +614,17 @@ Partial Class settings Me.Panel1.Controls.Add(Me.PictureBox15) Me.Panel1.ForeColor = System.Drawing.SystemColors.Control Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1438, 100) + Me.Panel1.Size = New System.Drawing.Size(719, 52) Me.Panel1.TabIndex = 89 ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(134, 25) - Me.Label1.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label1.Location = New System.Drawing.Point(67, 13) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(179, 51) + Me.Label1.Size = New System.Drawing.Size(91, 26) Me.Label1.TabIndex = 93 Me.Label1.Text = "Settings" ' @@ -679,7 +632,6 @@ Partial Class settings ' Me.PictureBox11.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.ocmlogo Me.PictureBox11.Location = New System.Drawing.Point(0, 0) - Me.PictureBox11.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.PictureBox11.Name = "PictureBox11" Me.PictureBox11.Size = New System.Drawing.Size(50, 50) Me.PictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize @@ -690,10 +642,9 @@ Partial Class settings ' Me.PictureBox14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBox14.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.minimize - Me.PictureBox14.Location = New System.Drawing.Point(1292, 25) - Me.PictureBox14.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox14.Location = New System.Drawing.Point(646, 13) Me.PictureBox14.Name = "PictureBox14" - Me.PictureBox14.Size = New System.Drawing.Size(50, 48) + Me.PictureBox14.Size = New System.Drawing.Size(25, 25) Me.PictureBox14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage Me.PictureBox14.TabIndex = 92 Me.PictureBox14.TabStop = False @@ -702,10 +653,9 @@ Partial Class settings ' Me.PictureBox15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBox15.Image = Global.VertcoinOneClickMiner.My.Resources.Resources.greenx - Me.PictureBox15.Location = New System.Drawing.Point(1368, 25) - Me.PictureBox15.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.PictureBox15.Location = New System.Drawing.Point(684, 13) Me.PictureBox15.Name = "PictureBox15" - Me.PictureBox15.Size = New System.Drawing.Size(50, 48) + Me.PictureBox15.Size = New System.Drawing.Size(25, 25) Me.PictureBox15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage Me.PictureBox15.TabIndex = 91 Me.PictureBox15.TabStop = False @@ -716,10 +666,9 @@ Partial Class settings Me.Panel2.Controls.Add(Me.GroupBox2) Me.Panel2.Controls.Add(Me.GroupBox1) Me.Panel2.Controls.Add(Me.GroupBox3) - Me.Panel2.Location = New System.Drawing.Point(0, 96) - Me.Panel2.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.Panel2.Location = New System.Drawing.Point(0, 50) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1438, 371) + Me.Panel2.Size = New System.Drawing.Size(719, 193) Me.Panel2.TabIndex = 90 ' 'GroupBox2 @@ -741,11 +690,9 @@ Partial Class settings Me.GroupBox2.Controls.Add(Me.TextBox3) Me.GroupBox2.Controls.Add(Me.Label4) Me.GroupBox2.ForeColor = System.Drawing.SystemColors.Control - Me.GroupBox2.Location = New System.Drawing.Point(630, 15) - Me.GroupBox2.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.GroupBox2.Location = New System.Drawing.Point(315, 8) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Padding = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.GroupBox2.Size = New System.Drawing.Size(550, 333) + Me.GroupBox2.Size = New System.Drawing.Size(275, 173) Me.GroupBox2.TabIndex = 12 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "P2Pool" @@ -774,11 +721,9 @@ Partial Class settings Me.GroupBox1.Controls.Add(Me.PictureBox9) Me.GroupBox1.Controls.Add(Me.CheckBox9) Me.GroupBox1.ForeColor = System.Drawing.SystemColors.Control - Me.GroupBox1.Location = New System.Drawing.Point(24, 15) - Me.GroupBox1.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.GroupBox1.Location = New System.Drawing.Point(12, 8) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Padding = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.GroupBox1.Size = New System.Drawing.Size(574, 333) + Me.GroupBox1.Size = New System.Drawing.Size(287, 173) Me.GroupBox1.TabIndex = 11 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "General" @@ -787,10 +732,9 @@ Partial Class settings ' Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(414, 33) - Me.Label8.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label8.Location = New System.Drawing.Point(207, 17) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(92, 26) + Me.Label8.Size = New System.Drawing.Size(46, 13) Me.Label8.TabIndex = 55 Me.Label8.Text = "Defaults" ' @@ -807,11 +751,9 @@ Partial Class settings Me.GroupBox3.Controls.Add(Me.Label7) Me.GroupBox3.Controls.Add(Me.Intensity_Text) Me.GroupBox3.ForeColor = System.Drawing.SystemColors.Control - Me.GroupBox3.Location = New System.Drawing.Point(1192, 15) - Me.GroupBox3.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.GroupBox3.Location = New System.Drawing.Point(596, 8) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Padding = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.GroupBox3.Size = New System.Drawing.Size(226, 333) + Me.GroupBox3.Size = New System.Drawing.Size(113, 173) Me.GroupBox3.TabIndex = 12 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Mining" @@ -820,26 +762,23 @@ Partial Class settings ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(86, 240) - Me.Label2.Margin = New System.Windows.Forms.Padding(6, 0, 6, 0) + Me.Label2.Location = New System.Drawing.Point(43, 125) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(90, 26) + Me.Label2.Size = New System.Drawing.Size(46, 13) Me.Label2.TabIndex = 45 Me.Label2.Text = "Devices" ' 'settings ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(12.0!, 25.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1438, 467) + Me.ClientSize = New System.Drawing.Size(719, 243) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.MaximizeBox = False - Me.MaximumSize = New System.Drawing.Size(1438, 467) - Me.MinimumSize = New System.Drawing.Size(1438, 467) + Me.MinimumSize = New System.Drawing.Size(719, 243) Me.Name = "settings" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Settings" diff --git a/Vertminer/settings.resx b/Vertminer/settings.resx index 132c31b..ea56381 100644 --- a/Vertminer/settings.resx +++ b/Vertminer/settings.resx @@ -120,6 +120,9 @@ 17, 17 + + 17, 17 + This sets the intensity of the miner. This can be used to help fine-tune miner performance. Either manually enter an intensity in the box or click a button to select Low, Medium, or High performance. diff --git a/Vertminer/settings.vb b/Vertminer/settings.vb index 5071c61..f76e062 100755 --- a/Vertminer/settings.vb +++ b/Vertminer/settings.vb @@ -303,13 +303,13 @@ Public Class settings Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - Intensity_Text.Text = "11" + Intensity_Text.Text = "9" End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click - Intensity_Text.Text = "12" + Intensity_Text.Text = "14" End Sub @@ -333,6 +333,29 @@ Public Class settings End Sub + Public Sub Resize_Settings() + + Dim screenwidth As Integer = Screen.PrimaryScreen.Bounds.Width + Dim screenheight As Integer = Screen.PrimaryScreen.Bounds.Height + Dim smallwindowwidth As Double = 0.2266 * screenwidth + Dim smallwindowheight As Double = 0.3102 * screenheight + Dim largewindowwidth As Double = 0.4532 * screenwidth + Dim largewindowheight As Double = 0.4653 * screenheight + + 'MsgBox(screenwidth & "," & screenheight & " " & smallwindowwidth & "," & smallwindowheight) + + If minmax = False Then 'Shrink + Me.Size = New Size(smallwindowwidth, smallwindowheight) + PictureBox2.Image = My.Resources.greenplus + minmax = True + ElseIf minmax = True Then 'Grow + Me.Size = New Size(largewindowwidth, largewindowheight) + PictureBox2.Image = My.Resources.greenminus + minmax = False + End If + + End Sub + Private Sub PictureBox15_Click(sender As Object, e As EventArgs) Handles PictureBox15.Click Me.Close() diff --git a/Vertminer/variables.vb b/Vertminer/variables.vb index c0a8997..ac175db 100755 --- a/Vertminer/variables.vb +++ b/Vertminer/variables.vb @@ -69,10 +69,14 @@ Module variables 'API Variables Public Property api_connected As Boolean Public Property jsonmaxlength As Integer = 200000000 '2 million characters - Public Property api_network1_hosts() = {"http://scanner1.alwayshashing.com:8085/api", "https://scanner.vtconline.org/api"} - Public Property api_network2_hosts() = {"http://scanner2.alwayshashing.com:8086/api"} + Public Property api_network1_hosts() = {"http://scanner1.alwayshashing.com/api", "https://scanner1.mining.moe/api", "https://scanner.vtconline.org/api"} + Public Property api_network2_hosts() = {"http://scanner2.alwayshashing.com/api", "https://scanner2.mining.moe/api"} Public Property network1data As DataSet Public Property network2data As DataSet + Public Property latencytimemsnet1 As Int32 = 0 + Public Property latencytimemsnet2 As Int32 = 0 + Public Property clientSocket1 + Public Property clientSocket2 ''Miner Public Property miner_hashrate As Decimal