diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
index 6926060..b006b0c 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
+++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
@@ -48,19 +48,19 @@
this.pkmnDefIV = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.pkmnStaIV = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.pkmnIV = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
+ this.pkmnCandy = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
+ this.pkmnCandyToEvolve = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
+ this.pkmnEvolveTimes = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.pkmnTransferButton = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.pkmnPowerUpButton = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.pkmnEvolveButton = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
+ this.cmsPokemonList = new System.Windows.Forms.ContextMenuStrip(this.components);
this.largePokemonImageList = new System.Windows.Forms.ImageList(this.components);
this.smallPokemonImageList = new System.Windows.Forms.ImageList(this.components);
this.btnRefresh = new System.Windows.Forms.Button();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.lblPokemonList = new System.Windows.Forms.Label();
- this.pkmnCandy = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
- this.pkmnCandyToEvolve = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
- this.pkmnEvolveTimes = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
- this.cmsPokemonList = new System.Windows.Forms.ContextMenuStrip(this.components);
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.olvPokemonList)).BeginInit();
@@ -85,7 +85,7 @@
this.logTextBox.Location = new System.Drawing.Point(0, 0);
this.logTextBox.Name = "logTextBox";
this.logTextBox.ReadOnly = true;
- this.logTextBox.Size = new System.Drawing.Size(422, 294);
+ this.logTextBox.Size = new System.Drawing.Size(554, 268);
this.logTextBox.TabIndex = 0;
this.logTextBox.Text = "";
this.logTextBox.TextChanged += new System.EventHandler(this.logTextBox_TextChanged);
@@ -95,7 +95,7 @@
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.statusLabel});
- this.statusStrip1.Location = new System.Drawing.Point(0, 541);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 498);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1254, 22);
this.statusStrip1.TabIndex = 1;
@@ -104,7 +104,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
@@ -117,35 +117,35 @@
this.forceUnbanToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(1254, 24);
+ this.menuStrip1.Size = new System.Drawing.Size(1254, 25);
this.menuStrip1.TabIndex = 2;
this.menuStrip1.Text = "menuStrip1";
//
// startStopBotToolStripMenuItem
//
this.startStopBotToolStripMenuItem.Name = "startStopBotToolStripMenuItem";
- this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(77, 20);
+ this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(85, 21);
this.startStopBotToolStripMenuItem.Text = "▶ Start Bot";
this.startStopBotToolStripMenuItem.Click += new System.EventHandler(this.startStopBotToolStripMenuItem_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);
//
// 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);
//
@@ -183,7 +183,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(416, 216);
+ this.gMapControl1.Size = new System.Drawing.Size(548, 195);
this.gMapControl1.TabIndex = 23;
this.gMapControl1.Zoom = 0D;
//
@@ -228,7 +228,7 @@
this.olvPokemonList.Name = "olvPokemonList";
this.olvPokemonList.RowHeight = 32;
this.olvPokemonList.ShowGroups = false;
- this.olvPokemonList.Size = new System.Drawing.Size(822, 464);
+ this.olvPokemonList.Size = new System.Drawing.Size(690, 425);
this.olvPokemonList.SmallImageList = this.smallPokemonImageList;
this.olvPokemonList.TabIndex = 25;
this.olvPokemonList.UseCompatibleStateImageBehavior = false;
@@ -245,31 +245,50 @@
//
this.pkmnCP.AspectName = "Cp";
this.pkmnCP.Text = "CP";
- this.pkmnCP.Width = 50;
+ this.pkmnCP.Width = 40;
//
// pkmnAtkIV
//
this.pkmnAtkIV.AspectName = "IndividualAttack";
this.pkmnAtkIV.Text = "Atk IV";
- this.pkmnAtkIV.Width = 50;
+ this.pkmnAtkIV.Width = 45;
//
// pkmnDefIV
//
this.pkmnDefIV.AspectName = "IndividualDefense";
this.pkmnDefIV.Text = "Def IV";
- this.pkmnDefIV.Width = 50;
+ this.pkmnDefIV.Width = 45;
//
// pkmnStaIV
//
this.pkmnStaIV.AspectName = "IndividualStamina";
this.pkmnStaIV.Text = "Sta IV";
- this.pkmnStaIV.Width = 50;
+ this.pkmnStaIV.Width = 45;
//
// pkmnIV
//
this.pkmnIV.AspectName = "GetIV";
this.pkmnIV.AspectToStringFormat = "{0:P2}";
this.pkmnIV.Text = "IV %";
+ this.pkmnIV.Width = 51;
+ //
+ // pkmnCandy
+ //
+ this.pkmnCandy.AspectName = "Candy";
+ this.pkmnCandy.Text = "Candy";
+ this.pkmnCandy.Width = 46;
+ //
+ // pkmnCandyToEvolve
+ //
+ this.pkmnCandyToEvolve.AspectName = "CandyToEvolve";
+ this.pkmnCandyToEvolve.Text = "CtE";
+ this.pkmnCandyToEvolve.Width = 31;
+ //
+ // pkmnEvolveTimes
+ //
+ this.pkmnEvolveTimes.AspectName = "EvolveTimes";
+ this.pkmnEvolveTimes.Text = "# Evolves";
+ this.pkmnEvolveTimes.Width = 66;
//
// pkmnTransferButton
//
@@ -295,6 +314,12 @@
this.pkmnEvolveButton.IsButton = true;
this.pkmnEvolveButton.Text = "";
//
+ // cmsPokemonList
+ //
+ this.cmsPokemonList.Name = "cmsPokemonList";
+ this.cmsPokemonList.ShowImageMargin = false;
+ this.cmsPokemonList.Size = new System.Drawing.Size(36, 4);
+ //
// largePokemonImageList
//
this.largePokemonImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
@@ -313,9 +338,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.btnRefresh.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.btnRefresh.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnRefresh.Location = new System.Drawing.Point(3, 486);
+ this.btnRefresh.Location = new System.Drawing.Point(3, 445);
this.btnRefresh.Name = "btnRefresh";
- this.btnRefresh.Size = new System.Drawing.Size(822, 28);
+ this.btnRefresh.Size = new System.Drawing.Size(690, 26);
this.btnRefresh.TabIndex = 26;
this.btnRefresh.Text = "Refresh";
this.btnRefresh.UseVisualStyleBackColor = true;
@@ -324,7 +349,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 24);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 25);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -336,8 +361,8 @@
this.splitContainer1.Panel2.Controls.Add(this.lblPokemonList);
this.splitContainer1.Panel2.Controls.Add(this.olvPokemonList);
this.splitContainer1.Panel2.Controls.Add(this.btnRefresh);
- this.splitContainer1.Size = new System.Drawing.Size(1254, 517);
- this.splitContainer1.SplitterDistance = 422;
+ this.splitContainer1.Size = new System.Drawing.Size(1254, 473);
+ this.splitContainer1.SplitterDistance = 554;
this.splitContainer1.TabIndex = 27;
//
// splitContainer2
@@ -354,8 +379,8 @@
// splitContainer2.Panel2
//
this.splitContainer2.Panel2.Controls.Add(this.gMapControl1);
- this.splitContainer2.Size = new System.Drawing.Size(422, 517);
- this.splitContainer2.SplitterDistance = 294;
+ this.splitContainer2.Size = new System.Drawing.Size(554, 473);
+ this.splitContainer2.SplitterDistance = 268;
this.splitContainer2.TabIndex = 0;
//
// lblPokemonList
@@ -363,40 +388,18 @@
this.lblPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblPokemonList.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblPokemonList.Location = new System.Drawing.Point(3, 470);
+ this.lblPokemonList.Location = new System.Drawing.Point(3, 431);
this.lblPokemonList.Name = "lblPokemonList";
- this.lblPokemonList.Size = new System.Drawing.Size(822, 13);
+ this.lblPokemonList.Size = new System.Drawing.Size(690, 11);
this.lblPokemonList.TabIndex = 27;
this.lblPokemonList.Text = "0 / 0";
this.lblPokemonList.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // pkmnCandy
- //
- this.pkmnCandy.AspectName = "Candy";
- this.pkmnCandy.Text = "Candy";
- //
- // pkmnCandyToEvolve
- //
- this.pkmnCandyToEvolve.AspectName = "CandyToEvolve";
- this.pkmnCandyToEvolve.Text = "CtE";
- //
- // pkmnEvolveTimes
- //
- this.pkmnEvolveTimes.AspectName = "EvolveTimes";
- this.pkmnEvolveTimes.Text = "# Evolves";
- this.pkmnEvolveTimes.Width = 70;
- //
- // cmsPokemonList
- //
- this.cmsPokemonList.Name = "cmsPokemonList";
- this.cmsPokemonList.ShowImageMargin = false;
- this.cmsPokemonList.Size = new System.Drawing.Size(36, 4);
- //
// 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(1254, 563);
+ this.ClientSize = new System.Drawing.Size(1254, 520);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.menuStrip1);
diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
index e95e991..a0275de 100644
--- a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
+++ b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
@@ -1,4 +1,5 @@
-namespace PokemonGo.RocketAPI.Window
+using System.Drawing;
+namespace PokemonGo.RocketAPI.Window
{
partial class SettingsForm
{
@@ -69,9 +70,9 @@
// authTypeLabel
//
this.authTypeLabel.AutoSize = true;
- this.authTypeLabel.Location = new System.Drawing.Point(3, 7);
+ this.authTypeLabel.Location = new System.Drawing.Point(3, 9);
this.authTypeLabel.Name = "authTypeLabel";
- this.authTypeLabel.Size = new System.Drawing.Size(71, 12);
+ this.authTypeLabel.Size = new System.Drawing.Size(70, 15);
this.authTypeLabel.TabIndex = 0;
this.authTypeLabel.Text = "Login Type:";
this.authTypeLabel.Click += new System.EventHandler(this.authTypeLabel_Click);
@@ -82,72 +83,73 @@
this.authTypeCb.Items.AddRange(new object[] {
"google",
"Ptc"});
- this.authTypeCb.Location = new System.Drawing.Point(82, 4);
+ this.authTypeCb.Location = new System.Drawing.Point(96, 5);
+ this.authTypeCb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.authTypeCb.Name = "authTypeCb";
- this.authTypeCb.Size = new System.Drawing.Size(136, 20);
+ this.authTypeCb.Size = new System.Drawing.Size(158, 23);
this.authTypeCb.TabIndex = 1;
this.authTypeCb.SelectedIndexChanged += new System.EventHandler(this.authTypeCb_SelectedIndexChanged);
//
// UserLabel
//
this.UserLabel.AutoSize = true;
- this.UserLabel.Location = new System.Drawing.Point(3, 33);
+ this.UserLabel.Location = new System.Drawing.Point(3, 41);
this.UserLabel.Name = "UserLabel";
- this.UserLabel.Size = new System.Drawing.Size(59, 12);
+ this.UserLabel.Size = new System.Drawing.Size(68, 15);
this.UserLabel.TabIndex = 2;
this.UserLabel.Text = "Username:";
//
// PasswordLabel
//
this.PasswordLabel.AutoSize = true;
- this.PasswordLabel.Location = new System.Drawing.Point(3, 57);
+ this.PasswordLabel.Location = new System.Drawing.Point(3, 71);
this.PasswordLabel.Name = "PasswordLabel";
- this.PasswordLabel.Size = new System.Drawing.Size(59, 12);
+ this.PasswordLabel.Size = new System.Drawing.Size(64, 15);
this.PasswordLabel.TabIndex = 3;
this.PasswordLabel.Text = "Password:";
//
// latLabel
//
this.latLabel.AutoSize = true;
- this.latLabel.Location = new System.Drawing.Point(3, 81);
+ this.latLabel.Location = new System.Drawing.Point(3, 101);
this.latLabel.Name = "latLabel";
- this.latLabel.Size = new System.Drawing.Size(59, 12);
+ this.latLabel.Size = new System.Drawing.Size(54, 15);
this.latLabel.TabIndex = 4;
this.latLabel.Text = "Latitude:";
//
// longiLabel
//
this.longiLabel.AutoSize = true;
- this.longiLabel.Location = new System.Drawing.Point(3, 105);
+ this.longiLabel.Location = new System.Drawing.Point(3, 131);
this.longiLabel.Name = "longiLabel";
- this.longiLabel.Size = new System.Drawing.Size(65, 12);
+ this.longiLabel.Size = new System.Drawing.Size(65, 15);
this.longiLabel.TabIndex = 5;
this.longiLabel.Text = "Longitude:";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(3, 129);
+ this.label1.Location = new System.Drawing.Point(3, 161);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(95, 12);
+ this.label1.Size = new System.Drawing.Size(100, 15);
this.label1.TabIndex = 6;
this.label1.Text = "Razzberry Mode:";
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(3, 178);
+ this.label2.Location = new System.Drawing.Point(3, 222);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(89, 12);
+ this.label2.Size = new System.Drawing.Size(84, 15);
this.label2.TabIndex = 7;
this.label2.Text = "Transfer Type:";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(3, 296);
+ this.label3.Location = new System.Drawing.Point(3, 370);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(95, 12);
+ this.label3.Size = new System.Drawing.Size(101, 15);
this.label3.TabIndex = 8;
this.label3.Text = "Evolve Pokemon:";
this.label3.Click += new System.EventHandler(this.label3_Click);
@@ -155,49 +157,53 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(3, 203);
+ this.label4.Location = new System.Drawing.Point(3, 254);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(83, 12);
+ this.label4.Size = new System.Drawing.Size(84, 15);
this.label4.TabIndex = 9;
this.label4.Text = "CP Threshold:";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(3, 154);
+ this.label5.Location = new System.Drawing.Point(3, 192);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(113, 12);
+ this.label5.Size = new System.Drawing.Size(106, 15);
this.label5.TabIndex = 10;
this.label5.Text = "Razzberry Setting:";
//
// UserLoginBox
//
- this.UserLoginBox.Location = new System.Drawing.Point(82, 31);
+ this.UserLoginBox.Location = new System.Drawing.Point(96, 39);
+ this.UserLoginBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.UserLoginBox.Name = "UserLoginBox";
- this.UserLoginBox.Size = new System.Drawing.Size(136, 21);
+ this.UserLoginBox.Size = new System.Drawing.Size(158, 21);
this.UserLoginBox.TabIndex = 11;
//
// UserPasswordBox
//
- this.UserPasswordBox.Location = new System.Drawing.Point(82, 57);
+ this.UserPasswordBox.Location = new System.Drawing.Point(96, 71);
+ this.UserPasswordBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.UserPasswordBox.Name = "UserPasswordBox";
- this.UserPasswordBox.Size = new System.Drawing.Size(136, 21);
+ this.UserPasswordBox.Size = new System.Drawing.Size(158, 21);
this.UserPasswordBox.TabIndex = 12;
//
// latitudeText
//
- this.latitudeText.Location = new System.Drawing.Point(118, 79);
+ this.latitudeText.Location = new System.Drawing.Point(138, 99);
+ this.latitudeText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.latitudeText.Name = "latitudeText";
this.latitudeText.ReadOnly = true;
- this.latitudeText.Size = new System.Drawing.Size(100, 21);
+ this.latitudeText.Size = new System.Drawing.Size(116, 21);
this.latitudeText.TabIndex = 13;
//
// longitudeText
//
- this.longitudeText.Location = new System.Drawing.Point(118, 103);
+ this.longitudeText.Location = new System.Drawing.Point(138, 129);
+ this.longitudeText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.longitudeText.Name = "longitudeText";
this.longitudeText.ReadOnly = true;
- this.longitudeText.Size = new System.Drawing.Size(100, 21);
+ this.longitudeText.Size = new System.Drawing.Size(116, 21);
this.longitudeText.TabIndex = 14;
//
// razzmodeCb
@@ -206,16 +212,18 @@
this.razzmodeCb.Items.AddRange(new object[] {
"probability",
"cp"});
- this.razzmodeCb.Location = new System.Drawing.Point(118, 127);
+ this.razzmodeCb.Location = new System.Drawing.Point(138, 159);
+ this.razzmodeCb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.razzmodeCb.Name = "razzmodeCb";
- this.razzmodeCb.Size = new System.Drawing.Size(100, 20);
+ this.razzmodeCb.Size = new System.Drawing.Size(116, 23);
this.razzmodeCb.TabIndex = 15;
//
// razzSettingText
//
- this.razzSettingText.Location = new System.Drawing.Point(118, 152);
+ this.razzSettingText.Location = new System.Drawing.Point(138, 190);
+ this.razzSettingText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.razzSettingText.Name = "razzSettingText";
- this.razzSettingText.Size = new System.Drawing.Size(100, 21);
+ this.razzSettingText.Size = new System.Drawing.Size(116, 21);
this.razzSettingText.TabIndex = 16;
this.razzSettingText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.razzSettingText_KeyPress);
//
@@ -230,24 +238,27 @@
"Duplicate",
"IV Duplicate",
"All"});
- this.transferTypeCb.Location = new System.Drawing.Point(118, 176);
+ this.transferTypeCb.Location = new System.Drawing.Point(138, 220);
+ this.transferTypeCb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.transferTypeCb.Name = "transferTypeCb";
- this.transferTypeCb.Size = new System.Drawing.Size(100, 20);
+ this.transferTypeCb.Size = new System.Drawing.Size(116, 23);
this.transferTypeCb.TabIndex = 17;
this.transferTypeCb.SelectedIndexChanged += new System.EventHandler(this.transferTypeCb_SelectedIndexChanged);
//
// transferCpThresText
//
- this.transferCpThresText.Location = new System.Drawing.Point(118, 202);
+ this.transferCpThresText.Location = new System.Drawing.Point(138, 252);
+ this.transferCpThresText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.transferCpThresText.Name = "transferCpThresText";
- this.transferCpThresText.Size = new System.Drawing.Size(100, 21);
+ this.transferCpThresText.Size = new System.Drawing.Size(116, 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(118, 296);
+ this.evolveAllChk.Location = new System.Drawing.Point(138, 370);
+ this.evolveAllChk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.evolveAllChk.Name = "evolveAllChk";
this.evolveAllChk.Size = new System.Drawing.Size(15, 14);
this.evolveAllChk.TabIndex = 19;
@@ -258,9 +269,10 @@
//
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, 315);
+ this.saveBtn.Location = new System.Drawing.Point(0, 394);
+ this.saveBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.saveBtn.Name = "saveBtn";
- this.saveBtn.Size = new System.Drawing.Size(218, 88);
+ this.saveBtn.Size = new System.Drawing.Size(254, 110);
this.saveBtn.TabIndex = 20;
this.saveBtn.Text = "Save";
this.saveBtn.UseVisualStyleBackColor = true;
@@ -275,7 +287,8 @@
this.gMapControl1.GrayScaleMode = false;
this.gMapControl1.HelperLineOption = GMap.NET.WindowsForms.HelperLineOptions.DontShow;
this.gMapControl1.LevelsKeepInMemmory = 5;
- this.gMapControl1.Location = new System.Drawing.Point(18, 15);
+ this.gMapControl1.Location = new System.Drawing.Point(21, 19);
+ this.gMapControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gMapControl1.MarkersEnabled = true;
this.gMapControl1.MaxZoom = 2;
this.gMapControl1.MinZoom = 2;
@@ -288,7 +301,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, 358);
+ this.gMapControl1.Size = new System.Drawing.Size(546, 448);
this.gMapControl1.TabIndex = 22;
this.gMapControl1.Zoom = 0D;
this.gMapControl1.Load += new System.EventHandler(this.gMapControl1_Load);
@@ -301,9 +314,11 @@
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(233, 8);
+ this.groupBox1.Location = new System.Drawing.Point(271, 10);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(480, 408);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.groupBox1.Size = new System.Drawing.Size(561, 510);
this.groupBox1.TabIndex = 25;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Location";
@@ -312,9 +327,10 @@
//
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(355, 379);
+ this.FindAdressButton.Location = new System.Drawing.Point(414, 474);
+ this.FindAdressButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.FindAdressButton.Name = "FindAdressButton";
- this.FindAdressButton.Size = new System.Drawing.Size(119, 24);
+ this.FindAdressButton.Size = new System.Drawing.Size(140, 30);
this.FindAdressButton.TabIndex = 25;
this.FindAdressButton.Text = "Find Location";
this.FindAdressButton.UseVisualStyleBackColor = true;
@@ -323,9 +339,10 @@
// AdressBox
//
this.AdressBox.ForeColor = System.Drawing.Color.Gray;
- this.AdressBox.Location = new System.Drawing.Point(18, 379);
+ this.AdressBox.Location = new System.Drawing.Point(21, 474);
+ this.AdressBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.AdressBox.Name = "AdressBox";
- this.AdressBox.Size = new System.Drawing.Size(331, 21);
+ this.AdressBox.Size = new System.Drawing.Size(385, 21);
this.AdressBox.TabIndex = 25;
this.AdressBox.Text = "Enter an address or a coordinate";
this.AdressBox.Enter += new System.EventHandler(this.AdressBox_Enter);
@@ -335,10 +352,11 @@
//
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(432, 15);
+ this.trackBar.Location = new System.Drawing.Point(505, 19);
+ this.trackBar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.trackBar.Name = "trackBar";
this.trackBar.Orientation = System.Windows.Forms.Orientation.Vertical;
- this.trackBar.Size = new System.Drawing.Size(45, 96);
+ this.trackBar.Size = new System.Drawing.Size(45, 120);
this.trackBar.TabIndex = 25;
this.trackBar.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.trackBar.Scroll += new System.EventHandler(this.trackBar_Scroll);
@@ -373,17 +391,19 @@
this.panel1.Controls.Add(this.UserLoginBox);
this.panel1.Controls.Add(this.UserPasswordBox);
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(9, 8);
+ this.panel1.Location = new System.Drawing.Point(10, 10);
+ this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(224, 408);
+ this.panel1.Size = new System.Drawing.Size(261, 510);
this.panel1.TabIndex = 26;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
// TravelSpeedBox
//
- this.TravelSpeedBox.Location = new System.Drawing.Point(118, 251);
+ this.TravelSpeedBox.Location = new System.Drawing.Point(138, 314);
+ this.TravelSpeedBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.TravelSpeedBox.Name = "TravelSpeedBox";
- this.TravelSpeedBox.Size = new System.Drawing.Size(100, 21);
+ this.TravelSpeedBox.Size = new System.Drawing.Size(116, 21);
this.TravelSpeedBox.TabIndex = 22;
this.TravelSpeedBox.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
this.TravelSpeedBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TravelSpeedBox_KeyPress);
@@ -391,7 +411,8 @@
// CatchPokemonBox
//
this.CatchPokemonBox.AutoSize = true;
- this.CatchPokemonBox.Location = new System.Drawing.Point(118, 275);
+ this.CatchPokemonBox.Location = new System.Drawing.Point(138, 344);
+ this.CatchPokemonBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.CatchPokemonBox.Name = "CatchPokemonBox";
this.CatchPokemonBox.Size = new System.Drawing.Size(15, 14);
this.CatchPokemonBox.TabIndex = 26;
@@ -401,51 +422,54 @@
// CatchPokemonText
//
this.CatchPokemonText.AutoSize = true;
- this.CatchPokemonText.Location = new System.Drawing.Point(3, 275);
+ this.CatchPokemonText.Location = new System.Drawing.Point(3, 344);
this.CatchPokemonText.Name = "CatchPokemonText";
- this.CatchPokemonText.Size = new System.Drawing.Size(89, 12);
+ this.CatchPokemonText.Size = new System.Drawing.Size(97, 15);
this.CatchPokemonText.TabIndex = 25;
this.CatchPokemonText.Text = "Catch Pokemon:";
this.CatchPokemonText.Click += new System.EventHandler(this.label7_Click);
//
// transferIVThresText
//
- this.transferIVThresText.Location = new System.Drawing.Point(118, 203);
+ this.transferIVThresText.Location = new System.Drawing.Point(138, 254);
+ this.transferIVThresText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.transferIVThresText.Name = "transferIVThresText";
- this.transferIVThresText.Size = new System.Drawing.Size(100, 21);
+ this.transferIVThresText.Size = new System.Drawing.Size(116, 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, 254);
+ this.TravelSpeedText.Location = new System.Drawing.Point(3, 318);
this.TravelSpeedText.Name = "TravelSpeedText";
- this.TravelSpeedText.Size = new System.Drawing.Size(113, 12);
+ this.TravelSpeedText.Size = new System.Drawing.Size(112, 15);
this.TravelSpeedText.TabIndex = 23;
this.TravelSpeedText.Text = "Travel Speed km/h:";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(3, 203);
+ this.label6.Location = new System.Drawing.Point(3, 254);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(83, 12);
+ this.label6.Size = new System.Drawing.Size(78, 15);
this.label6.TabIndex = 21;
this.label6.Text = "IV Threshold:";
this.label6.Click += new System.EventHandler(this.label6_Click);
//
// SettingsForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(722, 424);
+ this.ClientSize = new System.Drawing.Size(842, 530);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.panel1);
+ this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(630, 334);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.MinimumSize = new System.Drawing.Size(732, 408);
this.Name = "SettingsForm";
- this.Padding = new System.Windows.Forms.Padding(9, 8, 9, 8);
+ this.Padding = new System.Windows.Forms.Padding(10, 10, 10, 10);
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Settings";