diff --git a/GUI/Formatter.cs b/GUI/Formatter.cs index a48fb0d1e..59ad5d088 100644 --- a/GUI/Formatter.cs +++ b/GUI/Formatter.cs @@ -129,13 +129,16 @@ namespace MCGalaxy.Gui { } public static List GetColorsList() { - List colors = new List() { "black", "navy", "green", "teal", "maroon", - "purple", "gold", "silver", "gray", "blue", "lime", "aqua", "red", "pink", "yellow", "white" }; + List colors = new List() { + "Black", "Navy", "Green", "Teal", "Maroon", + "Purple", "Gold", "Silver", "Gray", "Blue", + "Lime", "Aqua", "Red", "Pink", "Yellow", "White" }; + for (int i = 0; i < 256; i++) { if (Colors.ExtColors[i].Undefined) continue; colors.Add(Colors.ExtColors[i].Name); } - return colors; + return colors; } } } diff --git a/GUI/Window.Designer.cs b/GUI/Window.Designer.cs index ea50cdfb2..d1b3190bb 100644 --- a/GUI/Window.Designer.cs +++ b/GUI/Window.Designer.cs @@ -154,8 +154,8 @@ namespace MCGalaxy.Gui this.lblMap_Name = new System.Windows.Forms.Label(); this.txtMap_Name = new System.Windows.Forms.TextBox(); this.tp_Players = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.pgPlayers = new System.Windows.Forms.PropertyGrid(); + this.pl_gbProps = new System.Windows.Forms.GroupBox(); + this.pl_pgProps = new System.Windows.Forms.PropertyGrid(); this.pl_gbOther = new System.Windows.Forms.GroupBox(); this.pl_txtImpersonate = new System.Windows.Forms.TextBox(); this.pl_txtUndo = new System.Windows.Forms.TextBox(); @@ -172,8 +172,8 @@ namespace MCGalaxy.Gui this.pl_btnSlap = new System.Windows.Forms.Button(); this.pl_btnBan = new System.Windows.Forms.Button(); this.pl_btnKill = new System.Windows.Forms.Button(); - this.PlayersTextBox = new MCGalaxy.Gui.AutoScrollTextBox(); - this.PlyersListBox = new System.Windows.Forms.ListBox(); + this.pl_statusBox = new MCGalaxy.Gui.AutoScrollTextBox(); + this.pl_listBox = new System.Windows.Forms.ListBox(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.mapsStrip.SuspendLayout(); this.playerStrip.SuspendLayout(); @@ -195,7 +195,7 @@ namespace MCGalaxy.Gui this.gbMap_Unld.SuspendLayout(); this.gbMap_New.SuspendLayout(); this.tp_Players.SuspendLayout(); - this.groupBox1.SuspendLayout(); + this.pl_gbProps.SuspendLayout(); this.pl_gbOther.SuspendLayout(); this.pl_gbActions.SuspendLayout(); this.SuspendLayout(); @@ -209,7 +209,7 @@ namespace MCGalaxy.Gui this.toolStripSeparator1, this.infoToolStripMenuItem}); this.mapsStrip.Name = "mapsStrip"; - this.mapsStrip.Size = new System.Drawing.Size(138, 98); + this.mapsStrip.Size = new System.Drawing.Size(144, 98); // // physicsToolStripMenuItem // @@ -221,48 +221,48 @@ namespace MCGalaxy.Gui this.toolStripMenuItem6, this.toolStripMenuItem7}); this.physicsToolStripMenuItem.Name = "physicsToolStripMenuItem"; - this.physicsToolStripMenuItem.Size = new System.Drawing.Size(137, 22); + this.physicsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.physicsToolStripMenuItem.Text = "Physics Level"; // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(128, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(135, 22); this.toolStripMenuItem2.Text = "Off"; this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click_1); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(128, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(135, 22); this.toolStripMenuItem3.Text = "Normal"; this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click_1); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(128, 22); + this.toolStripMenuItem4.Size = new System.Drawing.Size(135, 22); this.toolStripMenuItem4.Text = "Advanced"; this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click_1); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(128, 22); + this.toolStripMenuItem5.Size = new System.Drawing.Size(135, 22); this.toolStripMenuItem5.Text = "Hardcore"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click_1); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(128, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(135, 22); this.toolStripMenuItem6.Text = "Instant"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click_1); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(128, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(135, 22); this.toolStripMenuItem7.Text = "Doors-Only"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click_1); // @@ -273,7 +273,7 @@ namespace MCGalaxy.Gui this.loadingToolStripMenuItem, this.miscToolStripMenuItem}); this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(137, 22); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.settingsToolStripMenuItem.Text = "Settings"; // // physicsToolStripMenuItem1 @@ -287,55 +287,55 @@ namespace MCGalaxy.Gui this.leafDecayToolStripMenuItem, this.autpPhysicsToolStripMenuItem}); this.physicsToolStripMenuItem1.Name = "physicsToolStripMenuItem1"; - this.physicsToolStripMenuItem1.Size = new System.Drawing.Size(111, 22); + this.physicsToolStripMenuItem1.Size = new System.Drawing.Size(117, 22); this.physicsToolStripMenuItem1.Text = "Physics"; // // finiteModeToolStripMenuItem // this.finiteModeToolStripMenuItem.Name = "finiteModeToolStripMenuItem"; - this.finiteModeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.finiteModeToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.finiteModeToolStripMenuItem.Text = "Finite Mode"; this.finiteModeToolStripMenuItem.Click += new System.EventHandler(this.finiteModeToolStripMenuItem_Click); // // randomFlowToolStripMenuItem // this.randomFlowToolStripMenuItem.Name = "randomFlowToolStripMenuItem"; - this.randomFlowToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.randomFlowToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.randomFlowToolStripMenuItem.Text = "Random Flow"; this.randomFlowToolStripMenuItem.Click += new System.EventHandler(this.randomFlowToolStripMenuItem_Click); // // edgeWaterToolStripMenuItem // this.edgeWaterToolStripMenuItem.Name = "edgeWaterToolStripMenuItem"; - this.edgeWaterToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.edgeWaterToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.edgeWaterToolStripMenuItem.Text = "Edge Water"; this.edgeWaterToolStripMenuItem.Click += new System.EventHandler(this.edgeWaterToolStripMenuItem_Click); // // growingGrassToolStripMenuItem // this.growingGrassToolStripMenuItem.Name = "growingGrassToolStripMenuItem"; - this.growingGrassToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.growingGrassToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.growingGrassToolStripMenuItem.Text = "Grass Growing"; this.growingGrassToolStripMenuItem.Click += new System.EventHandler(this.growingGrassToolStripMenuItem_Click); // // treeGrowingToolStripMenuItem // this.treeGrowingToolStripMenuItem.Name = "treeGrowingToolStripMenuItem"; - this.treeGrowingToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.treeGrowingToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.treeGrowingToolStripMenuItem.Text = "Tree Growing"; this.treeGrowingToolStripMenuItem.Click += new System.EventHandler(this.treeGrowingToolStripMenuItem_Click); // // leafDecayToolStripMenuItem // this.leafDecayToolStripMenuItem.Name = "leafDecayToolStripMenuItem"; - this.leafDecayToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.leafDecayToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.leafDecayToolStripMenuItem.Text = "Leaf Decay"; this.leafDecayToolStripMenuItem.Click += new System.EventHandler(this.leafDecayToolStripMenuItem_Click); // // autpPhysicsToolStripMenuItem // this.autpPhysicsToolStripMenuItem.Name = "autpPhysicsToolStripMenuItem"; - this.autpPhysicsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.autpPhysicsToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.autpPhysicsToolStripMenuItem.Text = "Auto Physics"; this.autpPhysicsToolStripMenuItem.Click += new System.EventHandler(this.autpPhysicsToolStripMenuItem_Click); // @@ -345,20 +345,20 @@ namespace MCGalaxy.Gui this.unloadToolStripMenuItem1, this.loadOngotoToolStripMenuItem}); this.loadingToolStripMenuItem.Name = "loadingToolStripMenuItem"; - this.loadingToolStripMenuItem.Size = new System.Drawing.Size(111, 22); + this.loadingToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.loadingToolStripMenuItem.Text = "Loading"; // // unloadToolStripMenuItem1 // this.unloadToolStripMenuItem1.Name = "unloadToolStripMenuItem1"; - this.unloadToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.unloadToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); this.unloadToolStripMenuItem1.Text = "Auto Unload"; this.unloadToolStripMenuItem1.Click += new System.EventHandler(this.unloadToolStripMenuItem1_Click); // // loadOngotoToolStripMenuItem // this.loadOngotoToolStripMenuItem.Name = "loadOngotoToolStripMenuItem"; - this.loadOngotoToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.loadOngotoToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.loadOngotoToolStripMenuItem.Text = "Load on /goto"; this.loadOngotoToolStripMenuItem.Click += new System.EventHandler(this.loadOngotoToolStripMenuItem_Click); // @@ -372,48 +372,48 @@ namespace MCGalaxy.Gui this.rPChatToolStripMenuItem, this.gunsToolStripMenuItem}); this.miscToolStripMenuItem.Name = "miscToolStripMenuItem"; - this.miscToolStripMenuItem.Size = new System.Drawing.Size(111, 22); + this.miscToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.miscToolStripMenuItem.Text = "Misc"; // // animalAIToolStripMenuItem // this.animalAIToolStripMenuItem.Name = "animalAIToolStripMenuItem"; - this.animalAIToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.animalAIToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.animalAIToolStripMenuItem.Text = "Animal AI"; this.animalAIToolStripMenuItem.Click += new System.EventHandler(this.animalAIToolStripMenuItem_Click); // // survivalDeathToolStripMenuItem // this.survivalDeathToolStripMenuItem.Name = "survivalDeathToolStripMenuItem"; - this.survivalDeathToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.survivalDeathToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.survivalDeathToolStripMenuItem.Text = "Survival Death"; this.survivalDeathToolStripMenuItem.Click += new System.EventHandler(this.survivalDeathToolStripMenuItem_Click); // // killerBlocksToolStripMenuItem // this.killerBlocksToolStripMenuItem.Name = "killerBlocksToolStripMenuItem"; - this.killerBlocksToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.killerBlocksToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.killerBlocksToolStripMenuItem.Text = "Killer Blocks"; this.killerBlocksToolStripMenuItem.Click += new System.EventHandler(this.killerBlocksToolStripMenuItem_Click); // // instantBuildingToolStripMenuItem // this.instantBuildingToolStripMenuItem.Name = "instantBuildingToolStripMenuItem"; - this.instantBuildingToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.instantBuildingToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.instantBuildingToolStripMenuItem.Text = "Instant Building"; this.instantBuildingToolStripMenuItem.Click += new System.EventHandler(this.instantBuildingToolStripMenuItem_Click); // // rPChatToolStripMenuItem // this.rPChatToolStripMenuItem.Name = "rPChatToolStripMenuItem"; - this.rPChatToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.rPChatToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.rPChatToolStripMenuItem.Text = "RP Chat"; this.rPChatToolStripMenuItem.Click += new System.EventHandler(this.rPChatToolStripMenuItem_Click); // // gunsToolStripMenuItem // this.gunsToolStripMenuItem.Name = "gunsToolStripMenuItem"; - this.gunsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.gunsToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.gunsToolStripMenuItem.Text = "Guns"; this.gunsToolStripMenuItem.Click += new System.EventHandler(this.gunsToolStripMenuItem_Click); // @@ -425,46 +425,46 @@ namespace MCGalaxy.Gui this.unloadToolStripMenuItem, this.moveAllToolStripMenuItem}); this.actiondToolStripMenuItem.Name = "actiondToolStripMenuItem"; - this.actiondToolStripMenuItem.Size = new System.Drawing.Size(137, 22); + this.actiondToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.actiondToolStripMenuItem.Text = "Actions"; // // saveToolStripMenuItem // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(121, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click_1); // // reloadToolStripMenuItem // this.reloadToolStripMenuItem.Name = "reloadToolStripMenuItem"; - this.reloadToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.reloadToolStripMenuItem.Size = new System.Drawing.Size(121, 22); this.reloadToolStripMenuItem.Text = "Reload"; this.reloadToolStripMenuItem.Click += new System.EventHandler(this.reloadToolStripMenuItem_Click); // // unloadToolStripMenuItem // this.unloadToolStripMenuItem.Name = "unloadToolStripMenuItem"; - this.unloadToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.unloadToolStripMenuItem.Size = new System.Drawing.Size(121, 22); this.unloadToolStripMenuItem.Text = "Unload"; this.unloadToolStripMenuItem.Click += new System.EventHandler(this.unloadToolStripMenuItem_Click_1); // // moveAllToolStripMenuItem // this.moveAllToolStripMenuItem.Name = "moveAllToolStripMenuItem"; - this.moveAllToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.moveAllToolStripMenuItem.Size = new System.Drawing.Size(121, 22); this.moveAllToolStripMenuItem.Text = "Move All"; this.moveAllToolStripMenuItem.Click += new System.EventHandler(this.moveAllToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(134, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(140, 6); // // infoToolStripMenuItem // this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; - this.infoToolStripMenuItem.Size = new System.Drawing.Size(137, 22); + this.infoToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.infoToolStripMenuItem.Text = "Info"; this.infoToolStripMenuItem.Click += new System.EventHandler(this.infoToolStripMenuItem_Click); // @@ -479,54 +479,54 @@ namespace MCGalaxy.Gui this.promoteToolStripMenuItem, this.demoteToolStripMenuItem}); this.playerStrip.Name = "playerStrip"; - this.playerStrip.Size = new System.Drawing.Size(115, 158); + this.playerStrip.Size = new System.Drawing.Size(121, 158); // // whoisToolStripMenuItem // this.whoisToolStripMenuItem.Name = "whoisToolStripMenuItem"; - this.whoisToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.whoisToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.whoisToolStripMenuItem.Text = "Whois"; this.whoisToolStripMenuItem.Click += new System.EventHandler(this.whoisToolStripMenuItem_Click); // // kickToolStripMenuItem // this.kickToolStripMenuItem.Name = "kickToolStripMenuItem"; - this.kickToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.kickToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.kickToolStripMenuItem.Text = "Kick"; this.kickToolStripMenuItem.Click += new System.EventHandler(this.kickToolStripMenuItem_Click); // // banToolStripMenuItem // this.banToolStripMenuItem.Name = "banToolStripMenuItem"; - this.banToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.banToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.banToolStripMenuItem.Text = "Ban"; this.banToolStripMenuItem.Click += new System.EventHandler(this.banToolStripMenuItem_Click); // // voiceToolStripMenuItem // this.voiceToolStripMenuItem.Name = "voiceToolStripMenuItem"; - this.voiceToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.voiceToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.voiceToolStripMenuItem.Text = "Voice"; this.voiceToolStripMenuItem.Click += new System.EventHandler(this.voiceToolStripMenuItem_Click); // // clonesToolStripMenuItem // this.clonesToolStripMenuItem.Name = "clonesToolStripMenuItem"; - this.clonesToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.clonesToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.clonesToolStripMenuItem.Text = "Clones"; this.clonesToolStripMenuItem.Click += new System.EventHandler(this.clonesToolStripMenuItem_Click); // // promoteToolStripMenuItem // this.promoteToolStripMenuItem.Name = "promoteToolStripMenuItem"; - this.promoteToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.promoteToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.promoteToolStripMenuItem.Text = "Promote"; this.promoteToolStripMenuItem.Click += new System.EventHandler(this.promoteToolStripMenuItem_Click); // // demoteToolStripMenuItem // this.demoteToolStripMenuItem.Name = "demoteToolStripMenuItem"; - this.demoteToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.demoteToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.demoteToolStripMenuItem.Text = "Demote"; this.demoteToolStripMenuItem.Click += new System.EventHandler(this.demoteToolStripMenuItem_Click); // @@ -537,26 +537,26 @@ namespace MCGalaxy.Gui this.shutdownServer, this.restartServerToolStripMenuItem}); this.iconContext.Name = "iconContext"; - this.iconContext.Size = new System.Drawing.Size(158, 70); + this.iconContext.Size = new System.Drawing.Size(164, 70); // // openConsole // this.openConsole.Name = "openConsole"; - this.openConsole.Size = new System.Drawing.Size(157, 22); + this.openConsole.Size = new System.Drawing.Size(163, 22); this.openConsole.Text = "Open Console"; this.openConsole.Click += new System.EventHandler(this.openConsole_Click); // // shutdownServer // this.shutdownServer.Name = "shutdownServer"; - this.shutdownServer.Size = new System.Drawing.Size(157, 22); + this.shutdownServer.Size = new System.Drawing.Size(163, 22); this.shutdownServer.Text = "Shutdown Server"; this.shutdownServer.Click += new System.EventHandler(this.shutdownServer_Click); // // restartServerToolStripMenuItem // this.restartServerToolStripMenuItem.Name = "restartServerToolStripMenuItem"; - this.restartServerToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.restartServerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.restartServerToolStripMenuItem.Text = "Restart Server"; this.restartServerToolStripMenuItem.Click += new System.EventHandler(this.restartServerToolStripMenuItem_Click); // @@ -670,7 +670,7 @@ namespace MCGalaxy.Gui this.logs_dateGeneral.Size = new System.Drawing.Size(200, 21); this.logs_dateGeneral.TabIndex = 5; this.logs_dateGeneral.Value = new System.DateTime(2011, 7, 20, 18, 31, 50, 0); - this.logs_dateGeneral.ValueChanged += new System.EventHandler(this.DatePicker1_ValueChanged); + this.logs_dateGeneral.ValueChanged += new System.EventHandler(this.logs_dateGeneralValueChanged); // // logs_txtGeneral // @@ -824,12 +824,12 @@ namespace MCGalaxy.Gui this.toolStripSeparator3, this.clearToolStripMenuItem}); this.txtLogMenuStrip.Name = "txtLogMenuStrip"; - this.txtLogMenuStrip.Size = new System.Drawing.Size(144, 170); + this.txtLogMenuStrip.Size = new System.Drawing.Size(150, 170); // // nightModeToolStripMenuItem // this.nightModeToolStripMenuItem.Name = "nightModeToolStripMenuItem"; - this.nightModeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.nightModeToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.nightModeToolStripMenuItem.Text = "Night Theme"; this.nightModeToolStripMenuItem.Click += new System.EventHandler(this.nightModeToolStripMenuItem_Click_1); // @@ -838,7 +838,7 @@ namespace MCGalaxy.Gui this.colorsToolStripMenuItem.Checked = true; this.colorsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.colorsToolStripMenuItem.Name = "colorsToolStripMenuItem"; - this.colorsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.colorsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.colorsToolStripMenuItem.Text = "Colors"; this.colorsToolStripMenuItem.Click += new System.EventHandler(this.colorsToolStripMenuItem_Click_1); // @@ -847,7 +847,7 @@ namespace MCGalaxy.Gui this.dateStampToolStripMenuItem.Checked = true; this.dateStampToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.dateStampToolStripMenuItem.Name = "dateStampToolStripMenuItem"; - this.dateStampToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.dateStampToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.dateStampToolStripMenuItem.Text = "Date Stamp"; this.dateStampToolStripMenuItem.Click += new System.EventHandler(this.dateStampToolStripMenuItem_Click); // @@ -856,38 +856,38 @@ namespace MCGalaxy.Gui this.autoScrollToolStripMenuItem.Checked = true; this.autoScrollToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoScrollToolStripMenuItem.Name = "autoScrollToolStripMenuItem"; - this.autoScrollToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.autoScrollToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.autoScrollToolStripMenuItem.Text = "Auto Scroll"; this.autoScrollToolStripMenuItem.Click += new System.EventHandler(this.autoScrollToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(146, 6); // // copySelectedToolStripMenuItem // this.copySelectedToolStripMenuItem.Name = "copySelectedToolStripMenuItem"; - this.copySelectedToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.copySelectedToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.copySelectedToolStripMenuItem.Text = "Copy Selected"; this.copySelectedToolStripMenuItem.Click += new System.EventHandler(this.copySelectedToolStripMenuItem_Click); // // copyAllToolStripMenuItem // this.copyAllToolStripMenuItem.Name = "copyAllToolStripMenuItem"; - this.copyAllToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.copyAllToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.copyAllToolStripMenuItem.Text = "Copy All"; this.copyAllToolStripMenuItem.Click += new System.EventHandler(this.copyAllToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(146, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.clearToolStripMenuItem.Text = "Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // @@ -1197,11 +1197,11 @@ namespace MCGalaxy.Gui // // tp_Players // - this.tp_Players.Controls.Add(this.groupBox1); + this.tp_Players.Controls.Add(this.pl_gbProps); this.tp_Players.Controls.Add(this.pl_gbOther); this.tp_Players.Controls.Add(this.pl_gbActions); - this.tp_Players.Controls.Add(this.PlayersTextBox); - this.tp_Players.Controls.Add(this.PlyersListBox); + this.tp_Players.Controls.Add(this.pl_statusBox); + this.tp_Players.Controls.Add(this.pl_listBox); this.tp_Players.Location = new System.Drawing.Point(4, 22); this.tp_Players.Name = "tp_Players"; this.tp_Players.Padding = new System.Windows.Forms.Padding(3); @@ -1209,43 +1209,41 @@ namespace MCGalaxy.Gui this.tp_Players.TabIndex = 7; this.tp_Players.Text = "Players"; // - // groupBox1 + // pl_gbProps // - this.groupBox1.Controls.Add(this.pgPlayers); - this.groupBox1.Location = new System.Drawing.Point(147, 9); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(363, 349); - this.groupBox1.TabIndex = 67; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Properties for (none selected)"; + this.pl_gbProps.Controls.Add(this.pl_pgProps); + this.pl_gbProps.Location = new System.Drawing.Point(147, 9); + this.pl_gbProps.Name = "pl_gbProps"; + this.pl_gbProps.Size = new System.Drawing.Size(363, 380); + this.pl_gbProps.TabIndex = 67; + this.pl_gbProps.TabStop = false; + this.pl_gbProps.Text = "Properties for (none selected)"; // - // pgPlayers + // pl_pgProps // - this.pgPlayers.HelpVisible = false; - this.pgPlayers.Location = new System.Drawing.Point(6, 18); - this.pgPlayers.Name = "pgPlayers"; - this.pgPlayers.Size = new System.Drawing.Size(351, 325); - this.pgPlayers.TabIndex = 64; - this.pgPlayers.ToolbarVisible = false; + this.pl_pgProps.HelpVisible = false; + this.pl_pgProps.Location = new System.Drawing.Point(6, 18); + this.pl_pgProps.Name = "pl_pgProps"; + this.pl_pgProps.Size = new System.Drawing.Size(351, 356); + this.pl_pgProps.TabIndex = 64; + this.pl_pgProps.ToolbarVisible = false; // // pl_gbOther // this.pl_gbOther.Controls.Add(this.pl_txtImpersonate); - this.pl_gbOther.Controls.Add(this.pl_txtUndo); this.pl_gbOther.Controls.Add(this.pl_btnImpersonate); this.pl_gbOther.Controls.Add(this.pl_txtMessage); this.pl_gbOther.Controls.Add(this.pl_btnMessage); - this.pl_gbOther.Controls.Add(this.pl_btnUndo); - this.pl_gbOther.Location = new System.Drawing.Point(147, 364); + this.pl_gbOther.Location = new System.Drawing.Point(147, 395); this.pl_gbOther.Name = "pl_gbOther"; - this.pl_gbOther.Size = new System.Drawing.Size(614, 113); + this.pl_gbOther.Size = new System.Drawing.Size(614, 78); this.pl_gbOther.TabIndex = 66; this.pl_gbOther.TabStop = false; this.pl_gbOther.Text = "Other"; // // pl_txtImpersonate // - this.pl_txtImpersonate.Location = new System.Drawing.Point(115, 82); + this.pl_txtImpersonate.Location = new System.Drawing.Point(115, 50); this.pl_txtImpersonate.Name = "pl_txtImpersonate"; this.pl_txtImpersonate.Size = new System.Drawing.Size(485, 21); this.pl_txtImpersonate.TabIndex = 38; @@ -1253,15 +1251,15 @@ namespace MCGalaxy.Gui // // pl_txtUndo // - this.pl_txtUndo.Location = new System.Drawing.Point(115, 18); + this.pl_txtUndo.Location = new System.Drawing.Point(122, 150); this.pl_txtUndo.Name = "pl_txtUndo"; - this.pl_txtUndo.Size = new System.Drawing.Size(234, 21); + this.pl_txtUndo.Size = new System.Drawing.Size(98, 21); this.pl_txtUndo.TabIndex = 42; this.pl_txtUndo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.UndoTxt_KeyDown); // // pl_btnImpersonate // - this.pl_btnImpersonate.Location = new System.Drawing.Point(6, 80); + this.pl_btnImpersonate.Location = new System.Drawing.Point(6, 48); this.pl_btnImpersonate.Name = "pl_btnImpersonate"; this.pl_btnImpersonate.Size = new System.Drawing.Size(98, 23); this.pl_btnImpersonate.TabIndex = 37; @@ -1271,7 +1269,7 @@ namespace MCGalaxy.Gui // // pl_txtMessage // - this.pl_txtMessage.Location = new System.Drawing.Point(115, 50); + this.pl_txtMessage.Location = new System.Drawing.Point(115, 18); this.pl_txtMessage.Name = "pl_txtMessage"; this.pl_txtMessage.Size = new System.Drawing.Size(485, 21); this.pl_txtMessage.TabIndex = 8; @@ -1279,7 +1277,7 @@ namespace MCGalaxy.Gui // // pl_btnMessage // - this.pl_btnMessage.Location = new System.Drawing.Point(6, 48); + this.pl_btnMessage.Location = new System.Drawing.Point(6, 16); this.pl_btnMessage.Name = "pl_btnMessage"; this.pl_btnMessage.Size = new System.Drawing.Size(98, 23); this.pl_btnMessage.TabIndex = 9; @@ -1289,7 +1287,7 @@ namespace MCGalaxy.Gui // // pl_btnUndo // - this.pl_btnUndo.Location = new System.Drawing.Point(6, 16); + this.pl_btnUndo.Location = new System.Drawing.Point(8, 148); this.pl_btnUndo.Name = "pl_btnUndo"; this.pl_btnUndo.Size = new System.Drawing.Size(98, 23); this.pl_btnUndo.TabIndex = 41; @@ -1300,16 +1298,18 @@ namespace MCGalaxy.Gui // pl_gbActions // this.pl_gbActions.Controls.Add(this.pl_btnSpawn); + this.pl_gbActions.Controls.Add(this.pl_txtUndo); this.pl_gbActions.Controls.Add(this.pl_btnWarn); this.pl_gbActions.Controls.Add(this.pl_btnRules); this.pl_gbActions.Controls.Add(this.pl_btnKick); this.pl_gbActions.Controls.Add(this.pl_btnBanIP); + this.pl_gbActions.Controls.Add(this.pl_btnUndo); this.pl_gbActions.Controls.Add(this.pl_btnSlap); this.pl_gbActions.Controls.Add(this.pl_btnBan); this.pl_gbActions.Controls.Add(this.pl_btnKill); this.pl_gbActions.Location = new System.Drawing.Point(529, 9); this.pl_gbActions.Name = "pl_gbActions"; - this.pl_gbActions.Size = new System.Drawing.Size(228, 136); + this.pl_gbActions.Size = new System.Drawing.Size(228, 186); this.pl_gbActions.TabIndex = 65; this.pl_gbActions.TabStop = false; this.pl_gbActions.Text = "Actions"; @@ -1394,27 +1394,27 @@ namespace MCGalaxy.Gui this.pl_btnKill.UseVisualStyleBackColor = true; this.pl_btnKill.Click += new System.EventHandler(this.KillBt_Click); // - // PlayersTextBox + // pl_statusBox // - this.PlayersTextBox.BackColor = System.Drawing.SystemColors.Window; - this.PlayersTextBox.Cursor = System.Windows.Forms.Cursors.Default; - this.PlayersTextBox.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.PlayersTextBox.Location = new System.Drawing.Point(529, 151); - this.PlayersTextBox.Multiline = true; - this.PlayersTextBox.Name = "PlayersTextBox"; - this.PlayersTextBox.ReadOnly = true; - this.PlayersTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.PlayersTextBox.Size = new System.Drawing.Size(232, 207); - this.PlayersTextBox.TabIndex = 63; + this.pl_statusBox.BackColor = System.Drawing.SystemColors.Window; + this.pl_statusBox.Cursor = System.Windows.Forms.Cursors.Default; + this.pl_statusBox.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.pl_statusBox.Location = new System.Drawing.Point(529, 201); + this.pl_statusBox.Multiline = true; + this.pl_statusBox.Name = "pl_statusBox"; + this.pl_statusBox.ReadOnly = true; + this.pl_statusBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.pl_statusBox.Size = new System.Drawing.Size(232, 188); + this.pl_statusBox.TabIndex = 63; // - // PlyersListBox + // pl_listBox // - this.PlyersListBox.FormattingEnabled = true; - this.PlyersListBox.Location = new System.Drawing.Point(8, 14); - this.PlyersListBox.Name = "PlyersListBox"; - this.PlyersListBox.Size = new System.Drawing.Size(123, 459); - this.PlyersListBox.TabIndex = 62; - this.PlyersListBox.Click += new System.EventHandler(this.PlyersListBox_Click); + this.pl_listBox.FormattingEnabled = true; + this.pl_listBox.Location = new System.Drawing.Point(8, 14); + this.pl_listBox.Name = "pl_listBox"; + this.pl_listBox.Size = new System.Drawing.Size(123, 459); + this.pl_listBox.TabIndex = 62; + this.pl_listBox.Click += new System.EventHandler(this.PlyersListBox_Click); // // toolTip // @@ -1468,16 +1468,17 @@ namespace MCGalaxy.Gui this.gbMap_New.PerformLayout(); this.tp_Players.ResumeLayout(false); this.tp_Players.PerformLayout(); - this.groupBox1.ResumeLayout(false); + this.pl_gbProps.ResumeLayout(false); this.pl_gbOther.ResumeLayout(false); this.pl_gbOther.PerformLayout(); this.pl_gbActions.ResumeLayout(false); + this.pl_gbActions.PerformLayout(); this.ResumeLayout(false); } - private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox pl_gbProps; private System.Windows.Forms.GroupBox pl_gbActions; private System.Windows.Forms.GroupBox pl_gbOther; - private System.Windows.Forms.PropertyGrid pgPlayers; + private System.Windows.Forms.PropertyGrid pl_pgProps; private System.Windows.Forms.TextBox txtMap_Name; private System.Windows.Forms.Label lblMap_Name; private System.Windows.Forms.ComboBox cmbMap_X; @@ -1559,8 +1560,8 @@ namespace MCGalaxy.Gui private Button pl_btnUndo; private Button pl_btnSlap; private Button pl_btnRules; - private AutoScrollTextBox PlayersTextBox; - private ListBox PlyersListBox; + private AutoScrollTextBox pl_statusBox; + private ListBox pl_listBox; private Button main_btnSaveAll; private Button main_btnUnloadEmpty; private Button main_btnKillPhysics; diff --git a/GUI/Window.cs b/GUI/Window.cs index de29fa6a2..43c5308ea 100644 --- a/GUI/Window.cs +++ b/GUI/Window.cs @@ -57,14 +57,8 @@ namespace MCGalaxy.Gui { notifyIcon1.Icon = this.Icon; notifyIcon1.Visible = true; notifyIcon1.MouseClick += new System.Windows.Forms.MouseEventHandler(notifyIcon1_MouseClick); - - if (File.Exists("Changelog.txt")) { - logs_txtChangelog.Text = "Changelog for " + Server.Version + ":"; - foreach (string line in File.ReadAllLines("Changelog.txt")) { - logs_txtChangelog.AppendText("\r\n " + line); - } - } - + LoadChangelog(); + // Bind player list main_Players.DataSource = pc; main_Players.Font = new Font("Calibri", 8.25f); @@ -87,8 +81,8 @@ namespace MCGalaxy.Gui { Server s = new Server(); s.OnLog += WriteLine; s.OnCommand += WriteCommand; - s.OnError += newError; - s.OnSystem += newSystem; + s.OnError += LogErrorMessage; + s.OnSystem += LogSystemMessage; s.HeartBeatFail += HeartBeatFail; s.OnURLChange += UpdateUrl; @@ -102,6 +96,7 @@ namespace MCGalaxy.Gui { Player.PlayerConnect += Player_PlayerConnect; Player.PlayerDisconnect += Player_PlayerDisconnect; + Player.OnSendMap += Player_OnSendMap; Level.LevelLoaded += Level_LevelLoaded; Level.LevelUnload += Level_LevelUnload; @@ -119,6 +114,10 @@ namespace MCGalaxy.Gui { UpdatePlyersListBox(); } + void Player_OnSendMap(Player p, byte[] buffer) { + UpdatePlayerMapCombo(); + } + void Level_LevelUnload(Level l) { RunOnUiThread(() => { UpdateMapList(); @@ -149,28 +148,6 @@ namespace MCGalaxy.Gui { WriteLine("Recent Heartbeat Failed"); } - void newError(string message) { - try { - if (logs_txtError.InvokeRequired) { - Invoke(new LogDelegate(newError), new object[] { message }); - } else { - logs_txtError.AppendText(Environment.NewLine + message); - } - } catch { - } - } - - void newSystem(string message) { - try { - if (logs_txtSystem.InvokeRequired) { - Invoke(new LogDelegate(newSystem), new object[] { message }); - } else { - logs_txtSystem.AppendText(Environment.NewLine + message); - } - } catch { - } - } - delegate void LogDelegate(string message); /// Does the same as Console.WriteLine() only in the form @@ -322,23 +299,6 @@ namespace MCGalaxy.Gui { } } - void txtInput_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode != Keys.Enter) return; - e.Handled = true; - e.SuppressKeyPress = true; - string text = main_txtInput.Text; - if (text.Length == 0) return; - - if (text[0] == '/' && text.Length > 1 && text[1] == '/') { - Handlers.HandleChat(text.Substring(1), WriteLine); - } else if (text[0] == '/') { - Handlers.HandleCommand(text.Substring(1), WriteCommand); - } else { - Handlers.HandleChat(text, WriteLine); - } - main_txtInput.Clear(); - } - void btnClose_Click_1(object sender, EventArgs e) { Close(); } void btnProperties_Click_1(object sender, EventArgs e) { @@ -415,8 +375,7 @@ namespace MCGalaxy.Gui { void LevelCmd(string com, string args) { if (GetSelectedLevel() != null) Command.all.Find(com).Use(null, GetSelectedLevel().name + args); - } - + } void tabControl1_Click(object sender, EventArgs e) { try { UpdateUnloadedList(); } @@ -436,36 +395,10 @@ namespace MCGalaxy.Gui { tabControl1.Update(); } - void Restart_Click(object sender, EventArgs e) { - if (MessageBox.Show("Are you sure you want to restart?", "Restart", MessageBoxButtons.OKCancel) == DialogResult.OK) { - MCGalaxy.Gui.App.ExitProgram(true); - } - } - void restartServerToolStripMenuItem_Click(object sender, EventArgs e) { Restart_Click(sender, e); } - void DatePicker1_ValueChanged(object sender, EventArgs e) { - string dayofmonth = logs_dateGeneral.Value.Day.ToString().PadLeft(2, '0'); - string year = logs_dateGeneral.Value.Year.ToString(); - string month = logs_dateGeneral.Value.Month.ToString().PadLeft(2, '0'); - - string ymd = year + "-" + month + "-" + dayofmonth; - string filename = ymd + ".txt"; - - if (!File.Exists(Path.Combine("logs/", filename))) { - logs_txtGeneral.Text = "No logs found for: " + ymd; - } else { - logs_txtGeneral.Text = null; - logs_txtGeneral.Text = File.ReadAllText(Path.Combine("logs/", filename)); - } - } - - void txtUrl_DoubleClick(object sender, EventArgs e) { - main_txtUrl.SelectAll(); - } - void dgvPlayers_RowPrePaint(object sender, DataGridViewRowPrePaintEventArgs e) { e.PaintParts &= ~DataGridViewPaintParts.Focus; } @@ -478,172 +411,36 @@ namespace MCGalaxy.Gui { PlayerCmd("rank", "-down ", ""); } PlayerProperties playerProps; - - #region Tabs - #region playersTab - void LoadPLayerTabDetails(object sender, EventArgs e) { - Player p = PlayerInfo.Find(PlyersListBox.Text); - if (p == null) return; - - PlayersTextBox.AppendTextAndScroll("==" + p.name + "=="); - //Top Stuff - playerProps = new PlayerProperties(p); - pgPlayers.SelectedObject = playerProps; - - //Map - try { - UpdatePlayerMapCombo(); - } catch { } - } - - void UpdatePlayerMapCombo() { - // TODO: why not working - pgPlayers.Refresh(); - if (tabControl1.SelectedTab == tp_Players) - Invalidate(); - } - - void UndoBt_Click(object sender, EventArgs e) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - if (pl_txtUndo.Text.Trim() == "") { - PlayersTextBox.AppendTextAndScroll("You didn't specify a time"); return; - } - - try { - Command.core.Find("undo").Use(null, curPlayer.name + " " + pl_txtUndo.Text); - PlayersTextBox.AppendTextAndScroll("Undid player for " + pl_txtUndo.Text + " Seconds"); - } catch { - PlayersTextBox.AppendTextAndScroll("Something went wrong!!"); - } - } - - void MessageBt_Click(object sender, EventArgs e) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - Player.SendMessage(curPlayer, " " + pl_txtMessage.Text); - PlayersTextBox.AppendTextAndScroll("Sent player message ' " + pl_txtMessage.Text + "'"); - pl_txtMessage.Text = ""; - } - - void ImpersonateORSendCmdBt_Click(object sender, EventArgs e) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - try { - if (pl_txtImpersonate.Text.StartsWith("/")) { - string[] args = pl_txtImpersonate.Text.Trim().SplitSpaces(2); - Command cmd = Command.all.Find(args[0].Replace("/", "")); - if (cmd == null) { - PlayersTextBox.AppendTextAndScroll("That isn't a command!!"); return; - } - - cmd.Use(curPlayer, args.Length > 1 ? args[1] : ""); - if (args.Length > 1) { - PlayersTextBox.AppendTextAndScroll("Used command '" + args[0] + "' with parameters '" + args[1] + "' as player"); - } else { - PlayersTextBox.AppendTextAndScroll("Used command '" + args[0] + "' with no parameters as player"); - } - } else { - Command.all.Find("impersonate").Use(null, curPlayer.name + " " + pl_txtImpersonate.Text); - PlayersTextBox.AppendTextAndScroll("Sent Message '" + pl_txtImpersonate.Text + "' as player"); - } - pl_txtImpersonate.Text = ""; - } catch { - PlayersTextBox.AppendTextAndScroll("Something went wrong"); - } - } - - void SlapBt_Click(object sender, EventArgs e) { DoCmd("slap", "Slapped"); } - void KillBt_Click(object sender, EventArgs e) { DoCmd("kill", "Killed"); } - void WarnBt_Click(object sender, EventArgs e) { DoCmd("warn", "Warned"); } - void KickBt_Click(object sender, EventArgs e) { DoCmd("kick", "Kicked"); } - void BanBt_Click(object sender, EventArgs e) { DoCmd("ban", "Banned"); } - void IPBanBt_Click(object sender, EventArgs e) { DoCmd("banip", "IP-Banned"); } - void DoCmd(string cmdName, string action) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - Command.all.Find(cmdName).Use(null, curPlayer.name); - PlayersTextBox.AppendTextAndScroll(action + " player"); - } + #region Main tab - void DoCmd(string cmdName, string action, string prefix) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - Command.all.Find(cmdName).Use(null, prefix + curPlayer.name); - PlayersTextBox.AppendTextAndScroll(action + " player"); - } - - void DoToggle(string cmdName, Button target, string targetDesc, - Predicate getter, string action) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - Command.all.Find(cmdName).Use(null, curPlayer.name); + void txtInput_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode != Keys.Enter) return; + e.Handled = true; + e.SuppressKeyPress = true; + string text = main_txtInput.Text; + if (text.Length == 0) return; - if (getter(curPlayer)) { - PlayersTextBox.AppendTextAndScroll(action + " player"); - target.Text = "Un" + targetDesc; + if (text[0] == '/' && text.Length > 1 && text[1] == '/') { + Handlers.HandleChat(text.Substring(1), WriteLine); + } else if (text[0] == '/') { + Handlers.HandleCommand(text.Substring(1), WriteCommand); } else { - PlayersTextBox.AppendTextAndScroll("Un" + action + " player"); - target.Text = targetDesc; + Handlers.HandleChat(text, WriteLine); + } + main_txtInput.Clear(); + } + + void Restart_Click(object sender, EventArgs e) { + if (MessageBox.Show("Are you sure you want to restart?", "Restart", MessageBoxButtons.OKCancel) == DialogResult.OK) { + MCGalaxy.Gui.App.ExitProgram(true); } } - - void SendRulesTxt_Click(object sender, EventArgs e) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - Command.all.Find("rules").Use(curPlayer, ""); - PlayersTextBox.AppendTextAndScroll("Sent rules to player"); + + void txtUrl_DoubleClick(object sender, EventArgs e) { + main_txtUrl.SelectAll(); } - - void SpawnBt_Click(object sender, EventArgs e) { - if (curPlayer == null || !Player.players.Contains(curPlayer)) { - PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; - } - Player p = curPlayer; - ushort x = (ushort)((0.5 + p.level.spawnx) * 32); - ushort y = (ushort)((1 + p.level.spawny) * 32); - ushort z = (ushort)((0.5 + p.level.spawnz) * 32); - p.SendPos(0xFF, x, y, z, p.level.rotx, p.level.roty); - PlayersTextBox.AppendTextAndScroll("Sent player to spawn"); - } - - public void UpdatePlyersListBox() { - RunOnUiThread( - delegate { - PlyersListBox.Items.Clear(); - foreach (Player p in Player.players) - { - PlyersListBox.Items.Add(p.name); - } - }); - - } - - void PlyersListBox_Click(object sender, EventArgs e) { - LoadPLayerTabDetails(sender, e); - } - - void ImpersonateORSendCmdTxt_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) ImpersonateORSendCmdBt_Click(sender, e); - } - void UndoTxt_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) UndoBt_Click(sender, e); - } - void PLayersMessageTxt_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) MessageBt_Click(sender, e); - } - #endregion - - #endregion - + void button_saveall_Click(object sender, EventArgs e) { Command.all.Find("save").Use(null, "all"); } @@ -659,68 +456,61 @@ namespace MCGalaxy.Gui { try { UpdateMapList(); } catch { } } - - void loadOngotoToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " loadongoto"); } - void instantBuildingToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " instant"); } - void autpPhysicsToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " restartphysics"); } - void gunsToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("allowguns"); } - void unloadToolStripMenuItem1_Click(object sender, EventArgs e) { LevelCmd("map", " unload"); } - void infoToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map"); LevelCmd("mapinfo"); } - void moveAllToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("moveall"); } - void toolStripMenuItem2_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 0"); } - void toolStripMenuItem3_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 1"); } - void toolStripMenuItem4_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 2"); } - void toolStripMenuItem5_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 3"); } - void toolStripMenuItem6_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 4"); } - void toolStripMenuItem7_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 5"); } - void saveToolStripMenuItem_Click_1(object sender, EventArgs e) { LevelCmd("save"); } - void unloadToolStripMenuItem_Click_1(object sender, EventArgs e) { LevelCmd("unload"); } - void reloadToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("reload"); } - void leafDecayToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " leafdecay"); } - void randomFlowToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " randomflow"); } - void treeGrowingToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " growtrees"); } - - #region Colored Reader Context Menu - - void nightModeToolStripMenuItem_Click_1(object sender, EventArgs e) { - if (MessageBox.Show("Changing to and from night mode will clear your logs. Do you still want to change?", "You sure?", MessageBoxButtons.YesNo) == System.Windows.Forms.DialogResult.No) - return; - - main_txtLog.NightMode = nightModeToolStripMenuItem.Checked; - nightModeToolStripMenuItem.Checked = !nightModeToolStripMenuItem.Checked; - } - - void colorsToolStripMenuItem_Click_1(object sender, EventArgs e) { - main_txtLog.Colorize = !colorsToolStripMenuItem.Checked; - colorsToolStripMenuItem.Checked = !colorsToolStripMenuItem.Checked; - } - - void dateStampToolStripMenuItem_Click(object sender, EventArgs e) { - main_txtLog.DateStamp = !dateStampToolStripMenuItem.Checked; - dateStampToolStripMenuItem.Checked = !dateStampToolStripMenuItem.Checked; - } - - void autoScrollToolStripMenuItem_Click(object sender, EventArgs e) { - main_txtLog.AutoScroll = !autoScrollToolStripMenuItem.Checked; - autoScrollToolStripMenuItem.Checked = !autoScrollToolStripMenuItem.Checked; - } - - void copySelectedToolStripMenuItem_Click(object sender, EventArgs e) { - if (String.IsNullOrEmpty(main_txtLog.SelectedText)) return; - Clipboard.SetText(main_txtLog.SelectedText, TextDataFormat.Text); - } - void copyAllToolStripMenuItem_Click(object sender, EventArgs e) { - Clipboard.SetText(main_txtLog.Text, TextDataFormat.Text); - } + #endregion - void clearToolStripMenuItem_Click(object sender, EventArgs e) { - if (MessageBox.Show("Are you sure you want to clear logs?", "You sure?", MessageBoxButtons.YesNo) == DialogResult.Yes) { - main_txtLog.Clear(); + + #region Logs tab + + void LoadChangelog() { + if (!File.Exists("Changelog.txt")) return; + logs_txtChangelog.Text = "Changelog for " + Server.Version + ":"; + foreach (string line in File.ReadAllLines("Changelog.txt")) { + logs_txtChangelog.AppendText("\r\n " + line); } } - #endregion + + void logs_dateGeneralValueChanged(object sender, EventArgs e) { + string dayofmonth = logs_dateGeneral.Value.Day.ToString().PadLeft(2, '0'); + string year = logs_dateGeneral.Value.Year.ToString(); + string month = logs_dateGeneral.Value.Month.ToString().PadLeft(2, '0'); + string ymd = year + "-" + month + "-" + dayofmonth; + string filename = ymd + ".txt"; + + if (!File.Exists(Path.Combine("logs/", filename))) { + logs_txtGeneral.Text = "No logs found for: " + ymd; + } else { + logs_txtGeneral.Text = null; + logs_txtGeneral.Text = File.ReadAllText(Path.Combine("logs/", filename)); + } + } + + void LogErrorMessage(string message) { + try { + if (logs_txtError.InvokeRequired) { + Invoke(new LogDelegate(LogErrorMessage), new object[] { message }); + } else { + logs_txtError.AppendText(Environment.NewLine + message); + } + } catch { + } + } + + void LogSystemMessage(string message) { + try { + if (logs_txtSystem.InvokeRequired) { + Invoke(new LogDelegate(LogSystemMessage), new object[] { message }); + } else { + logs_txtSystem.AppendText(Environment.NewLine + message); + } + } catch { + } + } + + #endregion + + #region Map tab void MapGenClick(object sender, EventArgs e) { @@ -808,8 +598,7 @@ namespace MCGalaxy.Gui { gbMap_Props.Text = "Properties for " + name; } - public void UpdateUnloadedList() - { + public void UpdateUnloadedList() { RunOnUiThread(() => { string selectedLvl = null; @@ -833,6 +622,195 @@ namespace MCGalaxy.Gui { }); } #endregion + + + #region Players tab + + public void UpdatePlyersListBox() { + RunOnUiThread( + delegate { + pl_listBox.Items.Clear(); + Player[] players = PlayerInfo.Online.Items; + foreach (Player p in players) + pl_listBox.Items.Add(p.name); + + if (curPlayer == null) return; + if (PlayerInfo.FindExact(curPlayer.name) != null) return; + + curPlayer = null; + playerProps = null; + pl_gbProps.Text = "Properties for (none selected)"; + pl_pgProps.SelectedObject = null; + }); + } + + void LoadPlayerTabDetails(object sender, EventArgs e) { + Player p = PlayerInfo.FindExact(pl_listBox.Text); + if (p == null) return; + + pl_statusBox.AppendTextAndScroll("==" + p.name + "=="); + playerProps = new PlayerProperties(p); + pl_gbProps.Text = "Properties for " + p.name; + pl_pgProps.SelectedObject = playerProps; + curPlayer = p; + + try { + UpdatePlayerMapCombo(); + } catch { } + } + + void UpdatePlayerMapCombo() { + if (tabControl1.SelectedTab != tp_Players) return; + pl_pgProps.Refresh(); + } + + void UndoBt_Click(object sender, EventArgs e) { + if (curPlayer == null) { pl_statusBox.AppendTextAndScroll("No player selected"); return; } + if (pl_txtUndo.Text.Trim() == "") { + pl_statusBox.AppendTextAndScroll("You didn't specify a time"); return; + } + + try { + Command.core.Find("undo").Use(null, curPlayer.name + " " + pl_txtUndo.Text); + pl_statusBox.AppendTextAndScroll("Undid player for " + pl_txtUndo.Text + " Seconds"); + } catch { + pl_statusBox.AppendTextAndScroll("Something went wrong!!"); + } + } + + void MessageBt_Click(object sender, EventArgs e) { + if (curPlayer == null) { pl_statusBox.AppendTextAndScroll("No player selected"); return; } + Player.SendMessage(curPlayer, " " + pl_txtMessage.Text); + pl_statusBox.AppendTextAndScroll("Sent player message ' " + pl_txtMessage.Text + "'"); + pl_txtMessage.Text = ""; + } + + void ImpersonateORSendCmdBt_Click(object sender, EventArgs e) { + if (curPlayer == null) { pl_statusBox.AppendTextAndScroll("No player selected"); return; } + + try { + if (pl_txtImpersonate.Text.StartsWith("/")) { + string[] args = pl_txtImpersonate.Text.Trim().SplitSpaces(2); + Command cmd = Command.all.Find(args[0].Replace("/", "")); + if (cmd == null) { + pl_statusBox.AppendTextAndScroll("That isn't a command!!"); return; + } + + cmd.Use(curPlayer, args.Length > 1 ? args[1] : ""); + if (args.Length > 1) { + pl_statusBox.AppendTextAndScroll("Used command '" + args[0] + "' with parameters '" + args[1] + "' as player"); + } else { + pl_statusBox.AppendTextAndScroll("Used command '" + args[0] + "' with no parameters as player"); + } + } else { + Command.all.Find("impersonate").Use(null, curPlayer.name + " " + pl_txtImpersonate.Text); + pl_statusBox.AppendTextAndScroll("Sent Message '" + pl_txtImpersonate.Text + "' as player"); + } + pl_txtImpersonate.Text = ""; + } catch { + pl_statusBox.AppendTextAndScroll("Something went wrong"); + } + } + + void SlapBt_Click(object sender, EventArgs e) { DoCmd("slap", "Slapped"); } + void KillBt_Click(object sender, EventArgs e) { DoCmd("kill", "Killed"); } + void WarnBt_Click(object sender, EventArgs e) { DoCmd("warn", "Warned"); } + void KickBt_Click(object sender, EventArgs e) { DoCmd("kick", "Kicked"); } + void BanBt_Click(object sender, EventArgs e) { DoCmd("ban", "Banned"); } + void IPBanBt_Click(object sender, EventArgs e) { DoCmd("banip", "IP-Banned"); } + + void DoCmd(string cmdName, string action) { + if (curPlayer == null) { pl_statusBox.AppendTextAndScroll("No player selected"); return; } + Command.all.Find(cmdName).Use(null, curPlayer.name); + pl_statusBox.AppendTextAndScroll(action + " player"); + } + + void SendRulesTxt_Click(object sender, EventArgs e) { + if (curPlayer == null) { pl_statusBox.AppendTextAndScroll("No Player Selected"); return; } + Command.all.Find("rules").Use(curPlayer, ""); + pl_statusBox.AppendTextAndScroll("Sent rules to player"); + } + + void SpawnBt_Click(object sender, EventArgs e) { + if (curPlayer == null) { pl_statusBox.AppendTextAndScroll("No Player Selected"); return; } + Command.all.Find("spawn").Use(curPlayer, ""); + pl_statusBox.AppendTextAndScroll("Sent player to spawn"); + } + + void PlyersListBox_Click(object sender, EventArgs e) { + LoadPlayerTabDetails(sender, e); + } + + void ImpersonateORSendCmdTxt_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) ImpersonateORSendCmdBt_Click(sender, e); + } + void UndoTxt_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) UndoBt_Click(sender, e); + } + void PLayersMessageTxt_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) MessageBt_Click(sender, e); + } + #endregion + + void loadOngotoToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " loadongoto"); } + void instantBuildingToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " instant"); } + void autpPhysicsToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " restartphysics"); } + void gunsToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("allowguns"); } + void unloadToolStripMenuItem1_Click(object sender, EventArgs e) { LevelCmd("map", " unload"); } + void infoToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map"); LevelCmd("mapinfo"); } + void moveAllToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("moveall"); } + void toolStripMenuItem2_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 0"); } + void toolStripMenuItem3_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 1"); } + void toolStripMenuItem4_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 2"); } + void toolStripMenuItem5_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 3"); } + void toolStripMenuItem6_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 4"); } + void toolStripMenuItem7_Click_1(object sender, EventArgs e) { LevelCmd("physics", " 5"); } + void saveToolStripMenuItem_Click_1(object sender, EventArgs e) { LevelCmd("save"); } + void unloadToolStripMenuItem_Click_1(object sender, EventArgs e) { LevelCmd("unload"); } + void reloadToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("reload"); } + void leafDecayToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " leafdecay"); } + void randomFlowToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " randomflow"); } + void treeGrowingToolStripMenuItem_Click(object sender, EventArgs e) { LevelCmd("map", " growtrees"); } + + #region Colored Reader Context Menu + + void nightModeToolStripMenuItem_Click_1(object sender, EventArgs e) { + if (MessageBox.Show("Changing to and from night mode will clear your logs. Do you still want to change?", "You sure?", MessageBoxButtons.YesNo) == System.Windows.Forms.DialogResult.No) + return; + + main_txtLog.NightMode = nightModeToolStripMenuItem.Checked; + nightModeToolStripMenuItem.Checked = !nightModeToolStripMenuItem.Checked; + } + + void colorsToolStripMenuItem_Click_1(object sender, EventArgs e) { + main_txtLog.Colorize = !colorsToolStripMenuItem.Checked; + colorsToolStripMenuItem.Checked = !colorsToolStripMenuItem.Checked; + } + + void dateStampToolStripMenuItem_Click(object sender, EventArgs e) { + main_txtLog.DateStamp = !dateStampToolStripMenuItem.Checked; + dateStampToolStripMenuItem.Checked = !dateStampToolStripMenuItem.Checked; + } + + void autoScrollToolStripMenuItem_Click(object sender, EventArgs e) { + main_txtLog.AutoScroll = !autoScrollToolStripMenuItem.Checked; + autoScrollToolStripMenuItem.Checked = !autoScrollToolStripMenuItem.Checked; + } + + void copySelectedToolStripMenuItem_Click(object sender, EventArgs e) { + if (String.IsNullOrEmpty(main_txtLog.SelectedText)) return; + Clipboard.SetText(main_txtLog.SelectedText, TextDataFormat.Text); + } + + void copyAllToolStripMenuItem_Click(object sender, EventArgs e) { + Clipboard.SetText(main_txtLog.Text, TextDataFormat.Text); + } + + void clearToolStripMenuItem_Click(object sender, EventArgs e) { + if (MessageBox.Show("Are you sure you want to clear logs?", "You sure?", MessageBoxButtons.YesNo) == DialogResult.Yes) { + main_txtLog.Clear(); + } + } + #endregion } } - diff --git a/GUI/Window.resx b/GUI/Window.resx index c726d0a57..be8289b21 100644 --- a/GUI/Window.resx +++ b/GUI/Window.resx @@ -1,215 +1,215 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 318, 17 - - - 213, 17 - - - 102, 17 - - - 420, 17 - - - 17, 17 - - - 37 - - - - - AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA - AAAJAwT/BwIC/wYBAv8QBgL/FAoE/w0EAv8TCAL/Fw0C/xgNAv8eDwT/FwsD/wMAAf8FAQH/BgEB/wUB - Af8FAQH/BgIC/wgDA/8XDQT/NiUL/0QnBf9aLQf/dDsM/3A/DP9sPgz/XDYR/284Bv92PAj/Vi4E/0sq - CP8vGgb/GAwE/wgCA/8IAgP/CQIC/xkJAv8VCQP/FwsD/yQSA/8lFAP/JxYF/yIQBf8QBgL/CAMC/wYC - Av8FAQH/BQEB/wUBAf8FAQH/Fg0E/y4cBf9GKAT/Zz4N/283B/9yNwT/aj8P/1sxB/9yNwX/dj0J/3VE - D/9XMgn/VC4J/zcgB/8YCwP/CAID/wUAAv8PBQP/Hg8F/xMIA/8bDwX/NR8F/ywZBP8tGwf/HRAG/wsF - A/8OCQX/BwQB/wcCAv8HAgP/CAMC/xkQA/8zHwX/SCYE/25BC/93SBH/ZjEB/3ZCDf9SLAj/dTwE/4tI - C/9/Rgn/az8K/04qBv9ZKwj/QycG/x0SCf8HAQL/CwYF/w8HAv8bDwX/FwsC/y8dCP9OLwj/IxQD/yYX - CP8VDAb/CwUE/w0JBP8MBQL/CgYD/wsHA/8fDQH/MhsD/0gqBv9kOQn/cT8H/3A8Bv9rOgv/bDcH/284 - BP94PQb/ejkG/2MzA/9ULAb/UCkE/2o2F/87Jgr/IxgP/wsFA/8NBgT/EgcB/x8SBv8gEwX/QScG/0cr - CP8QCAP/EAcE/x0RBf83HgD/KBMA/xEIA/8RCgL/Gg4D/zUcBv9RKwb/XjME/2c+C/92SRL/ZjcF/2Q8 - D/92QQn/gUID/31ADf+IRhT/cUEK/18xBP9dMwj/TC4M/yAWCP8PCAH/CwMC/w4FAv8ZDQT/IxUH/zAb - Bf9EJQT/JxYE/wcCAv8FAQT/MR0C/6iFS/+VcD7/NR4F/xQIAv8nFAb/RCQF/2U4Cv9qPgn/bkAK/2E3 - Cv9bMQn/ajwH/3E6C/94NQn/gT4L/5tQCv9/SQ//XzAG/00tBv8kFwb/EQgB/xIKBP8PBgT/FAkD/yIU - B/8kFAb/MRoD/ykWBf8NBgT/BwID/wcEB/8rFwD/uJ+B/9TArP9gQRf/HwwB/zUZBf9GJAP/bDoF/31F - Bv97Rwr/YDID/2g5Bv95Qw3/h0sm/6dqPf+XVSH/mE0Q/5xTCv9yOQP/NB8E/xcMAv8QCAP/DwgD/xgP - Cf8ZDAP/JRIE/yoRAP8rFwT/DwcD/wYBAv8SCwb/IhcK/yQVA/9XNwX/lmUY/3BDCP9EIwT/TiYE/2M4 - Bf+LTQf/m18R/3hICv9yPwn/gkgP/3I5E/+GUD7/oWRH/345H/9vJwX/j0YN/3xIEf8mGAL/EgoE/xIL - BP8WDQP/EwkF/yAQA/8uFwX/Szkq/yUTBP8IAQH/DAUD/xoSCP8aEAH/NR8G/146Dv9hOAH/b0EG/181 - BP9hNQT/gUsJ/5ZdD/+IVhT/g1EV/4tPF/+CTSj/fUk+/4FJPf9cKyf/ejEd/380D/+YUBf/Wzsa/xkN - AP8ZDgr/EAgD/xwQBf8VCQT/JhIE/z4gBv9JNSf/Gw4D/w4HBP8SCgP/IhUI/yMSBf84HgX/WzMJ/1ox - Bv9eNgX/YjcC/3VFCP99Twv/fk0I/4NUFf+KXBf/d0sr/3toe/94XXD/dD85/3Q9Mv+BOyP/gTUN/5RM - DP8tEgD/HBEL/ykeGf8KAgD/GhAF/xgMA/9CJQr/SScF/zsfAP8bDgT/Ew0G/x4OBP8jCgP/KRUH/zsd - A/9bKwP/XTAE/2A4BP9rPQP/gk4B/3FHCv+LWRX/kl4f/5tpO/91bI3/XmWv/3Nrk/9tRU7/lEov/4A4 - Gf93LgH/aDAI/yYWB/8QBAD/DwYC/xMMCP8NBgL/IxIF/zgcBf9TLAX/QiYI/xQJAv8QBgL/JAwD/yoO - BP8mEQP/TygE/18xB/9wQgv/bT8G/3dHA/+GWx3/mWof/5BbE/+YaE3/f2eg/1Vv3/9hbrn/kHJo/4RM - Pf+JPRz/Vh4A/2wwBf87Gwb/FAoB/w8EAv8LAgD/CQMA/wsEAv84IAf/QiIG/2o7CP87IAf/EwcD/xIG - A/8rEwb/LREE/0EiBP9RKgP/XjUI/3RBCP9jOAX/fkwB/3JiY/+SXhT/i2BX/1Fk3P9aZOf/aILw/2hu - pP94W03/fkEp/2IoD/9nNQv/Sx4C/xkKAP8WCwT/DgIA/xELD/8NBwr/CgQB/zccA/9TMAn/XjMH/ycT - Bv8XDQb/HA0F/0AhDv9HJxX/WS0C/1YxBf9iOAX/aToF/2g9Bf91Rwb/ilwV/5pwT/9og+n/cJv//5CX - +P9hb9z/ZmB5/3NKP/9kLx7/cTkL/3lGGf9HKBL/MSIU/xQGAf8OAgD/EQoQ/w0HCv8HAQD/Nx0E/1ow - BP9GIgb/GwsE/xcKBP8jDgL/Vy4S/2hEJ/9bMwT/VTIF/2Y6A/9+SwX/fk8L/3dRDv+ZbSr/jY3H/6HG - ///V5Pr/dIT5/1xhsv9sVVH/aTIh/2cuCP9kLwX/OxkF/0cxH/9jTzr/CwAA/xEJBv8MAwD/Fw0E/w0G - BP9EIgT/UCgF/zYbBv8kGg3/HxIF/zQZBP9EHwL/UioE/1QzC/9QMAf/d00P/6NkC/+TYxT/jWYd/55/ - df+In/X/8fn+/+Dr/v95hfX/c2aB/29ELv95U0L/c1VI/z4aA/8lDgL/HQ4E/xgMA/8RCAL/EggC/xoN - A/8iFAX/KxcI/0YjBP9GIAP/IQ4D/xkNBv8jDwT/Nx8I/00pBP9oPg3/UjQK/1o2Bv+CVhT/mmMO/4hZ - Ff+ygUr/lI23/8PY//////v/zdz//2xw2P9+Vk//ZzQP/5Z3Zv+Ylq3/Lg0A/xwLBP8UCQP/GQ4H/xMI - Af8ZDAP/KRUD/zgdA/9NJwn/RSMF/zIYBP8YDQb/GAkE/ykTA/8wGQT/Ui4F/1IxB/9VMwj/bUUL/35O - Bv+EWxL/pnY9/6J/hv+JneX/6fT///f+/f+Novr/aFOL/3ZOOP+HUyH/ckIc/0ArJf8gDAH/FAkD/w8E - Av8QBgH/GA0D/ykWBv84HQT/bjkO/1wuCP81FgL/IREH/xkQCf8dDwb/HxAD/0UoCP8/Jgv/VDAF/2w/ - Bv9qQAf/fU4I/4dhI/+vfVb/enS0/4uv///R4Pj/tM7//251y/9vSU//gU0k/4pWIv83GAD/GAgA/xQJ - A/8PBgH/EAUB/xoMBP8jFAf/OB4D/0gmBv9wOg7/QyIF/x4OBP8RCgX/DAEA/xYHAf8yHgj/XDkQ/1Iy - DP93Rwv/e0cI/2s+Bv96TA3/kmg1/5Zxbv9nd97/mq///6G6//+Ai+z/c2WL/3VJLP9+ShL/US8O/x8N - Af8XCQP/EQYB/w0FAv8UCQP/IQ8D/0QmB/9KJgf/VikD/z8hAv8jEgL/DQYE/wcAAP8yJh3/NyMU/z4i - Bf9TMw3/VS0A/2w+DP9yRhb/XjQE/39VHv90UUH/cWeT/2Fv6v9xjv3/fIDZ/4Ftl/+JXUj/f0cR/1Mt - Bv8hDwD/IxMK/xcLBf8RCAH/FAoD/xgLBP82HAb/ajYK/2YwCP9gMAb/Nh4E/xcKA/8QCAX/CQEA/zUn - G/87JhL/Ph8A/1k2DP9vRhX/b0AM/1gwCv96Qgr/g1Af/2tSU/9qY7b/YFfI/21qsP+CaYD/rndU/6xm - I/9sOQL/MxwG/xoMA/8VCQL/FAkC/xcMBP8ZDAP/FwoC/0InCv9cNg7/SSUC/0srCv8uGgf/EAQB/xEI - BP8RCAT/IAwD/zAaB/85GQD/imtJ/51/XP9jMwD/VjAL/45XGf+ETiX/flRL/4pyqf9gT6j/fGaK/7F3 - W/+1bij/k08O/0knA/8iEAL/GQoE/xgMBv8eDwP/KhUH/yUaFP8eEQf/OyAE/0cpBf9YMgj/TCwK/xsM - A/8NAwL/EAYD/xMJBP8gEAX/PSIG/0olAf9tRR7/dVIn/1MpAf97SRv/lmU7/4pJJP+CSkX/f2N5/3hd - gP+1emz/xWdD/4xCCf9hMQP/LBcD/x8OAv8YCAL/Hg4E/zEaCP8xGAf/NTAz/yscEv89HQD/STEg/1c3 - Gf85HQL/DwUC/w8DAv8PBgL/DQQD/x4NBP9AJAf/USsJ/1YsAv9QKwH/XjEF/55WHf+STjD/nVYs/5hV - Pv+MYWD/pmhU/75XLf+lRxb/eUYS/zwfA/8rEwT/Iw8H/yUOAv87Hwf/PSAM/ycSB/8kFA3/MRsI/0Mh - AP9ILhz/PygX/x8NAP8OBAP/DgQC/xIIBf8RBwX/IxIE/04rCP9aLQP/bD0J/08qB/90NwP/kUoZ/5JK - L/+qWjH/q2k+/7RfOP+0Uyj/nT4L/5RREf9bORb/MBYB/ywUCf8lEgX/OR8H/00qDv9BHwv/IQsC/ycT - CP82Hgv/RSME/0QjA/8uFwP/FwgC/w0CAf8KAgH/DgYE/xQKBP9DLxX/UCoF/3xJD/9wPwr/XC4H/5ZN - DP+ZURn/n1Yw/7BiOv/PdDj/wVMZ/5A2Cv+EQAL/Wi4F/zUXBP8sDwP/KBEF/zEZBP9WLw//VC8X/z0d - B/8zGQX/JRAF/zUZA/9BIgT/OB0G/yIPBP8RBQL/CwIC/wkBAv8LBAL/Gw0E/0ksDf9cMgf/gUgI/10s - Bf92Ogf/lkgF/6NOE/+9YCD/zGkm/9FjHP+QOAX/ai4D/18uBf86GwX/LxUE/zgYA/87HAT/TCoN/246 - GP9aKAr/PiII/zIbB/8vGQT/PiIH/0IkBv8nEgT/FwoD/w4FA/8KAwL/CAEC/w4GBP8sFwX/WDII/1ku - A/9uOgf/aTEG/3s1Af+ZUBn/wFsZ/9BgFf/SYR3/nEgL/3A1Bv9bLQb/OhoE/zYYBf82GAL/SigJ/1Ew - EP92QBv/hToQ/1wuB/8rFgT/LxgC/0clBP9GJgf/MxkD/xoJA/8RBgL/EQYD/wwDA/8KAgL/EQgD/0gq - CP9hNwf/XTAF/3I6Bv+NSw7/izoA/5pWKP+3cEH/lj4F/7NZGf95Ngb/VycA/zsWAP8xFQP/PBwE/0wl - Bf9cNA7/eUAY/5pAE/+YSgv/WzkX/yIPAP9DIwT/UysF/zwfA/8oFAf/FAkD/xAGAv8MAwL/DgUF/wwC - Av8aDgX/TSoG/1QsA/9iMQX/djoF/2cuBP+eTBT/ijwI/4g/FP9/NgT/ZS4G/08iAP9SLBb/SCQV/zsa - A/9TKQ3/WS0K/3I3Df+JOA7/hToF/2g3CP8yGQf/Nh4H/1UtCP9OKAP/NhsD/xsKA/8PBAL/DgMC/w8E - Av8PBQX/CgEC/xsNA/9ULwj/ZDQG/3A2BP9+PQX/cTIE/4w9B/+FNQX/eCwC/24wA/9IHwX/PBQB/0cg - D/9KJg//VSkK/3lBG/+ERBP/gTYG/2QpA/9kLwT/OxwD/yEMA/81HAj/SCUG/0gmBP8qEwT/EQQB/w4E - A/8VCAX/DwQC/w4GBv8PCAj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 318, 17 + + + 213, 17 + + + 102, 17 + + + 420, 17 + + + 17, 17 + + + 37 + + + + + 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 + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + + \ No newline at end of file