Merge pull request #109 from Elfocrash/master
Merge pull request #109 from Elfocrash/master
Added status strip to display current info
diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
index 0842a56..fc3241d 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
+++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs
@@ -32,6 +32,8 @@
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.todoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+ this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
@@ -41,14 +43,16 @@
this.logTextBox.ForeColor = System.Drawing.Color.White;
this.logTextBox.Location = new System.Drawing.Point(12, 27);
this.logTextBox.Name = "logTextBox";
- this.logTextBox.Size = new System.Drawing.Size(659, 225);
+ this.logTextBox.Size = new System.Drawing.Size(659, 276);
this.logTextBox.TabIndex = 0;
this.logTextBox.Text = "";
this.logTextBox.TextChanged += new System.EventHandler(this.logTextBox_TextChanged);
//
// statusStrip1
//
- this.statusStrip1.Location = new System.Drawing.Point(0, 255);
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.statusLabel});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 306);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(683, 22);
this.statusStrip1.TabIndex = 1;
@@ -70,11 +74,17 @@
this.todoToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
this.todoToolStripMenuItem.Text = "Todo";
//
+ // statusLabel
+ //
+ this.statusLabel.Name = "statusLabel";
+ this.statusLabel.Size = new System.Drawing.Size(39, 17);
+ this.statusLabel.Text = "Status";
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(683, 277);
+ this.ClientSize = new System.Drawing.Size(683, 328);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.logTextBox);
@@ -82,6 +92,8 @@
this.Name = "MainForm";
this.Text = "PokemonGo Rocket API";
this.Load += new System.EventHandler(this.MainForm_Load);
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
@@ -95,6 +107,7 @@
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem todoToolStripMenuItem;
+ private System.Windows.Forms.ToolStripStatusLabel statusLabel;
}
}
diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs
index 505b9e5..7b73d9d 100644
--- a/PokemonGo/RocketAPI/Window/MainForm.cs
+++ b/PokemonGo/RocketAPI/Window/MainForm.cs
@@ -115,6 +115,17 @@ namespace PokemonGo.RocketAPI.Window
File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + @"\Logs.txt", "[" + DateTime.Now.ToString("HH:mm:ss tt") + "] " + text + "\n");
}
+ public void SetStatusText(string text)
+ {
+ if (InvokeRequired)
+ {
+ Invoke(new Action<string>(SetStatusText), text);
+ return;
+ }
+
+ statusLabel.Text = text;
+ }
+
private async Task EvolveAllGivenPokemons(Client client, IEnumerable<PokemonData> pokemonToEvolve)
{
foreach (var pokemon in pokemonToEvolve)
@@ -632,7 +643,7 @@ namespace PokemonGo.RocketAPI.Window
return (DateTime.Now - InitSessionDateTime).ToString(@"dd\.hh\:mm\:ss");
}
- public static async Task ConsoleLevelTitle(string Username, Client client)
+ public async Task ConsoleLevelTitle(string Username, Client client)
{
var inventory = await client.GetInventory();
var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).ToArray();
@@ -641,7 +652,7 @@ namespace PokemonGo.RocketAPI.Window
if (v != null)
{
int XpDiff = GetXpDiff(client, v.Level);
- System.Console.Title = string.Format(Username + " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, _getSessionRuntimeInTimeFormat(), (v.Experience - v.PrevLevelXp - XpDiff), (v.NextLevelXp - v.PrevLevelXp - XpDiff), profile.Profile.Currency.ToArray()[1].Amount) + " | XP/Hour: " + Math.Round(TotalExperience / GetRuntime()) + " | Pokemon/Hour: " + Math.Round(TotalPokemon / GetRuntime());
+ SetStatusText(string.Format(Username + " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, _getSessionRuntimeInTimeFormat(), (v.Experience - v.PrevLevelXp - XpDiff), (v.NextLevelXp - v.PrevLevelXp - XpDiff), profile.Profile.Currency.ToArray()[1].Amount) + " | XP/Hour: " + Math.Round(TotalExperience / GetRuntime()) + " | Pokemon/Hour: " + Math.Round(TotalPokemon / GetRuntime()));
}
await Task.Delay(1000);
ConsoleLevelTitle(Username, client);
You may download the files in Public Git.