diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs index 0152bda..a41b76d 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs @@ -34,13 +34,13 @@ this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.startBotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.todoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pokemonToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.useLuckyEggToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forceUnbanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showAllToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -51,8 +51,10 @@ this.logTextBox.Dock = System.Windows.Forms.DockStyle.Fill; 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.Name = "logTextBox"; + this.logTextBox.ReadOnly = true; this.logTextBox.Size = new System.Drawing.Size(905, 471); this.logTextBox.TabIndex = 0; this.logTextBox.Text = ""; @@ -96,6 +98,13 @@ this.startBotToolStripMenuItem.Text = "Start Bot"; this.startBotToolStripMenuItem.Click += new System.EventHandler(this.startBotToolStripMenuItem_Click); // + // mapToolStripMenuItem + // + this.mapToolStripMenuItem.Name = "mapToolStripMenuItem"; + this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20); + this.mapToolStripMenuItem.Text = "Map"; + this.mapToolStripMenuItem.Click += new System.EventHandler(this.mapToolStripMenuItem_Click); + // // todoToolStripMenuItem // this.todoToolStripMenuItem.Name = "todoToolStripMenuItem"; @@ -134,13 +143,6 @@ this.showAllToolStripMenuItem1.Name = "showAllToolStripMenuItem1"; this.showAllToolStripMenuItem1.Size = new System.Drawing.Size(32, 19); // - // mapToolStripMenuItem - // - this.mapToolStripMenuItem.Name = "mapToolStripMenuItem"; - this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20); - this.mapToolStripMenuItem.Text = "Map"; - this.mapToolStripMenuItem.Click += new System.EventHandler(this.mapToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -180,4 +182,3 @@ private System.Windows.Forms.ToolStripMenuItem mapToolStripMenuItem; } } - diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs index 5dba969..5d5f26d 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.cs @@ -96,6 +96,9 @@ namespace PokemonGo.RocketAPI.Window Invoke(new Action<Color, string>(ColoredConsoleWrite), color, text); return; } + + logTextBox.Select(logTextBox.Text.Length, 1); // Reset cursor to last + string textToAppend = "[" + DateTime.Now.ToString("HH:mm:ss tt") + "] " + text + "\r\n"; logTextBox.SelectionColor = color; logTextBox.AppendText(textToAppend); diff --git a/PokemonGo/RocketAPI/Window/MapForm.cs b/PokemonGo/RocketAPI/Window/MapForm.cs index 0a43592..595a80b 100644 --- a/PokemonGo/RocketAPI/Window/MapForm.cs +++ b/PokemonGo/RocketAPI/Window/MapForm.cs @@ -39,7 +39,7 @@ namespace PokemonGo.RocketAPI.Window gMapControl1.MaxZoom = trackBar.Maximum = 20; // Set zoom - trackBar.Value = 10; + trackBar.Value = 17; gMapControl1.Zoom = trackBar.Value; } diff --git a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs index e8735a2..3402d68 100644 --- a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs +++ b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyVersion("1.7.0.1")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs index 07e02a7..0501dce 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs @@ -61,6 +61,10 @@ 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.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit(); this.panel1.SuspendLayout(); @@ -172,16 +176,16 @@ // // ptcUserText // - this.ptcUserText.Location = new System.Drawing.Point(104, 33); + this.ptcUserText.Location = new System.Drawing.Point(68, 33); this.ptcUserText.Name = "ptcUserText"; - this.ptcUserText.Size = new System.Drawing.Size(100, 20); + this.ptcUserText.Size = new System.Drawing.Size(136, 20); this.ptcUserText.TabIndex = 11; // // ptcPassText // - this.ptcPassText.Location = new System.Drawing.Point(104, 59); + this.ptcPassText.Location = new System.Drawing.Point(68, 62); this.ptcPassText.Name = "ptcPassText"; - this.ptcPassText.Size = new System.Drawing.Size(100, 20); + this.ptcPassText.Size = new System.Drawing.Size(136, 20); this.ptcPassText.TabIndex = 12; // // latitudeText @@ -257,7 +261,7 @@ // 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(6, 337); + this.saveBtn.Location = new System.Drawing.Point(0, 341); this.saveBtn.Name = "saveBtn"; this.saveBtn.Size = new System.Drawing.Size(198, 95); this.saveBtn.TabIndex = 20; @@ -340,8 +344,12 @@ // // panel1 // + this.panel1.Controls.Add(this.EmailLoginText); this.panel1.Controls.Add(this.CatchPokemonBox); + this.panel1.Controls.Add(this.EmailPasswordText); this.panel1.Controls.Add(this.CatchPokemonText); + this.panel1.Controls.Add(this.EmailPasswordBox); + this.panel1.Controls.Add(this.EmailLoginBox); this.panel1.Controls.Add(this.transferIVThresText); this.panel1.Controls.Add(this.TravelSpeedText); this.panel1.Controls.Add(this.TravelSpeedBox); @@ -429,6 +437,38 @@ 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; + // // SettingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -489,5 +529,9 @@ private System.Windows.Forms.Button FindAdressButton; private System.Windows.Forms.CheckBox CatchPokemonBox; private System.Windows.Forms.Label CatchPokemonText; + private System.Windows.Forms.Label EmailLoginText; + private System.Windows.Forms.Label EmailPasswordText; + private System.Windows.Forms.TextBox EmailLoginBox; + private System.Windows.Forms.TextBox EmailPasswordBox; } } diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.cs b/PokemonGo/RocketAPI/Window/SettingsForm.cs index f086ec7..70bc0f8 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.cs @@ -23,16 +23,10 @@ namespace PokemonGo.RocketAPI.Window private void SettingsForm_Load(object sender, EventArgs e) { authTypeCb.Text = Settings.Instance.AuthType.ToString(); - if (authTypeCb.Text == "google") - { - ptcUserText.Text = Settings.Instance.Email; - ptcPassText.Text = Settings.Instance.Password; - } - else - { - ptcUserText.Text = Settings.Instance.PtcUsername; - ptcPassText.Text = Settings.Instance.PtcPassword; - } + ptcUserText.Text = Settings.Instance.PtcUsername.ToString(); + ptcPassText.Text = Settings.Instance.PtcPassword.ToString(); + EmailLoginBox.Text = Settings.Instance.Email.ToString(); + EmailPasswordBox.Text = Settings.Instance.Password.ToString(); latitudeText.Text = Settings.Instance.DefaultLatitude.ToString(); longitudeText.Text = Settings.Instance.DefaultLongitude.ToString(); razzmodeCb.Text = Settings.Instance.RazzBerryMode; @@ -74,16 +68,10 @@ namespace PokemonGo.RocketAPI.Window private void saveBtn_Click(object sender, EventArgs e) { Settings.Instance.SetSetting(authTypeCb.Text, "AuthType"); - if (authTypeCb.Text == "google") - { - Settings.Instance.SetSetting(ptcUserText.Text, "Email"); - Settings.Instance.SetSetting(ptcPassText.Text, "Password"); - } - else - { + Settings.Instance.SetSetting(EmailLoginBox.Text, "Email"); + Settings.Instance.SetSetting(EmailPasswordBox.Text, "Password"); Settings.Instance.SetSetting(ptcUserText.Text, "PtcUsername"); Settings.Instance.SetSetting(ptcPassText.Text, "PtcPassword"); - } Settings.Instance.SetSetting(latitudeText.Text.Replace(',', '.'), "DefaultLatitude"); Settings.Instance.SetSetting(longitudeText.Text.Replace(',', '.'), "DefaultLongitude"); @@ -109,12 +97,25 @@ namespace PokemonGo.RocketAPI.Window { if (authTypeCb.Text == "google") { - ptcUserLabel.Text = "Email:"; + EmailLoginBox.Visible = true; + EmailLoginText.Visible = true; + EmailPasswordBox.Visible = true; + EmailPasswordText.Visible = true; + ptcUserText.Visible = false; + ptcPassText.Visible = false; + ptcUserLabel.Visible = false; + ptcPasswordLabel.Visible = false; } else { - ptcUserLabel.Text = "Username:"; - + EmailLoginBox.Visible = false; + EmailLoginText.Visible = false; + EmailPasswordBox.Visible = false; + EmailPasswordText.Visible = false; + ptcUserText.Visible = true; + ptcPassText.Visible = true; + ptcUserLabel.Visible = true; + ptcPasswordLabel.Visible = true; } }