diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs index 2c3859c..30b8ea1 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs @@ -52,10 +52,10 @@ this.logTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.logTextBox.ForeColor = System.Drawing.Color.White; this.logTextBox.ImeMode = System.Windows.Forms.ImeMode.Off; - this.logTextBox.Location = new System.Drawing.Point(0, 24); + this.logTextBox.Location = new System.Drawing.Point(0, 25); this.logTextBox.Name = "logTextBox"; this.logTextBox.ReadOnly = true; - this.logTextBox.Size = new System.Drawing.Size(905, 471); + this.logTextBox.Size = new System.Drawing.Size(905, 430); this.logTextBox.TabIndex = 0; this.logTextBox.Text = ""; this.logTextBox.TextChanged += new System.EventHandler(this.logTextBox_TextChanged); @@ -64,7 +64,7 @@ // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 495); + this.statusStrip1.Location = new System.Drawing.Point(0, 455); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(905, 22); this.statusStrip1.TabIndex = 1; @@ -73,7 +73,7 @@ // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 17); + this.statusLabel.Size = new System.Drawing.Size(43, 17); this.statusLabel.Text = "Status"; // // menuStrip1 @@ -87,49 +87,49 @@ this.forceUnbanToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(905, 24); + this.menuStrip1.Size = new System.Drawing.Size(905, 25); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "menuStrip1"; // - // startBotToolStripMenuItem + // startStopBotToolStripMenuItem // this.startStopBotToolStripMenuItem.Name = "startStopBotToolStripMenuItem"; - this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(64, 20); - this.startStopBotToolStripMenuItem.Text = "Start Bot"; + this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(71, 21); + this.startStopBotToolStripMenuItem.Text = "&Start Bot"; this.startStopBotToolStripMenuItem.Click += new System.EventHandler(this.startStopBotToolStripMenuItem_Click); // // mapToolStripMenuItem // this.mapToolStripMenuItem.Name = "mapToolStripMenuItem"; - this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20); + this.mapToolStripMenuItem.Size = new System.Drawing.Size(47, 21); this.mapToolStripMenuItem.Text = "Map"; this.mapToolStripMenuItem.Click += new System.EventHandler(this.mapToolStripMenuItem_Click); // // todoToolStripMenuItem // this.todoToolStripMenuItem.Name = "todoToolStripMenuItem"; - this.todoToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.todoToolStripMenuItem.Size = new System.Drawing.Size(66, 21); this.todoToolStripMenuItem.Text = "Settings"; this.todoToolStripMenuItem.Click += new System.EventHandler(this.todoToolStripMenuItem_Click); // // pokemonToolStripMenuItem2 // this.pokemonToolStripMenuItem2.Name = "pokemonToolStripMenuItem2"; - this.pokemonToolStripMenuItem2.Size = new System.Drawing.Size(70, 20); + this.pokemonToolStripMenuItem2.Size = new System.Drawing.Size(75, 21); this.pokemonToolStripMenuItem2.Text = "Pokemon"; this.pokemonToolStripMenuItem2.Click += new System.EventHandler(this.pokemonToolStripMenuItem2_Click); // // useLuckyEggToolStripMenuItem // this.useLuckyEggToolStripMenuItem.Name = "useLuckyEggToolStripMenuItem"; - this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(95, 20); + this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(105, 21); this.useLuckyEggToolStripMenuItem.Text = "Use Lucky Egg"; this.useLuckyEggToolStripMenuItem.Click += new System.EventHandler(this.useLuckyEggToolStripMenuItem_Click); // // forceUnbanToolStripMenuItem // this.forceUnbanToolStripMenuItem.Name = "forceUnbanToolStripMenuItem"; - this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(86, 20); + this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(94, 21); this.forceUnbanToolStripMenuItem.Text = "Force Unban"; this.forceUnbanToolStripMenuItem.Click += new System.EventHandler(this.forceUnbanToolStripMenuItem_Click); // @@ -145,9 +145,9 @@ // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(905, 517); + this.ClientSize = new System.Drawing.Size(905, 477); this.Controls.Add(this.logTextBox); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.menuStrip1); diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs index 67fd3eb..28de7a8 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.cs @@ -222,7 +222,7 @@ namespace PokemonGo.RocketAPI.Window inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Pokemon) .Where(p => p != null && p?.PokemonId > 0); - ConsoleLevelTitle(profile.Profile.Username, client); + await ConsoleLevelTitle(profile.Profile.Username, client); // Write the players ingame details ColoredConsoleWrite(Color.Yellow, "----------------------------"); @@ -973,7 +973,7 @@ namespace PokemonGo.RocketAPI.Window if (!bot_started) { bot_started = true; - startStopBotToolStripMenuItem.Text = "Stop Bot"; + startStopBotToolStripMenuItem.Text = "&Stop Bot"; Task.Run(() => { try @@ -1075,8 +1075,9 @@ namespace PokemonGo.RocketAPI.Window private void todoToolStripMenuItem_Click(object sender, EventArgs e) { - SettingsForm settingsForm = new SettingsForm(); + SettingsForm settingsForm = new SettingsForm(); settingsForm.Show(); + settingsForm.Focus(); } private void pokemonToolStripMenuItem2_Click(object sender, EventArgs e) @@ -1087,8 +1088,15 @@ namespace PokemonGo.RocketAPI.Window private void mapToolStripMenuItem_Click(object sender, EventArgs e) { - var mForm = new MapForm(ref client); - mForm.Show(); + if (client != null) + { + var mForm = new MapForm(ref client); + mForm.Show(); + } + else + { + ColoredConsoleWrite(Color.Red, "Please start the bot before..."); + } } } } diff --git a/PokemonGo/RocketAPI/Window/PokeUi.Designer.cs b/PokemonGo/RocketAPI/Window/PokeUi.Designer.cs index 16fa9be..1e0f359 100644 --- a/PokemonGo/RocketAPI/Window/PokeUi.Designer.cs +++ b/PokemonGo/RocketAPI/Window/PokeUi.Designer.cs @@ -28,130 +28,118 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PokeUi)); - this.listView1 = new System.Windows.Forms.ListView(); - this.button1 = new System.Windows.Forms.Button(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.btnUpgrade = new System.Windows.Forms.Button(); - this.contextMenuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // listView1 - // - this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PokeUi)); + this.listView1 = new System.Windows.Forms.ListView(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.btnUpgrade = new System.Windows.Forms.Button(); + this.reloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.contextMenuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // listView1 + // + this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.listView1.Location = new System.Drawing.Point(16, 14); - this.listView1.Margin = new System.Windows.Forms.Padding(4); - this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(795, 458); - this.listView1.TabIndex = 0; - this.listView1.UseCompatibleStateImageBehavior = false; - this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); - this.listView1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseClick); - // - // button1 - // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.button1.Location = new System.Drawing.Point(16, 489); - this.button1.Margin = new System.Windows.Forms.Padding(4); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(795, 32); - this.button1.TabIndex = 3; - this.button1.Text = "Reload"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // contextMenuStrip1 - // - this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.listView1.Location = new System.Drawing.Point(12, 10); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(597, 381); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); + this.listView1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseClick); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.reloadToolStripMenuItem, this.toolStripMenuItem1}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(137, 30); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(136, 26); - this.toolStripMenuItem1.Text = "Transfer"; - this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); - // - // button2 - // - this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 48); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 22); + this.toolStripMenuItem1.Text = "Transfer"; + this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); + // + // button2 + // + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.button2.Location = new System.Drawing.Point(16, 529); - this.button2.Margin = new System.Windows.Forms.Padding(4); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(795, 32); - this.button2.TabIndex = 4; - this.button2.Text = "Evolve Selected"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // button3 - // - this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.button2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.button2.Location = new System.Drawing.Point(12, 397); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(596, 24); + this.button2.TabIndex = 4; + this.button2.Text = "Evolve Selected"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.button3.Location = new System.Drawing.Point(16, 609); - this.button3.Margin = new System.Windows.Forms.Padding(4); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(795, 32); - this.button3.TabIndex = 5; - this.button3.Text = "Transfer Selected"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); - // - // btnUpgrade - // - this.btnUpgrade.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.button3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.button3.Location = new System.Drawing.Point(12, 457); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(596, 24); + this.button3.TabIndex = 5; + this.button3.Text = "Transfer Selected"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // btnUpgrade + // + this.btnUpgrade.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.btnUpgrade.Location = new System.Drawing.Point(16, 569); - this.btnUpgrade.Margin = new System.Windows.Forms.Padding(4); - this.btnUpgrade.Name = "btnUpgrade"; - this.btnUpgrade.Size = new System.Drawing.Size(795, 32); - this.btnUpgrade.TabIndex = 6; - this.btnUpgrade.Text = "Upgrade Selected"; - this.btnUpgrade.UseVisualStyleBackColor = true; - this.btnUpgrade.Click += new System.EventHandler(this.btnUpgrade_Click); - // - // PokeUi - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(829, 664); - this.Controls.Add(this.btnUpgrade); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Controls.Add(this.listView1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4); - this.Name = "PokeUi"; - this.Text = "PokeUi"; - this.Load += new System.EventHandler(this.PokeUi_Load); - this.contextMenuStrip1.ResumeLayout(false); - this.ResumeLayout(false); + this.btnUpgrade.Location = new System.Drawing.Point(12, 427); + this.btnUpgrade.Name = "btnUpgrade"; + this.btnUpgrade.Size = new System.Drawing.Size(596, 24); + this.btnUpgrade.TabIndex = 6; + this.btnUpgrade.Text = "Upgrade Selected"; + this.btnUpgrade.UseVisualStyleBackColor = true; + this.btnUpgrade.Click += new System.EventHandler(this.btnUpgrade_Click); + // + // reloadToolStripMenuItem + // + this.reloadToolStripMenuItem.Name = "reloadToolStripMenuItem"; + this.reloadToolStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.reloadToolStripMenuItem.Text = "Reload"; + this.reloadToolStripMenuItem.Click += new System.EventHandler(this.reloadToolStripMenuItem_Click); + // + // PokeUi + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(622, 498); + this.Controls.Add(this.btnUpgrade); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.listView1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "PokeUi"; + this.Text = "PokeUi"; + this.Load += new System.EventHandler(this.PokeUi_Load); + this.contextMenuStrip1.ResumeLayout(false); + this.ResumeLayout(false); } #endregion private System.Windows.Forms.ListView listView1; - private System.Windows.Forms.Button button1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.Button btnUpgrade; - } + private System.Windows.Forms.ToolStripMenuItem reloadToolStripMenuItem; + } } \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/PokeUi.cs b/PokemonGo/RocketAPI/Window/PokeUi.cs index 3ee7962..f45454d 100644 --- a/PokemonGo/RocketAPI/Window/PokeUi.cs +++ b/PokemonGo/RocketAPI/Window/PokeUi.cs @@ -70,7 +70,7 @@ namespace PokemonGo.RocketAPI.Window var imageList = new ImageList { ImageSize = new Size(imageSize, imageSize) }; //var imageList = new ImageList { ImageSize = new Size(96, 96) }; listView1.ShowItemToolTips = true; - + listView1.BeginUpdate(); foreach (var pokemon in pokemons) { Bitmap pokemonImage = null; @@ -103,6 +103,7 @@ namespace PokemonGo.RocketAPI.Window this.listView1.Items.Add(listViewItem); } + listView1.EndUpdate(); this.Text = "PokeUi " + pokemons.Count<PokemonData>() + "/" + profile.Profile.PokeStorage; EnabledButton(true); @@ -118,7 +119,7 @@ namespace PokemonGo.RocketAPI.Window private void EnabledButton(bool enabled) { - button1.Enabled = enabled; + reloadToolStripMenuItem.Enabled = enabled; button2.Enabled = enabled; button3.Enabled = enabled; btnUpgrade.Enabled = enabled; @@ -141,11 +142,6 @@ namespace PokemonGo.RocketAPI.Window return bitmapRemote; } - private void button1_Click(object sender, EventArgs e) - { - this.listView1.Clear(); - Execute(); - } private void listView1_SelectedIndexChanged(object sender, EventArgs e) { @@ -310,5 +306,11 @@ namespace PokemonGo.RocketAPI.Window catch (NullReferenceException) { await PowerUp(pokemon); } catch (Exception ex) { await PowerUp(pokemon); } } + + private void reloadToolStripMenuItem_Click(object sender, EventArgs e) + { + this.listView1.Clear(); + Execute(); + } } } diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs index 9d34f6d..14c5b22 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs @@ -55,18 +55,18 @@ this.AdressBox = new System.Windows.Forms.TextBox(); this.trackBar = new System.Windows.Forms.TrackBar(); this.panel1 = new System.Windows.Forms.Panel(); + this.label7 = new System.Windows.Forms.Label(); + this.ImageSizeBox = new System.Windows.Forms.TextBox(); + this.EmailLoginText = new System.Windows.Forms.Label(); this.CatchPokemonBox = new System.Windows.Forms.CheckBox(); + this.EmailPasswordText = new System.Windows.Forms.Label(); this.CatchPokemonText = new System.Windows.Forms.Label(); + this.EmailPasswordBox = new System.Windows.Forms.TextBox(); + this.EmailLoginBox = new System.Windows.Forms.TextBox(); this.transferIVThresText = new System.Windows.Forms.TextBox(); this.TravelSpeedText = new System.Windows.Forms.Label(); this.TravelSpeedBox = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); - this.EmailLoginText = new System.Windows.Forms.Label(); - this.EmailPasswordText = new System.Windows.Forms.Label(); - this.EmailLoginBox = new System.Windows.Forms.TextBox(); - this.EmailPasswordBox = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.ImageSizeBox = new System.Windows.Forms.TextBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit(); this.panel1.SuspendLayout(); @@ -75,9 +75,9 @@ // authTypeLabel // this.authTypeLabel.AutoSize = true; - this.authTypeLabel.Location = new System.Drawing.Point(3, 7); + this.authTypeLabel.Location = new System.Drawing.Point(3, 6); this.authTypeLabel.Name = "authTypeLabel"; - this.authTypeLabel.Size = new System.Drawing.Size(63, 13); + this.authTypeLabel.Size = new System.Drawing.Size(71, 12); this.authTypeLabel.TabIndex = 0; this.authTypeLabel.Text = "Login Type:"; this.authTypeLabel.Click += new System.EventHandler(this.authTypeLabel_Click); @@ -88,72 +88,72 @@ this.authTypeCb.Items.AddRange(new object[] { "google", "Ptc"}); - this.authTypeCb.Location = new System.Drawing.Point(68, 4); + this.authTypeCb.Location = new System.Drawing.Point(85, 4); this.authTypeCb.Name = "authTypeCb"; - this.authTypeCb.Size = new System.Drawing.Size(136, 21); + this.authTypeCb.Size = new System.Drawing.Size(136, 20); this.authTypeCb.TabIndex = 1; this.authTypeCb.SelectedIndexChanged += new System.EventHandler(this.authTypeCb_SelectedIndexChanged); // // ptcUserLabel // this.ptcUserLabel.AutoSize = true; - this.ptcUserLabel.Location = new System.Drawing.Point(3, 36); + this.ptcUserLabel.Location = new System.Drawing.Point(3, 33); this.ptcUserLabel.Name = "ptcUserLabel"; - this.ptcUserLabel.Size = new System.Drawing.Size(58, 13); + this.ptcUserLabel.Size = new System.Drawing.Size(59, 12); this.ptcUserLabel.TabIndex = 2; this.ptcUserLabel.Text = "Username:"; // // ptcPasswordLabel // this.ptcPasswordLabel.AutoSize = true; - this.ptcPasswordLabel.Location = new System.Drawing.Point(3, 62); + this.ptcPasswordLabel.Location = new System.Drawing.Point(3, 57); this.ptcPasswordLabel.Name = "ptcPasswordLabel"; - this.ptcPasswordLabel.Size = new System.Drawing.Size(56, 13); + this.ptcPasswordLabel.Size = new System.Drawing.Size(59, 12); this.ptcPasswordLabel.TabIndex = 3; this.ptcPasswordLabel.Text = "Password:"; // // latLabel // this.latLabel.AutoSize = true; - this.latLabel.Location = new System.Drawing.Point(3, 88); + this.latLabel.Location = new System.Drawing.Point(3, 81); this.latLabel.Name = "latLabel"; - this.latLabel.Size = new System.Drawing.Size(48, 13); + this.latLabel.Size = new System.Drawing.Size(59, 12); this.latLabel.TabIndex = 4; this.latLabel.Text = "Latitude:"; // // longiLabel // this.longiLabel.AutoSize = true; - this.longiLabel.Location = new System.Drawing.Point(3, 114); + this.longiLabel.Location = new System.Drawing.Point(3, 105); this.longiLabel.Name = "longiLabel"; - this.longiLabel.Size = new System.Drawing.Size(57, 13); + this.longiLabel.Size = new System.Drawing.Size(65, 12); this.longiLabel.TabIndex = 5; this.longiLabel.Text = "Longitude:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 140); + this.label1.Location = new System.Drawing.Point(3, 129); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(87, 13); + this.label1.Size = new System.Drawing.Size(95, 12); this.label1.TabIndex = 6; this.label1.Text = "Razzberry Mode:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 193); + this.label2.Location = new System.Drawing.Point(3, 178); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(76, 13); + this.label2.Size = new System.Drawing.Size(89, 12); this.label2.TabIndex = 7; this.label2.Text = "Transfer Type:"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 321); + this.label3.Location = new System.Drawing.Point(3, 296); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(91, 13); + this.label3.Size = new System.Drawing.Size(95, 12); this.label3.TabIndex = 8; this.label3.Text = "Evolve Pokemon:"; this.label3.Click += new System.EventHandler(this.label3_Click); @@ -161,49 +161,49 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(3, 220); + this.label4.Location = new System.Drawing.Point(3, 203); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 13); + this.label4.Size = new System.Drawing.Size(83, 12); this.label4.TabIndex = 9; this.label4.Text = "CP Threshold:"; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(3, 167); + this.label5.Location = new System.Drawing.Point(3, 154); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(93, 13); + this.label5.Size = new System.Drawing.Size(113, 12); this.label5.TabIndex = 10; this.label5.Text = "Razzberry Setting:"; // // ptcUserText // - this.ptcUserText.Location = new System.Drawing.Point(68, 33); + this.ptcUserText.Location = new System.Drawing.Point(85, 30); this.ptcUserText.Name = "ptcUserText"; - this.ptcUserText.Size = new System.Drawing.Size(136, 20); + this.ptcUserText.Size = new System.Drawing.Size(136, 21); this.ptcUserText.TabIndex = 11; // // ptcPassText // - this.ptcPassText.Location = new System.Drawing.Point(68, 62); + this.ptcPassText.Location = new System.Drawing.Point(85, 57); this.ptcPassText.Name = "ptcPassText"; - this.ptcPassText.Size = new System.Drawing.Size(136, 20); + this.ptcPassText.Size = new System.Drawing.Size(136, 21); this.ptcPassText.TabIndex = 12; // // latitudeText // - this.latitudeText.Location = new System.Drawing.Point(104, 85); + this.latitudeText.Location = new System.Drawing.Point(121, 78); this.latitudeText.Name = "latitudeText"; this.latitudeText.ReadOnly = true; - this.latitudeText.Size = new System.Drawing.Size(100, 20); + this.latitudeText.Size = new System.Drawing.Size(100, 21); this.latitudeText.TabIndex = 13; // // longitudeText // - this.longitudeText.Location = new System.Drawing.Point(104, 111); + this.longitudeText.Location = new System.Drawing.Point(121, 102); this.longitudeText.Name = "longitudeText"; this.longitudeText.ReadOnly = true; - this.longitudeText.Size = new System.Drawing.Size(100, 20); + this.longitudeText.Size = new System.Drawing.Size(100, 21); this.longitudeText.TabIndex = 14; // // razzmodeCb @@ -212,16 +212,16 @@ this.razzmodeCb.Items.AddRange(new object[] { "probability", "cp"}); - this.razzmodeCb.Location = new System.Drawing.Point(104, 137); + this.razzmodeCb.Location = new System.Drawing.Point(121, 126); this.razzmodeCb.Name = "razzmodeCb"; - this.razzmodeCb.Size = new System.Drawing.Size(100, 21); + this.razzmodeCb.Size = new System.Drawing.Size(100, 20); this.razzmodeCb.TabIndex = 15; // // razzSettingText // - this.razzSettingText.Location = new System.Drawing.Point(104, 164); + this.razzSettingText.Location = new System.Drawing.Point(121, 151); this.razzSettingText.Name = "razzSettingText"; - this.razzSettingText.Size = new System.Drawing.Size(100, 20); + this.razzSettingText.Size = new System.Drawing.Size(100, 21); this.razzSettingText.TabIndex = 16; // // transferTypeCb @@ -235,24 +235,24 @@ "Duplicate", "IV Duplicate", "All"}); - this.transferTypeCb.Location = new System.Drawing.Point(104, 190); + this.transferTypeCb.Location = new System.Drawing.Point(121, 175); this.transferTypeCb.Name = "transferTypeCb"; - this.transferTypeCb.Size = new System.Drawing.Size(100, 21); + this.transferTypeCb.Size = new System.Drawing.Size(100, 20); this.transferTypeCb.TabIndex = 17; this.transferTypeCb.SelectedIndexChanged += new System.EventHandler(this.transferTypeCb_SelectedIndexChanged); // // transferCpThresText // - this.transferCpThresText.Location = new System.Drawing.Point(104, 220); + this.transferCpThresText.Location = new System.Drawing.Point(121, 203); this.transferCpThresText.Name = "transferCpThresText"; - this.transferCpThresText.Size = new System.Drawing.Size(100, 20); + this.transferCpThresText.Size = new System.Drawing.Size(100, 21); this.transferCpThresText.TabIndex = 18; this.transferCpThresText.TextChanged += new System.EventHandler(this.transferCpThresText_TextChanged); // // evolveAllChk // this.evolveAllChk.AutoSize = true; - this.evolveAllChk.Location = new System.Drawing.Point(104, 321); + this.evolveAllChk.Location = new System.Drawing.Point(122, 296); this.evolveAllChk.Name = "evolveAllChk"; this.evolveAllChk.Size = new System.Drawing.Size(15, 14); this.evolveAllChk.TabIndex = 19; @@ -263,9 +263,9 @@ // this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.saveBtn.Location = new System.Drawing.Point(0, 341); + this.saveBtn.Location = new System.Drawing.Point(0, 316); this.saveBtn.Name = "saveBtn"; - this.saveBtn.Size = new System.Drawing.Size(198, 95); + this.saveBtn.Size = new System.Drawing.Size(211, 88); this.saveBtn.TabIndex = 20; this.saveBtn.Text = "Save"; this.saveBtn.UseVisualStyleBackColor = true; @@ -280,7 +280,7 @@ this.gMapControl1.GrayScaleMode = false; this.gMapControl1.HelperLineOption = GMap.NET.WindowsForms.HelperLineOptions.DontShow; this.gMapControl1.LevelsKeepInMemmory = 5; - this.gMapControl1.Location = new System.Drawing.Point(3, 16); + this.gMapControl1.Location = new System.Drawing.Point(3, 15); this.gMapControl1.MarkersEnabled = true; this.gMapControl1.MaxZoom = 2; this.gMapControl1.MinZoom = 2; @@ -293,7 +293,7 @@ this.gMapControl1.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.gMapControl1.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.gMapControl1.ShowTileGridLines = false; - this.gMapControl1.Size = new System.Drawing.Size(468, 388); + this.gMapControl1.Size = new System.Drawing.Size(468, 358); this.gMapControl1.TabIndex = 22; this.gMapControl1.Zoom = 0D; this.gMapControl1.Load += new System.EventHandler(this.gMapControl1_Load); @@ -306,9 +306,9 @@ this.groupBox1.Controls.Add(this.trackBar); this.groupBox1.Controls.Add(this.gMapControl1); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(221, 9); + this.groupBox1.Location = new System.Drawing.Point(234, 8); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(474, 442); + this.groupBox1.Size = new System.Drawing.Size(461, 409); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; this.groupBox1.Text = "Location"; @@ -317,9 +317,9 @@ // this.FindAdressButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FindAdressButton.Location = new System.Drawing.Point(338, 410); + this.FindAdressButton.Location = new System.Drawing.Point(338, 379); this.FindAdressButton.Name = "FindAdressButton"; - this.FindAdressButton.Size = new System.Drawing.Size(130, 26); + this.FindAdressButton.Size = new System.Drawing.Size(117, 24); this.FindAdressButton.TabIndex = 25; this.FindAdressButton.Text = "Find Location"; this.FindAdressButton.UseVisualStyleBackColor = true; @@ -327,19 +327,19 @@ // // AdressBox // - this.AdressBox.Location = new System.Drawing.Point(6, 416); + this.AdressBox.Location = new System.Drawing.Point(6, 384); this.AdressBox.Name = "AdressBox"; - this.AdressBox.Size = new System.Drawing.Size(326, 20); + this.AdressBox.Size = new System.Drawing.Size(326, 21); this.AdressBox.TabIndex = 25; // // trackBar // this.trackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.trackBar.BackColor = System.Drawing.SystemColors.Info; - this.trackBar.Location = new System.Drawing.Point(426, 16); + this.trackBar.Location = new System.Drawing.Point(413, 15); this.trackBar.Name = "trackBar"; this.trackBar.Orientation = System.Windows.Forms.Orientation.Vertical; - this.trackBar.Size = new System.Drawing.Size(45, 104); + this.trackBar.Size = new System.Drawing.Size(45, 96); this.trackBar.TabIndex = 25; this.trackBar.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.trackBar.Scroll += new System.EventHandler(this.trackBar_Scroll); @@ -380,126 +380,126 @@ this.panel1.Controls.Add(this.ptcUserText); this.panel1.Controls.Add(this.ptcPassText); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(9, 9); + this.panel1.Location = new System.Drawing.Point(9, 8); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(212, 442); + this.panel1.Size = new System.Drawing.Size(225, 409); this.panel1.TabIndex = 26; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(3, 230); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(113, 12); + this.label7.TabIndex = 32; + this.label7.Text = "PokeUi Image Size:"; + // + // ImageSizeBox + // + this.ImageSizeBox.Location = new System.Drawing.Point(121, 227); + this.ImageSizeBox.Name = "ImageSizeBox"; + this.ImageSizeBox.Size = new System.Drawing.Size(100, 21); + this.ImageSizeBox.TabIndex = 31; + // + // EmailLoginText + // + this.EmailLoginText.AutoSize = true; + this.EmailLoginText.Location = new System.Drawing.Point(3, 33); + this.EmailLoginText.Name = "EmailLoginText"; + this.EmailLoginText.Size = new System.Drawing.Size(41, 12); + this.EmailLoginText.TabIndex = 27; + this.EmailLoginText.Text = "Email:"; + // // CatchPokemonBox // this.CatchPokemonBox.AutoSize = true; - this.CatchPokemonBox.Location = new System.Drawing.Point(104, 298); + this.CatchPokemonBox.Location = new System.Drawing.Point(122, 275); this.CatchPokemonBox.Name = "CatchPokemonBox"; this.CatchPokemonBox.Size = new System.Drawing.Size(15, 14); this.CatchPokemonBox.TabIndex = 26; this.CatchPokemonBox.UseVisualStyleBackColor = true; this.CatchPokemonBox.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // + // EmailPasswordText + // + this.EmailPasswordText.AutoSize = true; + this.EmailPasswordText.Location = new System.Drawing.Point(3, 57); + this.EmailPasswordText.Name = "EmailPasswordText"; + this.EmailPasswordText.Size = new System.Drawing.Size(59, 12); + this.EmailPasswordText.TabIndex = 28; + this.EmailPasswordText.Text = "Password:"; + // // CatchPokemonText // this.CatchPokemonText.AutoSize = true; - this.CatchPokemonText.Location = new System.Drawing.Point(3, 298); + this.CatchPokemonText.Location = new System.Drawing.Point(3, 275); this.CatchPokemonText.Name = "CatchPokemonText"; - this.CatchPokemonText.Size = new System.Drawing.Size(86, 13); + this.CatchPokemonText.Size = new System.Drawing.Size(89, 12); this.CatchPokemonText.TabIndex = 25; this.CatchPokemonText.Text = "Catch Pokemon:"; this.CatchPokemonText.Click += new System.EventHandler(this.label7_Click); // + // EmailPasswordBox + // + this.EmailPasswordBox.Location = new System.Drawing.Point(85, 57); + this.EmailPasswordBox.Name = "EmailPasswordBox"; + this.EmailPasswordBox.Size = new System.Drawing.Size(136, 21); + this.EmailPasswordBox.TabIndex = 30; + // + // EmailLoginBox + // + this.EmailLoginBox.Location = new System.Drawing.Point(85, 30); + this.EmailLoginBox.Name = "EmailLoginBox"; + this.EmailLoginBox.Size = new System.Drawing.Size(136, 21); + this.EmailLoginBox.TabIndex = 29; + // // transferIVThresText // - this.transferIVThresText.Location = new System.Drawing.Point(104, 220); + this.transferIVThresText.Location = new System.Drawing.Point(121, 203); this.transferIVThresText.Name = "transferIVThresText"; - this.transferIVThresText.Size = new System.Drawing.Size(100, 20); + this.transferIVThresText.Size = new System.Drawing.Size(100, 21); this.transferIVThresText.TabIndex = 24; this.transferIVThresText.TextChanged += new System.EventHandler(this.textBox2_TextChanged); // // TravelSpeedText // this.TravelSpeedText.AutoSize = true; - this.TravelSpeedText.Location = new System.Drawing.Point(3, 275); + this.TravelSpeedText.Location = new System.Drawing.Point(3, 254); this.TravelSpeedText.Name = "TravelSpeedText"; - this.TravelSpeedText.Size = new System.Drawing.Size(102, 13); + this.TravelSpeedText.Size = new System.Drawing.Size(113, 12); this.TravelSpeedText.TabIndex = 23; this.TravelSpeedText.Text = "Travel Speed km/h:"; // // TravelSpeedBox // - this.TravelSpeedBox.Location = new System.Drawing.Point(104, 272); + this.TravelSpeedBox.Location = new System.Drawing.Point(121, 251); this.TravelSpeedBox.Name = "TravelSpeedBox"; - this.TravelSpeedBox.Size = new System.Drawing.Size(100, 20); + this.TravelSpeedBox.Size = new System.Drawing.Size(100, 21); this.TravelSpeedBox.TabIndex = 22; this.TravelSpeedBox.TextChanged += new System.EventHandler(this.textBox1_TextChanged); // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 220); + this.label6.Location = new System.Drawing.Point(3, 203); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(70, 13); + this.label6.Size = new System.Drawing.Size(83, 12); this.label6.TabIndex = 21; this.label6.Text = "IV Threshold:"; this.label6.Click += new System.EventHandler(this.label6_Click); // - // EmailLoginText - // - this.EmailLoginText.AutoSize = true; - this.EmailLoginText.Location = new System.Drawing.Point(3, 36); - this.EmailLoginText.Name = "EmailLoginText"; - this.EmailLoginText.Size = new System.Drawing.Size(35, 13); - this.EmailLoginText.TabIndex = 27; - this.EmailLoginText.Text = "Email:"; - // - // EmailPasswordText - // - this.EmailPasswordText.AutoSize = true; - this.EmailPasswordText.Location = new System.Drawing.Point(3, 62); - this.EmailPasswordText.Name = "EmailPasswordText"; - this.EmailPasswordText.Size = new System.Drawing.Size(56, 13); - this.EmailPasswordText.TabIndex = 28; - this.EmailPasswordText.Text = "Password:"; - // - // EmailLoginBox - // - this.EmailLoginBox.Location = new System.Drawing.Point(68, 33); - this.EmailLoginBox.Name = "EmailLoginBox"; - this.EmailLoginBox.Size = new System.Drawing.Size(136, 20); - this.EmailLoginBox.TabIndex = 29; - // - // EmailPasswordBox - // - this.EmailPasswordBox.Location = new System.Drawing.Point(68, 62); - this.EmailPasswordBox.Name = "EmailPasswordBox"; - this.EmailPasswordBox.Size = new System.Drawing.Size(136, 20); - this.EmailPasswordBox.TabIndex = 30; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(3, 249); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(100, 13); - this.label7.TabIndex = 32; - this.label7.Text = "PokeUi Image Size:"; - // - // ImageSizeBox - // - this.ImageSizeBox.Location = new System.Drawing.Point(104, 246); - this.ImageSizeBox.Name = "ImageSizeBox"; - this.ImageSizeBox.Size = new System.Drawing.Size(100, 20); - this.ImageSizeBox.TabIndex = 31; - // // SettingsForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(704, 460); + this.ClientSize = new System.Drawing.Size(704, 425); this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(630, 360); + this.MinimumSize = new System.Drawing.Size(630, 335); this.Name = "SettingsForm"; - this.Padding = new System.Windows.Forms.Padding(9); + this.Padding = new System.Windows.Forms.Padding(9, 8, 9, 8); this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Settings";