diff --git a/ATA-GUI/Classes/ATA.cs b/ATA-GUI/Classes/ATA.cs index 96150a2..cb880ad 100644 --- a/ATA-GUI/Classes/ATA.cs +++ b/ATA-GUI/Classes/ATA.cs @@ -1,11 +1,11 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.Net.Http; using System.Threading.Tasks; using System.Windows.Forms; -using Newtonsoft.Json; namespace ATA_GUI.Classes { diff --git a/ATA-GUI/Forms/AboutForm.cs b/ATA-GUI/Forms/AboutForm.cs index 22e798a..c625b46 100644 --- a/ATA-GUI/Forms/AboutForm.cs +++ b/ATA-GUI/Forms/AboutForm.cs @@ -1,7 +1,7 @@ -using System; -using System.Windows.Forms; -using ATA_GUI.Classes; +using ATA_GUI.Classes; using ATA_GUI.Utils; +using System; +using System.Windows.Forms; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/BloatwareRemoverForm.cs b/ATA-GUI/Forms/BloatwareRemoverForm.cs index 071c16e..b98acee 100644 --- a/ATA-GUI/Forms/BloatwareRemoverForm.cs +++ b/ATA-GUI/Forms/BloatwareRemoverForm.cs @@ -1,11 +1,11 @@ -using System; +using ATA_GUI.Classes; +using ATA_GUI.Utils; +using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Windows.Forms; using System.Xml; -using ATA_GUI.Classes; -using ATA_GUI.Utils; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/BootloaderMenuForm.cs b/ATA-GUI/Forms/BootloaderMenuForm.cs index 33f3878..f13d91b 100644 --- a/ATA-GUI/Forms/BootloaderMenuForm.cs +++ b/ATA-GUI/Forms/BootloaderMenuForm.cs @@ -1,6 +1,6 @@ -using System; +using ATA_GUI.Utils; +using System; using System.Windows.Forms; -using ATA_GUI.Utils; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/DefaultAppForm.cs b/ATA-GUI/Forms/DefaultAppForm.cs index 8a53a48..1ad5ada 100644 --- a/ATA-GUI/Forms/DefaultAppForm.cs +++ b/ATA-GUI/Forms/DefaultAppForm.cs @@ -1,6 +1,6 @@ -using System; +using ATA_GUI.Utils; +using System; using System.Windows.Forms; -using ATA_GUI.Utils; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/DeviceLogsForm.cs b/ATA-GUI/Forms/DeviceLogsForm.cs index 9ec7146..c267be8 100644 --- a/ATA-GUI/Forms/DeviceLogsForm.cs +++ b/ATA-GUI/Forms/DeviceLogsForm.cs @@ -1,11 +1,11 @@ -using System; +using ATA_GUI.Classes; +using ATA_GUI.Utils; +using System; using System.ComponentModel; using System.Diagnostics; using System.Drawing; using System.Linq; using System.Windows.Forms; -using ATA_GUI.Classes; -using ATA_GUI.Utils; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/FeedbackForm.cs b/ATA-GUI/Forms/FeedbackForm.cs index 6d727eb..304c717 100644 --- a/ATA-GUI/Forms/FeedbackForm.cs +++ b/ATA-GUI/Forms/FeedbackForm.cs @@ -1,8 +1,8 @@ -using System; +using ATA_GUI.Utils; +using System; using System.IO; using System.Windows.Forms; using System.Xml; -using ATA_GUI.Utils; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/LoadingForm.cs b/ATA-GUI/Forms/LoadingForm.cs index 73f0796..2a5ac92 100644 --- a/ATA-GUI/Forms/LoadingForm.cs +++ b/ATA-GUI/Forms/LoadingForm.cs @@ -1,11 +1,11 @@ -using System; +using ATA_GUI.Utils; +using System; using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Linq; using System.Threading; using System.Windows.Forms; -using ATA_GUI.Utils; namespace ATA_GUI { diff --git a/ATA-GUI/Forms/MainForm.Designer.cs b/ATA-GUI/Forms/MainForm.Designer.cs index 9da16bc..29f4a4c 100644 --- a/ATA-GUI/Forms/MainForm.Designer.cs +++ b/ATA-GUI/Forms/MainForm.Designer.cs @@ -253,11 +253,11 @@ private void InitializeComponent() labelLog.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; labelLog.AutoSize = true; labelLog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - labelLog.Location = new System.Drawing.Point(474, 427); + labelLog.Location = new System.Drawing.Point(474, 484); labelLog.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); labelLog.Name = "labelLog"; labelLog.RightToLeft = System.Windows.Forms.RightToLeft.No; - labelLog.Size = new System.Drawing.Size(28, 13); + labelLog.Size = new System.Drawing.Size(31, 15); labelLog.TabIndex = 24; labelLog.Text = "Log:"; // @@ -268,10 +268,10 @@ private void InitializeComponent() buttonLogClear.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonLogClear.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); buttonLogClear.ForeColor = System.Drawing.Color.Black; - buttonLogClear.Location = new System.Drawing.Point(366, 504); + buttonLogClear.Location = new System.Drawing.Point(366, 571); buttonLogClear.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonLogClear.Name = "buttonLogClear"; - buttonLogClear.Size = new System.Drawing.Size(102, 27); + buttonLogClear.Size = new System.Drawing.Size(102, 31); buttonLogClear.TabIndex = 31; buttonLogClear.Text = "Clear log"; buttonLogClear.UseVisualStyleBackColor = false; @@ -300,11 +300,11 @@ private void InitializeComponent() groupBoxDeviceInfo.Controls.Add(labelManufacturer); groupBoxDeviceInfo.Controls.Add(labelCpuAbilitis); groupBoxDeviceInfo.Controls.Add(labelBuildUser); - groupBoxDeviceInfo.Location = new System.Drawing.Point(7, 10); + groupBoxDeviceInfo.Location = new System.Drawing.Point(7, 11); groupBoxDeviceInfo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxDeviceInfo.Name = "groupBoxDeviceInfo"; groupBoxDeviceInfo.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxDeviceInfo.Size = new System.Drawing.Size(374, 181); + groupBoxDeviceInfo.Size = new System.Drawing.Size(374, 205); groupBoxDeviceInfo.TabIndex = 32; groupBoxDeviceInfo.TabStop = false; groupBoxDeviceInfo.Text = "Device Info"; @@ -312,10 +312,10 @@ private void InitializeComponent() // buttonTurnOffAdb // buttonTurnOffAdb.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonTurnOffAdb.Location = new System.Drawing.Point(280, 147); + buttonTurnOffAdb.Location = new System.Drawing.Point(280, 167); buttonTurnOffAdb.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonTurnOffAdb.Name = "buttonTurnOffAdb"; - buttonTurnOffAdb.Size = new System.Drawing.Size(88, 27); + buttonTurnOffAdb.Size = new System.Drawing.Size(88, 31); buttonTurnOffAdb.TabIndex = 20; buttonTurnOffAdb.Text = "Turn off adb"; buttonTurnOffAdb.UseVisualStyleBackColor = true; @@ -324,200 +324,200 @@ private void InitializeComponent() // labelUser // labelUser.AutoSize = true; - labelUser.Location = new System.Drawing.Point(115, 153); + labelUser.Location = new System.Drawing.Point(115, 173); labelUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelUser.Name = "labelUser"; - labelUser.Size = new System.Drawing.Size(69, 15); + labelUser.Size = new System.Drawing.Size(77, 17); labelUser.TabIndex = 19; labelUser.Text = "UNKNOWN"; // // label12 // label12.AutoSize = true; - label12.Location = new System.Drawing.Point(7, 153); + label12.Location = new System.Drawing.Point(7, 173); label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label12.Name = "label12"; - label12.Size = new System.Drawing.Size(36, 15); + label12.Size = new System.Drawing.Size(42, 17); label12.TabIndex = 18; label12.Text = "User: "; // // labelStatus // labelStatus.AutoSize = true; - labelStatus.Location = new System.Drawing.Point(115, 138); + labelStatus.Location = new System.Drawing.Point(115, 156); labelStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelStatus.Name = "labelStatus"; - labelStatus.Size = new System.Drawing.Size(69, 15); + labelStatus.Size = new System.Drawing.Size(77, 17); labelStatus.TabIndex = 17; labelStatus.Text = "UNKNOWN"; // // label4 // label4.AutoSize = true; - label4.Location = new System.Drawing.Point(7, 138); + label4.Location = new System.Drawing.Point(7, 156); label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label4.Name = "label4"; - label4.Size = new System.Drawing.Size(89, 15); + label4.Size = new System.Drawing.Size(97, 17); label4.TabIndex = 16; label4.Text = "Connected via: "; // // labelIP // labelIP.AutoSize = true; - labelIP.Location = new System.Drawing.Point(115, 123); + labelIP.Location = new System.Drawing.Point(115, 139); labelIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelIP.Name = "labelIP"; - labelIP.Size = new System.Drawing.Size(44, 15); + labelIP.Size = new System.Drawing.Size(48, 17); labelIP.TabIndex = 15; labelIP.Text = "EMPTY"; // // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(7, 123); + label1.Location = new System.Drawing.Point(7, 139); label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(23, 15); + label1.Size = new System.Drawing.Size(25, 17); label1.TabIndex = 14; label1.Text = "IP: "; // // labelAV // labelAV.AutoSize = true; - labelAV.Location = new System.Drawing.Point(115, 108); + labelAV.Location = new System.Drawing.Point(115, 122); labelAV.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelAV.Name = "labelAV"; - labelAV.Size = new System.Drawing.Size(44, 15); + labelAV.Size = new System.Drawing.Size(48, 17); labelAV.TabIndex = 13; labelAV.Text = "EMPTY"; // // labelDevice // labelDevice.AutoSize = true; - labelDevice.Location = new System.Drawing.Point(115, 93); + labelDevice.Location = new System.Drawing.Point(115, 105); labelDevice.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelDevice.Name = "labelDevice"; - labelDevice.Size = new System.Drawing.Size(44, 15); + labelDevice.Size = new System.Drawing.Size(48, 17); labelDevice.TabIndex = 12; labelDevice.Text = "EMPTY"; // // labelBoard // labelBoard.AutoSize = true; - labelBoard.Location = new System.Drawing.Point(115, 78); + labelBoard.Location = new System.Drawing.Point(115, 88); labelBoard.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelBoard.Name = "labelBoard"; - labelBoard.Size = new System.Drawing.Size(44, 15); + labelBoard.Size = new System.Drawing.Size(48, 17); labelBoard.TabIndex = 11; labelBoard.Text = "EMPTY"; // // labelModel // labelModel.AutoSize = true; - labelModel.Location = new System.Drawing.Point(115, 63); + labelModel.Location = new System.Drawing.Point(115, 71); labelModel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelModel.Name = "labelModel"; - labelModel.Size = new System.Drawing.Size(44, 15); + labelModel.Size = new System.Drawing.Size(48, 17); labelModel.TabIndex = 10; labelModel.Text = "EMPTY"; // // labelManu // labelManu.AutoSize = true; - labelManu.Location = new System.Drawing.Point(115, 48); + labelManu.Location = new System.Drawing.Point(115, 54); labelManu.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelManu.Name = "labelManu"; - labelManu.Size = new System.Drawing.Size(44, 15); + labelManu.Size = new System.Drawing.Size(48, 17); labelManu.TabIndex = 9; labelManu.Text = "EMPTY"; // // labelCPUAb // labelCPUAb.AutoSize = true; - labelCPUAb.Location = new System.Drawing.Point(115, 33); + labelCPUAb.Location = new System.Drawing.Point(115, 37); labelCPUAb.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelCPUAb.Name = "labelCPUAb"; - labelCPUAb.Size = new System.Drawing.Size(44, 15); + labelCPUAb.Size = new System.Drawing.Size(48, 17); labelCPUAb.TabIndex = 8; labelCPUAb.Text = "EMPTY"; // // labelBuildU // labelBuildU.AutoSize = true; - labelBuildU.Location = new System.Drawing.Point(115, 18); + labelBuildU.Location = new System.Drawing.Point(115, 20); labelBuildU.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelBuildU.Name = "labelBuildU"; - labelBuildU.Size = new System.Drawing.Size(44, 15); + labelBuildU.Size = new System.Drawing.Size(48, 17); labelBuildU.TabIndex = 7; labelBuildU.Text = "EMPTY"; // // labelAndroidVersion // labelAndroidVersion.AutoSize = true; - labelAndroidVersion.Location = new System.Drawing.Point(7, 108); + labelAndroidVersion.Location = new System.Drawing.Point(7, 122); labelAndroidVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelAndroidVersion.Name = "labelAndroidVersion"; - labelAndroidVersion.Size = new System.Drawing.Size(94, 15); + labelAndroidVersion.Size = new System.Drawing.Size(105, 17); labelAndroidVersion.TabIndex = 6; labelAndroidVersion.Text = "Android Version:"; // // labelProductDevice // labelProductDevice.AutoSize = true; - labelProductDevice.Location = new System.Drawing.Point(7, 93); + labelProductDevice.Location = new System.Drawing.Point(7, 105); labelProductDevice.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelProductDevice.Name = "labelProductDevice"; - labelProductDevice.Size = new System.Drawing.Size(45, 15); + labelProductDevice.Size = new System.Drawing.Size(49, 17); labelProductDevice.TabIndex = 5; labelProductDevice.Text = "Device:"; // // labelProductBoard // labelProductBoard.AutoSize = true; - labelProductBoard.Location = new System.Drawing.Point(7, 78); + labelProductBoard.Location = new System.Drawing.Point(7, 88); labelProductBoard.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelProductBoard.Name = "labelProductBoard"; - labelProductBoard.Size = new System.Drawing.Size(41, 15); + labelProductBoard.Size = new System.Drawing.Size(46, 17); labelProductBoard.TabIndex = 4; labelProductBoard.Text = "Board:"; // // labelProductModel // labelProductModel.AutoSize = true; - labelProductModel.Location = new System.Drawing.Point(7, 63); + labelProductModel.Location = new System.Drawing.Point(7, 71); labelProductModel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelProductModel.Name = "labelProductModel"; - labelProductModel.Size = new System.Drawing.Size(44, 15); + labelProductModel.Size = new System.Drawing.Size(49, 17); labelProductModel.TabIndex = 3; labelProductModel.Text = "Model:"; // // labelManufacturer // labelManufacturer.AutoSize = true; - labelManufacturer.Location = new System.Drawing.Point(7, 48); + labelManufacturer.Location = new System.Drawing.Point(7, 54); labelManufacturer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelManufacturer.Name = "labelManufacturer"; - labelManufacturer.Size = new System.Drawing.Size(82, 15); + labelManufacturer.Size = new System.Drawing.Size(89, 17); labelManufacturer.TabIndex = 2; labelManufacturer.Text = "Manufacturer:"; // // labelCpuAbilitis // labelCpuAbilitis.AutoSize = true; - labelCpuAbilitis.Location = new System.Drawing.Point(7, 33); + labelCpuAbilitis.Location = new System.Drawing.Point(7, 37); labelCpuAbilitis.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelCpuAbilitis.Name = "labelCpuAbilitis"; - labelCpuAbilitis.Size = new System.Drawing.Size(71, 15); + labelCpuAbilitis.Size = new System.Drawing.Size(76, 17); labelCpuAbilitis.TabIndex = 1; labelCpuAbilitis.Text = "Cpu Abilitis:"; // // labelBuildUser // labelBuildUser.AutoSize = true; - labelBuildUser.Location = new System.Drawing.Point(7, 18); + labelBuildUser.Location = new System.Drawing.Point(7, 20); labelBuildUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelBuildUser.Name = "labelBuildUser"; - labelBuildUser.Size = new System.Drawing.Size(63, 15); + labelBuildUser.Size = new System.Drawing.Size(70, 17); labelBuildUser.TabIndex = 0; labelBuildUser.Text = "Build User:"; // @@ -528,11 +528,11 @@ private void InitializeComponent() tabControls.Controls.Add(tabPageFastboot); tabControls.Controls.Add(tabPageRecovery); tabControls.Controls.Add(tabPageTools); - tabControls.Location = new System.Drawing.Point(4, 54); + tabControls.Location = new System.Drawing.Point(4, 61); tabControls.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); tabControls.Name = "tabControls"; tabControls.SelectedIndex = 0; - tabControls.Size = new System.Drawing.Size(933, 370); + tabControls.Size = new System.Drawing.Size(933, 419); tabControls.TabIndex = 33; tabControls.Selected += tabControl1_Selected; // @@ -543,11 +543,11 @@ private void InitializeComponent() tabPageSystem.Controls.Add(groupBoxAPKMenu); tabPageSystem.Controls.Add(groupBoxADBNet); tabPageSystem.Controls.Add(groupBoxRebootMenu); - tabPageSystem.Location = new System.Drawing.Point(4, 24); + tabPageSystem.Location = new System.Drawing.Point(4, 26); tabPageSystem.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); tabPageSystem.Name = "tabPageSystem"; tabPageSystem.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - tabPageSystem.Size = new System.Drawing.Size(925, 342); + tabPageSystem.Size = new System.Drawing.Size(925, 389); tabPageSystem.TabIndex = 0; tabPageSystem.Text = "System"; // @@ -561,11 +561,11 @@ private void InitializeComponent() groupBoxAPKMenu.Controls.Add(label6); groupBoxAPKMenu.Controls.Add(labelSelectedAppCount); groupBoxAPKMenu.Controls.Add(toolStrip1); - groupBoxAPKMenu.Location = new System.Drawing.Point(386, 10); + groupBoxAPKMenu.Location = new System.Drawing.Point(386, 11); groupBoxAPKMenu.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxAPKMenu.Name = "groupBoxAPKMenu"; groupBoxAPKMenu.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxAPKMenu.Size = new System.Drawing.Size(531, 329); + groupBoxAPKMenu.Size = new System.Drawing.Size(531, 373); groupBoxAPKMenu.TabIndex = 36; groupBoxAPKMenu.TabStop = false; groupBoxAPKMenu.Text = "APK Menu"; @@ -573,9 +573,9 @@ private void InitializeComponent() // labelTotalPackages // labelTotalPackages.AutoSize = true; - labelTotalPackages.Location = new System.Drawing.Point(11, 75); + labelTotalPackages.Location = new System.Drawing.Point(11, 85); labelTotalPackages.Name = "labelTotalPackages"; - labelTotalPackages.Size = new System.Drawing.Size(44, 15); + labelTotalPackages.Size = new System.Drawing.Size(50, 17); labelTotalPackages.TabIndex = 48; labelTotalPackages.Text = "Total: 0"; // @@ -589,11 +589,12 @@ private void InitializeComponent() dataGridViewPackages.BackgroundColor = System.Drawing.Color.White; dataGridViewPackages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridViewPackages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { name, package }); - dataGridViewPackages.Location = new System.Drawing.Point(11, 99); + dataGridViewPackages.Location = new System.Drawing.Point(11, 112); dataGridViewPackages.Name = "dataGridViewPackages"; dataGridViewPackages.ReadOnly = true; + dataGridViewPackages.RowHeadersWidth = 43; dataGridViewPackages.RowTemplate.Height = 25; - dataGridViewPackages.Size = new System.Drawing.Size(324, 224); + dataGridViewPackages.Size = new System.Drawing.Size(324, 254); dataGridViewPackages.TabIndex = 47; dataGridViewPackages.SelectionChanged += dataGridViewPackages_SelectionChanged; // @@ -602,12 +603,14 @@ private void InitializeComponent() name.HeaderText = "name"; name.Name = "name"; name.ReadOnly = true; + name.Width = 105; // // package // package.HeaderText = "package"; package.Name = "package"; package.ReadOnly = true; + package.Width = 105; // // groupBox6 // @@ -615,11 +618,11 @@ private void InitializeComponent() groupBox6.BackgroundImage = Properties.Resources.icons8_drag_and_drop_48; groupBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; groupBox6.Controls.Add(label3); - groupBox6.Location = new System.Drawing.Point(342, 206); + groupBox6.Location = new System.Drawing.Point(342, 233); groupBox6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBox6.Name = "groupBox6"; groupBox6.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBox6.Size = new System.Drawing.Size(181, 117); + groupBox6.Size = new System.Drawing.Size(181, 133); groupBox6.TabIndex = 43; groupBox6.TabStop = false; groupBox6.Text = "Apk Installer"; @@ -629,10 +632,10 @@ private void InitializeComponent() // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(64, 80); + label3.Location = new System.Drawing.Point(64, 91); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; - label3.Size = new System.Drawing.Size(57, 15); + label3.Size = new System.Drawing.Size(64, 17); label3.TabIndex = 1; label3.Text = "Drop Apk"; // @@ -640,9 +643,9 @@ private void InitializeComponent() // buttonBloatwareRemover.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; buttonBloatwareRemover.Image = Properties.Resources.user_shield_48; - buttonBloatwareRemover.Location = new System.Drawing.Point(400, 99); + buttonBloatwareRemover.Location = new System.Drawing.Point(400, 112); buttonBloatwareRemover.Name = "buttonBloatwareRemover"; - buttonBloatwareRemover.Size = new System.Drawing.Size(75, 80); + buttonBloatwareRemover.Size = new System.Drawing.Size(75, 91); buttonBloatwareRemover.TabIndex = 46; buttonBloatwareRemover.UseVisualStyleBackColor = true; buttonBloatwareRemover.Click += buttonBloatwareRemover_Click; @@ -651,9 +654,9 @@ private void InitializeComponent() // label6.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; label6.AutoSize = true; - label6.Location = new System.Drawing.Point(386, 182); + label6.Location = new System.Drawing.Point(386, 206); label6.Name = "label6"; - label6.Size = new System.Drawing.Size(103, 15); + label6.Size = new System.Drawing.Size(114, 17); label6.TabIndex = 45; label6.Text = "Blotware Remover"; // @@ -661,10 +664,10 @@ private void InitializeComponent() // labelSelectedAppCount.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; labelSelectedAppCount.AutoSize = true; - labelSelectedAppCount.Location = new System.Drawing.Point(218, 75); + labelSelectedAppCount.Location = new System.Drawing.Point(218, 85); labelSelectedAppCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelSelectedAppCount.Name = "labelSelectedAppCount"; - labelSelectedAppCount.Size = new System.Drawing.Size(88, 15); + labelSelectedAppCount.Size = new System.Drawing.Size(99, 17); labelSelectedAppCount.TabIndex = 44; labelSelectedAppCount.Text = "Selected App: 0"; // @@ -674,7 +677,7 @@ private void InitializeComponent() toolStrip1.ImageScalingSize = new System.Drawing.Size(18, 18); toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { toolStripButtonReloadApps, toolStripSeparator2, toolStripButtonFilter, toolStripSeparator6, textBoxSearch, toolStripSeparator1, toolStripButtonRestoreApp, toolStripSeparator7, toolStripButtonUninstallApp, toolStripSeparator5, toolStripButtonPackageManager, toolStripSeparator3, toolStripButtonPermissionMenu, toolStripSeparator4, toolStripButtonSetDefault, toolStripSeparator8, toolStripButtonSearch, toolStripSeparator9, toolStripButtonExtract, toolStripSeparator11, toolStripDropDownInstallApkButton }); toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - toolStrip1.Location = new System.Drawing.Point(4, 19); + toolStrip1.Location = new System.Drawing.Point(4, 21); toolStrip1.Name = "toolStrip1"; toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; toolStrip1.Size = new System.Drawing.Size(523, 25); @@ -687,7 +690,7 @@ private void InitializeComponent() toolStripButtonReloadApps.Image = Properties.Resources.icons8_refresh_48; toolStripButtonReloadApps.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonReloadApps.Name = "toolStripButtonReloadApps"; - toolStripButtonReloadApps.Size = new System.Drawing.Size(23, 22); + toolStripButtonReloadApps.Size = new System.Drawing.Size(24, 22); toolStripButtonReloadApps.Text = "Reload Apps"; toolStripButtonReloadApps.Click += toolStripButton1_Click; // @@ -702,7 +705,7 @@ private void InitializeComponent() toolStripButtonFilter.Image = Properties.Resources.icons8_filter_48; toolStripButtonFilter.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonFilter.Name = "toolStripButtonFilter"; - toolStripButtonFilter.Size = new System.Drawing.Size(23, 22); + toolStripButtonFilter.Size = new System.Drawing.Size(24, 22); toolStripButtonFilter.Text = "Filter Apps"; toolStripButtonFilter.ToolTipText = "Apps Filter "; toolStripButtonFilter.Click += toolStripButtonFilter_Click; @@ -716,7 +719,7 @@ private void InitializeComponent() // textBoxSearch.BackColor = System.Drawing.Color.White; textBoxSearch.Name = "textBoxSearch"; - textBoxSearch.Size = new System.Drawing.Size(170, 23); + textBoxSearch.Size = new System.Drawing.Size(170, 25); textBoxSearch.Text = "Search"; textBoxSearch.Click += textBoxSearch_Click; textBoxSearch.TextChanged += textBoxSearch_TextChanged; @@ -733,7 +736,7 @@ private void InitializeComponent() toolStripButtonRestoreApp.Image = Properties.Resources.icons8_restart_48; toolStripButtonRestoreApp.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonRestoreApp.Name = "toolStripButtonRestoreApp"; - toolStripButtonRestoreApp.Size = new System.Drawing.Size(23, 22); + toolStripButtonRestoreApp.Size = new System.Drawing.Size(24, 22); toolStripButtonRestoreApp.Tag = ""; toolStripButtonRestoreApp.Text = "Restore App [Only system apps can be restored]"; toolStripButtonRestoreApp.Click += toolStripButtonRestoreApp_Click; @@ -749,7 +752,7 @@ private void InitializeComponent() toolStripButtonUninstallApp.Image = Properties.Resources.icons8_remove_48; toolStripButtonUninstallApp.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonUninstallApp.Name = "toolStripButtonUninstallApp"; - toolStripButtonUninstallApp.Size = new System.Drawing.Size(23, 22); + toolStripButtonUninstallApp.Size = new System.Drawing.Size(24, 22); toolStripButtonUninstallApp.Text = "Uninstall App"; toolStripButtonUninstallApp.Click += toolStripButton4_Click; // @@ -764,7 +767,7 @@ private void InitializeComponent() toolStripButtonPackageManager.Image = Properties.Resources.icons8_support_48; toolStripButtonPackageManager.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonPackageManager.Name = "toolStripButtonPackageManager"; - toolStripButtonPackageManager.Size = new System.Drawing.Size(23, 22); + toolStripButtonPackageManager.Size = new System.Drawing.Size(24, 22); toolStripButtonPackageManager.Text = "Package Manager"; toolStripButtonPackageManager.ToolTipText = "Package Menu"; toolStripButtonPackageManager.Click += toolStripButton5_Click; @@ -780,7 +783,7 @@ private void InitializeComponent() toolStripButtonPermissionMenu.Image = Properties.Resources.icons8_services_48; toolStripButtonPermissionMenu.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonPermissionMenu.Name = "toolStripButtonPermissionMenu"; - toolStripButtonPermissionMenu.Size = new System.Drawing.Size(23, 22); + toolStripButtonPermissionMenu.Size = new System.Drawing.Size(24, 22); toolStripButtonPermissionMenu.Text = "toolStripButton1"; toolStripButtonPermissionMenu.ToolTipText = "Permission Menu"; toolStripButtonPermissionMenu.Click += toolStripButtonPermissionMenu_Click; @@ -796,7 +799,7 @@ private void InitializeComponent() toolStripButtonSetDefault.Image = Properties.Resources.icons8_operating_system_48; toolStripButtonSetDefault.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonSetDefault.Name = "toolStripButtonSetDefault"; - toolStripButtonSetDefault.Size = new System.Drawing.Size(23, 22); + toolStripButtonSetDefault.Size = new System.Drawing.Size(24, 22); toolStripButtonSetDefault.Text = "Set default app"; toolStripButtonSetDefault.Click += toolStripButtonSetDefault_Click; // @@ -811,7 +814,7 @@ private void InitializeComponent() toolStripButtonSearch.Image = Properties.Resources.icons8_search_48; toolStripButtonSearch.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonSearch.Name = "toolStripButtonSearch"; - toolStripButtonSearch.Size = new System.Drawing.Size(23, 22); + toolStripButtonSearch.Size = new System.Drawing.Size(24, 22); toolStripButtonSearch.Text = "Search"; toolStripButtonSearch.Click += toolStripButtonSearch_Click; // @@ -826,7 +829,7 @@ private void InitializeComponent() toolStripButtonExtract.Image = (System.Drawing.Image)resources.GetObject("toolStripButtonExtract.Image"); toolStripButtonExtract.ImageTransparentColor = System.Drawing.Color.Magenta; toolStripButtonExtract.Name = "toolStripButtonExtract"; - toolStripButtonExtract.Size = new System.Drawing.Size(23, 22); + toolStripButtonExtract.Size = new System.Drawing.Size(24, 22); toolStripButtonExtract.Text = "Extract"; toolStripButtonExtract.Click += toolStripButtonExtract_Click; // @@ -848,14 +851,14 @@ private void InitializeComponent() // installAppToolStripMenuItem // installAppToolStripMenuItem.Name = "installAppToolStripMenuItem"; - installAppToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + installAppToolStripMenuItem.Size = new System.Drawing.Size(174, 24); installAppToolStripMenuItem.Text = "Install App"; installAppToolStripMenuItem.Click += installAppToolStripMenuItem_Click; // // downgradeAppToolStripMenuItem // downgradeAppToolStripMenuItem.Name = "downgradeAppToolStripMenuItem"; - downgradeAppToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + downgradeAppToolStripMenuItem.Size = new System.Drawing.Size(174, 24); downgradeAppToolStripMenuItem.Text = "Downgrade App"; downgradeAppToolStripMenuItem.Click += downgradeAppToolStripMenuItem_Click; // @@ -871,20 +874,20 @@ private void InitializeComponent() groupBoxADBNet.Controls.Add(label2); groupBoxADBNet.Controls.Add(buttonDisconnectIP); groupBoxADBNet.Controls.Add(buttonConnectToIP); - groupBoxADBNet.Location = new System.Drawing.Point(174, 196); + groupBoxADBNet.Location = new System.Drawing.Point(174, 222); groupBoxADBNet.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxADBNet.Name = "groupBoxADBNet"; groupBoxADBNet.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxADBNet.Size = new System.Drawing.Size(208, 143); + groupBoxADBNet.Size = new System.Drawing.Size(208, 162); groupBoxADBNet.TabIndex = 37; groupBoxADBNet.TabStop = false; groupBoxADBNet.Text = "ADB over Network Menu"; // // buttonPair // - buttonPair.Location = new System.Drawing.Point(103, 104); + buttonPair.Location = new System.Drawing.Point(103, 118); buttonPair.Name = "buttonPair"; - buttonPair.Size = new System.Drawing.Size(54, 27); + buttonPair.Size = new System.Drawing.Size(54, 31); buttonPair.TabIndex = 46; buttonPair.Text = "Pair"; buttonPair.UseVisualStyleBackColor = true; @@ -895,9 +898,9 @@ private void InitializeComponent() // radioButtonCWired.AutoSize = true; radioButtonCWired.Checked = true; - radioButtonCWired.Location = new System.Drawing.Point(12, 118); + radioButtonCWired.Location = new System.Drawing.Point(12, 134); radioButtonCWired.Name = "radioButtonCWired"; - radioButtonCWired.Size = new System.Drawing.Size(56, 19); + radioButtonCWired.Size = new System.Drawing.Size(61, 21); radioButtonCWired.TabIndex = 45; radioButtonCWired.TabStop = true; radioButtonCWired.Text = "Wired"; @@ -906,9 +909,9 @@ private void InitializeComponent() // radioButtonCWireless // radioButtonCWireless.AutoSize = true; - radioButtonCWireless.Location = new System.Drawing.Point(12, 100); + radioButtonCWireless.Location = new System.Drawing.Point(12, 113); radioButtonCWireless.Name = "radioButtonCWireless"; - radioButtonCWireless.Size = new System.Drawing.Size(68, 19); + radioButtonCWireless.Size = new System.Drawing.Size(75, 21); radioButtonCWireless.TabIndex = 44; radioButtonCWireless.Text = "Wireless"; radioButtonCWireless.UseVisualStyleBackColor = true; @@ -917,10 +920,10 @@ private void InitializeComponent() // buttonUnlockNetworkMenu // buttonUnlockNetworkMenu.Image = Properties.Resources.icons8_unlock_16; - buttonUnlockNetworkMenu.Location = new System.Drawing.Point(164, 104); + buttonUnlockNetworkMenu.Location = new System.Drawing.Point(164, 118); buttonUnlockNetworkMenu.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonUnlockNetworkMenu.Name = "buttonUnlockNetworkMenu"; - buttonUnlockNetworkMenu.Size = new System.Drawing.Size(33, 27); + buttonUnlockNetworkMenu.Size = new System.Drawing.Size(33, 31); buttonUnlockNetworkMenu.TabIndex = 43; buttonUnlockNetworkMenu.UseVisualStyleBackColor = true; buttonUnlockNetworkMenu.Click += buttonUnlockButtons_Click; @@ -928,39 +931,38 @@ private void InitializeComponent() // label11 // label11.AutoSize = true; - label11.Location = new System.Drawing.Point(146, 22); + label11.Location = new System.Drawing.Point(146, 25); label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label11.Name = "label11"; - label11.Size = new System.Drawing.Size(38, 15); + label11.Size = new System.Drawing.Size(42, 17); label11.TabIndex = 42; label11.Text = "PORT:"; // // textBoxPort // - textBoxPort.Location = new System.Drawing.Point(149, 40); + textBoxPort.Location = new System.Drawing.Point(149, 45); textBoxPort.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); textBoxPort.Name = "textBoxPort"; - textBoxPort.Size = new System.Drawing.Size(47, 23); + textBoxPort.Size = new System.Drawing.Size(47, 25); textBoxPort.TabIndex = 41; // // comboBoxIP // comboBoxIP.FormattingEnabled = true; - comboBoxIP.Location = new System.Drawing.Point(10, 40); + comboBoxIP.Location = new System.Drawing.Point(10, 45); comboBoxIP.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); comboBoxIP.Name = "comboBoxIP"; - comboBoxIP.Size = new System.Drawing.Size(131, 23); + comboBoxIP.Size = new System.Drawing.Size(131, 25); comboBoxIP.TabIndex = 40; comboBoxIP.TextUpdate += comboBoxIP_TextUpdate; - comboBoxIP.KeyPress += comboBoxIP_KeyPress; // // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(7, 22); + label2.Location = new System.Drawing.Point(7, 25); label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; - label2.Size = new System.Drawing.Size(20, 15); + label2.Size = new System.Drawing.Size(21, 17); label2.TabIndex = 39; label2.Text = "IP:"; // @@ -969,10 +971,10 @@ private void InitializeComponent() buttonDisconnectIP.BackColor = System.Drawing.Color.White; buttonDisconnectIP.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonDisconnectIP.ForeColor = System.Drawing.Color.Black; - buttonDisconnectIP.Location = new System.Drawing.Point(103, 70); + buttonDisconnectIP.Location = new System.Drawing.Point(103, 79); buttonDisconnectIP.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonDisconnectIP.Name = "buttonDisconnectIP"; - buttonDisconnectIP.Size = new System.Drawing.Size(94, 27); + buttonDisconnectIP.Size = new System.Drawing.Size(94, 31); buttonDisconnectIP.TabIndex = 38; buttonDisconnectIP.Text = "Disconnect"; buttonDisconnectIP.UseVisualStyleBackColor = false; @@ -983,10 +985,10 @@ private void InitializeComponent() buttonConnectToIP.BackColor = System.Drawing.Color.White; buttonConnectToIP.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonConnectToIP.ForeColor = System.Drawing.Color.Black; - buttonConnectToIP.Location = new System.Drawing.Point(10, 70); + buttonConnectToIP.Location = new System.Drawing.Point(10, 79); buttonConnectToIP.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonConnectToIP.Name = "buttonConnectToIP"; - buttonConnectToIP.Size = new System.Drawing.Size(85, 27); + buttonConnectToIP.Size = new System.Drawing.Size(85, 31); buttonConnectToIP.TabIndex = 35; buttonConnectToIP.Text = "Connect"; buttonConnectToIP.UseVisualStyleBackColor = false; @@ -997,11 +999,11 @@ private void InitializeComponent() groupBoxRebootMenu.Controls.Add(buttonRS); groupBoxRebootMenu.Controls.Add(buttonRR); groupBoxRebootMenu.Controls.Add(buttonRF); - groupBoxRebootMenu.Location = new System.Drawing.Point(7, 196); + groupBoxRebootMenu.Location = new System.Drawing.Point(7, 222); groupBoxRebootMenu.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxRebootMenu.Name = "groupBoxRebootMenu"; groupBoxRebootMenu.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxRebootMenu.Size = new System.Drawing.Size(160, 143); + groupBoxRebootMenu.Size = new System.Drawing.Size(160, 162); groupBoxRebootMenu.TabIndex = 35; groupBoxRebootMenu.TabStop = false; groupBoxRebootMenu.Text = "Reboot Menu"; @@ -1011,10 +1013,10 @@ private void InitializeComponent() buttonRS.BackColor = System.Drawing.Color.White; buttonRS.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonRS.ForeColor = System.Drawing.Color.Black; - buttonRS.Location = new System.Drawing.Point(7, 32); + buttonRS.Location = new System.Drawing.Point(7, 36); buttonRS.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonRS.Name = "buttonRS"; - buttonRS.Size = new System.Drawing.Size(145, 27); + buttonRS.Size = new System.Drawing.Size(145, 31); buttonRS.TabIndex = 1; buttonRS.Text = "Reboot Smartphone"; buttonRS.UseVisualStyleBackColor = false; @@ -1025,10 +1027,10 @@ private void InitializeComponent() buttonRR.BackColor = System.Drawing.Color.White; buttonRR.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonRR.ForeColor = System.Drawing.Color.Black; - buttonRR.Location = new System.Drawing.Point(7, 66); + buttonRR.Location = new System.Drawing.Point(7, 75); buttonRR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonRR.Name = "buttonRR"; - buttonRR.Size = new System.Drawing.Size(145, 27); + buttonRR.Size = new System.Drawing.Size(145, 31); buttonRR.TabIndex = 2; buttonRR.Text = "Reboot Into Recovery"; buttonRR.UseVisualStyleBackColor = false; @@ -1039,10 +1041,10 @@ private void InitializeComponent() buttonRF.BackColor = System.Drawing.Color.White; buttonRF.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonRF.ForeColor = System.Drawing.Color.Black; - buttonRF.Location = new System.Drawing.Point(7, 99); + buttonRF.Location = new System.Drawing.Point(7, 112); buttonRF.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonRF.Name = "buttonRF"; - buttonRF.Size = new System.Drawing.Size(145, 27); + buttonRF.Size = new System.Drawing.Size(145, 31); buttonRF.TabIndex = 3; buttonRF.Text = "Reboot into Fastboot"; buttonRF.UseVisualStyleBackColor = false; @@ -1051,11 +1053,11 @@ private void InitializeComponent() // tabPageFastboot // tabPageFastboot.Controls.Add(panelFastboot); - tabPageFastboot.Location = new System.Drawing.Point(4, 24); + tabPageFastboot.Location = new System.Drawing.Point(4, 26); tabPageFastboot.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); tabPageFastboot.Name = "tabPageFastboot"; tabPageFastboot.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - tabPageFastboot.Size = new System.Drawing.Size(925, 342); + tabPageFastboot.Size = new System.Drawing.Size(925, 389); tabPageFastboot.TabIndex = 1; tabPageFastboot.Text = "Fastboot"; tabPageFastboot.UseVisualStyleBackColor = true; @@ -1074,14 +1076,14 @@ private void InitializeComponent() panelFastboot.Location = new System.Drawing.Point(0, 3); panelFastboot.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); panelFastboot.Name = "panelFastboot"; - panelFastboot.Size = new System.Drawing.Size(921, 336); + panelFastboot.Size = new System.Drawing.Size(921, 381); panelFastboot.TabIndex = 49; // // buttonWd_md // - buttonWd_md.Location = new System.Drawing.Point(289, 250); + buttonWd_md.Location = new System.Drawing.Point(289, 283); buttonWd_md.Name = "buttonWd_md"; - buttonWd_md.Size = new System.Drawing.Size(138, 46); + buttonWd_md.Size = new System.Drawing.Size(138, 52); buttonWd_md.TabIndex = 56; buttonWd_md.Text = "Wipe data and metadata partitions"; buttonWd_md.UseVisualStyleBackColor = true; @@ -1092,10 +1094,10 @@ private void InitializeComponent() buttonBootloaderMenu.BackColor = System.Drawing.Color.White; buttonBootloaderMenu.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonBootloaderMenu.ForeColor = System.Drawing.Color.Black; - buttonBootloaderMenu.Location = new System.Drawing.Point(74, 269); + buttonBootloaderMenu.Location = new System.Drawing.Point(74, 305); buttonBootloaderMenu.Margin = new System.Windows.Forms.Padding(2); buttonBootloaderMenu.Name = "buttonBootloaderMenu"; - buttonBootloaderMenu.Size = new System.Drawing.Size(138, 27); + buttonBootloaderMenu.Size = new System.Drawing.Size(138, 31); buttonBootloaderMenu.TabIndex = 55; buttonBootloaderMenu.Text = "Bootloader Menu"; buttonBootloaderMenu.UseVisualStyleBackColor = false; @@ -1106,10 +1108,10 @@ private void InitializeComponent() buttonRebootRecovery.BackColor = System.Drawing.Color.White; buttonRebootRecovery.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonRebootRecovery.ForeColor = System.Drawing.Color.Black; - buttonRebootRecovery.Location = new System.Drawing.Point(74, 238); + buttonRebootRecovery.Location = new System.Drawing.Point(74, 270); buttonRebootRecovery.Margin = new System.Windows.Forms.Padding(2); buttonRebootRecovery.Name = "buttonRebootRecovery"; - buttonRebootRecovery.Size = new System.Drawing.Size(138, 27); + buttonRebootRecovery.Size = new System.Drawing.Size(138, 31); buttonRebootRecovery.TabIndex = 54; buttonRebootRecovery.Text = "Reboot to Recovery"; buttonRebootRecovery.UseVisualStyleBackColor = false; @@ -1117,25 +1119,26 @@ private void InitializeComponent() // // groupBox5 // - groupBox5.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + groupBox5.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; groupBox5.Controls.Add(richTextBoxFastbootInfo); groupBox5.Location = new System.Drawing.Point(499, 3); groupBox5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBox5.Name = "groupBox5"; groupBox5.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBox5.Size = new System.Drawing.Size(415, 330); + groupBox5.Size = new System.Drawing.Size(415, 374); groupBox5.TabIndex = 51; groupBox5.TabStop = false; groupBox5.Text = "Device Info"; // // richTextBoxFastbootInfo // + richTextBoxFastbootInfo.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; richTextBoxFastbootInfo.BackColor = System.Drawing.Color.White; richTextBoxFastbootInfo.BorderStyle = System.Windows.Forms.BorderStyle.None; - richTextBoxFastbootInfo.Location = new System.Drawing.Point(7, 22); + richTextBoxFastbootInfo.Location = new System.Drawing.Point(7, 25); richTextBoxFastbootInfo.Name = "richTextBoxFastbootInfo"; richTextBoxFastbootInfo.ReadOnly = true; - richTextBoxFastbootInfo.Size = new System.Drawing.Size(401, 302); + richTextBoxFastbootInfo.Size = new System.Drawing.Size(401, 342); richTextBoxFastbootInfo.TabIndex = 0; richTextBoxFastbootInfo.Text = ""; // @@ -1144,10 +1147,10 @@ private void InitializeComponent() buttonHardReset.BackColor = System.Drawing.Color.White; buttonHardReset.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonHardReset.ForeColor = System.Drawing.Color.Black; - buttonHardReset.Location = new System.Drawing.Point(289, 207); + buttonHardReset.Location = new System.Drawing.Point(289, 235); buttonHardReset.Margin = new System.Windows.Forms.Padding(2); buttonHardReset.Name = "buttonHardReset"; - buttonHardReset.Size = new System.Drawing.Size(138, 38); + buttonHardReset.Size = new System.Drawing.Size(138, 43); buttonHardReset.TabIndex = 50; buttonHardReset.Text = "Erase flash partition userdata and cache"; buttonHardReset.UseVisualStyleBackColor = false; @@ -1158,10 +1161,10 @@ private void InitializeComponent() buttonRebootToSystem.BackColor = System.Drawing.Color.White; buttonRebootToSystem.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonRebootToSystem.ForeColor = System.Drawing.Color.Black; - buttonRebootToSystem.Location = new System.Drawing.Point(74, 207); + buttonRebootToSystem.Location = new System.Drawing.Point(74, 235); buttonRebootToSystem.Margin = new System.Windows.Forms.Padding(2); buttonRebootToSystem.Name = "buttonRebootToSystem"; - buttonRebootToSystem.Size = new System.Drawing.Size(138, 27); + buttonRebootToSystem.Size = new System.Drawing.Size(138, 31); buttonRebootToSystem.TabIndex = 49; buttonRebootToSystem.Text = "Reboot to System"; buttonRebootToSystem.UseVisualStyleBackColor = false; @@ -1179,7 +1182,7 @@ private void InitializeComponent() groupBox4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBox4.Name = "groupBox4"; groupBox4.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBox4.Size = new System.Drawing.Size(489, 183); + groupBox4.Size = new System.Drawing.Size(489, 207); groupBox4.TabIndex = 48; groupBox4.TabStop = false; groupBox4.Text = "Flash img"; @@ -1187,9 +1190,9 @@ private void InitializeComponent() // label10 // label10.AutoSize = true; - label10.Location = new System.Drawing.Point(50, 76); + label10.Location = new System.Drawing.Point(50, 86); label10.Name = "label10"; - label10.Size = new System.Drawing.Size(37, 15); + label10.Size = new System.Drawing.Size(40, 17); label10.TabIndex = 52; label10.Text = "Flash:"; // @@ -1198,18 +1201,18 @@ private void InitializeComponent() comboBoxImg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; comboBoxImg.FormattingEnabled = true; comboBoxImg.Items.AddRange(new object[] { "boot", "bootloader", "cache", "dtbo", "radio", "recovery", "system", "update", "vendor", "vendor_boot", "vendor_kernel_boot " }); - comboBoxImg.Location = new System.Drawing.Point(117, 72); + comboBoxImg.Location = new System.Drawing.Point(117, 82); comboBoxImg.Name = "comboBoxImg"; - comboBoxImg.Size = new System.Drawing.Size(328, 23); + comboBoxImg.Size = new System.Drawing.Size(328, 25); comboBoxImg.Sorted = true; comboBoxImg.TabIndex = 51; // // button1 // - button1.Location = new System.Drawing.Point(50, 128); + button1.Location = new System.Drawing.Point(50, 145); button1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); button1.Name = "button1"; - button1.Size = new System.Drawing.Size(395, 30); + button1.Size = new System.Drawing.Size(395, 34); button1.TabIndex = 50; button1.Text = "flash"; button1.UseVisualStyleBackColor = true; @@ -1217,20 +1220,20 @@ private void InitializeComponent() // // textBoxDirImg // - textBoxDirImg.Location = new System.Drawing.Point(50, 41); + textBoxDirImg.Location = new System.Drawing.Point(50, 46); textBoxDirImg.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); textBoxDirImg.Name = "textBoxDirImg"; - textBoxDirImg.Size = new System.Drawing.Size(285, 23); + textBoxDirImg.Size = new System.Drawing.Size(285, 25); textBoxDirImg.TabIndex = 37; // // buttonSearchFileFastboot // buttonSearchFileFastboot.BackColor = System.Drawing.Color.White; buttonSearchFileFastboot.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonSearchFileFastboot.Location = new System.Drawing.Point(343, 39); + buttonSearchFileFastboot.Location = new System.Drawing.Point(343, 44); buttonSearchFileFastboot.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonSearchFileFastboot.Name = "buttonSearchFileFastboot"; - buttonSearchFileFastboot.Size = new System.Drawing.Size(102, 27); + buttonSearchFileFastboot.Size = new System.Drawing.Size(102, 31); buttonSearchFileFastboot.TabIndex = 36; buttonSearchFileFastboot.Text = "Search File"; buttonSearchFileFastboot.UseVisualStyleBackColor = false; @@ -1239,16 +1242,17 @@ private void InitializeComponent() // tabPageRecovery // tabPageRecovery.Controls.Add(panelRecovery); - tabPageRecovery.Location = new System.Drawing.Point(4, 24); + tabPageRecovery.Location = new System.Drawing.Point(4, 26); tabPageRecovery.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); tabPageRecovery.Name = "tabPageRecovery"; - tabPageRecovery.Size = new System.Drawing.Size(925, 342); + tabPageRecovery.Size = new System.Drawing.Size(925, 389); tabPageRecovery.TabIndex = 2; tabPageRecovery.Text = "Recovery"; tabPageRecovery.UseVisualStyleBackColor = true; // // panelRecovery // + panelRecovery.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; panelRecovery.BackColor = System.Drawing.Color.White; panelRecovery.Controls.Add(groupBoxImageExtraction); panelRecovery.Controls.Add(groupBoxRecoveryRM); @@ -1256,16 +1260,17 @@ private void InitializeComponent() panelRecovery.Location = new System.Drawing.Point(0, 3); panelRecovery.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); panelRecovery.Name = "panelRecovery"; - panelRecovery.Size = new System.Drawing.Size(921, 336); + panelRecovery.Size = new System.Drawing.Size(921, 381); panelRecovery.TabIndex = 37; // // groupBoxImageExtraction // + groupBoxImageExtraction.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; groupBoxImageExtraction.Controls.Add(comboBoxImgExtraction); groupBoxImageExtraction.Controls.Add(buttonImgExtraction); groupBoxImageExtraction.Location = new System.Drawing.Point(482, 3); groupBoxImageExtraction.Name = "groupBoxImageExtraction"; - groupBoxImageExtraction.Size = new System.Drawing.Size(435, 198); + groupBoxImageExtraction.Size = new System.Drawing.Size(435, 224); groupBoxImageExtraction.TabIndex = 42; groupBoxImageExtraction.TabStop = false; groupBoxImageExtraction.Text = "Image extraction"; @@ -1275,17 +1280,17 @@ private void InitializeComponent() comboBoxImgExtraction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; comboBoxImgExtraction.FormattingEnabled = true; comboBoxImgExtraction.Items.AddRange(new object[] { "abl_a", "abl_b", "aop_a", "aop_b", "boot", "cmnlib_a", "cmnlib_b", "cmnlib64_a", "cmnlib64_b", "devcfg_a", "devcfg_b", "dtbo", "hyp_a", "hyp_b", "keymaster_a", "keymaster_b", "modem", "recovery", "system", "tz_a", "tz_b", "vbmeta", "vendor", "xbl_a", "xbl_b", "xbl_config_a", "xbl_config_b" }); - comboBoxImgExtraction.Location = new System.Drawing.Point(29, 78); + comboBoxImgExtraction.Location = new System.Drawing.Point(29, 88); comboBoxImgExtraction.Name = "comboBoxImgExtraction"; - comboBoxImgExtraction.Size = new System.Drawing.Size(381, 23); + comboBoxImgExtraction.Size = new System.Drawing.Size(381, 25); comboBoxImgExtraction.Sorted = true; comboBoxImgExtraction.TabIndex = 1; // // buttonImgExtraction // - buttonImgExtraction.Location = new System.Drawing.Point(29, 107); + buttonImgExtraction.Location = new System.Drawing.Point(29, 121); buttonImgExtraction.Name = "buttonImgExtraction"; - buttonImgExtraction.Size = new System.Drawing.Size(381, 27); + buttonImgExtraction.Size = new System.Drawing.Size(381, 31); buttonImgExtraction.TabIndex = 0; buttonImgExtraction.Text = "Extract"; buttonImgExtraction.UseVisualStyleBackColor = true; @@ -1293,24 +1298,25 @@ private void InitializeComponent() // // groupBoxRecoveryRM // + groupBoxRecoveryRM.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; groupBoxRecoveryRM.Controls.Add(buttonrr_); groupBoxRecoveryRM.Controls.Add(buttonrf_); groupBoxRecoveryRM.Controls.Add(buttonrs_); - groupBoxRecoveryRM.Location = new System.Drawing.Point(482, 206); + groupBoxRecoveryRM.Location = new System.Drawing.Point(482, 233); groupBoxRecoveryRM.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxRecoveryRM.Name = "groupBoxRecoveryRM"; groupBoxRecoveryRM.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxRecoveryRM.Size = new System.Drawing.Size(435, 127); + groupBoxRecoveryRM.Size = new System.Drawing.Size(435, 144); groupBoxRecoveryRM.TabIndex = 41; groupBoxRecoveryRM.TabStop = false; groupBoxRecoveryRM.Text = "Reboot menu"; // // buttonrr_ // - buttonrr_.Location = new System.Drawing.Point(155, 22); + buttonrr_.Location = new System.Drawing.Point(132, 25); buttonrr_.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonrr_.Name = "buttonrr_"; - buttonrr_.Size = new System.Drawing.Size(130, 27); + buttonrr_.Size = new System.Drawing.Size(180, 31); buttonrr_.TabIndex = 39; buttonrr_.Text = "Reboot recovery"; buttonrr_.UseVisualStyleBackColor = true; @@ -1318,10 +1324,10 @@ private void InitializeComponent() // // buttonrf_ // - buttonrf_.Location = new System.Drawing.Point(155, 89); + buttonrf_.Location = new System.Drawing.Point(132, 99); buttonrf_.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonrf_.Name = "buttonrf_"; - buttonrf_.Size = new System.Drawing.Size(130, 27); + buttonrf_.Size = new System.Drawing.Size(180, 31); buttonrf_.TabIndex = 37; buttonrf_.Text = "Reboot into fastboot"; buttonrf_.UseVisualStyleBackColor = true; @@ -1329,10 +1335,10 @@ private void InitializeComponent() // // buttonrs_ // - buttonrs_.Location = new System.Drawing.Point(155, 55); + buttonrs_.Location = new System.Drawing.Point(132, 62); buttonrs_.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonrs_.Name = "buttonrs_"; - buttonrs_.Size = new System.Drawing.Size(130, 27); + buttonrs_.Size = new System.Drawing.Size(180, 31); buttonrs_.TabIndex = 38; buttonrs_.Text = "Reboot into system"; buttonrs_.UseVisualStyleBackColor = true; @@ -1340,6 +1346,7 @@ private void InitializeComponent() // // groupBoxFlash // + groupBoxFlash.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; groupBoxFlash.Controls.Add(textBoxDirFile); groupBoxFlash.Controls.Add(buttonFlashZip); groupBoxFlash.Controls.Add(buttonBrowseFile); @@ -1347,27 +1354,27 @@ private void InitializeComponent() groupBoxFlash.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxFlash.Name = "groupBoxFlash"; groupBoxFlash.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxFlash.Size = new System.Drawing.Size(470, 330); + groupBoxFlash.Size = new System.Drawing.Size(470, 374); groupBoxFlash.TabIndex = 40; groupBoxFlash.TabStop = false; groupBoxFlash.Text = "Flash menu"; // // textBoxDirFile // - textBoxDirFile.Location = new System.Drawing.Point(36, 140); + textBoxDirFile.Location = new System.Drawing.Point(36, 159); textBoxDirFile.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); textBoxDirFile.Name = "textBoxDirFile"; - textBoxDirFile.Size = new System.Drawing.Size(285, 23); + textBoxDirFile.Size = new System.Drawing.Size(285, 25); textBoxDirFile.TabIndex = 33; // // buttonFlashZip // buttonFlashZip.BackColor = System.Drawing.Color.White; buttonFlashZip.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonFlashZip.Location = new System.Drawing.Point(36, 171); + buttonFlashZip.Location = new System.Drawing.Point(36, 194); buttonFlashZip.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonFlashZip.Name = "buttonFlashZip"; - buttonFlashZip.Size = new System.Drawing.Size(381, 27); + buttonFlashZip.Size = new System.Drawing.Size(381, 31); buttonFlashZip.TabIndex = 34; buttonFlashZip.Text = "Flash"; buttonFlashZip.UseVisualStyleBackColor = false; @@ -1375,10 +1382,10 @@ private void InitializeComponent() // // buttonBrowseFile // - buttonBrowseFile.Location = new System.Drawing.Point(329, 137); + buttonBrowseFile.Location = new System.Drawing.Point(329, 155); buttonBrowseFile.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonBrowseFile.Name = "buttonBrowseFile"; - buttonBrowseFile.Size = new System.Drawing.Size(88, 27); + buttonBrowseFile.Size = new System.Drawing.Size(88, 31); buttonBrowseFile.TabIndex = 36; buttonBrowseFile.Text = "Browse file"; buttonBrowseFile.UseVisualStyleBackColor = true; @@ -1391,11 +1398,11 @@ private void InitializeComponent() tabPageTools.Controls.Add(groupBox3); tabPageTools.Controls.Add(groupBoxTextInject); tabPageTools.Controls.Add(groupBoxFreeRotation); - tabPageTools.Location = new System.Drawing.Point(4, 24); + tabPageTools.Location = new System.Drawing.Point(4, 26); tabPageTools.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); tabPageTools.Name = "tabPageTools"; tabPageTools.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - tabPageTools.Size = new System.Drawing.Size(925, 342); + tabPageTools.Size = new System.Drawing.Size(925, 389); tabPageTools.TabIndex = 3; tabPageTools.Text = "Tools"; // @@ -1404,11 +1411,11 @@ private void InitializeComponent() groupBox2.BackgroundImage = Properties.Resources.icons8_drag_and_drop_48; groupBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; groupBox2.Controls.Add(label5); - groupBox2.Location = new System.Drawing.Point(8, 110); + groupBox2.Location = new System.Drawing.Point(8, 125); groupBox2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBox2.Name = "groupBox2"; groupBox2.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBox2.Size = new System.Drawing.Size(181, 112); + groupBox2.Size = new System.Drawing.Size(181, 127); groupBox2.TabIndex = 48; groupBox2.TabStop = false; groupBox2.Text = "File Transfer"; @@ -1418,10 +1425,10 @@ private void InitializeComponent() // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(65, 80); + label5.Location = new System.Drawing.Point(65, 91); label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; - label5.Size = new System.Drawing.Size(54, 15); + label5.Size = new System.Drawing.Size(61, 17); label5.TabIndex = 1; label5.Text = "Drop File"; // @@ -1429,11 +1436,11 @@ private void InitializeComponent() // groupBox3.Controls.Add(comboBoxCameraModes); groupBox3.Controls.Add(buttonCamera); - groupBox3.Location = new System.Drawing.Point(388, 7); + groupBox3.Location = new System.Drawing.Point(414, 8); groupBox3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBox3.Name = "groupBox3"; groupBox3.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBox3.Size = new System.Drawing.Size(233, 97); + groupBox3.Size = new System.Drawing.Size(233, 110); groupBox3.TabIndex = 47; groupBox3.TabStop = false; groupBox3.Text = "Live Camera"; @@ -1442,19 +1449,19 @@ private void InitializeComponent() // comboBoxCameraModes.FormattingEnabled = true; comboBoxCameraModes.Items.AddRange(new object[] { "front", "back", "external" }); - comboBoxCameraModes.Location = new System.Drawing.Point(7, 45); + comboBoxCameraModes.Location = new System.Drawing.Point(7, 51); comboBoxCameraModes.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); comboBoxCameraModes.Name = "comboBoxCameraModes"; - comboBoxCameraModes.Size = new System.Drawing.Size(136, 23); + comboBoxCameraModes.Size = new System.Drawing.Size(136, 25); comboBoxCameraModes.TabIndex = 48; // // buttonCamera // buttonCamera.Image = Properties.Resources.camera_live; - buttonCamera.Location = new System.Drawing.Point(150, 23); + buttonCamera.Location = new System.Drawing.Point(150, 26); buttonCamera.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonCamera.Name = "buttonCamera"; - buttonCamera.Size = new System.Drawing.Size(76, 65); + buttonCamera.Size = new System.Drawing.Size(76, 74); buttonCamera.TabIndex = 0; buttonCamera.UseVisualStyleBackColor = true; buttonCamera.Click += buttonCamera_Click; @@ -1464,11 +1471,11 @@ private void InitializeComponent() groupBoxTextInject.Controls.Add(buttonClearTextSend); groupBoxTextInject.Controls.Add(buttonInjectText); groupBoxTextInject.Controls.Add(richTextBoxSend); - groupBoxTextInject.Location = new System.Drawing.Point(113, 7); + groupBoxTextInject.Location = new System.Drawing.Point(138, 8); groupBoxTextInject.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxTextInject.Name = "groupBoxTextInject"; groupBoxTextInject.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxTextInject.Size = new System.Drawing.Size(268, 97); + groupBoxTextInject.Size = new System.Drawing.Size(268, 110); groupBoxTextInject.TabIndex = 46; groupBoxTextInject.TabStop = false; groupBoxTextInject.Text = "Text Injection"; @@ -1476,10 +1483,10 @@ private void InitializeComponent() // buttonClearTextSend // buttonClearTextSend.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonClearTextSend.Location = new System.Drawing.Point(174, 61); + buttonClearTextSend.Location = new System.Drawing.Point(174, 69); buttonClearTextSend.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonClearTextSend.Name = "buttonClearTextSend"; - buttonClearTextSend.Size = new System.Drawing.Size(88, 27); + buttonClearTextSend.Size = new System.Drawing.Size(88, 31); buttonClearTextSend.TabIndex = 2; buttonClearTextSend.Text = "Clear"; buttonClearTextSend.UseVisualStyleBackColor = true; @@ -1488,10 +1495,10 @@ private void InitializeComponent() // buttonInjectText // buttonInjectText.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonInjectText.Location = new System.Drawing.Point(174, 23); + buttonInjectText.Location = new System.Drawing.Point(174, 26); buttonInjectText.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonInjectText.Name = "buttonInjectText"; - buttonInjectText.Size = new System.Drawing.Size(88, 27); + buttonInjectText.Size = new System.Drawing.Size(88, 31); buttonInjectText.TabIndex = 1; buttonInjectText.Text = "Inject"; buttonInjectText.UseVisualStyleBackColor = true; @@ -1499,10 +1506,10 @@ private void InitializeComponent() // // richTextBoxSend // - richTextBoxSend.Location = new System.Drawing.Point(7, 23); + richTextBoxSend.Location = new System.Drawing.Point(7, 26); richTextBoxSend.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); richTextBoxSend.Name = "richTextBoxSend"; - richTextBoxSend.Size = new System.Drawing.Size(156, 64); + richTextBoxSend.Size = new System.Drawing.Size(156, 72); richTextBoxSend.TabIndex = 0; richTextBoxSend.Text = ""; // @@ -1510,11 +1517,11 @@ private void InitializeComponent() // groupBoxFreeRotation.Controls.Add(buttonSetRotation); groupBoxFreeRotation.Controls.Add(domainUpDownFreeRotation); - groupBoxFreeRotation.Location = new System.Drawing.Point(7, 7); + groupBoxFreeRotation.Location = new System.Drawing.Point(7, 8); groupBoxFreeRotation.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxFreeRotation.Name = "groupBoxFreeRotation"; groupBoxFreeRotation.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxFreeRotation.Size = new System.Drawing.Size(99, 97); + groupBoxFreeRotation.Size = new System.Drawing.Size(123, 110); groupBoxFreeRotation.TabIndex = 45; groupBoxFreeRotation.TabStop = false; groupBoxFreeRotation.Text = "Free Rotation"; @@ -1522,10 +1529,10 @@ private void InitializeComponent() // buttonSetRotation // buttonSetRotation.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonSetRotation.Location = new System.Drawing.Point(9, 61); + buttonSetRotation.Location = new System.Drawing.Point(9, 69); buttonSetRotation.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonSetRotation.Name = "buttonSetRotation"; - buttonSetRotation.Size = new System.Drawing.Size(83, 27); + buttonSetRotation.Size = new System.Drawing.Size(83, 31); buttonSetRotation.TabIndex = 45; buttonSetRotation.Text = "Set"; buttonSetRotation.UseVisualStyleBackColor = true; @@ -1533,11 +1540,11 @@ private void InitializeComponent() // // domainUpDownFreeRotation // - domainUpDownFreeRotation.Location = new System.Drawing.Point(9, 23); + domainUpDownFreeRotation.Location = new System.Drawing.Point(9, 26); domainUpDownFreeRotation.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); domainUpDownFreeRotation.Name = "domainUpDownFreeRotation"; domainUpDownFreeRotation.ReadOnly = true; - domainUpDownFreeRotation.Size = new System.Drawing.Size(83, 23); + domainUpDownFreeRotation.Size = new System.Drawing.Size(83, 25); domainUpDownFreeRotation.TabIndex = 44; domainUpDownFreeRotation.Text = "0"; // @@ -1563,11 +1570,11 @@ private void InitializeComponent() richTextBoxLog.BackColor = System.Drawing.SystemColors.MenuText; richTextBoxLog.Font = new System.Drawing.Font("Consolas", 8.25F); richTextBoxLog.ForeColor = System.Drawing.Color.White; - richTextBoxLog.Location = new System.Drawing.Point(474, 443); + richTextBoxLog.Location = new System.Drawing.Point(474, 502); richTextBoxLog.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); richTextBoxLog.Name = "richTextBoxLog"; richTextBoxLog.ReadOnly = true; - richTextBoxLog.Size = new System.Drawing.Size(463, 186); + richTextBoxLog.Size = new System.Drawing.Size(463, 210); richTextBoxLog.TabIndex = 38; richTextBoxLog.TabStop = false; richTextBoxLog.Text = ""; @@ -1577,13 +1584,13 @@ private void InitializeComponent() // systemAppToolStripMenuItem.Name = "systemAppToolStripMenuItem"; systemAppToolStripMenuItem.ShowShortcutKeys = false; - systemAppToolStripMenuItem.Size = new System.Drawing.Size(240, 22); + systemAppToolStripMenuItem.Size = new System.Drawing.Size(242, 24); systemAppToolStripMenuItem.Text = "System App"; // // nonSystemAppToolStripMenuItem // nonSystemAppToolStripMenuItem.Name = "nonSystemAppToolStripMenuItem"; - nonSystemAppToolStripMenuItem.Size = new System.Drawing.Size(180, 23); + nonSystemAppToolStripMenuItem.Size = new System.Drawing.Size(180, 25); nonSystemAppToolStripMenuItem.Text = "Non System App"; // // filterByToolStripMenuItem @@ -1598,40 +1605,40 @@ private void InitializeComponent() contextMenuStripFilterBy.ImageScalingSize = new System.Drawing.Size(18, 18); contextMenuStripFilterBy.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { allToolStripMenuItem, systemAppToolStripMenuItem1, nonSystemAppToolStripMenuItem1, uninstalledAppToolStripMenuItem, disabledAppToolStripMenuItem }); contextMenuStripFilterBy.Name = "contextMenuStripFilterBy"; - contextMenuStripFilterBy.Size = new System.Drawing.Size(164, 114); + contextMenuStripFilterBy.Size = new System.Drawing.Size(175, 114); // // allToolStripMenuItem // allToolStripMenuItem.Name = "allToolStripMenuItem"; - allToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + allToolStripMenuItem.Size = new System.Drawing.Size(174, 22); allToolStripMenuItem.Text = "All"; allToolStripMenuItem.Click += allToolStripMenuItem_Click; // // systemAppToolStripMenuItem1 // systemAppToolStripMenuItem1.Name = "systemAppToolStripMenuItem1"; - systemAppToolStripMenuItem1.Size = new System.Drawing.Size(163, 22); + systemAppToolStripMenuItem1.Size = new System.Drawing.Size(174, 22); systemAppToolStripMenuItem1.Text = "System App"; systemAppToolStripMenuItem1.Click += systemAppToolStripMenuItem1_Click; // // nonSystemAppToolStripMenuItem1 // nonSystemAppToolStripMenuItem1.Name = "nonSystemAppToolStripMenuItem1"; - nonSystemAppToolStripMenuItem1.Size = new System.Drawing.Size(163, 22); + nonSystemAppToolStripMenuItem1.Size = new System.Drawing.Size(174, 22); nonSystemAppToolStripMenuItem1.Text = "Non System App"; nonSystemAppToolStripMenuItem1.Click += nonSystemAppToolStripMenuItem1_Click; // // uninstalledAppToolStripMenuItem // uninstalledAppToolStripMenuItem.Name = "uninstalledAppToolStripMenuItem"; - uninstalledAppToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + uninstalledAppToolStripMenuItem.Size = new System.Drawing.Size(174, 22); uninstalledAppToolStripMenuItem.Text = "Uninstalled App"; uninstalledAppToolStripMenuItem.Click += uninstalledAppToolStripMenuItem_Click; // // disabledAppToolStripMenuItem // disabledAppToolStripMenuItem.Name = "disabledAppToolStripMenuItem"; - disabledAppToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + disabledAppToolStripMenuItem.Size = new System.Drawing.Size(174, 22); disabledAppToolStripMenuItem.Text = "Disabled App"; disabledAppToolStripMenuItem.Click += disabledAppToolStripMenuItem_Click; // @@ -1640,13 +1647,13 @@ private void InitializeComponent() contextMenuStripPermissionMenu.ImageScalingSize = new System.Drawing.Size(18, 18); contextMenuStripPermissionMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { checkGrantedPermissionsToolStripMenuItem, grantRevokePermissionToolStripMenuItem }); contextMenuStripPermissionMenu.Name = "contextMenuStripPermissionMenu"; - contextMenuStripPermissionMenu.Size = new System.Drawing.Size(220, 52); + contextMenuStripPermissionMenu.Size = new System.Drawing.Size(237, 52); // // checkGrantedPermissionsToolStripMenuItem // checkGrantedPermissionsToolStripMenuItem.Image = Properties.Resources.icons8_privacy_policy_48; checkGrantedPermissionsToolStripMenuItem.Name = "checkGrantedPermissionsToolStripMenuItem"; - checkGrantedPermissionsToolStripMenuItem.Size = new System.Drawing.Size(219, 24); + checkGrantedPermissionsToolStripMenuItem.Size = new System.Drawing.Size(236, 24); checkGrantedPermissionsToolStripMenuItem.Text = "Check granted permissions"; checkGrantedPermissionsToolStripMenuItem.Click += checkGrantedPermissionsToolStripMenuItem_Click; // @@ -1654,7 +1661,7 @@ private void InitializeComponent() // grantRevokePermissionToolStripMenuItem.Image = Properties.Resources.cyber_security; grantRevokePermissionToolStripMenuItem.Name = "grantRevokePermissionToolStripMenuItem"; - grantRevokePermissionToolStripMenuItem.Size = new System.Drawing.Size(219, 24); + grantRevokePermissionToolStripMenuItem.Size = new System.Drawing.Size(236, 24); grantRevokePermissionToolStripMenuItem.Text = "Grant/Revoke Permission"; grantRevokePermissionToolStripMenuItem.Click += grantRevokePermissionToolStripMenuItem_Click; // @@ -1668,10 +1675,10 @@ private void InitializeComponent() buttonMobileScreenShare.ForeColor = System.Drawing.Color.Black; buttonMobileScreenShare.Image = Properties.Resources.multiple_devices_48; buttonMobileScreenShare.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - buttonMobileScreenShare.Location = new System.Drawing.Point(391, 537); + buttonMobileScreenShare.Location = new System.Drawing.Point(391, 609); buttonMobileScreenShare.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonMobileScreenShare.Name = "buttonMobileScreenShare"; - buttonMobileScreenShare.Size = new System.Drawing.Size(70, 91); + buttonMobileScreenShare.Size = new System.Drawing.Size(70, 103); buttonMobileScreenShare.TabIndex = 39; buttonMobileScreenShare.Text = "Screen Share"; buttonMobileScreenShare.TextAlign = System.Drawing.ContentAlignment.BottomCenter; @@ -1683,10 +1690,10 @@ private void InitializeComponent() pictureBoxLogo.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; pictureBoxLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; pictureBoxLogo.Image = Properties.Resources.logo; - pictureBoxLogo.Location = new System.Drawing.Point(9, 6); + pictureBoxLogo.Location = new System.Drawing.Point(9, 7); pictureBoxLogo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); pictureBoxLogo.Name = "pictureBoxLogo"; - pictureBoxLogo.Size = new System.Drawing.Size(94, 43); + pictureBoxLogo.Size = new System.Drawing.Size(94, 49); pictureBoxLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; pictureBoxLogo.TabIndex = 3; pictureBoxLogo.TabStop = false; @@ -1706,7 +1713,7 @@ private void InitializeComponent() panelTopBar.Location = new System.Drawing.Point(0, -3); panelTopBar.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); panelTopBar.Name = "panelTopBar"; - panelTopBar.Size = new System.Drawing.Size(942, 51); + panelTopBar.Size = new System.Drawing.Size(942, 58); panelTopBar.TabIndex = 0; panelTopBar.MouseDoubleClick += panelTopBar_MouseDoubleClick; panelTopBar.MouseMove += panelTopBar_MouseMove; @@ -1718,7 +1725,7 @@ private void InitializeComponent() pictureBoxMaximize.Location = new System.Drawing.Point(852, 3); pictureBoxMaximize.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); pictureBoxMaximize.Name = "pictureBoxMaximize"; - pictureBoxMaximize.Size = new System.Drawing.Size(44, 48); + pictureBoxMaximize.Size = new System.Drawing.Size(44, 54); pictureBoxMaximize.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; pictureBoxMaximize.TabIndex = 43; pictureBoxMaximize.TabStop = false; @@ -1732,10 +1739,10 @@ private void InitializeComponent() labelTools.AutoSize = true; labelTools.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F); labelTools.ForeColor = System.Drawing.Color.White; - labelTools.Location = new System.Drawing.Point(245, 19); + labelTools.Location = new System.Drawing.Point(245, 22); labelTools.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelTools.Name = "labelTools"; - labelTools.Size = new System.Drawing.Size(37, 15); + labelTools.Size = new System.Drawing.Size(42, 16); labelTools.TabIndex = 42; labelTools.Text = "Tools"; labelTools.Click += labelTools_Click; @@ -1749,7 +1756,7 @@ private void InitializeComponent() pictureBoxClose.Location = new System.Drawing.Point(897, 3); pictureBoxClose.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); pictureBoxClose.Name = "pictureBoxClose"; - pictureBoxClose.Size = new System.Drawing.Size(45, 48); + pictureBoxClose.Size = new System.Drawing.Size(45, 54); pictureBoxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; pictureBoxClose.TabIndex = 41; pictureBoxClose.TabStop = false; @@ -1764,7 +1771,7 @@ private void InitializeComponent() pictureBoxMinimize.Location = new System.Drawing.Point(807, 3); pictureBoxMinimize.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); pictureBoxMinimize.Name = "pictureBoxMinimize"; - pictureBoxMinimize.Size = new System.Drawing.Size(44, 48); + pictureBoxMinimize.Size = new System.Drawing.Size(44, 54); pictureBoxMinimize.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; pictureBoxMinimize.TabIndex = 6; pictureBoxMinimize.TabStop = false; @@ -1777,10 +1784,10 @@ private void InitializeComponent() labelHelp.AutoSize = true; labelHelp.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F); labelHelp.ForeColor = System.Drawing.Color.White; - labelHelp.Location = new System.Drawing.Point(194, 19); + labelHelp.Location = new System.Drawing.Point(194, 22); labelHelp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelHelp.Name = "labelHelp"; - labelHelp.Size = new System.Drawing.Size(33, 15); + labelHelp.Size = new System.Drawing.Size(36, 16); labelHelp.TabIndex = 5; labelHelp.Text = "Help"; labelHelp.Click += labelHelp_Click; @@ -1792,10 +1799,10 @@ private void InitializeComponent() labelSettings.AutoSize = true; labelSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F); labelSettings.ForeColor = System.Drawing.Color.White; - labelSettings.Location = new System.Drawing.Point(120, 19); + labelSettings.Location = new System.Drawing.Point(120, 22); labelSettings.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); labelSettings.Name = "labelSettings"; - labelSettings.Size = new System.Drawing.Size(51, 15); + labelSettings.Size = new System.Drawing.Size(55, 16); labelSettings.TabIndex = 4; labelSettings.Text = "Settings"; labelSettings.Click += labelSettings_Click; @@ -1843,20 +1850,20 @@ private void InitializeComponent() contextMenuStripHelp.ImageScalingSize = new System.Drawing.Size(18, 18); contextMenuStripHelp.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { helpToolStripMenuItem, submitFeedbackToolStripMenuItem, driverToolStripMenuItem }); contextMenuStripHelp.Name = "contextMenuStripHelp"; - contextMenuStripHelp.Size = new System.Drawing.Size(168, 76); + contextMenuStripHelp.Size = new System.Drawing.Size(178, 76); // // helpToolStripMenuItem // helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { videoTutorialToolStripMenuItem }); helpToolStripMenuItem.Image = Properties.Resources.icons8_help_48; helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - helpToolStripMenuItem.Size = new System.Drawing.Size(167, 24); + helpToolStripMenuItem.Size = new System.Drawing.Size(177, 24); helpToolStripMenuItem.Text = "Tutorials"; // // videoTutorialToolStripMenuItem // videoTutorialToolStripMenuItem.Name = "videoTutorialToolStripMenuItem"; - videoTutorialToolStripMenuItem.Size = new System.Drawing.Size(147, 22); + videoTutorialToolStripMenuItem.Size = new System.Drawing.Size(160, 24); videoTutorialToolStripMenuItem.Text = "Video Tutorial"; videoTutorialToolStripMenuItem.Click += videoTutorialToolStripMenuItem_Click; // @@ -1864,7 +1871,7 @@ private void InitializeComponent() // submitFeedbackToolStripMenuItem.Image = Properties.Resources.icons8_get_help_48; submitFeedbackToolStripMenuItem.Name = "submitFeedbackToolStripMenuItem"; - submitFeedbackToolStripMenuItem.Size = new System.Drawing.Size(167, 24); + submitFeedbackToolStripMenuItem.Size = new System.Drawing.Size(177, 24); submitFeedbackToolStripMenuItem.Text = "Submit Feedback"; submitFeedbackToolStripMenuItem.Click += submitFeedbackToolStripMenuItem_Click; // @@ -1872,7 +1879,7 @@ private void InitializeComponent() // driverToolStripMenuItem.Image = Properties.Resources.tools_48; driverToolStripMenuItem.Name = "driverToolStripMenuItem"; - driverToolStripMenuItem.Size = new System.Drawing.Size(167, 24); + driverToolStripMenuItem.Size = new System.Drawing.Size(177, 24); driverToolStripMenuItem.Text = "OEM drivers"; driverToolStripMenuItem.Click += driverToolStripMenuItem_Click; // @@ -1888,10 +1895,10 @@ private void InitializeComponent() buttonDeviceLogs.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonDeviceLogs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); buttonDeviceLogs.ForeColor = System.Drawing.Color.Black; - buttonDeviceLogs.Location = new System.Drawing.Point(366, 471); + buttonDeviceLogs.Location = new System.Drawing.Point(366, 534); buttonDeviceLogs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonDeviceLogs.Name = "buttonDeviceLogs"; - buttonDeviceLogs.Size = new System.Drawing.Size(102, 27); + buttonDeviceLogs.Size = new System.Drawing.Size(102, 31); buttonDeviceLogs.TabIndex = 41; buttonDeviceLogs.Text = "Device Logs"; buttonDeviceLogs.UseVisualStyleBackColor = false; @@ -1904,11 +1911,11 @@ private void InitializeComponent() groupBox1.Controls.Add(comboBoxDevices); groupBox1.Controls.Add(buttonSyncApp); groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - groupBox1.Location = new System.Drawing.Point(9, 531); + groupBox1.Location = new System.Drawing.Point(9, 602); groupBox1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBox1.Name = "groupBox1"; groupBox1.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBox1.Size = new System.Drawing.Size(374, 97); + groupBox1.Size = new System.Drawing.Size(374, 110); groupBox1.TabIndex = 31; groupBox1.TabStop = false; groupBox1.Text = "Device Sync Settings"; @@ -1918,10 +1925,10 @@ private void InitializeComponent() buttonReloadDevicesList.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonReloadDevicesList.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); buttonReloadDevicesList.ForeColor = System.Drawing.Color.Black; - buttonReloadDevicesList.Location = new System.Drawing.Point(185, 56); + buttonReloadDevicesList.Location = new System.Drawing.Point(185, 63); buttonReloadDevicesList.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonReloadDevicesList.Name = "buttonReloadDevicesList"; - buttonReloadDevicesList.Size = new System.Drawing.Size(177, 27); + buttonReloadDevicesList.Size = new System.Drawing.Size(177, 31); buttonReloadDevicesList.TabIndex = 2; buttonReloadDevicesList.Text = "Refresh Device List"; buttonReloadDevicesList.UseVisualStyleBackColor = true; @@ -1931,10 +1938,10 @@ private void InitializeComponent() // comboBoxDevices.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); comboBoxDevices.FormattingEnabled = true; - comboBoxDevices.Location = new System.Drawing.Point(185, 19); + comboBoxDevices.Location = new System.Drawing.Point(185, 22); comboBoxDevices.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); comboBoxDevices.Name = "comboBoxDevices"; - comboBoxDevices.Size = new System.Drawing.Size(177, 21); + comboBoxDevices.Size = new System.Drawing.Size(177, 23); comboBoxDevices.TabIndex = 1; comboBoxDevices.SelectedIndexChanged += comboBoxDevices_SelectedIndexChanged; // @@ -1945,10 +1952,10 @@ private void InitializeComponent() buttonSyncApp.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonSyncApp.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F); buttonSyncApp.ForeColor = System.Drawing.Color.Black; - buttonSyncApp.Location = new System.Drawing.Point(7, 18); + buttonSyncApp.Location = new System.Drawing.Point(7, 20); buttonSyncApp.Margin = new System.Windows.Forms.Padding(2); buttonSyncApp.Name = "buttonSyncApp"; - buttonSyncApp.Size = new System.Drawing.Size(169, 65); + buttonSyncApp.Size = new System.Drawing.Size(169, 74); buttonSyncApp.TabIndex = 0; buttonSyncApp.Text = "Sync Smartphone"; buttonSyncApp.UseVisualStyleBackColor = false; @@ -1959,13 +1966,13 @@ private void InitializeComponent() contextMenuStripSearch.ImageScalingSize = new System.Drawing.Size(18, 18); contextMenuStripSearch.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { duckduckgoToolStripMenuItem, googleToolStripMenuItem, playMarketToolStripMenuItem, APKMirrorToolStripMenuItem, fDroidToolStripMenuItem }); contextMenuStripSearch.Name = "contextMenuStripSearch"; - contextMenuStripSearch.Size = new System.Drawing.Size(144, 124); + contextMenuStripSearch.Size = new System.Drawing.Size(150, 124); // // duckduckgoToolStripMenuItem // duckduckgoToolStripMenuItem.Image = Properties.Resources.icons8_duckduckgo_48; duckduckgoToolStripMenuItem.Name = "duckduckgoToolStripMenuItem"; - duckduckgoToolStripMenuItem.Size = new System.Drawing.Size(143, 24); + duckduckgoToolStripMenuItem.Size = new System.Drawing.Size(149, 24); duckduckgoToolStripMenuItem.Text = "Duckduckgo"; duckduckgoToolStripMenuItem.Click += duckduckgoToolStripMenuItem_Click; // @@ -1973,7 +1980,7 @@ private void InitializeComponent() // googleToolStripMenuItem.Image = Properties.Resources.icons8_google_48; googleToolStripMenuItem.Name = "googleToolStripMenuItem"; - googleToolStripMenuItem.Size = new System.Drawing.Size(143, 24); + googleToolStripMenuItem.Size = new System.Drawing.Size(149, 24); googleToolStripMenuItem.Text = "Google"; googleToolStripMenuItem.Click += googleToolStripMenuItem_Click; // @@ -1981,7 +1988,7 @@ private void InitializeComponent() // playMarketToolStripMenuItem.Image = Properties.Resources.icons8_play_store_48; playMarketToolStripMenuItem.Name = "playMarketToolStripMenuItem"; - playMarketToolStripMenuItem.Size = new System.Drawing.Size(143, 24); + playMarketToolStripMenuItem.Size = new System.Drawing.Size(149, 24); playMarketToolStripMenuItem.Text = "Play Market"; playMarketToolStripMenuItem.Click += playMarketToolStripMenuItem_Click; // @@ -1989,7 +1996,7 @@ private void InitializeComponent() // APKMirrorToolStripMenuItem.Image = Properties.Resources.apkmirror; APKMirrorToolStripMenuItem.Name = "APKMirrorToolStripMenuItem"; - APKMirrorToolStripMenuItem.Size = new System.Drawing.Size(143, 24); + APKMirrorToolStripMenuItem.Size = new System.Drawing.Size(149, 24); APKMirrorToolStripMenuItem.Text = "APK Mirror"; APKMirrorToolStripMenuItem.Click += APKMirrorToolStripMenuItem_Click; // @@ -1997,7 +2004,7 @@ private void InitializeComponent() // fDroidToolStripMenuItem.Image = Properties.Resources.fdroidlogo; fDroidToolStripMenuItem.Name = "fDroidToolStripMenuItem"; - fDroidToolStripMenuItem.Size = new System.Drawing.Size(143, 24); + fDroidToolStripMenuItem.Size = new System.Drawing.Size(149, 24); fDroidToolStripMenuItem.Text = "F-Droid"; fDroidToolStripMenuItem.Click += fDroidToolStripMenuItem_Click; // @@ -2006,19 +2013,19 @@ private void InitializeComponent() contextMenuStripTools.ImageScalingSize = new System.Drawing.Size(18, 18); contextMenuStripTools.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { toolStripMenuItem1 }); contextMenuStripTools.Name = "contextMenuStripHelp"; - contextMenuStripTools.Size = new System.Drawing.Size(98, 26); + contextMenuStripTools.Size = new System.Drawing.Size(101, 26); // // toolStripMenuItem1 // toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { toolStripMenuItemADBKill }); toolStripMenuItem1.Name = "toolStripMenuItem1"; - toolStripMenuItem1.Size = new System.Drawing.Size(97, 22); + toolStripMenuItem1.Size = new System.Drawing.Size(100, 22); toolStripMenuItem1.Text = "ADB"; // // toolStripMenuItemADBKill // toolStripMenuItemADBKill.Name = "toolStripMenuItemADBKill"; - toolStripMenuItemADBKill.Size = new System.Drawing.Size(116, 22); + toolStripMenuItemADBKill.Size = new System.Drawing.Size(123, 24); toolStripMenuItemADBKill.Text = "Kill ADB"; toolStripMenuItemADBKill.Click += toolStripMenuItemADBKill_Click; // @@ -2029,10 +2036,10 @@ private void InitializeComponent() buttonTaskManager.FlatStyle = System.Windows.Forms.FlatStyle.System; buttonTaskManager.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); buttonTaskManager.ForeColor = System.Drawing.Color.Black; - buttonTaskManager.Location = new System.Drawing.Point(366, 438); + buttonTaskManager.Location = new System.Drawing.Point(366, 496); buttonTaskManager.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonTaskManager.Name = "buttonTaskManager"; - buttonTaskManager.Size = new System.Drawing.Size(102, 27); + buttonTaskManager.Size = new System.Drawing.Size(102, 31); buttonTaskManager.TabIndex = 42; buttonTaskManager.Text = "Task Manager"; buttonTaskManager.UseVisualStyleBackColor = false; @@ -2053,11 +2060,11 @@ private void InitializeComponent() groupBoxTerminal.Controls.Add(radioButtonADB); groupBoxTerminal.Controls.Add(buttonTerminalRun); groupBoxTerminal.Controls.Add(richTextBoxTerminal); - groupBoxTerminal.Location = new System.Drawing.Point(9, 428); + groupBoxTerminal.Location = new System.Drawing.Point(9, 485); groupBoxTerminal.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); groupBoxTerminal.Name = "groupBoxTerminal"; groupBoxTerminal.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - groupBoxTerminal.Size = new System.Drawing.Size(349, 103); + groupBoxTerminal.Size = new System.Drawing.Size(349, 117); groupBoxTerminal.TabIndex = 46; groupBoxTerminal.TabStop = false; groupBoxTerminal.Text = "Terminal"; @@ -2066,10 +2073,10 @@ private void InitializeComponent() // radioButtonFastboot.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; radioButtonFastboot.AutoSize = true; - radioButtonFastboot.Location = new System.Drawing.Point(255, 76); + radioButtonFastboot.Location = new System.Drawing.Point(258, 85); radioButtonFastboot.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); radioButtonFastboot.Name = "radioButtonFastboot"; - radioButtonFastboot.Size = new System.Drawing.Size(69, 19); + radioButtonFastboot.Size = new System.Drawing.Size(75, 21); radioButtonFastboot.TabIndex = 50; radioButtonFastboot.TabStop = true; radioButtonFastboot.Text = "fastboot"; @@ -2080,10 +2087,10 @@ private void InitializeComponent() radioButtonADB.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; radioButtonADB.AutoSize = true; radioButtonADB.Checked = true; - radioButtonADB.Location = new System.Drawing.Point(255, 55); + radioButtonADB.Location = new System.Drawing.Point(258, 61); radioButtonADB.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); radioButtonADB.Name = "radioButtonADB"; - radioButtonADB.Size = new System.Drawing.Size(45, 19); + radioButtonADB.Size = new System.Drawing.Size(49, 21); radioButtonADB.TabIndex = 49; radioButtonADB.TabStop = true; radioButtonADB.Text = "adb"; @@ -2093,10 +2100,10 @@ private void InitializeComponent() // buttonTerminalRun.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; buttonTerminalRun.FlatStyle = System.Windows.Forms.FlatStyle.System; - buttonTerminalRun.Location = new System.Drawing.Point(255, 22); + buttonTerminalRun.Location = new System.Drawing.Point(255, 25); buttonTerminalRun.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); buttonTerminalRun.Name = "buttonTerminalRun"; - buttonTerminalRun.Size = new System.Drawing.Size(88, 27); + buttonTerminalRun.Size = new System.Drawing.Size(88, 31); buttonTerminalRun.TabIndex = 48; buttonTerminalRun.Text = "Run"; buttonTerminalRun.UseVisualStyleBackColor = true; @@ -2105,10 +2112,10 @@ private void InitializeComponent() // richTextBoxTerminal // richTextBoxTerminal.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; - richTextBoxTerminal.Location = new System.Drawing.Point(7, 17); + richTextBoxTerminal.Location = new System.Drawing.Point(7, 19); richTextBoxTerminal.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); richTextBoxTerminal.Name = "richTextBoxTerminal"; - richTextBoxTerminal.Size = new System.Drawing.Size(240, 78); + richTextBoxTerminal.Size = new System.Drawing.Size(240, 88); richTextBoxTerminal.TabIndex = 47; richTextBoxTerminal.Text = ""; // @@ -2127,10 +2134,10 @@ private void InitializeComponent() // MainForm // AllowDrop = true; - AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; BackColor = System.Drawing.Color.White; - ClientSize = new System.Drawing.Size(942, 632); + ClientSize = new System.Drawing.Size(942, 716); Controls.Add(richTextBoxLog); Controls.Add(groupBoxTerminal); Controls.Add(buttonTaskManager); diff --git a/ATA-GUI/Forms/MainForm.cs b/ATA-GUI/Forms/MainForm.cs index 30f959f..733e634 100644 --- a/ATA-GUI/Forms/MainForm.cs +++ b/ATA-GUI/Forms/MainForm.cs @@ -1,3 +1,8 @@ +using ATA_GUI.Classes; +using ATA_GUI.Forms; +using ATA_GUI.Utils; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Diagnostics; @@ -15,11 +20,6 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using ATA_GUI.Classes; -using ATA_GUI.Forms; -using ATA_GUI.Utils; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; namespace ATA_GUI { @@ -261,7 +261,7 @@ private void ExtractDeviceData() try { - localIp = ConsoleProcess.AdbProcess(commandAssemblerF("shell ip route")).Split(' ').Where(it => Regex.Match(it, "(\\b25[0-5]|\\b2[0-4][0-9]|\\b[01]?[0-9][0-9]?)(\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}").Success).Last(); + localIp = ConsoleProcess.AdbProcess(commandAssemblerF("shell ip route")).Split(' ').Where(it => Network.IsValidIP(it)).Last(); } catch { @@ -547,7 +547,6 @@ private void buttonRR_Click(object sender, EventArgs e) _ = ConsoleProcess.AdbProcess(commandAssemblerF("reboot recovery")); LogWriteLine("rebooted", LogType.OK); Thread.Sleep(1000); - reloadList(); } } @@ -558,7 +557,6 @@ private void buttonRF_Click(object sender, EventArgs e) _ = ConsoleProcess.AdbProcess(commandAssemblerF("reboot-bootloader")); LogWriteLine("rebooted", LogType.OK); Thread.Sleep(1000); - reloadList(); } } @@ -979,7 +977,6 @@ private void buttonRebootToSystem_Click(object sender, EventArgs e) { LogWriteLine(ConsoleProcess.AdbFastbootCommandR(commandAssemblerF("reboot"), 1), LogType.INFO); Thread.Sleep(1000); - reloadList(); } private void buttonHardReset_Click(object sender, EventArgs e) @@ -1004,7 +1001,6 @@ private void buttonRebootRecovery_Click(object sender, EventArgs e) { LogWriteLine(ConsoleProcess.AdbFastbootCommandR(commandAssemblerF("reboot recovery"), 1), LogType.INFO); Thread.Sleep(1000); - reloadList(); } private void buttonBootloaderMenu_Click(object sender, EventArgs e) @@ -1820,14 +1816,6 @@ private void toolStripButtonSetDefault_Click(object sender, EventArgs e) } } - private void comboBoxIP_KeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == (char)13) - { - connectToIp(); - } - } - private void comboBoxIP_TextUpdate(object sender, EventArgs e) { buttonConnectToIP.Enabled = buttonDisconnectIP.Enabled = true; @@ -2020,21 +2008,17 @@ private void buttonrr__Click(object sender, EventArgs e) { _ = ConsoleProcess.AdbProcess(commandAssemblerF("reboot recovery")); LogWriteLine("rebooted", LogType.INFO); - reloadList(); } private void buttonrs__Click(object sender, EventArgs e) { rebootSmartphone(); - LogWriteLine("rebooted", LogType.INFO); - reloadList(); } private void buttonrf__Click(object sender, EventArgs e) { _ = ConsoleProcess.AdbProcess(commandAssemblerF("reboot-bootloader")); LogWriteLine("rebooted", LogType.INFO); - reloadList(); } private async void buttonCamera_Click(object sender, EventArgs e) @@ -2178,14 +2162,28 @@ private void radioButtonCWireless_CheckedChanged(object sender, EventArgs e) private void buttonPair_Click(object sender, EventArgs e) { - string port = textBoxPort.Text.Trim(); - string ip = comboBoxIP.Text.Trim(); + if (Network.IsValidIP(comboBoxIP.Text)) + { + if (textBoxPort.Text.Length > 0) + { + string port = textBoxPort.Text.Trim(); + string ip = comboBoxIP.Text.Trim(); - WirelessPairingForm wirelessPairingForm = new WirelessPairingForm(ip, port); - wirelessPairingForm.ShowDialog(); - string result = (wirelessPairingForm.DialogResult == DialogResult.OK ? "Paired successfully to" : "Operation failed\nCannot pair to ") + ip; + WirelessPairingForm wirelessPairingForm = new WirelessPairingForm(ip, port); + wirelessPairingForm.ShowDialog(); + string result = (wirelessPairingForm.DialogResult == DialogResult.OK ? "Paired successfully to" : "Operation failed\nCannot pair to ") + ip; - MessageShowBox(result, wirelessPairingForm.DialogResult == DialogResult.OK ? 2 : 0); + MessageShowBox(result, wirelessPairingForm.DialogResult == DialogResult.OK ? 2 : 0); + } + else + { + MessageShowBox("PORT cannot be empty", 1); + } + } + else + { + MessageShowBox("IP not valid, try again with a different one!", 1); + } } private void setWantedRows() diff --git a/ATA-GUI/Forms/MainForm.resx b/ATA-GUI/Forms/MainForm.resx index 7de85c6..07db4d4 100644 --- a/ATA-GUI/Forms/MainForm.resx +++ b/ATA-GUI/Forms/MainForm.resx @@ -1,7 +1,7 @@