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/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;
}
}