diff --git a/General.txt b/General.txt index b24f68f..48d382b 100644 --- a/General.txt +++ b/General.txt @@ -5,12 +5,19 @@ }, "Release": { - "ReleaseName": "o", - "Version": "1.1", - "Link": "https://github.com/bladecoding/LoLNotes/releases/tag/1.1o" + "ReleaseName": "", + "Version": "1.2", + "Link": "https://github.com/SebastienGllmt/LoLNotes/releases/tag/1.2" }, "Changes": { + "1.2": + [ + "Fixed certificate issue so that LoLNotes works on the new season.", + "Now shows ranking for players", + "Now get more feedback about whether or not the process is injected", + "No longer unloads enemy team at the end of the game", + ], "1.1o": [ "Fixed unicode broadcast messages breaking lolnotes.", diff --git a/LoLNotes/Content/Certificates/NA_prod.na1.lol.riotgames.com.p12 b/LoLNotes/Content/Certificates/NA_prod.na1.lol.riotgames.com.p12 deleted file mode 100644 index 89ec32e..0000000 Binary files a/LoLNotes/Content/Certificates/NA_prod.na1.lol.riotgames.com.p12 and /dev/null differ diff --git a/LoLNotes/Content/Certificates/NA_prod.na2.lol.riotgames.com.p12 b/LoLNotes/Content/Certificates/NA_prod.na2.lol.riotgames.com.p12 new file mode 100644 index 0000000..522ecce Binary files /dev/null and b/LoLNotes/Content/Certificates/NA_prod.na2.lol.riotgames.com.p12 differ diff --git a/LoLNotes/Gui/Controls/PlayerControl.Designer.cs b/LoLNotes/Gui/Controls/PlayerControl.Designer.cs index 5df6738..34ff519 100644 --- a/LoLNotes/Gui/Controls/PlayerControl.Designer.cs +++ b/LoLNotes/Gui/Controls/PlayerControl.Designer.cs @@ -1,37 +1,38 @@ namespace LoLNotes.Gui.Controls { - partial class PlayerControl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class PlayerControl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Component Designer generated code + #region Component Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlayerControl)); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); this.LevelLabel = new System.Windows.Forms.Label(); + this.RankingLabel = new System.Windows.Forms.Label(); this.LoadingPicture = new System.Windows.Forms.PictureBox(); this.InfoTabs = new System.Windows.Forms.TabControl(); this.TeamLabel = new System.Windows.Forms.Label(); @@ -44,12 +45,22 @@ private void InitializeComponent() // this.LevelLabel.AutoSize = true; this.LevelLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LevelLabel.Location = new System.Drawing.Point(10, 89); + this.LevelLabel.Location = new System.Drawing.Point(10, 74); this.LevelLabel.Name = "LevelLabel"; this.LevelLabel.Size = new System.Drawing.Size(46, 13); this.LevelLabel.TabIndex = 2; this.LevelLabel.Text = "Level: "; // + // RankingLabel + // + this.RankingLabel.AutoSize = true; + this.RankingLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RankingLabel.Location = new System.Drawing.Point(10, 89); + this.RankingLabel.Name = "RankingLabel"; + this.RankingLabel.Size = new System.Drawing.Size(62, 13); + this.RankingLabel.TabIndex = 2; + this.RankingLabel.Text = "Ranking: "; + // // LoadingPicture // this.LoadingPicture.Image = ((System.Drawing.Image)(resources.GetObject("LoadingPicture.Image"))); @@ -62,8 +73,8 @@ private void InitializeComponent() // // InfoTabs // - this.InfoTabs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.InfoTabs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.InfoTabs.ItemSize = new System.Drawing.Size(0, 15); this.InfoTabs.Location = new System.Drawing.Point(160, 6); this.InfoTabs.Multiline = true; @@ -76,7 +87,7 @@ private void InitializeComponent() // this.TeamLabel.AutoSize = true; this.TeamLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TeamLabel.Location = new System.Drawing.Point(10, 74); + this.TeamLabel.Location = new System.Drawing.Point(10, 60); this.TeamLabel.Name = "TeamLabel"; this.TeamLabel.Size = new System.Drawing.Size(32, 13); this.TeamLabel.TabIndex = 4; @@ -115,22 +126,24 @@ private void InitializeComponent() this.Controls.Add(this.InfoTabs); this.Controls.Add(this.LoadingPicture); this.Controls.Add(this.LevelLabel); + this.Controls.Add(this.RankingLabel); this.Name = "PlayerControl"; this.Size = new System.Drawing.Size(500, 150); ((System.ComponentModel.ISupportInitialize)(this.LoadingPicture)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); - } + } - #endregion + #endregion private System.Windows.Forms.ToolTip ToolTip; private System.Windows.Forms.Label LevelLabel; + private System.Windows.Forms.Label RankingLabel; private System.Windows.Forms.PictureBox LoadingPicture; public System.Windows.Forms.TabControl InfoTabs; private System.Windows.Forms.Label TeamLabel; private System.Windows.Forms.LinkLabel NameLabel; private System.Windows.Forms.Label SeenCountLabel; - } + } } diff --git a/LoLNotes/Gui/Controls/PlayerControl.cs b/LoLNotes/Gui/Controls/PlayerControl.cs index 56efd03..990140d 100644 --- a/LoLNotes/Gui/Controls/PlayerControl.cs +++ b/LoLNotes/Gui/Controls/PlayerControl.cs @@ -41,9 +41,9 @@ public partial class PlayerControl : UserControl public TeamControl Parent { get; set; } public PlayerEntry Player { get; set; } - public string DefaultGameTab { get; set; } + public string DefaultGameTab { get; set; } - static protected Dictionary LeagueRegions = new Dictionary + static protected Dictionary LeagueRegions = new Dictionary { {"NA", "na"}, {"EUW", "euw"}, @@ -61,6 +61,7 @@ public PlayerControl() LoadingPicture.Visible = false; LevelLabel.Text = "Level: "; + RankingLabel.Text = "Ranking: "; } public PlayerControl(TeamControl parent) : this() @@ -76,8 +77,8 @@ protected override void OnLoad(EventArgs e) const int BorderSize = 5; protected override void OnPaint(PaintEventArgs e) - { - e.Graphics.Clear(BackColor); + { + e.Graphics.Clear(BackColor); base.OnPaint(e); var pen = new Pen(Player != null && Player.NoteColor.A != 0 ? Player.NoteColor : Color.Green, BorderSize); e.Graphics.DrawRectangle(pen, BorderSize, BorderSize, Width - BorderSize * 2, Height - BorderSize * 2); @@ -96,15 +97,15 @@ public void SetLoading(bool loading) BeginInvoke(new Action(SetLoading), loading); return; } - if (loading) - { - InfoTabs.TabPages.Clear(); - } - else - { - if (!string.IsNullOrWhiteSpace(DefaultGameTab) && InfoTabs.TabPages[DefaultGameTab] != null) - InfoTabs.SelectTab(DefaultGameTab); - } + if (loading) + { + InfoTabs.TabPages.Clear(); + } + else + { + if (!string.IsNullOrWhiteSpace(DefaultGameTab) && InfoTabs.TabPages[DefaultGameTab] != null) + InfoTabs.SelectTab(DefaultGameTab); + } LoadingPicture.Visible = loading; } @@ -137,7 +138,7 @@ void SetTitle(Participant part) } } - void SetLevel(int level) + public void SetLevel(int level) { if (InvokeRequired) { @@ -148,6 +149,17 @@ void SetLevel(int level) LevelLabel.Text = "Level: " + (level != 0 ? Convert.ToString(level) : "?"); } + void SetRanking(string ranking) + { + if (InvokeRequired) + { + Invoke(new Action(SetRanking), ranking); + return; + } + + RankingLabel.Text = "Ranking: " + ranking; + } + void RemoveAll(Predicate find) { for (int i = 0; i < InfoTabs.TabPages.Count; i++) @@ -167,15 +179,16 @@ public void SetEmpty() Player = null; InfoTabs.TabPages.Clear(); SetLevel(0); + SetRanking("Loading..."); SetTeam(0); SetSeen(0); Invalidate(); //Force the border to redraw. } - public void AddTab(TabPage page) - { - InfoTabs.TabPages.Add(page); - } + public void AddTab(TabPage page) + { + InfoTabs.TabPages.Add(page); + } public void SetPlayer(PlayerEntry plr) { @@ -204,7 +217,7 @@ public void SetPlayer(PlayerEntry plr) Text = plr.Note }; tab.Controls.Add(lbl); - AddTab(tab); + AddTab(tab); ResumeLayout(); } @@ -222,24 +235,60 @@ public void SetParticipant(Participant part) SetTitle(part); } - public void SetStats(PublicSummoner summoner, PlayerLifetimeStats stats) + public void SetLeagueInfo(SummonerLeaguesDTO leagueInfo) + { + if (InvokeRequired) + { + Invoke(new Action(SetLeagueInfo), leagueInfo); + return; + } + + if (leagueInfo == null) + { + SetRanking("???"); + } + else + { + Dictionary queueInfo = leagueInfo.GetQueueByName("RANKED_SOLO_5x5"); + SetRanking(SummonerLeaguesDTO.GetRanking(queueInfo)); + } + } + + public void SetStats(PublicSummoner summoner, SummonerLeaguesDTO leagueInfo, PlayerLifetimeStats stats) { if (summoner == null || stats == null) return; if (InvokeRequired) { - Invoke(new Action(SetStats), summoner, stats); + Invoke(new Action(SetStats), summoner, leagueInfo, stats); return; } - SetLevel(summoner.SummonerLevel); RemoveAll(p => (p.Tag as string) == "Stats"); + var nameMap = new Dictionary() + { + {"RankedSolo5x5", "RANKED_SOLO_5x5"}, + {"RankedTeam5x5", "RANKED_TEAM_5x5"}, + {"RankedTeam3x3", "RANKED_TEAM_3x3"} + }; + foreach (var stat in stats.PlayerStatSummaries.PlayerStatSummarySet) { var sc = new StatsControl { Dock = DockStyle.Fill, Tag = "Stats" }; - sc.SetStatSummary(stat); + + Dictionary queueInfo = null; + if (leagueInfo != null) + { + string queueType; + if (nameMap.TryGetValue(stat.PlayerStatSummaryTypeString, out queueType)) + { + queueInfo = leagueInfo.GetQueueByName(queueType); + } + } + + sc.SetStatSummary(stat, SummonerLeaguesDTO.GetRanking(queueInfo)); var tab = new TabPage(MinifyStatType(stat.PlayerStatSummaryType)) { @@ -247,7 +296,7 @@ public void SetStats(PublicSummoner summoner, PlayerLifetimeStats stats) Tag = "Stats" }; tab.Controls.Add(sc); - AddTab(tab); + AddTab(tab); } } @@ -303,7 +352,7 @@ public void SetChamps(ChampionStatInfoList champs) Tag = "Champs" }; tab.Controls.Add(layout); - AddTab(tab); + AddTab(tab); } public void SetSeen(int times) @@ -318,14 +367,14 @@ public void SetSeen(int times) SeenCountLabel.Text = "Seen: " + times; } - public void SetGames(RecentGames games) + public void SetGames(RecentGames games, bool grayUnranked) { if (games == null || games.GameStatistics.Count < 1) return; if (InvokeRequired) { - Invoke(new Action(SetGames), games); + Invoke(new Action(SetGames), games, grayUnranked); return; } @@ -359,12 +408,20 @@ public void SetGames(RecentGames games) var assists = game.Statistics.GetInt(RawStat.ASSISTS); var left = game.Leaver; var botgame = game.QueueType == "BOT"; + var unranked = game.QueueType != "RANKED_SOLO_5x5"; var wonlabel = CreateLabel(string.Format("{0}{1}", left ? "[L] " : "", won ? "Won" : "Lost")); - wonlabel.ForeColor = won ? Color.Green : Color.Red; + if (grayUnranked && unranked) + { + wonlabel.ForeColor = Color.Gray; + } + else + { + wonlabel.ForeColor = won ? Color.Green : Color.Red; + } var kdrlbl = CreateLabel(string.Format("({0}/{1}/{2})", kills, deaths, assists)); - kdrlbl.ForeColor = GetKdrColor(kills, deaths); + kdrlbl.ForeColor = GetKdrColor(kills, deaths, grayUnranked && unranked); var champicon = new PictureBox { @@ -402,7 +459,7 @@ public void SetGames(RecentGames games) Tag = "Recent" }; tab.Controls.Add(layout); - AddTab(tab); + AddTab(tab); } static Label CreateLabel(string text) @@ -431,7 +488,7 @@ static PictureBox CreateSpellPicture(int id) }; } - static Color GetKdrColor(int kills, int deaths) + static Color GetKdrColor(int kills, int deaths, bool gray) { if (deaths == 0) deaths = 1; @@ -458,7 +515,13 @@ static Color GetKdrColor(int kills, int deaths) ratio -= 0.5d; ratio *= 2; } - return Interpolate(top, bot, ratio); + + var color = Interpolate(top, bot, ratio); + if (gray) + { + color = Interpolate(Color.Gray, color, 0.25); + } + return color; } static byte Interpolate(byte from, byte to, double step) @@ -480,7 +543,7 @@ static void kdrtest() { for (var i = 0; i < 10; i++) { - var color = GetKdrColor(i, 10); + var color = GetKdrColor(i, 10, false); Debug.WriteLine(string.Format("Color.FromArgb({0}, {1}, {2}, {3})", color.A, color.R, color.G, color.B)); } } @@ -517,14 +580,10 @@ private void NameLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs } string url = null; - if (e.Button == MouseButtons.Left) + if (e.Button == MouseButtons.Left || e.Button == MouseButtons.Middle) { url = string.Format("http://www.lolking.net/summoner/{0}/{1}", region, plr.Item1); } - else if (e.Button == MouseButtons.Middle) - { - url = string.Format("http://bladecoding.com/lolnotes/leagueofstats.php?name={0}", plr.Item2); - } if (url != null) { diff --git a/LoLNotes/Gui/Controls/PlayerControl.resx b/LoLNotes/Gui/Controls/PlayerControl.resx index 1329d8c..3d02df7 100644 --- a/LoLNotes/Gui/Controls/PlayerControl.resx +++ b/LoLNotes/Gui/Controls/PlayerControl.resx @@ -123,140 +123,133 @@ - iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAASdEAAEnRAQX8q5UAAAAGYktHRAAAAAAAAPlDu38AAAAJdnBBZwAAAEAAAABAAOrz - +GAAAAAldEVYdGNyZWF0ZS1kYXRlADIwMDktMTItMDhUMTI6NTE6MTQtMDc6MDBeNyKOAAAAJXRFWHRk - YXRlOmNyZWF0ZQAyMDEwLTAyLTIwVDIzOjI2OjE4LTA3OjAwZ+w9QQAAACV0RVh0ZGF0ZTptb2RpZnkA - MjAxMC0wMS0xMVQwOToxMTo1MS0wNzowMPnIXZsAAAA0dEVYdExpY2Vuc2UAaHR0cDovL2NyZWF0aXZl - Y29tbW9ucy5vcmcvbGljZW5zZXMvR1BMLzIuMC9sagaoAAAAJXRFWHRtb2RpZnktZGF0ZQAyMDA5LTEy - LTA4VDEyOjUxOjE0LTA3OjAwAYZUugAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoA - AAAXdEVYdFNvdXJjZQBHTk9NRSBJY29uIFRoZW1lwfkmaQAAACB0RVh0U291cmNlX1VSTABodHRwOi8v - YXJ0Lmdub21lLm9yZy8y5JF5AAAdMklEQVR4Xu1bB1RWV7YGa4zGWFLtvVdE7AVFmiBFLNgQFQULNqQq - vXdEBERAepEiKBbEXmPFgjVlJprJvGTykpnMm0lMdL/vu/zXIUYFE9966701rLXX/cv9zz3ft8vZZ5+N - lta///7NwL8Z+P/OQDfTEC2Itub6+uF2mx6q1c0yig9pAmnTzSS4T1eT4EkQM8gcyDLICshCyEzIdMhY - SA9IO/ymeffpodrdp4e89slpQPMZYyHN+P61/HGgHlbRBN2ym2nwUABxgCTgfSXA3OthHv5NrxkR3/e2 - iPxHX6voR32tox/1sYr+oY9l5H/hs+97mod/hftudzUJOYrfZXYxDvbE1QTSHWO0IBm/d7Ia8G/hGgxJ - grzxe8dUJtXDLIzXdzDZWZBcAPlDL4vIH/vbxMnQ+UmityRdJjjliP6afJm2freYbCoRM7c9Yu6uSqlM - 31Qs09bmyUTHDNFbvEMGz4l/DGK+gzXd6GISnA9C1mFsXTynleZ5r6Q4DfhWGMOnq2nIP/A+k5b2uwjQ - DNoCg87A64qeM8L/NmhOvOjap8lYxxyZ5FwoU9cD2MYSMXQpFaNNe8TYtUxMXMvF1H2vmHvuE8st+2Wm - z0GZ418pC4KrZHHYUVkacUzsw6rE1q9Cpm8slPEOaSBk6089zcM+BxlFXYyDaF39GmrCmnm2BIleA22i - /zZ8bpzgs12wtt9GAAfEBKj1rrhGQyNfD7VNkIkrc8RgfZHory2SiWsKFZmwZjeuEOciEFIsk9cWi/66 - EpmyvlSmbtgjBi5lYripXIxc94qJ+z4x89ovVj6HZG5gldhHHBenuNPivO2MrIo9LvN9y2WK0y4ZPDv2 - B1jZHRARDULG0EU6Gwdp9UTsefZPA/5N3Os2cGbUd+7bQaxXgYCMdMz91WMAB+xsFETwwyAH+llH/zTB - MUtMXaFdaHgywI9bWSBjIeNWFcj41RoSSADATwZ4fRX8xjKZ5lL+lABjt30goUJMPfbLdM8DYr75IMio - FNugo+IIItxTL4hv5iXx2HFGFvmXyVj75Ce9ZoQ/ALhUAJpG9yARPTREcK6IHW/gu439rSO/dUuoksNX - H8pC790CDKmvTECt5pVgNBxyGn4qRhuKxMILE4dpU/MEP8YpXyFg/CqAX70bVgCLULW/HtrfAO1vrNX+ - NI32nwVv5nVQIcDC+5DM9DuskGAfeUKct58Vn8zLElNyQ6J2X5W1sZVisDJN+lpGfgWgGZBxqmsAfHPG - jr6WEf+5Ie6QHKn+Qk7e/FIWbFEI2PlKBGhMieB7QCqHzI1HICsVK/iwqVuZ4uvU9lPweD0JhEyBxg0A - 2NBlD2JAmUZqtV4rexXzVwjwgM977ocb1Gp/xpZDYuVbKbMDj8iC0GOyBASsiDsla0CCG6whrPCa7Dx4 - V1IP3pYtKSfEcFW6wCL+CHAhADcY4Ff3sYj4i3PUfqm88kAOXH4oR6/9SSUg5bcQwCiaOMAm9rGZawmC - 1wEx89iLIFcK/96taJxXkmGIwGfsUqJE/OmupWIOsiw9y8XGu0Lm+B2UeYEw7cDDSvCzRhA033xAAU/T - r9X+IbH0rhQb/yqZF3JU7BAPHGJOySrEg3VJ52TTzo/EK+OSBOVXS8K+W5J/8lPJO3ZP6OPjlyT9BCXd - BxnfOIXvk4OXH8jeCw8k98SnsII/yfzNhbSAHcDStEGrgGr6+MFsDPqtgXO+zPKFecL06fdTYdb6a3fL - 5DUwe8QDPfudMnz+dhk0e+uTATYxP/efqchPA2fFPho6N/7xiIWJMmF5mhivxzhbymRx6GFxiDouSwBy - XtARxe9p+ta+h2Uu3i8MOy5Lo0+K01YExMSz4pLykXikXxSf7MsSmH9VwouuS/zeGsk+/onsu/i5ZFfd - llUA7hx9QPbjfcWlB7LryMeSg++rQMA8L4WA5FciACS8D6kaabdDZkHz1jD96W6I3ljeJmN917VLEVjG - k94WEUxsPu83M/bqoLnbjg6au31f/9nbSvtYx4Zg/V2BgOUC04zEw0sRya/RRIfZxv+sj+g+e/MecYw+ - Jmug5eXQtl34ccX0F8P0l8eektUJZ2VD8nlxS7sgWxAM/XOvSujuaxJdekMhYPv+25J6+K4Un/0DtP4Q - Ae8LBXzG0Y8l7fB9haBKfDbXs0A6GQUlIZ7VbwGq72PCtgD2d1MkLNT+DKzhxptKZaxDukC7AB751cA5 - 207pLU3PnOxcGI11PxiuETDaKS9g5PKc2WNWFb7Vd2aSVm8rJUVuhPHoTl0gk7lE4Vreyzz8wfB5236e - viFPHCOrxAtAGfkZ+Gj6axM1pr/rovjmXJHggmqJKL4uceU1klBxWxJBQNKBO7IDcSHj6H1F47uq7ivg - KZlHP5FDV76QOR4KAYlQSIMJeJMZng5M10ajfRP4t+6iHQKN/x3Jz9mJK3OTTNzKg8w8K/xneFUEWGze - H6i/rihI1yF7LeQDiBaIeO46zbwf47eGjIR1bAFBZwfOjP67sXOWrI8/JmEAGgxf9wRwd5i+dxZMP++q - hBVdk5g9N2UbYgC1n3jgtiQfBAGH7koKZGflPQV4Okjg6/SqjxXLmO2RTwKYpnOv8vKMUpP0DMAkP9Zf - laNon0FNBz4OrX+tZ59aYu6xL8TK+2AAMrpAG99DgXP8DwfidcDYlfmBI5ZlG4x0yNYmAfX9aayN1tEB - RHCjdAiZ2/fmG3LEJ+2MJAFoTOlNJfCFFFZLFJbCrRrTJ/gkgoeo4FMPE3St9pNgFSm47r/0UGa555GA - bfUSUMf8Z3PTMh2R39Jrr4y0S5ZeFhFfj1uRlTXLrzJgTsDhAGRu/ghgfguCj3ovDD3uBQvw1lue4wng - 3QneogEEqATxub1nhDPneBdEzAcRh4fNjfunfUCZbC+/LplH7iuRP7b8Jkz/lqJ5mr6qfWqb4NMIHpJy - 6B7u4/f3pOLiA7FxUwiIbxAB2KXRPP0Q0cUCy9iEFRk0+7/pLUkrsA084rsg5BgAH/NaFHrczS7suIt9 - +Il19hEn1yDn9wDwlZC3GqL951kHiZi8PIVEfMCEpodZaM1kh5THfmmnpOj0p1jWPlFA/8L0K39p+qnQ - euKBuxK39zbc5K7sw3I40zWXBGzF+I1f6gIaC2gOAjJ1FiQh69uNSB/zGMHuyGz/So/F4Sc22kecWLck - 8uTqJZGnHJdFnXJwiD5tvyz6tN2U9cXuMP/5AN/0txJQ1yLggo2Q9yO5CUoaZBP93fLgMik4fk/KPvoc - Jn5PIeJXpg/t74D2t0H70WW3JL7irpTjfutNOdLJMDAOYzaAAJOQ1sz5dRYly3CQgD395wbrdgcA5ArI - MoeY0/bLY84sXBF7dp5T3NnZK7eet8Z764nOu11BgCXAN/69BKhEaNLwViBhMa3BdM0uSd9/Q0rO/UEB - n/KM9ukK1HostB9eWoPrHYUwDQGxDSIA2n8HN54aPHeb9LaM/GnovMRCu/ATdo5xZ+c6xZ2btXLrOetV - 8ednrN52fvqahI+M1m6/OBVkTJuwunD9CIdsQ51lWQ0KgPUFyF9aQ0hLbHoSh82JfbKt+JKiVYJVfZ+B - j6afBJ+P33dHoqD9kKKbuN6WPec/FysXxQJiGkQAtP8BbvwImqf2H6KgsXH1to/MIKZrEi4YOm+/MHVt - 4sVJ65IujV+ffGn0xh2XdUGIHnaFdoj+YwYtznhtBNTu7kKbALwjtrZ/8U45pqS52cc/fgpeDXw0fQa+ - mHJov6RGAgpvwApuSem5z8WyloAo7BobNSQGMAM8D5EBs+LKEeRMAXYiZNwGDWCXHVeGbdp5ZbBr6tX+ - bmnVfUBIn6kbSqZhFRgwYFE6CPj1+t9QjdfVPAoi2giGc7C7+2IjdncEn4c9wK/X/H8FvkiADob2ffOv - S0jxLbjLH8ViYzYJiIQbNYiA9gB/ElvLR6PsUzxcU6/puKQQ8NVBGsC93dKu9fBIv9bFc9f1jl4ZN953 - 2Xn1Xez8+umtyO0wxH6Xtu7y+nOAlxFCLQ23jdMCeONe5mEfO4aUI8f/oxSe/uy5az6XOzXwhRbXiD+0 - vznnmgTtrpGSs08JiGgoAa0wgQqY3p8NVueYeWff6uGedq07wHaGdADg9zZn3mi3Jevm2z5ZNS39cmre - 2JJ5oxkIaDlyeW6LYUsytBAMX1XhT+8neGiL4MfAZKtZzCg796kUndEEvjoZ39M1f/8d5Ai1ph+4+6Z4 - 510X96xqEHGzrgWE06Ia4gIsG8Wi7LXXyn1PH7+8O+0BuC0At/bOBODsmjcCcm83Dcy70zg097Z2TMFd - rRMXH2i1MMrS6muXqzVsRbbW0FdIguoypclCWX4bRCucieWr5PTH2PHVbnAysMPLxDXr2CdK3s9rGtLd - ZGXpu6v4f1jJLQ0JNyS0tDYIWmzIko6GgWG9keM0hADe9H5Ps7Cu83wPNA0out/IJ+92I/+Cu9p+u25r - Fx75UktEtD75D/nNWn5REqTJQ7pj+dtniKpPVmWNUtBgWasSUoUKD98fu/6lHL/xpRzFldvdQ9jxHbj8 - BYh6KOUXHsqejx5A8w+kDK+ZCJmvVwgIxU705QS8VkTPGUxNtdVr3YCn+awDrnlwv8dTVqQolRzKQu8i - WeRTJHYU32JZ7Fcs9hBeF+M9P6Ms0shCzdXOt0QW4Lc6tltZFA1tqAsoNUCY4SIUERY+Iwvwvq7Mx/v5 - SDNVmYf3z4otMjpbjEmZC+n9EgIm47tkCCu46Vj+0jHeU8Fz0jvxM+OgXbju4vUZycD7X4pRUAYsKgtj - znr2uS/YqipnaAG9LcJ/HG679QedefG/kBF4P2J+/D8pui8Q5ft5W2sFrwfMjPonxvwBcrAeArhfZ+2+ - Get3dYTpecPEOJiFUUjQU9GcByhpcL0xoNeMMG0WGSc6pEhA9gUJyb8swXmXJBTXiMIrEl10VWJLrkr8 - nmpJLL8mO/Zdl537IRXXldfJe69JEj7fXlaNnVy1hOacE32YMyZxFQ8fXe8kXqMf9reK1MKhCM4cQ0lq - wwign4CAsKlOaRJbhr04lhW/ghtKahm559bTXVYKUtFd2KYyGnOXxisztKxjrMTcl7wTiNhVd2Q+ljGs - 5fehQUOM/bvP+1R+Tpz4s9a31X/V2r7nM63o3fe0Q3IRqHNuNfHNudXcO7umxeasGy3DSz9tNXZpKmsb - LIYY10s+b+hpHkoCwkkAa2+e2dfELbNatuReV9LLMKy1McixmXgw/VRSUeThqZrcnNWZ9Kp7knXkjiwL - KhPs879gNodl9XdFYB2HTK1hyzK0RznmNrXecrBJcM6dxv45t5sC8Bs+2TUtvbNqWm/JvNmOeQrylQ89 - dl3rHFBwt7OeXfJiJHXfA5tPgwhgtgQCIqauTFcIIHAvZFWKFSDLioIVcMPBigs3ILUbkdqNCVNUblVz - UK5mhbafVeQ3AO/IfP6lvtcAsx/hkKU1bGlG4zFOeR1xvthhS1bN25szb7b3rAXcgYDd0691d0ut7oWM - tZ/rzqsDXVOrhwy13RaFZ/NsME51gxc+jpPUEBBJAmL23FByah9kVnSFCOTZ3Gpyy1lbc6vVvgIeW1OC - zz1+X9wTj8jgWTF/5+Ekxvz9R9KYMbfYw5dmNhntmDvczHOfnnt6dVcA7gHAvZmiM1Vnyo7N2Yj1yZdH - bdhxeSwOX01xLH9cQ8AOXF9eFK1DQJQBTl3iEANo9v7QPnNsFhlo+sy81F2Yqn1ec+H3fumnRGfe1h8B - PhrjsbbQAP3WfwsJ0Fma1VRvRY4hjuVmbEy5PISAAVSXmzRu1rhLxW51CnetqxMumExeleOBPoWvYYG0 - gHTNCvPih3Gy3DPDBWKmrd6l1N4Z/Li7YgDcCu2z3KSafl3tM/iF552X0YsSngB8NsZ653WB54xJAPYY - zXC1Rfl9ydrECxM0gKcCsBG366xTrIw/Z4UijQ1KdgsHz00o62MZ9bifdQwJaJgFaAiINQQBLERyg6EE - PuTZCTB9Rn/F9J/x/WwQ4JpwWLDmPwYB+Yj6ffpZRby2qE8CIC0gy6a5lK5ahYIMATuhQOMYd262Y+xZ - 2+WxZxY4xJxZjDLdUn3ngsCeMyK+YFWLPQyYT8MKIhoC4oxQfkrcf0sJemrg47ZTrbs/1T4CH+tzaTih - ycCy55F8DMfYiY/B+HkQMRNXnjFoQRP12/lL7tAQ0BrX1aZu5c6oUNmyNKfUJKNOL1sadcoRtcpV9pEn - 16J+6TpgdvwxtOQ8mbw6j3WNJ5iDJ5Kj+hMhpQKDCqqxc4bsQPmZ20wl8MH06wY+ZdlDLOCyRwJYpk45 - dAcnM3clIv8CihA50scy4i8gAUdSwUPrLUfVQ4+GgA9x2LIJJfgNBAywqxdHnFyHYq3LorDjbjB7z/nB - RzePWpqeDd//6+il6WK0sVj6WkX9gDksbNAyiJtIwDaTtRkAeAeV1Tu/XPOfMX0eSxE8j6lYs2fcSNgH - lympFqfIAzLaLvEJm6FAhAsm0Y3V3leNDag1qjFgCFYBHxvfSg+U5N1Ynue5xPygo74o2fvPDajyn7Qq - NxWm/+UQdLBMxzG+wdp8Qan/P/Bsdom9nGYNQyQgYfq6TEk/fEfR/HMDHzSvaj8RBPCoiuCjkDvwADMU - Jzlhu3G8lXpWrNwK2ObyI8a/iI3RekyGnWAvL1HXmapG+40RBC0mrCnkSZS/LQ5mcA3AQQ1OpQ4FWG05 - EIiT6kw0az0YMGsrmrOKlANdnmXSHfHMD1+FgO1m2ENnwJyZ7fGkRV3zudxxza9r+tT+Nmg/Bssmj655 - hO2D8zwvnO1tzrgoXukXcApcJYbO2TLQRiHiMg9fIKPwuhWs4oW+qYsMUENAJ1w3ovkiyNr7YKAlAFt4 - 7Q8w96wImLahOFJn0Y690Pw3A3GgM8W5ACdaFWK1eZ8MQXWbAZCW3VACmsICEs1RRck6yiMnzWmrxvRV - AlS/5ykNtb8VJ7aROLsLhub9cJLLZgZXNDWwuYEdHjzxXR1/WhYEHhT9VVnsAnuMvcFDTK4QshKi29XI - v21nfbcmVH77ASaKDYxckQPJfRPgZyELDDB2LfdHx1kAOtCCJq0piB1ht7MIfYh3Af5HlPBlKvoWzNHE - wWYOw/WF7CD5BmPXvw/gwzQuQAKSWEnNxdLGRgM16ck+9rEUnuLmh+fvtb5P8DytjcapbRhMPwCnuFug - fXccdW/YcV7W4IyfbS7s9+H5P2Vh6FGZ7YsJrivAiXMyj9sfYa/wEB2mh7saB8Z1MQpw6mLoZ9xlmo9e - d9PA4YPmJS4Zumhn/Milu5J5HD9sQVI5zPw8zP2LnuYRP/Sz2Sp6SzPQnlOM9p1yaB6teN77ZcTCJGq/ - HLja1qv9ZwhIZi09/wR3drUE5GCnR/CBmWckMOOMstnJhIUkwQLicGjJc/sgHGv7Zl9RjrXZ1cHzfSdo - fRm6PRYBOLs/2ABliY6QmegFmuV/WGxw+mzugXa4NXlKpwkPZNhVCs19B1K+hHs86GEe9jWi+rcIZn+F - pv8B4D/3tY6VQbaJMsI+XcY65Sng2b3CPgaeaBs45zH4UfuW9Ub/uqUp7NubwQJSeJxUeKq2CEnNF53+ - RDajMQmntj/hkOKHOei6iCy4UBsoK2rg+9fQwXEFPn9JaWhan3xOaXJgp8fiiBMyH30/swKqFPAz0A/E - viA2R1FmQCzQM4Q+A6Whko2Wk9CFMg7Nl6OWZYguOk91AZTXkcsyZfTyHBnjmPe0QYt9SuxbMnMvF2to - nh2pA2vX/kSARytvA9PxHhYxWl2NAkjATp6oFoGAPOz1Cd4XJ7SoED3qPM03u6O++6auxgEXUe15tCRw - j4QXXJKtZYj+8H8S4JIC04fPO6LHZ0nUSfT8HJM56PxiDxA7wdgRRuBskmKnmDEaJtk1xu4xI3SVspts - GlrqDNBaNxUdZ2y0ZM8hmy/ZiDkOzVlsy2OHGo7k0IRZrLTtWW6ukBmwJvYrwZ1OdzbY3F+jXO2GZmHa - 7+kubtHZKDDdxi1XigG89OyniskD7E+dDHzy2/Y1HozBPmjX32x0h0mukd1Ngz4bbbf98UK/PbI59YwE - 5F4WT0R9Bj1qnz5vG3xUZqL7ywJdYLXg0XSB7jA2SLJRUgVP4OwlZE8hewv10Yw1GabNjlMVPDvTVPDs - UWSjphFa8tiGy0aO4fMTCf5mp8mbpmGeb2ikKa6NIS8kgl/whqZv99R/q7NhQOYsNBUUn/lEQrLPysiF - 234G+OK2fY10cE8nxktI98ZvtO7bfpCVZYdJm1K7mQR+Nnxe/M+WrgVocz0iG5MR+RPOwP9PgAB0gsHn - qX0zEDAd2jel9p8Bzy5SA3STsqWWrbXsMq2refYlshuVBIyF9tmSy55EpW8RS19tzh9Y3WG8s4V246Zt - Mce3Ia0gb0KaQ7jC/IoEFXwzstWqy6g2nQ39s9lWEgrw1G6naT5lbfuZjMT3nSE9IL0hfSEDKI2bv6XT - pvc0mw/HrUnsauR7F20ujyaiLc7as0TsQiphBcdkHqyAQc8S7XDmJECjfSOYviFMnx2kT7UP8DR79hkr - 2kfn6Xh0oNY1fVoCA98UNGgzeKJ958cuhr4H39O1M9TWbvw+5vUupB2kDeStl5HQiJrXmMqbrTrptO9i - 5J+LDY2MAfjOhr772g0wH6UB3x3XXnXA0x2GQWgZIxo1aTamVWe9We/p2od31Hc7Aff4Cr2CP49dlqas - yWy3sUGTJPqKBD1GCIaMAxVi4lbr+/R7xfw1BPxa+xrzRwAcvTxbdBalcMV4DOv7pOMkl+DW3SdwHh0h - HSAk4R1IXUtogfdU9C/cQTH9fxEwoj0CXD6rKF2M/A62HzJztGbArnW03w+vB0KGQIZDdCEkaQxkHKxs - QtNW75m+3WvKyvdHOezsNMXjUneTwK/Qd/SIXebcpCBnFzRewH/RYYoAZgRhe60BovkU+j6DHkycZk9z - 13MA4MVoo5+XLFz30ar/A+Z5t+PkTUntB1mawQpplZxjFw0JH+CqWoHqCs8lgBZA36CPvPlWl1EKAZAj - 7+nMJ6j3NANy4GctYBA+G6qxALoIyQIBWhMgkyCTYY4GzVp3sG7dffzKd4fZRnw4zrms81Sv692MA77s - aRbyPUnBP1o8QRsOcoAEGWy7XYYgoxuEK7a0Ctg+1jFPCLi7afDXXY38akBo6QdjHD3b9JpiBOB0w54a - 5ZAAxqhnLaA1PmupUbJqAXj7r7+nbvB2j4ntuhhscfpwjCPB0HxIwIeageuS0AefcZkhCaoljMBrPQ0R - Y3EdD5mokoGrfqMmzQ2bt+1qDaLt2w0w2/iuzoLQD8asTOswYd3ujpM2lnfSd6vsPMXjOEAeRiTfg89y - ENS2v6+3xKPdQIv5rTqNmNqkZXuaOq2Qc6BLMi4RPGNUXfCMAc9q/7mBkFQoJDRt+W6L1t3GtWnUtAWj - J3/MQWhK9CkOTob5MNUaOAnVJRgTaBF0C5JB1yAhqnuQlLpCl4Foj9Vu3Gxc4+atxjd5sy3dZ0LTlu/g - /Vuj8DnHIcF0ORKuAqfJE3g3DXD6Ps2eCmsPaQNRNf9c08f3v/p7uhziG66hNBtGUJUIBhUSQYvgA8m4 - SgbNUF0dOFGaJidNUgiAxAzTCAmqK+rnvIf38jf8LcfgWFxx6mq7G97TGuuaO5X0IuDUOhXc4D8SoboF - YwMZpEWQ0TYQWgXJINtkvS4hnBgnSAuhhkgMzZTkEASFgOqK+jnv4b0U/o5jcCzVvFXAfOazSx3npq75 - VJ6a/LwScPzuV38qGWRRyRUgTCz4MNU6GCtUUqgJlRiVHLoOLYYAVKH1qMLP+L26hPF+kqoC5XgknBrm - s9pA6gKmgqiouqAbnP4+D/SLPuOgdQnhA1VSOAkSQ7dRrYWuQ+GEOXGVKJL1rKjf814Kf0eQJJnjcVyO - TwUQLJ9LpXAZp5b/RwA3hByVFJUYTojCyZEglSROmBN/mfAeVfg7jlEXpAr0fw1sQwj5P3XPfwPhGvDv - JKyj5gAAAABJRU5ErkJggg== + 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 + w4qU1P8B4Rrw73DU+YIAAAAASUVORK5CYII= \ No newline at end of file diff --git a/LoLNotes/Gui/Controls/StatsControl.Designer.cs b/LoLNotes/Gui/Controls/StatsControl.Designer.cs index ea5caa7..e051592 100644 --- a/LoLNotes/Gui/Controls/StatsControl.Designer.cs +++ b/LoLNotes/Gui/Controls/StatsControl.Designer.cs @@ -30,8 +30,7 @@ private void InitializeComponent() { this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.GameType = new System.Windows.Forms.Label(); - this.MaxElo = new System.Windows.Forms.Label(); - this.Elo = new System.Windows.Forms.Label(); + this.Ranking = new System.Windows.Forms.Label(); this.Wins = new System.Windows.Forms.Label(); this.Losses = new System.Windows.Forms.Label(); this.Leaves = new System.Windows.Forms.Label(); @@ -42,8 +41,7 @@ private void InitializeComponent() // this.flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent; this.flowLayoutPanel1.Controls.Add(this.GameType); - this.flowLayoutPanel1.Controls.Add(this.MaxElo); - this.flowLayoutPanel1.Controls.Add(this.Elo); + this.flowLayoutPanel1.Controls.Add(this.Ranking); this.flowLayoutPanel1.Controls.Add(this.Wins); this.flowLayoutPanel1.Controls.Add(this.Losses); this.flowLayoutPanel1.Controls.Add(this.Leaves); @@ -64,25 +62,15 @@ private void InitializeComponent() this.GameType.TabIndex = 5; this.GameType.Text = "Type: "; // - // MaxElo + // Ranking // - this.MaxElo.AutoSize = true; - this.MaxElo.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MaxElo.Location = new System.Drawing.Point(3, 13); - this.MaxElo.Name = "MaxElo"; - this.MaxElo.Size = new System.Drawing.Size(60, 13); - this.MaxElo.TabIndex = 0; - this.MaxElo.Text = "Max Elo: "; - // - // Elo - // - this.Elo.AutoSize = true; - this.Elo.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Elo.Location = new System.Drawing.Point(3, 26); - this.Elo.Name = "Elo"; - this.Elo.Size = new System.Drawing.Size(33, 13); - this.Elo.TabIndex = 1; - this.Elo.Text = "Elo: "; + this.Ranking.AutoSize = true; + this.Ranking.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Ranking.Location = new System.Drawing.Point(3, 26); + this.Ranking.Name = "Ranking"; + this.Ranking.Size = new System.Drawing.Size(33, 13); + this.Ranking.TabIndex = 1; + this.Ranking.Text = "Ranking: "; // // Wins // @@ -131,8 +119,7 @@ private void InitializeComponent() #endregion private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Label MaxElo; - private System.Windows.Forms.Label Elo; + private System.Windows.Forms.Label Ranking; private System.Windows.Forms.Label Wins; private System.Windows.Forms.Label Losses; private System.Windows.Forms.Label Leaves; diff --git a/LoLNotes/Gui/Controls/StatsControl.cs b/LoLNotes/Gui/Controls/StatsControl.cs index f91e9dd..a2ab138 100644 --- a/LoLNotes/Gui/Controls/StatsControl.cs +++ b/LoLNotes/Gui/Controls/StatsControl.cs @@ -28,6 +28,7 @@ THE SOFTWARE. using System.Text; using System.Windows.Forms; using LoLNotes.Messages.Statistics; +using LoLNotes.Messages.Summoner; namespace LoLNotes.Gui.Controls { @@ -42,13 +43,12 @@ public StatsControl() Prepends.Add(control, control.Text); } - public void SetStatSummary(PlayerStatSummary stat) + public void SetStatSummary(PlayerStatSummary stat, string ranking) { var values = new Dictionary() { {GameType, stat.PlayerStatSummaryType}, - {MaxElo, stat.MaxRating.ToString()}, - {Elo, stat.Rating.ToString()}, + {Ranking, ranking}, {Wins, stat.Wins.ToString()}, {Losses, stat.Losses.ToString()}, {Leaves, stat.Leaves.ToString()} diff --git a/LoLNotes/Gui/Controls/TeamControl.Designer.cs b/LoLNotes/Gui/Controls/TeamControl.Designer.cs index 09e15dc..eed11cc 100644 --- a/LoLNotes/Gui/Controls/TeamControl.Designer.cs +++ b/LoLNotes/Gui/Controls/TeamControl.Designer.cs @@ -1,61 +1,61 @@ namespace LoLNotes.Gui.Controls { - partial class TeamControl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class TeamControl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Component Designer generated code + #region Component Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.NameLabel = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // NameLabel - // - this.NameLabel.AutoSize = true; - this.NameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.NameLabel.Location = new System.Drawing.Point(10, 10); - this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(61, 16); - this.NameLabel.TabIndex = 0; - this.NameLabel.Text = "Team X"; - // - // TeamControl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; - this.Controls.Add(this.NameLabel); - this.Name = "TeamControl"; - this.Size = new System.Drawing.Size(500, 890); - this.ResumeLayout(false); - this.PerformLayout(); + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.NameLabel = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // NameLabel + // + this.NameLabel.AutoSize = true; + this.NameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.NameLabel.Location = new System.Drawing.Point(10, 10); + this.NameLabel.Name = "NameLabel"; + this.NameLabel.Size = new System.Drawing.Size(61, 16); + this.NameLabel.TabIndex = 0; + this.NameLabel.Text = "Team X"; + // + // TeamControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.NameLabel); + this.Name = "TeamControl"; + this.Size = new System.Drawing.Size(500, 890); + this.ResumeLayout(false); + this.PerformLayout(); - } + } - #endregion + #endregion private System.Windows.Forms.Label NameLabel; - } + } } diff --git a/LoLNotes/Gui/LoadDataEnum.cs b/LoLNotes/Gui/LoadDataEnum.cs index c98ed67..d276a11 100644 --- a/LoLNotes/Gui/LoadDataEnum.cs +++ b/LoLNotes/Gui/LoadDataEnum.cs @@ -25,14 +25,16 @@ THE SOFTWARE. using System.Text; namespace LoLNotes.Gui -{ - [Flags] - public enum LoadDataEnum : uint - { - None = 0, - RecentGames = 1, - Stats = 2, - TopChamps = 4, - All = TopChamps | Stats | RecentGames, - } +{ + [Flags] + public enum LoadDataEnum : uint + { + None = 0, + RecentGames = 1, + Stats = 2, + TopChamps = 4, + LeagueInfo = 8, + GrayUnranked = 16, + All = LeagueInfo | TopChamps | Stats | RecentGames | GrayUnranked, + } } diff --git a/LoLNotes/Gui/MainForm.Designer.cs b/LoLNotes/Gui/MainForm.Designer.cs index d6b6600..f67a590 100644 --- a/LoLNotes/Gui/MainForm.Designer.cs +++ b/LoLNotes/Gui/MainForm.Designer.cs @@ -38,678 +38,720 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.NewsTab = new System.Windows.Forms.TabPage(); - this.NewsBrowser = new System.Windows.Forms.WebBrowser(); - this.GameTab = new System.Windows.Forms.TabPage(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.button1 = new System.Windows.Forms.Button(); - this.PlayerEditStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SettingsTab = new System.Windows.Forms.TabPage(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.DefaultGameTab = new System.Windows.Forms.ComboBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.DownloadLink = new System.Windows.Forms.LinkLabel(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.RegionList = new System.Windows.Forms.ComboBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.InstallButton = new System.Windows.Forms.Button(); - this.ModuleGroupBox = new System.Windows.Forms.GroupBox(); - this.MirrorRadio = new System.Windows.Forms.RadioButton(); - this.ToolHelpRadio = new System.Windows.Forms.RadioButton(); - this.ProcessRadio = new System.Windows.Forms.RadioButton(); - this.LeaveCheck = new System.Windows.Forms.CheckBox(); - this.DevCheck = new System.Windows.Forms.CheckBox(); - this.LogGroupBox = new System.Windows.Forms.GroupBox(); - this.DebugCheck = new System.Windows.Forms.CheckBox(); - this.TraceCheck = new System.Windows.Forms.CheckBox(); - this.DatabaseGroupBox = new System.Windows.Forms.GroupBox(); - this.ExportButton = new System.Windows.Forms.Button(); - this.ImportButton = new System.Windows.Forms.Button(); - this.LogTab = new System.Windows.Forms.TabPage(); - this.LogList = new System.Windows.Forms.ListBox(); - this.ChangesTab = new System.Windows.Forms.TabPage(); - this.ChangesText = new System.Windows.Forms.RichTextBox(); - this.DevTab = new System.Windows.Forms.TabPage(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.CallView = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.CallEditStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.dumpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.CallTree = new System.Windows.Forms.TreeView(); - this.teamControl1 = new LoLNotes.Gui.Controls.TeamControl(); - this.teamControl2 = new LoLNotes.Gui.Controls.TeamControl(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); - this.RecentGamesBox = new System.Windows.Forms.CheckBox(); - this.StatsBox = new System.Windows.Forms.CheckBox(); - this.TopChampsBox = new System.Windows.Forms.CheckBox(); - this.tabControl1.SuspendLayout(); - this.NewsTab.SuspendLayout(); - this.GameTab.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); - this.splitContainer2.Panel1.SuspendLayout(); - this.splitContainer2.Panel2.SuspendLayout(); - this.splitContainer2.SuspendLayout(); - this.PlayerEditStrip.SuspendLayout(); - this.SettingsTab.SuspendLayout(); - this.groupBox4.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.ModuleGroupBox.SuspendLayout(); - this.LogGroupBox.SuspendLayout(); - this.DatabaseGroupBox.SuspendLayout(); - this.LogTab.SuspendLayout(); - this.ChangesTab.SuspendLayout(); - this.DevTab.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.CallEditStrip.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.SuspendLayout(); - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.NewsTab); - this.tabControl1.Controls.Add(this.GameTab); - this.tabControl1.Controls.Add(this.SettingsTab); - this.tabControl1.Controls.Add(this.LogTab); - this.tabControl1.Controls.Add(this.ChangesTab); - this.tabControl1.Controls.Add(this.DevTab); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1165, 868); - this.tabControl1.TabIndex = 0; - this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl1_Selected); - // - // NewsTab - // - this.NewsTab.Controls.Add(this.NewsBrowser); - this.NewsTab.Location = new System.Drawing.Point(4, 22); - this.NewsTab.Name = "NewsTab"; - this.NewsTab.Padding = new System.Windows.Forms.Padding(3); - this.NewsTab.Size = new System.Drawing.Size(1157, 842); - this.NewsTab.TabIndex = 6; - this.NewsTab.Text = "News"; - this.NewsTab.UseVisualStyleBackColor = true; - // - // NewsBrowser - // - this.NewsBrowser.Dock = System.Windows.Forms.DockStyle.Fill; - this.NewsBrowser.Location = new System.Drawing.Point(3, 3); - this.NewsBrowser.MinimumSize = new System.Drawing.Size(20, 20); - this.NewsBrowser.Name = "NewsBrowser"; - this.NewsBrowser.ScriptErrorsSuppressed = true; - this.NewsBrowser.Size = new System.Drawing.Size(1151, 836); - this.NewsBrowser.TabIndex = 0; - // - // GameTab - // - this.GameTab.AutoScroll = true; - this.GameTab.Controls.Add(this.splitContainer2); - this.GameTab.Location = new System.Drawing.Point(4, 22); - this.GameTab.Name = "GameTab"; - this.GameTab.Padding = new System.Windows.Forms.Padding(3); - this.GameTab.Size = new System.Drawing.Size(1157, 842); - this.GameTab.TabIndex = 0; - this.GameTab.Text = "Game"; - this.GameTab.UseVisualStyleBackColor = true; - // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.IsSplitterFixed = true; - this.splitContainer2.Location = new System.Drawing.Point(3, 3); - this.splitContainer2.Name = "splitContainer2"; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.AutoScroll = true; - this.splitContainer2.Panel1.AutoScrollMinSize = new System.Drawing.Size(500, 836); - this.splitContainer2.Panel1.Controls.Add(this.comboBox1); - this.splitContainer2.Panel1.Controls.Add(this.button1); - this.splitContainer2.Panel1.Controls.Add(this.teamControl1); - // - // splitContainer2.Panel2 - // - this.splitContainer2.Panel2.AutoScroll = true; - this.splitContainer2.Panel2.AutoScrollMinSize = new System.Drawing.Size(500, 836); - this.splitContainer2.Panel2.Controls.Add(this.teamControl2); - this.splitContainer2.Size = new System.Drawing.Size(1151, 836); - this.splitContainer2.SplitterDistance = 575; - this.splitContainer2.SplitterWidth = 1; - this.splitContainer2.TabIndex = 4; - // - // comboBox1 - // - this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Items.AddRange(new object[] { + this.components = new System.ComponentModel.Container(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.NewsTab = new System.Windows.Forms.TabPage(); + this.NewsBrowser = new System.Windows.Forms.WebBrowser(); + this.GameTab = new System.Windows.Forms.TabPage(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.statusMask = new System.Windows.Forms.Label(); + this.statusLabel = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.PlayerEditStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SettingsTab = new System.Windows.Forms.TabPage(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.TopChampsBox = new System.Windows.Forms.CheckBox(); + this.StatsBox = new System.Windows.Forms.CheckBox(); + this.RecentGamesBox = new System.Windows.Forms.CheckBox(); + this.LeagueInfoBox = new System.Windows.Forms.CheckBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.DefaultGameTab = new System.Windows.Forms.ComboBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.DownloadLink = new System.Windows.Forms.LinkLabel(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.RegionList = new System.Windows.Forms.ComboBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.InstallButton = new System.Windows.Forms.Button(); + this.ModuleGroupBox = new System.Windows.Forms.GroupBox(); + this.MirrorRadio = new System.Windows.Forms.RadioButton(); + this.ToolHelpRadio = new System.Windows.Forms.RadioButton(); + this.ProcessRadio = new System.Windows.Forms.RadioButton(); + this.LeaveCheck = new System.Windows.Forms.CheckBox(); + this.DevCheck = new System.Windows.Forms.CheckBox(); + this.LogGroupBox = new System.Windows.Forms.GroupBox(); + this.DebugCheck = new System.Windows.Forms.CheckBox(); + this.TraceCheck = new System.Windows.Forms.CheckBox(); + this.DatabaseGroupBox = new System.Windows.Forms.GroupBox(); + this.ExportButton = new System.Windows.Forms.Button(); + this.ImportButton = new System.Windows.Forms.Button(); + this.LogTab = new System.Windows.Forms.TabPage(); + this.LogList = new System.Windows.Forms.ListBox(); + this.ChangesTab = new System.Windows.Forms.TabPage(); + this.ChangesText = new System.Windows.Forms.RichTextBox(); + this.DevTab = new System.Windows.Forms.TabPage(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.CallView = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.CallEditStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.dumpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.CallTree = new System.Windows.Forms.TreeView(); + this.GrayUnrankedBox = new System.Windows.Forms.CheckBox(); + this.teamControl1 = new LoLNotes.Gui.Controls.TeamControl(); + this.teamControl2 = new LoLNotes.Gui.Controls.TeamControl(); + this.tabControl1.SuspendLayout(); + this.NewsTab.SuspendLayout(); + this.GameTab.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + this.PlayerEditStrip.SuspendLayout(); + this.SettingsTab.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.ModuleGroupBox.SuspendLayout(); + this.LogGroupBox.SuspendLayout(); + this.DatabaseGroupBox.SuspendLayout(); + this.LogTab.SuspendLayout(); + this.ChangesTab.SuspendLayout(); + this.DevTab.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.CallEditStrip.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.NewsTab); + this.tabControl1.Controls.Add(this.GameTab); + this.tabControl1.Controls.Add(this.SettingsTab); + this.tabControl1.Controls.Add(this.LogTab); + this.tabControl1.Controls.Add(this.ChangesTab); + this.tabControl1.Controls.Add(this.DevTab); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(1165, 868); + this.tabControl1.TabIndex = 0; + this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl1_Selected); + // + // NewsTab + // + this.NewsTab.Controls.Add(this.NewsBrowser); + this.NewsTab.Location = new System.Drawing.Point(4, 22); + this.NewsTab.Name = "NewsTab"; + this.NewsTab.Padding = new System.Windows.Forms.Padding(3); + this.NewsTab.Size = new System.Drawing.Size(1157, 842); + this.NewsTab.TabIndex = 6; + this.NewsTab.Text = "News"; + this.NewsTab.UseVisualStyleBackColor = true; + // + // NewsBrowser + // + this.NewsBrowser.Dock = System.Windows.Forms.DockStyle.Fill; + this.NewsBrowser.Location = new System.Drawing.Point(3, 3); + this.NewsBrowser.MinimumSize = new System.Drawing.Size(20, 20); + this.NewsBrowser.Name = "NewsBrowser"; + this.NewsBrowser.ScriptErrorsSuppressed = true; + this.NewsBrowser.Size = new System.Drawing.Size(1151, 836); + this.NewsBrowser.TabIndex = 0; + // + // GameTab + // + this.GameTab.AutoScroll = true; + this.GameTab.Controls.Add(this.splitContainer2); + this.GameTab.Location = new System.Drawing.Point(4, 22); + this.GameTab.Name = "GameTab"; + this.GameTab.Padding = new System.Windows.Forms.Padding(3); + this.GameTab.Size = new System.Drawing.Size(1157, 842); + this.GameTab.TabIndex = 0; + this.GameTab.Text = "Game"; + this.GameTab.UseVisualStyleBackColor = true; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.IsSplitterFixed = true; + this.splitContainer2.Location = new System.Drawing.Point(3, 3); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.AutoScroll = true; + this.splitContainer2.Panel1.AutoScrollMinSize = new System.Drawing.Size(500, 836); + this.splitContainer2.Panel1.Controls.Add(this.statusMask); + this.splitContainer2.Panel1.Controls.Add(this.statusLabel); + this.splitContainer2.Panel1.Controls.Add(this.comboBox1); + this.splitContainer2.Panel1.Controls.Add(this.teamControl1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.AutoScroll = true; + this.splitContainer2.Panel2.AutoScrollMinSize = new System.Drawing.Size(500, 836); + this.splitContainer2.Panel2.Controls.Add(this.teamControl2); + this.splitContainer2.Size = new System.Drawing.Size(1151, 836); + this.splitContainer2.SplitterDistance = 575; + this.splitContainer2.SplitterWidth = 1; + this.splitContainer2.TabIndex = 4; + // + // statusMask + // + this.statusMask.AutoSize = true; + this.statusMask.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.statusMask.Location = new System.Drawing.Point(287, 5); + this.statusMask.Name = "statusMask"; + this.statusMask.Size = new System.Drawing.Size(99, 20); + this.statusMask.TabIndex = 4; + this.statusMask.Text = "0000000000"; + // + // statusLabel + // + this.statusLabel.AutoSize = true; + this.statusLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.statusLabel.Location = new System.Drawing.Point(221, 4); + this.statusLabel.Name = "statusLabel"; + this.statusLabel.Size = new System.Drawing.Size(60, 20); + this.statusLabel.TabIndex = 3; + this.statusLabel.Text = "Status:"; + // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { "Champs", "Recent"}); - this.comboBox1.Location = new System.Drawing.Point(94, 4); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 21); - this.comboBox1.Sorted = true; - this.comboBox1.TabIndex = 2; - this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(221, 3); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 3; - this.button1.Text = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Visible = false; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // PlayerEditStrip - // - this.PlayerEditStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.comboBox1.Location = new System.Drawing.Point(94, 4); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.Sorted = true; + this.comboBox1.TabIndex = 2; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // PlayerEditStrip + // + this.PlayerEditStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.editToolStripMenuItem, this.clearToolStripMenuItem}); - this.PlayerEditStrip.Name = "PlayerEditStrip"; - this.PlayerEditStrip.Size = new System.Drawing.Size(102, 48); - // - // editToolStripMenuItem - // - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(101, 22); - this.editToolStripMenuItem.Text = "Edit"; - this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(101, 22); - this.clearToolStripMenuItem.Text = "Clear"; - this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); - // - // SettingsTab - // - this.SettingsTab.Controls.Add(this.groupBox5); - this.SettingsTab.Controls.Add(this.groupBox4); - this.SettingsTab.Controls.Add(this.groupBox3); - this.SettingsTab.Controls.Add(this.groupBox2); - this.SettingsTab.Controls.Add(this.groupBox1); - this.SettingsTab.Controls.Add(this.ModuleGroupBox); - this.SettingsTab.Controls.Add(this.LeaveCheck); - this.SettingsTab.Controls.Add(this.DevCheck); - this.SettingsTab.Controls.Add(this.LogGroupBox); - this.SettingsTab.Controls.Add(this.DatabaseGroupBox); - this.SettingsTab.Location = new System.Drawing.Point(4, 22); - this.SettingsTab.Name = "SettingsTab"; - this.SettingsTab.Size = new System.Drawing.Size(1157, 842); - this.SettingsTab.TabIndex = 2; - this.SettingsTab.Text = "Settings"; - this.SettingsTab.UseVisualStyleBackColor = true; - // - // groupBox4 - // - this.groupBox4.Controls.Add(this.DefaultGameTab); - this.groupBox4.Location = new System.Drawing.Point(103, 3); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(155, 50); - this.groupBox4.TabIndex = 12; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Default Game Tab"; - // - // DefaultGameTab - // - this.DefaultGameTab.FormattingEnabled = true; - this.DefaultGameTab.Items.AddRange(new object[] { + this.PlayerEditStrip.Name = "PlayerEditStrip"; + this.PlayerEditStrip.Size = new System.Drawing.Size(102, 48); + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(101, 22); + this.editToolStripMenuItem.Text = "Edit"; + this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); + // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(101, 22); + this.clearToolStripMenuItem.Text = "Clear"; + this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); + // + // SettingsTab + // + this.SettingsTab.Controls.Add(this.groupBox5); + this.SettingsTab.Controls.Add(this.groupBox4); + this.SettingsTab.Controls.Add(this.groupBox3); + this.SettingsTab.Controls.Add(this.groupBox2); + this.SettingsTab.Controls.Add(this.groupBox1); + this.SettingsTab.Controls.Add(this.ModuleGroupBox); + this.SettingsTab.Controls.Add(this.LeaveCheck); + this.SettingsTab.Controls.Add(this.DevCheck); + this.SettingsTab.Controls.Add(this.LogGroupBox); + this.SettingsTab.Controls.Add(this.DatabaseGroupBox); + this.SettingsTab.Location = new System.Drawing.Point(4, 22); + this.SettingsTab.Name = "SettingsTab"; + this.SettingsTab.Size = new System.Drawing.Size(1157, 842); + this.SettingsTab.TabIndex = 2; + this.SettingsTab.Text = "Settings"; + this.SettingsTab.UseVisualStyleBackColor = true; + // + // groupBox5 + // + this.groupBox5.Controls.Add(this.GrayUnrankedBox); + this.groupBox5.Controls.Add(this.TopChampsBox); + this.groupBox5.Controls.Add(this.StatsBox); + this.groupBox5.Controls.Add(this.RecentGamesBox); + this.groupBox5.Controls.Add(this.LeagueInfoBox); + this.groupBox5.Location = new System.Drawing.Point(172, 59); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(211, 94); + this.groupBox5.TabIndex = 13; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Load What Stats"; + // + // TopChampsBox + // + this.TopChampsBox.AutoSize = true; + this.TopChampsBox.Checked = true; + this.TopChampsBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.TopChampsBox.Location = new System.Drawing.Point(6, 68); + this.TopChampsBox.Name = "TopChampsBox"; + this.TopChampsBox.Size = new System.Drawing.Size(86, 17); + this.TopChampsBox.TabIndex = 2; + this.TopChampsBox.Text = "Top Champs"; + this.TopChampsBox.UseVisualStyleBackColor = true; + this.TopChampsBox.CheckedChanged += new System.EventHandler(this.TopChampsBox_CheckedChanged); + // + // StatsBox + // + this.StatsBox.AutoSize = true; + this.StatsBox.Checked = true; + this.StatsBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.StatsBox.Location = new System.Drawing.Point(6, 45); + this.StatsBox.Name = "StatsBox"; + this.StatsBox.Size = new System.Drawing.Size(50, 17); + this.StatsBox.TabIndex = 1; + this.StatsBox.Text = "Stats"; + this.StatsBox.UseVisualStyleBackColor = true; + this.StatsBox.CheckedChanged += new System.EventHandler(this.StatsBox_CheckedChanged); + // + // RecentGamesBox + // + this.RecentGamesBox.AutoSize = true; + this.RecentGamesBox.Checked = true; + this.RecentGamesBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.RecentGamesBox.Location = new System.Drawing.Point(6, 22); + this.RecentGamesBox.Name = "RecentGamesBox"; + this.RecentGamesBox.Size = new System.Drawing.Size(97, 17); + this.RecentGamesBox.TabIndex = 0; + this.RecentGamesBox.Text = "Recent Games"; + this.RecentGamesBox.UseVisualStyleBackColor = true; + this.RecentGamesBox.CheckedChanged += new System.EventHandler(this.RecentGamesBox_CheckedChanged); + // + // LeagueInfoBox + // + this.LeagueInfoBox.AutoSize = true; + this.LeagueInfoBox.Checked = true; + this.LeagueInfoBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.LeagueInfoBox.Location = new System.Drawing.Point(109, 19); + this.LeagueInfoBox.Name = "LeagueInfoBox"; + this.LeagueInfoBox.Size = new System.Drawing.Size(83, 17); + this.LeagueInfoBox.TabIndex = 3; + this.LeagueInfoBox.Text = "League Info"; + this.LeagueInfoBox.UseVisualStyleBackColor = true; + this.LeagueInfoBox.CheckedChanged += new System.EventHandler(this.LeagueInfoBox_CheckedChanged); + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.DefaultGameTab); + this.groupBox4.Location = new System.Drawing.Point(103, 3); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(155, 50); + this.groupBox4.TabIndex = 12; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Default Game Tab"; + // + // DefaultGameTab + // + this.DefaultGameTab.FormattingEnabled = true; + this.DefaultGameTab.Items.AddRange(new object[] { "Champs", "Recent"}); - this.DefaultGameTab.Location = new System.Drawing.Point(6, 19); - this.DefaultGameTab.Name = "DefaultGameTab"; - this.DefaultGameTab.Size = new System.Drawing.Size(143, 21); - this.DefaultGameTab.TabIndex = 0; - this.DefaultGameTab.Text = "Recent"; - this.DefaultGameTab.TextChanged += new System.EventHandler(this.DefaultGameTab_TextChanged); - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.DownloadLink); - this.groupBox3.Location = new System.Drawing.Point(11, 114); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(81, 39); - this.groupBox3.TabIndex = 11; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Update Link"; - // - // DownloadLink - // - this.DownloadLink.AutoSize = true; - this.DownloadLink.Location = new System.Drawing.Point(6, 16); - this.DownloadLink.Name = "DownloadLink"; - this.DownloadLink.Size = new System.Drawing.Size(55, 13); - this.DownloadLink.TabIndex = 2; - this.DownloadLink.TabStop = true; - this.DownloadLink.Text = "Download"; - this.DownloadLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.DownloadLink_LinkClicked); - // - // groupBox2 - // - this.groupBox2.Controls.Add(this.RegionList); - this.groupBox2.Location = new System.Drawing.Point(11, 59); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(155, 49); - this.groupBox2.TabIndex = 10; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "League Of Legends Region"; - // - // RegionList - // - this.RegionList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.RegionList.FormattingEnabled = true; - this.RegionList.Location = new System.Drawing.Point(6, 19); - this.RegionList.Name = "RegionList"; - this.RegionList.Size = new System.Drawing.Size(121, 21); - this.RegionList.TabIndex = 3; - this.RegionList.SelectedIndexChanged += new System.EventHandler(this.RegionList_SelectedIndexChanged); - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.InstallButton); - this.groupBox1.Location = new System.Drawing.Point(11, 3); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(86, 50); - this.groupBox1.TabIndex = 9; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Certificates"; - // - // InstallButton - // - this.InstallButton.Location = new System.Drawing.Point(6, 19); - this.InstallButton.Name = "InstallButton"; - this.InstallButton.Size = new System.Drawing.Size(75, 23); - this.InstallButton.TabIndex = 0; - this.InstallButton.Text = "Install"; - this.InstallButton.UseVisualStyleBackColor = true; - this.InstallButton.Click += new System.EventHandler(this.InstallButton_Click); - // - // ModuleGroupBox - // - this.ModuleGroupBox.Controls.Add(this.MirrorRadio); - this.ModuleGroupBox.Controls.Add(this.ToolHelpRadio); - this.ModuleGroupBox.Controls.Add(this.ProcessRadio); - this.ModuleGroupBox.Location = new System.Drawing.Point(107, 159); - this.ModuleGroupBox.Name = "ModuleGroupBox"; - this.ModuleGroupBox.Size = new System.Drawing.Size(125, 95); - this.ModuleGroupBox.TabIndex = 8; - this.ModuleGroupBox.TabStop = false; - this.ModuleGroupBox.Text = "Module Resolver"; - // - // MirrorRadio - // - this.MirrorRadio.AutoSize = true; - this.MirrorRadio.Location = new System.Drawing.Point(6, 65); - this.MirrorRadio.Name = "MirrorRadio"; - this.MirrorRadio.Size = new System.Drawing.Size(51, 17); - this.MirrorRadio.TabIndex = 2; - this.MirrorRadio.Text = "Mirror"; - this.MirrorRadio.UseVisualStyleBackColor = true; - // - // ToolHelpRadio - // - this.ToolHelpRadio.AutoSize = true; - this.ToolHelpRadio.Location = new System.Drawing.Point(6, 42); - this.ToolHelpRadio.Name = "ToolHelpRadio"; - this.ToolHelpRadio.Size = new System.Drawing.Size(78, 17); - this.ToolHelpRadio.TabIndex = 1; - this.ToolHelpRadio.Text = "Toolhelp32"; - this.ToolHelpRadio.UseVisualStyleBackColor = true; - // - // ProcessRadio - // - this.ProcessRadio.AutoSize = true; - this.ProcessRadio.Checked = true; - this.ProcessRadio.Location = new System.Drawing.Point(6, 19); - this.ProcessRadio.Name = "ProcessRadio"; - this.ProcessRadio.Size = new System.Drawing.Size(88, 17); - this.ProcessRadio.TabIndex = 0; - this.ProcessRadio.TabStop = true; - this.ProcessRadio.Text = "ProcessClass"; - this.ProcessRadio.UseVisualStyleBackColor = true; - // - // LeaveCheck - // - this.LeaveCheck.AutoSize = true; - this.LeaveCheck.Location = new System.Drawing.Point(16, 345); - this.LeaveCheck.Name = "LeaveCheck"; - this.LeaveCheck.Size = new System.Drawing.Size(120, 17); - this.LeaveCheck.TabIndex = 7; - this.LeaveCheck.Text = "Delete LeaveBuster"; - this.LeaveCheck.UseVisualStyleBackColor = true; - // - // DevCheck - // - this.DevCheck.AutoSize = true; - this.DevCheck.Location = new System.Drawing.Point(16, 322); - this.DevCheck.Name = "DevCheck"; - this.DevCheck.Size = new System.Drawing.Size(76, 17); - this.DevCheck.TabIndex = 6; - this.DevCheck.Text = "Dev Mode"; - this.DevCheck.UseVisualStyleBackColor = true; - this.DevCheck.Click += new System.EventHandler(this.DevCheck_Click); - // - // LogGroupBox - // - this.LogGroupBox.Controls.Add(this.DebugCheck); - this.LogGroupBox.Controls.Add(this.TraceCheck); - this.LogGroupBox.Location = new System.Drawing.Point(10, 247); - this.LogGroupBox.Name = "LogGroupBox"; - this.LogGroupBox.Size = new System.Drawing.Size(91, 69); - this.LogGroupBox.TabIndex = 5; - this.LogGroupBox.TabStop = false; - this.LogGroupBox.Text = "Log Levels"; - // - // DebugCheck - // - this.DebugCheck.AutoSize = true; - this.DebugCheck.Location = new System.Drawing.Point(6, 42); - this.DebugCheck.Name = "DebugCheck"; - this.DebugCheck.Size = new System.Drawing.Size(58, 17); - this.DebugCheck.TabIndex = 1; - this.DebugCheck.Text = "Debug"; - this.DebugCheck.UseVisualStyleBackColor = true; - this.DebugCheck.Click += new System.EventHandler(this.DebugCheck_Click); - // - // TraceCheck - // - this.TraceCheck.AutoSize = true; - this.TraceCheck.Location = new System.Drawing.Point(6, 19); - this.TraceCheck.Name = "TraceCheck"; - this.TraceCheck.Size = new System.Drawing.Size(54, 17); - this.TraceCheck.TabIndex = 0; - this.TraceCheck.Text = "Trace"; - this.TraceCheck.UseVisualStyleBackColor = true; - this.TraceCheck.Click += new System.EventHandler(this.TraceCheck_Click); - // - // DatabaseGroupBox - // - this.DatabaseGroupBox.Controls.Add(this.ExportButton); - this.DatabaseGroupBox.Controls.Add(this.ImportButton); - this.DatabaseGroupBox.Location = new System.Drawing.Point(11, 159); - this.DatabaseGroupBox.Name = "DatabaseGroupBox"; - this.DatabaseGroupBox.Size = new System.Drawing.Size(90, 82); - this.DatabaseGroupBox.TabIndex = 4; - this.DatabaseGroupBox.TabStop = false; - this.DatabaseGroupBox.Text = "Database"; - // - // ExportButton - // - this.ExportButton.Location = new System.Drawing.Point(6, 48); - this.ExportButton.Name = "ExportButton"; - this.ExportButton.Size = new System.Drawing.Size(75, 23); - this.ExportButton.TabIndex = 1; - this.ExportButton.Text = "Export"; - this.ExportButton.UseVisualStyleBackColor = true; - this.ExportButton.Click += new System.EventHandler(this.ExportButton_Click); - // - // ImportButton - // - this.ImportButton.Location = new System.Drawing.Point(6, 19); - this.ImportButton.Name = "ImportButton"; - this.ImportButton.Size = new System.Drawing.Size(75, 23); - this.ImportButton.TabIndex = 0; - this.ImportButton.Text = "Import"; - this.ImportButton.UseVisualStyleBackColor = true; - this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click); - // - // LogTab - // - this.LogTab.Controls.Add(this.LogList); - this.LogTab.Location = new System.Drawing.Point(4, 22); - this.LogTab.Name = "LogTab"; - this.LogTab.Size = new System.Drawing.Size(1157, 842); - this.LogTab.TabIndex = 3; - this.LogTab.Text = "Log"; - this.LogTab.UseVisualStyleBackColor = true; - // - // LogList - // - this.LogList.Dock = System.Windows.Forms.DockStyle.Fill; - this.LogList.FormattingEnabled = true; - this.LogList.Location = new System.Drawing.Point(0, 0); - this.LogList.Name = "LogList"; - this.LogList.Size = new System.Drawing.Size(1157, 842); - this.LogList.TabIndex = 0; - // - // ChangesTab - // - this.ChangesTab.Controls.Add(this.ChangesText); - this.ChangesTab.Location = new System.Drawing.Point(4, 22); - this.ChangesTab.Name = "ChangesTab"; - this.ChangesTab.Padding = new System.Windows.Forms.Padding(3); - this.ChangesTab.Size = new System.Drawing.Size(1157, 842); - this.ChangesTab.TabIndex = 4; - this.ChangesTab.Text = "Changes"; - this.ChangesTab.UseVisualStyleBackColor = true; - // - // ChangesText - // - this.ChangesText.BackColor = System.Drawing.SystemColors.Window; - this.ChangesText.Dock = System.Windows.Forms.DockStyle.Fill; - this.ChangesText.Location = new System.Drawing.Point(3, 3); - this.ChangesText.Name = "ChangesText"; - this.ChangesText.ReadOnly = true; - this.ChangesText.Size = new System.Drawing.Size(1151, 836); - this.ChangesText.TabIndex = 0; - this.ChangesText.Text = "Loading..."; - // - // DevTab - // - this.DevTab.Controls.Add(this.splitContainer1); - this.DevTab.Location = new System.Drawing.Point(4, 22); - this.DevTab.Name = "DevTab"; - this.DevTab.Size = new System.Drawing.Size(1157, 842); - this.DevTab.TabIndex = 5; - this.DevTab.Text = "Dev"; - this.DevTab.UseVisualStyleBackColor = true; - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Name = "splitContainer1"; - this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.CallView); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.CallTree); - this.splitContainer1.Size = new System.Drawing.Size(1157, 842); - this.splitContainer1.SplitterDistance = 270; - this.splitContainer1.TabIndex = 0; - // - // CallView - // - this.CallView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.DefaultGameTab.Location = new System.Drawing.Point(6, 19); + this.DefaultGameTab.Name = "DefaultGameTab"; + this.DefaultGameTab.Size = new System.Drawing.Size(143, 21); + this.DefaultGameTab.TabIndex = 0; + this.DefaultGameTab.Text = "Recent"; + this.DefaultGameTab.TextChanged += new System.EventHandler(this.DefaultGameTab_TextChanged); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.DownloadLink); + this.groupBox3.Location = new System.Drawing.Point(11, 114); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(81, 39); + this.groupBox3.TabIndex = 11; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Update Link"; + // + // DownloadLink + // + this.DownloadLink.AutoSize = true; + this.DownloadLink.Location = new System.Drawing.Point(6, 16); + this.DownloadLink.Name = "DownloadLink"; + this.DownloadLink.Size = new System.Drawing.Size(55, 13); + this.DownloadLink.TabIndex = 2; + this.DownloadLink.TabStop = true; + this.DownloadLink.Text = "Download"; + this.DownloadLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.DownloadLink_LinkClicked); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.RegionList); + this.groupBox2.Location = new System.Drawing.Point(11, 59); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(155, 49); + this.groupBox2.TabIndex = 10; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "League Of Legends Region"; + // + // RegionList + // + this.RegionList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.RegionList.FormattingEnabled = true; + this.RegionList.Location = new System.Drawing.Point(6, 19); + this.RegionList.Name = "RegionList"; + this.RegionList.Size = new System.Drawing.Size(121, 21); + this.RegionList.TabIndex = 3; + this.RegionList.SelectedIndexChanged += new System.EventHandler(this.RegionList_SelectedIndexChanged); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.InstallButton); + this.groupBox1.Location = new System.Drawing.Point(11, 3); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(86, 50); + this.groupBox1.TabIndex = 9; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Certificates"; + // + // InstallButton + // + this.InstallButton.Location = new System.Drawing.Point(6, 19); + this.InstallButton.Name = "InstallButton"; + this.InstallButton.Size = new System.Drawing.Size(75, 23); + this.InstallButton.TabIndex = 0; + this.InstallButton.Text = "Install"; + this.InstallButton.UseVisualStyleBackColor = true; + this.InstallButton.Click += new System.EventHandler(this.InstallButton_Click); + // + // ModuleGroupBox + // + this.ModuleGroupBox.Controls.Add(this.MirrorRadio); + this.ModuleGroupBox.Controls.Add(this.ToolHelpRadio); + this.ModuleGroupBox.Controls.Add(this.ProcessRadio); + this.ModuleGroupBox.Location = new System.Drawing.Point(107, 182); + this.ModuleGroupBox.Name = "ModuleGroupBox"; + this.ModuleGroupBox.Size = new System.Drawing.Size(125, 95); + this.ModuleGroupBox.TabIndex = 8; + this.ModuleGroupBox.TabStop = false; + this.ModuleGroupBox.Text = "Module Resolver"; + // + // MirrorRadio + // + this.MirrorRadio.AutoSize = true; + this.MirrorRadio.Location = new System.Drawing.Point(6, 65); + this.MirrorRadio.Name = "MirrorRadio"; + this.MirrorRadio.Size = new System.Drawing.Size(51, 17); + this.MirrorRadio.TabIndex = 2; + this.MirrorRadio.Text = "Mirror"; + this.MirrorRadio.UseVisualStyleBackColor = true; + // + // ToolHelpRadio + // + this.ToolHelpRadio.AutoSize = true; + this.ToolHelpRadio.Location = new System.Drawing.Point(6, 42); + this.ToolHelpRadio.Name = "ToolHelpRadio"; + this.ToolHelpRadio.Size = new System.Drawing.Size(78, 17); + this.ToolHelpRadio.TabIndex = 1; + this.ToolHelpRadio.Text = "Toolhelp32"; + this.ToolHelpRadio.UseVisualStyleBackColor = true; + // + // ProcessRadio + // + this.ProcessRadio.AutoSize = true; + this.ProcessRadio.Checked = true; + this.ProcessRadio.Location = new System.Drawing.Point(6, 19); + this.ProcessRadio.Name = "ProcessRadio"; + this.ProcessRadio.Size = new System.Drawing.Size(88, 17); + this.ProcessRadio.TabIndex = 0; + this.ProcessRadio.TabStop = true; + this.ProcessRadio.Text = "ProcessClass"; + this.ProcessRadio.UseVisualStyleBackColor = true; + // + // LeaveCheck + // + this.LeaveCheck.AutoSize = true; + this.LeaveCheck.Location = new System.Drawing.Point(16, 368); + this.LeaveCheck.Name = "LeaveCheck"; + this.LeaveCheck.Size = new System.Drawing.Size(120, 17); + this.LeaveCheck.TabIndex = 7; + this.LeaveCheck.Text = "Delete LeaveBuster"; + this.LeaveCheck.UseVisualStyleBackColor = true; + // + // DevCheck + // + this.DevCheck.AutoSize = true; + this.DevCheck.Location = new System.Drawing.Point(16, 345); + this.DevCheck.Name = "DevCheck"; + this.DevCheck.Size = new System.Drawing.Size(76, 17); + this.DevCheck.TabIndex = 6; + this.DevCheck.Text = "Dev Mode"; + this.DevCheck.UseVisualStyleBackColor = true; + this.DevCheck.Click += new System.EventHandler(this.DevCheck_Click); + // + // LogGroupBox + // + this.LogGroupBox.Controls.Add(this.DebugCheck); + this.LogGroupBox.Controls.Add(this.TraceCheck); + this.LogGroupBox.Location = new System.Drawing.Point(10, 270); + this.LogGroupBox.Name = "LogGroupBox"; + this.LogGroupBox.Size = new System.Drawing.Size(91, 69); + this.LogGroupBox.TabIndex = 5; + this.LogGroupBox.TabStop = false; + this.LogGroupBox.Text = "Log Levels"; + // + // DebugCheck + // + this.DebugCheck.AutoSize = true; + this.DebugCheck.Location = new System.Drawing.Point(6, 42); + this.DebugCheck.Name = "DebugCheck"; + this.DebugCheck.Size = new System.Drawing.Size(58, 17); + this.DebugCheck.TabIndex = 1; + this.DebugCheck.Text = "Debug"; + this.DebugCheck.UseVisualStyleBackColor = true; + this.DebugCheck.Click += new System.EventHandler(this.DebugCheck_Click); + // + // TraceCheck + // + this.TraceCheck.AutoSize = true; + this.TraceCheck.Location = new System.Drawing.Point(6, 19); + this.TraceCheck.Name = "TraceCheck"; + this.TraceCheck.Size = new System.Drawing.Size(54, 17); + this.TraceCheck.TabIndex = 0; + this.TraceCheck.Text = "Trace"; + this.TraceCheck.UseVisualStyleBackColor = true; + this.TraceCheck.Click += new System.EventHandler(this.TraceCheck_Click); + // + // DatabaseGroupBox + // + this.DatabaseGroupBox.Controls.Add(this.ExportButton); + this.DatabaseGroupBox.Controls.Add(this.ImportButton); + this.DatabaseGroupBox.Location = new System.Drawing.Point(11, 182); + this.DatabaseGroupBox.Name = "DatabaseGroupBox"; + this.DatabaseGroupBox.Size = new System.Drawing.Size(90, 82); + this.DatabaseGroupBox.TabIndex = 4; + this.DatabaseGroupBox.TabStop = false; + this.DatabaseGroupBox.Text = "Database"; + // + // ExportButton + // + this.ExportButton.Location = new System.Drawing.Point(6, 48); + this.ExportButton.Name = "ExportButton"; + this.ExportButton.Size = new System.Drawing.Size(75, 23); + this.ExportButton.TabIndex = 1; + this.ExportButton.Text = "Export"; + this.ExportButton.UseVisualStyleBackColor = true; + this.ExportButton.Click += new System.EventHandler(this.ExportButton_Click); + // + // ImportButton + // + this.ImportButton.Location = new System.Drawing.Point(6, 19); + this.ImportButton.Name = "ImportButton"; + this.ImportButton.Size = new System.Drawing.Size(75, 23); + this.ImportButton.TabIndex = 0; + this.ImportButton.Text = "Import"; + this.ImportButton.UseVisualStyleBackColor = true; + this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click); + // + // LogTab + // + this.LogTab.Controls.Add(this.LogList); + this.LogTab.Location = new System.Drawing.Point(4, 22); + this.LogTab.Name = "LogTab"; + this.LogTab.Size = new System.Drawing.Size(1157, 842); + this.LogTab.TabIndex = 3; + this.LogTab.Text = "Log"; + this.LogTab.UseVisualStyleBackColor = true; + // + // LogList + // + this.LogList.Dock = System.Windows.Forms.DockStyle.Fill; + this.LogList.FormattingEnabled = true; + this.LogList.Location = new System.Drawing.Point(0, 0); + this.LogList.Name = "LogList"; + this.LogList.Size = new System.Drawing.Size(1157, 842); + this.LogList.TabIndex = 0; + // + // ChangesTab + // + this.ChangesTab.Controls.Add(this.ChangesText); + this.ChangesTab.Location = new System.Drawing.Point(4, 22); + this.ChangesTab.Name = "ChangesTab"; + this.ChangesTab.Padding = new System.Windows.Forms.Padding(3); + this.ChangesTab.Size = new System.Drawing.Size(1157, 842); + this.ChangesTab.TabIndex = 4; + this.ChangesTab.Text = "Changes"; + this.ChangesTab.UseVisualStyleBackColor = true; + // + // ChangesText + // + this.ChangesText.BackColor = System.Drawing.SystemColors.Window; + this.ChangesText.Dock = System.Windows.Forms.DockStyle.Fill; + this.ChangesText.Location = new System.Drawing.Point(3, 3); + this.ChangesText.Name = "ChangesText"; + this.ChangesText.ReadOnly = true; + this.ChangesText.Size = new System.Drawing.Size(1151, 836); + this.ChangesText.TabIndex = 0; + this.ChangesText.Text = "Loading..."; + // + // DevTab + // + this.DevTab.Controls.Add(this.splitContainer1); + this.DevTab.Location = new System.Drawing.Point(4, 22); + this.DevTab.Name = "DevTab"; + this.DevTab.Size = new System.Drawing.Size(1157, 842); + this.DevTab.TabIndex = 5; + this.DevTab.Text = "Dev"; + this.DevTab.UseVisualStyleBackColor = true; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.CallView); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.CallTree); + this.splitContainer1.Size = new System.Drawing.Size(1157, 842); + this.splitContainer1.SplitterDistance = 270; + this.splitContainer1.TabIndex = 0; + // + // CallView + // + this.CallView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1}); - this.CallView.ContextMenuStrip = this.CallEditStrip; - this.CallView.Dock = System.Windows.Forms.DockStyle.Fill; - this.CallView.FullRowSelect = true; - this.CallView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.CallView.HideSelection = false; - this.CallView.Location = new System.Drawing.Point(0, 0); - this.CallView.MultiSelect = false; - this.CallView.Name = "CallView"; - this.CallView.Size = new System.Drawing.Size(1157, 270); - this.CallView.TabIndex = 0; - this.CallView.UseCompatibleStateImageBehavior = false; - this.CallView.View = System.Windows.Forms.View.Details; - this.CallView.SelectedIndexChanged += new System.EventHandler(this.CallView_SelectedIndexChanged); - this.CallView.Resize += new System.EventHandler(this.CallView_Resize); - // - // columnHeader1 - // - this.columnHeader1.Width = 476; - // - // CallEditStrip - // - this.CallEditStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.CallView.ContextMenuStrip = this.CallEditStrip; + this.CallView.Dock = System.Windows.Forms.DockStyle.Fill; + this.CallView.FullRowSelect = true; + this.CallView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.CallView.HideSelection = false; + this.CallView.Location = new System.Drawing.Point(0, 0); + this.CallView.MultiSelect = false; + this.CallView.Name = "CallView"; + this.CallView.Size = new System.Drawing.Size(1157, 270); + this.CallView.TabIndex = 0; + this.CallView.UseCompatibleStateImageBehavior = false; + this.CallView.View = System.Windows.Forms.View.Details; + this.CallView.SelectedIndexChanged += new System.EventHandler(this.CallView_SelectedIndexChanged); + this.CallView.Resize += new System.EventHandler(this.CallView_Resize); + // + // columnHeader1 + // + this.columnHeader1.Width = 476; + // + // CallEditStrip + // + this.CallEditStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.dumpToolStripMenuItem, this.clearToolStripMenuItem1}); - this.CallEditStrip.Name = "CallEditStrip"; - this.CallEditStrip.Size = new System.Drawing.Size(108, 48); - // - // dumpToolStripMenuItem - // - this.dumpToolStripMenuItem.Name = "dumpToolStripMenuItem"; - this.dumpToolStripMenuItem.Size = new System.Drawing.Size(107, 22); - this.dumpToolStripMenuItem.Text = "Dump"; - this.dumpToolStripMenuItem.Click += new System.EventHandler(this.dumpToolStripMenuItem_Click); - // - // clearToolStripMenuItem1 - // - this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(107, 22); - this.clearToolStripMenuItem1.Text = "Clear"; - this.clearToolStripMenuItem1.Click += new System.EventHandler(this.clearToolStripMenuItem1_Click); - // - // CallTree - // - this.CallTree.Dock = System.Windows.Forms.DockStyle.Fill; - this.CallTree.Location = new System.Drawing.Point(0, 0); - this.CallTree.Name = "CallTree"; - this.CallTree.Size = new System.Drawing.Size(1157, 568); - this.CallTree.TabIndex = 0; - // - // teamControl1 - // - this.teamControl1.BackColor = System.Drawing.Color.White; - this.teamControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.teamControl1.Location = new System.Drawing.Point(0, 0); - this.teamControl1.MinimumSize = new System.Drawing.Size(500, 836); - this.teamControl1.Name = "teamControl1"; - this.teamControl1.PlayerContextMenuStrip = this.PlayerEditStrip; - this.teamControl1.Size = new System.Drawing.Size(575, 836); - this.teamControl1.TabIndex = 0; - this.teamControl1.TeamSize = 5; - this.teamControl1.Text = "Team 1"; - // - // teamControl2 - // - this.teamControl2.BackColor = System.Drawing.Color.White; - this.teamControl2.Dock = System.Windows.Forms.DockStyle.Fill; - this.teamControl2.Location = new System.Drawing.Point(0, 0); - this.teamControl2.MinimumSize = new System.Drawing.Size(500, 836); - this.teamControl2.Name = "teamControl2"; - this.teamControl2.PlayerContextMenuStrip = this.PlayerEditStrip; - this.teamControl2.Size = new System.Drawing.Size(575, 836); - this.teamControl2.TabIndex = 1; - this.teamControl2.TeamSize = 5; - this.teamControl2.Text = "Team 2"; - // - // groupBox5 - // - this.groupBox5.Controls.Add(this.TopChampsBox); - this.groupBox5.Controls.Add(this.StatsBox); - this.groupBox5.Controls.Add(this.RecentGamesBox); - this.groupBox5.Location = new System.Drawing.Point(172, 59); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(125, 94); - this.groupBox5.TabIndex = 13; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "Load What Stats"; - // - // RecentGamesBox - // - this.RecentGamesBox.AutoSize = true; - this.RecentGamesBox.Checked = true; - this.RecentGamesBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.RecentGamesBox.Location = new System.Drawing.Point(6, 19); - this.RecentGamesBox.Name = "RecentGamesBox"; - this.RecentGamesBox.Size = new System.Drawing.Size(97, 17); - this.RecentGamesBox.TabIndex = 0; - this.RecentGamesBox.Text = "Recent Games"; - this.RecentGamesBox.UseVisualStyleBackColor = true; - this.RecentGamesBox.CheckedChanged += new System.EventHandler(this.RecentGamesBox_CheckedChanged); - // - // StatsBox - // - this.StatsBox.AutoSize = true; - this.StatsBox.Checked = true; - this.StatsBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.StatsBox.Location = new System.Drawing.Point(6, 42); - this.StatsBox.Name = "StatsBox"; - this.StatsBox.Size = new System.Drawing.Size(50, 17); - this.StatsBox.TabIndex = 1; - this.StatsBox.Text = "Stats"; - this.StatsBox.UseVisualStyleBackColor = true; - this.StatsBox.CheckedChanged += new System.EventHandler(this.StatsBox_CheckedChanged); - // - // TopChampsBox - // - this.TopChampsBox.AutoSize = true; - this.TopChampsBox.Checked = true; - this.TopChampsBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.TopChampsBox.Location = new System.Drawing.Point(6, 65); - this.TopChampsBox.Name = "TopChampsBox"; - this.TopChampsBox.Size = new System.Drawing.Size(86, 17); - this.TopChampsBox.TabIndex = 2; - this.TopChampsBox.Text = "Top Champs"; - this.TopChampsBox.UseVisualStyleBackColor = true; - this.TopChampsBox.CheckedChanged += new System.EventHandler(this.TopChampsBox_CheckedChanged); - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1165, 868); - this.Controls.Add(this.tabControl1); - this.MinimumSize = new System.Drawing.Size(800, 38); - this.Name = "MainForm"; - this.Text = "LoL"; - this.Shown += new System.EventHandler(this.MainForm_Shown); - this.ResizeBegin += new System.EventHandler(this.MainForm_ResizeBegin); - this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd); - this.tabControl1.ResumeLayout(false); - this.NewsTab.ResumeLayout(false); - this.GameTab.ResumeLayout(false); - this.splitContainer2.Panel1.ResumeLayout(false); - this.splitContainer2.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); - this.splitContainer2.ResumeLayout(false); - this.PlayerEditStrip.ResumeLayout(false); - this.SettingsTab.ResumeLayout(false); - this.SettingsTab.PerformLayout(); - this.groupBox4.ResumeLayout(false); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.ModuleGroupBox.ResumeLayout(false); - this.ModuleGroupBox.PerformLayout(); - this.LogGroupBox.ResumeLayout(false); - this.LogGroupBox.PerformLayout(); - this.DatabaseGroupBox.ResumeLayout(false); - this.LogTab.ResumeLayout(false); - this.ChangesTab.ResumeLayout(false); - this.DevTab.ResumeLayout(false); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.CallEditStrip.ResumeLayout(false); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.ResumeLayout(false); + this.CallEditStrip.Name = "CallEditStrip"; + this.CallEditStrip.Size = new System.Drawing.Size(108, 48); + // + // dumpToolStripMenuItem + // + this.dumpToolStripMenuItem.Name = "dumpToolStripMenuItem"; + this.dumpToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.dumpToolStripMenuItem.Text = "Dump"; + this.dumpToolStripMenuItem.Click += new System.EventHandler(this.dumpToolStripMenuItem_Click); + // + // clearToolStripMenuItem1 + // + this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; + this.clearToolStripMenuItem1.Size = new System.Drawing.Size(107, 22); + this.clearToolStripMenuItem1.Text = "Clear"; + this.clearToolStripMenuItem1.Click += new System.EventHandler(this.clearToolStripMenuItem1_Click); + // + // CallTree + // + this.CallTree.Dock = System.Windows.Forms.DockStyle.Fill; + this.CallTree.Location = new System.Drawing.Point(0, 0); + this.CallTree.Name = "CallTree"; + this.CallTree.Size = new System.Drawing.Size(1157, 568); + this.CallTree.TabIndex = 0; + // + // GrayUnrankedBox + // + this.GrayUnrankedBox.AutoSize = true; + this.GrayUnrankedBox.Checked = true; + this.GrayUnrankedBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.GrayUnrankedBox.Location = new System.Drawing.Point(109, 42); + this.GrayUnrankedBox.Name = "GrayUnrankedBox"; + this.GrayUnrankedBox.Size = new System.Drawing.Size(98, 17); + this.GrayUnrankedBox.TabIndex = 4; + this.GrayUnrankedBox.Text = "Gray Unranked"; + this.GrayUnrankedBox.UseVisualStyleBackColor = true; + this.GrayUnrankedBox.CheckedChanged += new System.EventHandler(this.GrayUnrankedBox_CheckedChanged); + // + // teamControl1 + // + this.teamControl1.BackColor = System.Drawing.Color.White; + this.teamControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.teamControl1.Location = new System.Drawing.Point(0, 0); + this.teamControl1.MinimumSize = new System.Drawing.Size(500, 836); + this.teamControl1.Name = "teamControl1"; + this.teamControl1.PlayerContextMenuStrip = this.PlayerEditStrip; + this.teamControl1.Size = new System.Drawing.Size(575, 836); + this.teamControl1.TabIndex = 0; + this.teamControl1.TeamSize = 5; + this.teamControl1.Text = "Team 1"; + // + // teamControl2 + // + this.teamControl2.BackColor = System.Drawing.Color.White; + this.teamControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.teamControl2.Location = new System.Drawing.Point(0, 0); + this.teamControl2.MinimumSize = new System.Drawing.Size(500, 836); + this.teamControl2.Name = "teamControl2"; + this.teamControl2.PlayerContextMenuStrip = this.PlayerEditStrip; + this.teamControl2.Size = new System.Drawing.Size(575, 836); + this.teamControl2.TabIndex = 1; + this.teamControl2.TeamSize = 5; + this.teamControl2.Text = "Team 2"; + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1165, 868); + this.Controls.Add(this.tabControl1); + this.MinimumSize = new System.Drawing.Size(800, 39); + this.Name = "MainForm"; + this.Text = "LoL"; + this.Shown += new System.EventHandler(this.MainForm_Shown); + this.ResizeBegin += new System.EventHandler(this.MainForm_ResizeBegin); + this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd); + this.tabControl1.ResumeLayout(false); + this.NewsTab.ResumeLayout(false); + this.GameTab.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.PlayerEditStrip.ResumeLayout(false); + this.SettingsTab.ResumeLayout(false); + this.SettingsTab.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.ModuleGroupBox.ResumeLayout(false); + this.ModuleGroupBox.PerformLayout(); + this.LogGroupBox.ResumeLayout(false); + this.LogGroupBox.PerformLayout(); + this.DatabaseGroupBox.ResumeLayout(false); + this.LogTab.ResumeLayout(false); + this.ChangesTab.ResumeLayout(false); + this.DevTab.ResumeLayout(false); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.CallEditStrip.ResumeLayout(false); + this.ResumeLayout(false); } @@ -748,7 +790,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem dumpToolStripMenuItem; private System.Windows.Forms.TreeView CallTree; private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.Button button1; private System.Windows.Forms.TabPage NewsTab; private System.Windows.Forms.WebBrowser NewsBrowser; private System.Windows.Forms.CheckBox LeaveCheck; @@ -766,7 +807,10 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox TopChampsBox; private System.Windows.Forms.CheckBox StatsBox; private System.Windows.Forms.CheckBox RecentGamesBox; - + private System.Windows.Forms.CheckBox LeagueInfoBox; + private System.Windows.Forms.Label statusLabel; + private System.Windows.Forms.Label statusMask; + private System.Windows.Forms.CheckBox GrayUnrankedBox; } } diff --git a/LoLNotes/Gui/MainForm.cs b/LoLNotes/Gui/MainForm.cs index ff6303b..940e052 100644 --- a/LoLNotes/Gui/MainForm.cs +++ b/LoLNotes/Gui/MainForm.cs @@ -1,3 +1,26 @@ +using Db4objects.Db4o; +using Db4objects.Db4o.Config; +using Db4objects.Db4o.TA; +using FluorineFx; +using FluorineFx.AMF3; +using FluorineFx.IO; +using FluorineFx.Messaging.Messages; +using FluorineFx.Messaging.Rtmp.Event; +using LoLNotes.Gui.Controls; +using LoLNotes.Messages.Account; +using LoLNotes.Messages.Champion; +using LoLNotes.Messages.Commands; +using LoLNotes.Messages.GameLobby; +using LoLNotes.Messages.GameLobby.Participants; +using LoLNotes.Messages.GameStats; +using LoLNotes.Messages.Readers; +using LoLNotes.Properties; +using LoLNotes.Proxy; +using LoLNotes.Storage; +using LoLNotes.Util; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using NotMissing.Logging; /* copyright (C) 2011-2012 by high828@gmail.com @@ -32,31 +55,6 @@ THE SOFTWARE. using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using Db4objects.Db4o; -using Db4objects.Db4o.Config; -using Db4objects.Db4o.TA; -using FluorineFx; -using FluorineFx.AMF3; -using FluorineFx.IO; -using FluorineFx.Messaging.Messages; -using FluorineFx.Messaging.Rtmp.Event; -using LoLNotes.Gui.Controls; -using LoLNotes.Messages.Account; -using LoLNotes.Messages.Champion; -using LoLNotes.Messages.Commands; -using LoLNotes.Messages.GameLobby; -using LoLNotes.Messages.GameLobby.Participants; -using LoLNotes.Messages.GameStats; -using LoLNotes.Messages.Readers; -using LoLNotes.Messages.Statistics; -using LoLNotes.Messages.Summoner; -using LoLNotes.Properties; -using LoLNotes.Proxy; -using LoLNotes.Storage; -using LoLNotes.Util; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using NotMissing.Logging; namespace LoLNotes.Gui { @@ -66,7 +64,7 @@ public partial class MainForm : Form const string SettingsFile = "settings.json"; readonly Dictionary Icons; - readonly Dictionary Certificates; + readonly Dictionary Certificates; readonly Dictionary ModuleResolvers; readonly List PlayersCache = new List(); readonly ProcessQueue TrackingQueue = new ProcessQueue(); @@ -83,7 +81,7 @@ public partial class MainForm : Form SummonerData SelfSummoner; MainSettings Settings { get { return MainSettings.Instance; } } - + public MainForm() { InitializeComponent(); @@ -102,13 +100,13 @@ public MainForm() {"Green", Icon.FromHandle(Resources.circle_green.GetHicon())}, }; - Certificates = LoadCertificates(Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Content/Certificates")); - if (Certificates.Count < 1) - { - MessageBox.Show("Unable to load any certificates"); - Application.Exit(); - return; - } + Certificates = LoadCertificates(Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Content/Certificates")); + if (Certificates.Count < 1) + { + MessageBox.Show("Unable to load any certificates"); + Application.Exit(); + return; + } ModuleResolvers = new Dictionary { @@ -133,6 +131,7 @@ public MainForm() Connection.Connected += Connection_Connected; Injector.Injected += Injector_Injected; + Injector.ErrorOccurred += Injector_ErrorOccurred; Reader.ObjectRead += Reader_ObjectRead; //Recorder must be initiated after Reader.ObjectRead as @@ -148,37 +147,43 @@ public MainForm() int idx = RegionList.Items.IndexOf(Settings.Region); RegionList.SelectedIndex = idx != -1 ? idx : 0; //This ends up calling UpdateRegion so no reason to initialize the connection here. - DefaultGameTab.Text = Settings.DefaultGameTab; + DefaultGameTab.Text = Settings.DefaultGameTab; Installer = new CertificateInstaller(Certificates.Select(c => c.Value.Certificate).ToArray()); TrackingQueue.Process += TrackingQueue_Process; launcher.ProcessFound += launcher_ProcessFound; -#if DEBUG - button1.Visible = true; -#endif - StaticLogger.Info("Startup Completed"); } - Dictionary LoadCertificates(string path) - { - var ret = new Dictionary(); - if (!Directory.Exists(path)) - return ret; + Dictionary LoadCertificates(string path) + { + var ret = new Dictionary(); + if (!Directory.Exists(path)) + return ret; - foreach (var file in new DirectoryInfo(path).GetFiles("*.p12")) - { - var nameNoExt = Path.GetFileNameWithoutExtension(file.Name); - var idx = nameNoExt.IndexOf('_'); - var name = idx != -1 ? nameNoExt.Substring(0, idx) : nameNoExt; - var host = idx != -1 ? nameNoExt.Substring(idx + 1) : nameNoExt; - ret[name] = new CertificateHolder(host, File.ReadAllBytes(file.FullName)); - } + foreach (var file in new DirectoryInfo(path).GetFiles("*.p12")) + { + var nameNoExt = Path.GetFileNameWithoutExtension(file.Name); + var idx = nameNoExt.IndexOf('_'); + var name = idx != -1 ? nameNoExt.Substring(0, idx) : nameNoExt; + var host = idx != -1 ? nameNoExt.Substring(idx + 1) : nameNoExt; + + // We want to replace old NA certificates with the new one. + // We do this by guaranteeing that if the new certificate exists, it will be placed in the dictionary and will not be replaced by any other element + if (ret.ContainsKey("NA")) + { + if (nameNoExt != "NA_prod.na2.lol.riotgames.com") + { + continue; + } + } + ret[name] = new CertificateHolder(host, File.ReadAllBytes(file.FullName)); + } - return ret; - } + return ret; + } void moduleresolvers_Click(object sender, EventArgs e) { @@ -241,7 +246,7 @@ void launcher_ProcessFound(object sender, ProcessMonitor.ProcessEventArgs e) } catch (Exception ex) { - StaticLogger.Warning("LeaverBuster: Unable to read global.properties '" + filename + "'"); + StaticLogger.Warning("LeaverBuster: Unable to read global.properties '" + filename + "'"); continue; } } @@ -261,7 +266,7 @@ void launcher_ProcessFound(object sender, ProcessMonitor.ProcessEventArgs e) } catch (Exception ex) { - StaticLogger.Warning("LeaverBuster: Unable to write global.properties '" + filename + "'"); + StaticLogger.Warning("LeaverBuster: Unable to write global.properties '" + filename + "'"); continue; } } @@ -301,6 +306,16 @@ void TrackingQueue_Process(object sender, ProcessQueueEventArgs e) } } + void Injector_ErrorOccurred(object sender, EventArgs e) + { + string err = Injector.ErrorMessage; + + if (!string.IsNullOrEmpty(err)) + { + MessageBox.Show(err); + } + } + void Injector_Injected(object sender, EventArgs e) { if (Created) @@ -317,9 +332,11 @@ void Settings_Loaded(object sender, EventArgs e) if (mod.Value == null) mod = ModuleResolvers.First(); mod.Value.Checked = true; - TopChampsBox.Checked = (Settings.LoadWhatData & LoadDataEnum.TopChamps) != 0; - StatsBox.Checked = (Settings.LoadWhatData & LoadDataEnum.Stats) != 0; - RecentGamesBox.Checked = (Settings.LoadWhatData & LoadDataEnum.RecentGames) != 0; + TopChampsBox.Checked = (Settings.LoadWhatData & LoadDataEnum.TopChamps) != 0; + StatsBox.Checked = (Settings.LoadWhatData & LoadDataEnum.Stats) != 0; + RecentGamesBox.Checked = (Settings.LoadWhatData & LoadDataEnum.RecentGames) != 0; + LeagueInfoBox.Checked = (Settings.LoadWhatData & LoadDataEnum.LeagueInfo) != 0; + GrayUnrankedBox.Checked = (Settings.LoadWhatData & LoadDataEnum.GrayUnranked) != 0; } readonly object settingslock = new object(); @@ -366,7 +383,7 @@ void SetRelease(JObject data) if (data == null) return; SetTitle(string.Format("v{0}{1}", data.Value("Version"), data.Value("ReleaseName"))); - DownloadLink.Links.Add(0, DownloadLink.Text.Length + 1, data.Value("Link")); + DownloadLink.Links.Add(0, DownloadLink.Text.Length + 1, data.Value("Link")); } void SetChanges(JObject data) @@ -407,12 +424,7 @@ void SetChanges(JObject data) void SetNews(JObject data) { - if (data == null) - return; - NewsBrowser.Navigate("about:blank"); - if (NewsBrowser.Document != null) - NewsBrowser.Document.Write(string.Empty); - NewsBrowser.DocumentText = data.Value("html"); + return; } void GetGeneral() @@ -456,13 +468,13 @@ void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs void LogException(Exception ex, bool track) { - var log = string.Format( - "[{0}] {1} ({2:MM/dd/yyyy HH:mm:ss.fff})", - Levels.Fatal.ToString().ToUpper(), - string.Format("{0} [{1}]", ex.Message, Parse.ToBase64(ex.ToString())), - DateTime.UtcNow); - LogToFile(log); - AddLogToList(log); + var log = string.Format( + "[{0}] {1} ({2:MM/dd/yyyy HH:mm:ss.fff})", + Levels.Fatal.ToString().ToUpper(), + string.Format("{0} [{1}]", ex.Message, Parse.ToBase64(ex.ToString())), + DateTime.UtcNow); + LogToFile(log); + AddLogToList(log); if (track) TrackingQueue.Enqueue(string.Format("error/{0}", Parse.ToBase64(ex.ToString()))); @@ -475,8 +487,8 @@ void Log(Levels level, object obj) level.ToString().ToUpper(), obj, DateTime.UtcNow); - Task.Factory.StartNew(LogToFile, log, TaskCreationOptions.LongRunning); - AddLogToList(log); + Task.Factory.StartNew(LogToFile, log, TaskCreationOptions.LongRunning); + AddLogToList(log); } void OnLog(Levels level, object obj) @@ -501,12 +513,12 @@ void AddLogToList(string log) { if (InvokeRequired) { - BeginInvoke(new Action(AddLogToList), log); + BeginInvoke(new Action(AddLogToList), log); return; } if (LogList.Items.Count > 1000) LogList.Items.RemoveAt(0); - LogList.Items.Add(log); + LogList.Items.Add(log); LogList.SelectedIndex = LogList.Items.Count - 1; LogList.SelectedIndex = -1; } @@ -572,6 +584,13 @@ public void UpdateLists(GameDTO lobby) return; } + statusMask.Text = lobby.StatusOfParticipants; + + if (lobby.GameState == "TERMINATED") + { + return; + } + if (CurrentGame == null || CurrentGame.Id != lobby.Id) { CurrentGame = lobby; @@ -604,12 +623,12 @@ public void UpdateLists(GameDTO lobby) var lists = new List { teamControl1, teamControl2 }; - //Load the opposite team first. Not currently useful with the way things are loaded. - if (SelfSummoner != null && lobby.TeamOne.Find(p => p is PlayerParticipant && ((PlayerParticipant)p).SummonerId == SelfSummoner.SummonerId) != null) - { - teams.Reverse(); - lists.Reverse(); - } + //Load the opposite team first. Not currently useful with the way things are loaded. + if (SelfSummoner != null && lobby.TeamOne.Find(p => p is PlayerParticipant && ((PlayerParticipant)p).SummonerId == SelfSummoner.SummonerId) != null) + { + teams.Reverse(); + lists.Reverse(); + } for (int i = 0; i < lists.Count; i++) { @@ -641,7 +660,7 @@ public void UpdateLists(GameDTO lobby) plycontrol.SetLoading(true); plycontrol.SetEmpty(); plycontrol.SetParticipant(ply); - Task.Factory.StartNew(() => LoadPlayer(ply, plycontrol), TaskCreationOptions.LongRunning); + Task.Factory.StartNew(() => LoadPlayer(ply, plycontrol), TaskCreationOptions.LongRunning); } else { @@ -682,14 +701,17 @@ void LoadPlayerUIFinish(PlayerCache ply, PlayerControl control) return; - control.DefaultGameTab = Settings.DefaultGameTab; + control.DefaultGameTab = Settings.DefaultGameTab; control.SetPlayer(ply.Player); - if (ply.Stats != null) - control.SetStats(ply.Summoner, ply.Stats); - if (ply.RecentChamps != null) - control.SetChamps(ply.RecentChamps); - if (ply.Games != null) - control.SetGames(ply.Games); + control.SetLeagueInfo(ply.LeagueInfo); + if (ply.Summoner != null) + control.SetLevel(ply.Summoner.SummonerLevel); + if (ply.Stats != null) + control.SetStats(ply.Summoner, ply.LeagueInfo, ply.Stats); + if (ply.RecentChamps != null) + control.SetChamps(ply.RecentChamps); + if (ply.Games != null) + control.SetGames(ply.Games, ((Settings.LoadWhatData & LoadDataEnum.GrayUnranked) != 0)); control.SetSeen(ply.SeenCount); control.SetLoading(false); @@ -699,8 +721,8 @@ void LoadPlayerUIFinish(PlayerCache ply, PlayerControl control) { if (!comboBox1.Items.Contains(stat.PlayerStatSummaryType)) comboBox1.Items.Add(stat.PlayerStatSummaryType); - if (!DefaultGameTab.Items.Contains(stat.PlayerStatSummaryType)) - DefaultGameTab.Items.Add(stat.PlayerStatSummaryType); + if (!DefaultGameTab.Items.Contains(stat.PlayerStatSummaryType)) + DefaultGameTab.Items.Add(stat.PlayerStatSummaryType); } } }); @@ -753,12 +775,15 @@ void LoadPlayer(PlayerParticipant player, PlayerControl control) if (summoner != null) { ply.Summoner = summoner; - if ((Settings.LoadWhatData & LoadDataEnum.Stats) != 0) - ply.Stats = cmd.RetrievePlayerStatsByAccountId(summoner.AccountId); - if ((Settings.LoadWhatData & LoadDataEnum.TopChamps) != 0) - ply.RecentChamps = cmd.RetrieveTopPlayedChampions(summoner.AccountId, "CLASSIC"); - if ((Settings.LoadWhatData & LoadDataEnum.RecentGames) != 0) - ply.Games = cmd.GetRecentGames(summoner.AccountId); + + if ((Settings.LoadWhatData & LoadDataEnum.LeagueInfo) != 0) + ply.LeagueInfo = cmd.getAllLeaguesForPlayer(summoner.SummonerId); + if ((Settings.LoadWhatData & LoadDataEnum.Stats) != 0) + ply.Stats = cmd.RetrievePlayerStatsByAccountId(summoner.AccountId); + if ((Settings.LoadWhatData & LoadDataEnum.TopChamps) != 0) + ply.RecentChamps = cmd.RetrieveTopPlayedChampions(summoner.AccountId, "CLASSIC"); + if ((Settings.LoadWhatData & LoadDataEnum.RecentGames) != 0) + ply.Games = cmd.GetRecentGames(summoner.AccountId); } else { @@ -779,7 +804,7 @@ void LoadPlayer(PlayerParticipant player, PlayerControl control) } catch (Exception ex) { - ply.LoadWait.Set(); // + ply.LoadWait.Set(); StaticLogger.Warning(ex); } } @@ -799,8 +824,8 @@ private void InstallButton_Click(object sender, EventArgs e) Installer.Uninstall(); } else - { - Installer.Uninstall(); + { + Installer.Uninstall(); Installer.Install(); } } @@ -858,7 +883,7 @@ private void editToolStripMenuItem_Click(object sender, EventArgs e) plrcontrol.Player.NoteColor = Color.FromName(form.ColorBox.Items[form.ColorBox.SelectedIndex].ToString()); plrcontrol.SetPlayer(plrcontrol.Player); //Forces the notes/color to update - Task.Factory.StartNew(() => Recorder.CommitPlayer(plrcontrol.Player), TaskCreationOptions.LongRunning); + Task.Factory.StartNew(() => Recorder.CommitPlayer(plrcontrol.Player), TaskCreationOptions.LongRunning); } private void clearToolStripMenuItem_Click(object sender, EventArgs e) @@ -882,7 +907,7 @@ private void clearToolStripMenuItem_Click(object sender, EventArgs e) plrcontrol.Player.NoteColor = default(Color); plrcontrol.SetPlayer(plrcontrol.Player); //Forces the notes/color to update - Task.Factory.StartNew(() => Recorder.CommitPlayer(plrcontrol.Player), TaskCreationOptions.LongRunning); + Task.Factory.StartNew(() => Recorder.CommitPlayer(plrcontrol.Player), TaskCreationOptions.LongRunning); } private void DownloadLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -893,7 +918,7 @@ private void DownloadLink_LinkClicked(object sender, LinkLabelLinkClickedEventAr private void MainForm_Shown(object sender, EventArgs e) { SetTitle("(Checking)"); - Task.Factory.StartNew(GetGeneral, TaskCreationOptions.LongRunning); + Task.Factory.StartNew(GetGeneral, TaskCreationOptions.LongRunning); TrackingQueue.Enqueue("startup"); Settings_Loaded(this, new EventArgs()); @@ -948,10 +973,10 @@ private void RegionList_SelectedIndexChanged(object sender, EventArgs e) Connection.ChangeRemote(cert.Domain, cert.Certificate); } - private void DefaultGameTab_TextChanged(object sender, EventArgs e) - { - Settings.DefaultGameTab = DefaultGameTab.Text; - } + private void DefaultGameTab_TextChanged(object sender, EventArgs e) + { + Settings.DefaultGameTab = DefaultGameTab.Text; + } private void ImportButton_Click(object sender, EventArgs e) { @@ -1289,69 +1314,44 @@ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) comboBox1.SelectedIndex = -1; } - private void button1_Click(object sender, EventArgs e) + private void RecentGamesBox_CheckedChanged(object sender, EventArgs e) { - var cmd = new PlayerCommands(Connection); - var summoner = cmd.GetPlayerByName(SelfSummoner.Username); - if (summoner != null) - { - cmd.RetrievePlayerStatsByAccountId(summoner.AccountId); - cmd.RetrieveTopPlayedChampions(summoner.AccountId, "CLASSIC"); - cmd.GetRecentGames(summoner.AccountId); - } + if (RecentGamesBox.Checked) + Settings.LoadWhatData |= LoadDataEnum.RecentGames; + else + Settings.LoadWhatData &= ~LoadDataEnum.RecentGames; + } + private void StatsBox_CheckedChanged(object sender, EventArgs e) + { + if (StatsBox.Checked) + Settings.LoadWhatData |= LoadDataEnum.Stats; + else + Settings.LoadWhatData &= ~LoadDataEnum.Stats; + } + + private void TopChampsBox_CheckedChanged(object sender, EventArgs e) + { + if (TopChampsBox.Checked) + Settings.LoadWhatData |= LoadDataEnum.TopChamps; + else + Settings.LoadWhatData &= ~LoadDataEnum.TopChamps; + } + + private void LeagueInfoBox_CheckedChanged(object sender, EventArgs e) + { + if (LeagueInfoBox.Checked) + Settings.LoadWhatData |= LoadDataEnum.LeagueInfo; + else + Settings.LoadWhatData &= ~LoadDataEnum.LeagueInfo; + } - //var cmd = new PlayerCommands(Connection); - //var obj = cmd.InvokeServiceUnknown( - // "gameService", - // "quitGame" - //); - - //if (Champions == null) - // return; - - //var sorted = Champions.OrderBy(c => ChampNames.Get(c.ChampionId)).ToList(); - - //var cmd = new PlayerCommands(Connection); - //for (int i = 0; i < sorted.Count; i++) - //{ - // if (sorted[i].FreeToPlay || sorted[i].Owned) - // { - // var id = sorted[i].ChampionId; - // //ThreadPool.QueueUserWorkItem(delegate - // //{ - // var obj = cmd.InvokeServiceUnknown( - // "gameService", - // "selectChampion", - // id - // ); - // //}); - // } - //} - } - - private void RecentGamesBox_CheckedChanged(object sender, EventArgs e) - { - if (RecentGamesBox.Checked) - Settings.LoadWhatData |= LoadDataEnum.RecentGames; - else - Settings.LoadWhatData &= ~LoadDataEnum.RecentGames; - } - - private void StatsBox_CheckedChanged(object sender, EventArgs e) - { - if (StatsBox.Checked) - Settings.LoadWhatData |= LoadDataEnum.Stats; - else - Settings.LoadWhatData &= ~LoadDataEnum.Stats; - } - - private void TopChampsBox_CheckedChanged(object sender, EventArgs e) - { - if (TopChampsBox.Checked) - Settings.LoadWhatData |= LoadDataEnum.TopChamps; - else - Settings.LoadWhatData &= ~LoadDataEnum.TopChamps; - } + private void GrayUnrankedBox_CheckedChanged(object sender, EventArgs e) + { + if (GrayUnrankedBox.Checked) + Settings.LoadWhatData |= LoadDataEnum.GrayUnranked; + else + Settings.LoadWhatData &= ~LoadDataEnum.GrayUnranked; + } } } diff --git a/LoLNotes/Gui/MainSettings.cs b/LoLNotes/Gui/MainSettings.cs index 959d8e4..811b921 100644 --- a/LoLNotes/Gui/MainSettings.cs +++ b/LoLNotes/Gui/MainSettings.cs @@ -40,12 +40,12 @@ public static MainSettings Instance return _instance ?? (_instance = new MainSettings()); } } - + public event PropertyChangedEventHandler PropertyChanged; public event EventHandler Loaded; - string _region; - public string Region + string _region; + public string Region { get { @@ -109,48 +109,48 @@ public bool DeleteLeaveBuster OnPropertyChanged("DeleteLeaveBuster"); } } - string _moduleresolver; - public string ModuleResolver - { - get - { - return _moduleresolver; - } - set - { - _moduleresolver = value; - OnPropertyChanged("ModuleResolver"); - } - } - - string _defaultgametab; - public string DefaultGameTab - { - get - { - return _defaultgametab; - } - set - { - _defaultgametab = value; - OnPropertyChanged("DefaultGameTab"); - } - } - - - LoadDataEnum _loadwhatdata; - public LoadDataEnum LoadWhatData - { - get - { - return _loadwhatdata; - } - set - { - _loadwhatdata = value; - OnPropertyChanged("LoadWhatData"); - } - } + string _moduleresolver; + public string ModuleResolver + { + get + { + return _moduleresolver; + } + set + { + _moduleresolver = value; + OnPropertyChanged("ModuleResolver"); + } + } + + string _defaultgametab; + public string DefaultGameTab + { + get + { + return _defaultgametab; + } + set + { + _defaultgametab = value; + OnPropertyChanged("DefaultGameTab"); + } + } + + + LoadDataEnum _loadwhatdata; + public LoadDataEnum LoadWhatData + { + get + { + return _loadwhatdata; + } + set + { + _loadwhatdata = value; + OnPropertyChanged("LoadWhatData"); + } + } public MainSettings() { @@ -160,9 +160,9 @@ public MainSettings() _devmode = false; _deleteleavebuster = true; _moduleresolver = ""; - _defaultgametab = "Recent"; - _loadwhatdata = LoadDataEnum.All; - } + _defaultgametab = "Recent"; + _loadwhatdata = LoadDataEnum.LeagueInfo | LoadDataEnum.GrayUnranked | LoadDataEnum.RecentGames; + } public bool Save(string file) { diff --git a/LoLNotes/Gui/PlayerCache.cs b/LoLNotes/Gui/PlayerCache.cs index 5d2206f..ef8d77d 100644 --- a/LoLNotes/Gui/PlayerCache.cs +++ b/LoLNotes/Gui/PlayerCache.cs @@ -32,6 +32,7 @@ namespace LoLNotes.Gui { public class PlayerCache { + public SummonerLeaguesDTO LeagueInfo { get; set; } public PlayerEntry Player { get; set; } public PublicSummoner Summoner { get; set; } public PlayerLifetimeStats Stats { get; set; } diff --git a/LoLNotes/LoLNotes.csproj b/LoLNotes/LoLNotes.csproj index 0b4a5b0..a19c7cc 100644 --- a/LoLNotes/LoLNotes.csproj +++ b/LoLNotes/LoLNotes.csproj @@ -142,6 +142,8 @@ + + @@ -151,6 +153,7 @@ + @@ -281,10 +284,7 @@ PreserveNewest - - PreserveNewest - - + PreserveNewest diff --git a/LoLNotes/Messages/Commands/PlayerCommands.cs b/LoLNotes/Messages/Commands/PlayerCommands.cs index 6a5332e..d342904 100644 --- a/LoLNotes/Messages/Commands/PlayerCommands.cs +++ b/LoLNotes/Messages/Commands/PlayerCommands.cs @@ -77,7 +77,7 @@ public object InvokeServiceUnknown(string service, string operation, params obje var errordetail = error != null && error.faultDetail != null ? string.Format(" [{0}]", error.faultDetail) : ""; var errorstr = error != null && error.faultString != null ? string.Format(", {0}", error.faultString) : ""; StaticLogger.Warning(string.Format( - "{0} returned an error{1}{2}", + "{0} returned an error{1}{2}", endpoint, errorstr, errordetail @@ -177,6 +177,15 @@ public T InvokeService(string service, string operation, params object[] args return (T)obj; } + public SummonerLeaguesDTO getAllLeaguesForPlayer(Int64 summonerId) + { + return InvokeService( + "leaguesServiceProxy", + "getAllLeaguesForPlayer", + summonerId + ); + } + public PublicSummoner GetPlayerByName(string name) { return InvokeService( @@ -191,8 +200,7 @@ public PlayerLifetimeStats RetrievePlayerStatsByAccountId(Int64 acctid) return InvokeService( "playerStatsService", "retrievePlayerStatsByAccountId", - acctid, - "CURRENT" + acctid ); } diff --git a/LoLNotes/Messages/GameLobby/GameDTO.cs b/LoLNotes/Messages/GameLobby/GameDTO.cs index fb3df8d..1711f98 100644 --- a/LoLNotes/Messages/GameLobby/GameDTO.cs +++ b/LoLNotes/Messages/GameLobby/GameDTO.cs @@ -40,6 +40,13 @@ public GameDTO(ASObject obj) BaseObject.SetFields(this, obj); } + [InternalName("statusOfParticipants")] + public string StatusOfParticipants + { + get; + set; + } + [InternalName("maxNumPlayers")] public int MaxPlayers { diff --git a/LoLNotes/Messages/Statistics/LeagueItemDTO.cs b/LoLNotes/Messages/Statistics/LeagueItemDTO.cs new file mode 100644 index 0000000..81cdc7c --- /dev/null +++ b/LoLNotes/Messages/Statistics/LeagueItemDTO.cs @@ -0,0 +1,95 @@ +/* +copyright (C) 2011-2012 by high828@gmail.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FluorineFx; +using FluorineFx.AMF3; +using LoLNotes.Flash; + +namespace LoLNotes.Messages.Summoner +{ + [Message(".LeagueItemDTO")] + public class LeagueItemDTO : MessageObject + { + public LeagueItemDTO(ASObject obj) + : base(obj) + { + BaseObject.SetFields(this, obj); + } + + [InternalName("previousDayLeaguePosition")] + public Int32 PreviousDayLeaguePosition { get; set; } + + [InternalName("timeLastDecayMessageShown")] + public Double TimeLastDecayMessageShown { get; set; } + + [InternalName("hotStreak")] + public Boolean HotStreak { get; set; } + + [InternalName("leagueName")] + public String LeagueName { get; set; } + + [InternalName("miniSeries")] + public object MiniSeries { get; set; } + + [InternalName("tier")] + public String Tier { get; set; } + + [InternalName("freshBlood")] + public Boolean FreshBlood { get; set; } + + [InternalName("lastPlayed")] + public Double LastPlayed { get; set; } + + [InternalName("playerOrTeamId")] + public String PlayerOrTeamId { get; set; } + + [InternalName("leaguePoints")] + public Int32 LeaguePoints { get; set; } + + [InternalName("inactive")] + public Boolean Inactive { get; set; } + + [InternalName("rank")] + public String Rank { get; set; } + + [InternalName("veteran")] + public Boolean Veteran { get; set; } + + [InternalName("queueType")] + public String QueueType { get; set; } + + [InternalName("losses")] + public Int32 Losses { get; set; } + + [InternalName("timeUntilDecay")] + public Double TimeUntilDecay { get; set; } + + [InternalName("playerOrTeamName")] + public String PlayerOrTeamName { get; set; } + + [InternalName("wins")] + public Int32 Wins { get; set; } + } +} diff --git a/LoLNotes/Messages/Statistics/LeagueListDTO.cs b/LoLNotes/Messages/Statistics/LeagueListDTO.cs new file mode 100644 index 0000000..5ff80ae --- /dev/null +++ b/LoLNotes/Messages/Statistics/LeagueListDTO.cs @@ -0,0 +1,60 @@ +/* +copyright (C) 2011-2012 by high828@gmail.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FluorineFx; +using FluorineFx.AMF3; +using LoLNotes.Flash; + +namespace LoLNotes.Messages.Summoner +{ + [Message(".LeagueListDTO")] + public class LeagueListDTO : MessageObject + { + public LeagueListDTO(ASObject obj) + : base(obj) + { + BaseObject.SetFields(this, obj); + } + + [InternalName("queue")] + public String Queue { get; set; } + + [InternalName("name")] + public String Name { get; set; } + + [InternalName("tier")] + public String Tier { get; set; } + + [InternalName("requestorsRank")] + public String RequestorsRank { get; set; } + + [InternalName("entries")] + public ArrayCollection Entries { get; set; } + + [InternalName("requestorsName")] + public String RequestorsName { get; set; } + + } +} diff --git a/LoLNotes/Messages/Statistics/PlayerStatSummaryList.cs b/LoLNotes/Messages/Statistics/PlayerStatSummaryList.cs index 09132a6..f640303 100644 --- a/LoLNotes/Messages/Statistics/PlayerStatSummaryList.cs +++ b/LoLNotes/Messages/Statistics/PlayerStatSummaryList.cs @@ -41,7 +41,7 @@ public PlayerStatSummaryList(ArrayCollection obj) if (obj == null) return; - foreach(var ao in obj) + foreach (var ao in obj) Add(new PlayerStatSummary(ao as ASObject)); } } diff --git a/LoLNotes/Messages/Statistics/SummonerLeaguesDTO.cs b/LoLNotes/Messages/Statistics/SummonerLeaguesDTO.cs new file mode 100644 index 0000000..a25703e --- /dev/null +++ b/LoLNotes/Messages/Statistics/SummonerLeaguesDTO.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FluorineFx; +using FluorineFx.AMF3; +using LoLNotes.Flash; + +namespace LoLNotes.Messages.Summoner +{ + [Message(".SummonerLeaguesDTO")] + public class SummonerLeaguesDTO : MessageObject + { + public SummonerLeaguesDTO(ASObject obj) + : base(obj) + { + BaseObject.SetFields(this, obj); + } + + [InternalName("summonerLeagues")] + public ArrayCollection SummonerLeagues { get; set; } + + public Dictionary GetQueueByName(string queueName) + { + foreach (Dictionary queueInfo in this.SummonerLeagues.List) + { + if (queueInfo["queue"].ToString() == queueName) + { + return queueInfo; + } + } + + return null; + } + + public static string GetRanking(Dictionary queueInfo) + { + if (queueInfo == null) + { + return "Unranked"; + } + return String.Format("{0}: {1}", queueInfo["tier"].ToString(), queueInfo["requestorsRank"].ToString()); + } + } +} diff --git a/LoLNotes/Properties/CommitInfo.cs b/LoLNotes/Properties/CommitInfo.cs index e4ed5bf..db0d594 100644 --- a/LoLNotes/Properties/CommitInfo.cs +++ b/LoLNotes/Properties/CommitInfo.cs @@ -1,3 +1,3 @@ -[assembly: AssemblyCommit("commit 9471ae5aa9f9fc38b9e4ce46389895230e873771\nAuthor: Will \nDate: Sun Aug 19 01:04:24 2012 -0400\n\n Changed GameIds/AccountIds/SummonerIds should be Int64s to prevent overflowing.\n", "9471ae5aa9f9fc38b9e4ce46389895230e873771", "Will", " Sun Aug 19 01:04:24 2012 -0400", "Changed GameIds/AccountIds/SummonerIds should be Int64s to prevent overflowing.", "will@bladecoding.com")] +[assembly: AssemblyCommit("commit 20444be5a0acead8c3fd59bb8416ea7f3e61f691\nAuthor: SebastienGllmt \nDate: Sat Nov 29 08:39:06 2014 -0800\n\n Ability to gray out unranked games\n", "20444be5a0acead8c3fd59bb8416ea7f3e61f691", "SebastienGllmt", " Sat Nov 29 08:39:06 2014 -0800", "Ability to gray out unranked games", "SebastienGllmt@gmail.com")] diff --git a/LoLNotes/Util/ProcessInjector.cs b/LoLNotes/Util/ProcessInjector.cs index 8c1cfae..a415711 100644 --- a/LoLNotes/Util/ProcessInjector.cs +++ b/LoLNotes/Util/ProcessInjector.cs @@ -64,6 +64,10 @@ public class ProcessInjector : IDisposable /// Called when the IsInjected status changes. /// public event EventHandler Injected; + /// + /// Called when an error occurrs in the process injection + /// + public event EventHandler ErrorOccurred; bool isinjected; public bool IsInjected @@ -80,6 +84,32 @@ protected set } } + + private string errorMessage; + private object errorLock = new object(); + public string ErrorMessage + { + get { + lock (errorLock) + { + string msg = errorMessage; + errorMessage = ""; + return msg; + } + } + protected set + { + lock (errorLock) + { + errorMessage = value; + if (!string.IsNullOrEmpty(value) && ErrorOccurred != null) + { + ErrorOccurred(this, new EventArgs()); + } + } + } + } + GetModuleFrom From { get; set; } public ProcessInjector(string process) @@ -105,11 +135,35 @@ public void Clear() protected void CheckLoop() { + bool showedError = false; + while (CheckThread != null) { - if (CurrentProcess == null || CurrentProcess.HasExited) + if (CurrentProcess != null) + { + try + { + if (CurrentProcess.HasExited) + { + CurrentProcess = null; + IsInjected = false; // update icon + } + } + catch (Exception ex) + { + if (!showedError) + { + ErrorMessage = "Privilege of LoLNotes must be greater or equal to that of the LoLClient.\n\nSituations where LoLClient is run as admin and LoLNotes is not are no good."; + showedError = true; + } + StaticLogger.Error(ex); + CurrentProcess = null; + IsInjected = false; // update icon + } + } + + if (CurrentProcess == null) { - IsInjected = false; CurrentProcess = Process.GetProcessesByName(ProcessName).FirstOrDefault(); if (CurrentProcess != null) { diff --git a/README.md b/README.md index fa49708..2df1950 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ LoLNotes is a program that records your games and who you play with. Allowing you to search your previous games and keep notes on people you have played with. ##Screenshot: -![Screenshot](http://img140.imageshack.us/img140/5774/jr1x00a4.png) \ No newline at end of file +![Screenshot](http://i.imgur.com/G5GF1Sp.png) \ No newline at end of file