GUI: Improve Players tab again by not showing + in names, also explic…

…itly mention player name in actions log
ClassiCube · Jan 15, 2021 · d14b07b · d14b07b
1 parent c19c682
commit d14b07b
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/GUI/Window/Window.Players.cs b/GUI/Window/Window.Players.cs
@@ -29,7 +29,7 @@ public partial class Window : Form {
             if (time.Length == 0) { Players_AppendStatus("Amount of time to undo required"); return; }
 
             UIHelpers.HandleCommand("UndoPlayer " + curPlayer.name + " " + time);
-            Players_AppendStatus("Undid player for " + time + " seconds");
+            Players_AppendStatus("Undid " + curPlayer.truename + " for " + time + " seconds");
         }
 
         void pl_BtnMessage_Click(object sender, EventArgs e) {
@@ -63,34 +63,29 @@ public partial class Window : Form {
             pl_txtImpersonate.Text = "";
         }
 
-        void pl_BtnMute_Click(object sender, EventArgs e) {  DoCmd("mute", "Muted"); }
-        void pl_BtnKill_Click(object sender, EventArgs e) {  DoCmd("kill", "Killed"); }
-        void pl_BtnWarn_Click(object sender, EventArgs e) {  DoCmd("warn", "Warned"); }
-        void pl_BtnKick_Click(object sender, EventArgs e) {  DoCmd("kick", "Kicked"); }
-        void pl_BtnBan_Click(object sender, EventArgs e)  {  DoCmd("ban", "Banned"); }
-        void pl_BtnIPBan_Click(object sender, EventArgs e) { DoCmd("banip", "IP-Banned"); }
-        void pl_BtnSlap_Click(object sender, EventArgs e) {  DoCmd("slap", "Slapped"); }
+        void pl_BtnMute_Click(object sender, EventArgs e) {  DoCmd("mute", "Muted @p"); }
+        void pl_BtnKill_Click(object sender, EventArgs e) {  DoCmd("kill", "Killed @p"); }
+        void pl_BtnWarn_Click(object sender, EventArgs e) {  DoCmd("warn", "Warned @p"); }
+        void pl_BtnKick_Click(object sender, EventArgs e) {  DoCmd("kick", "Kicked @p"); }
+        void pl_BtnBan_Click(object sender, EventArgs e)  {  DoCmd("ban", "Banned @p"); }
+        void pl_BtnIPBan_Click(object sender, EventArgs e) { DoCmd("banip", "IP-Banned @p"); }
+        void pl_BtnSlap_Click(object sender, EventArgs e)  { DoCmd("slap", "Slapped @p"); }
+        void pl_BtnRules_Click(object sender, EventArgs e) { DoCmd("Rules", "Sent rules to @p"); }
 
         void DoCmd(string cmdName, string action) {
             if (curPlayer == null) { Players_AppendStatus("No player selected"); return; }
             UIHelpers.HandleCommand(cmdName + " " + curPlayer.name);
-            Players_AppendStatus(action + " player");
-        }
-
-        void pl_BtnRules_Click(object sender, EventArgs e) {
-            if (curPlayer == null) { Players_AppendStatus("No player selected"); return; }
-            UIHelpers.HandleCommand("Rules " + curPlayer.name);
-            Players_AppendStatus("Sent rules to player");
+            Players_AppendStatus(action.Replace("@p", curPlayer.truename));
         }
 
         void pl_listBox_Click(object sender, EventArgs e) {
             Player p = PlayerInfo.FindExact(pl_listBox.Text);
             if (p == null || p == curPlayer) return;
 
             pl_statusBox.Text = "";
-            Players_AppendStatus("==" + p.name + "==");
+            Players_AppendStatus("==" + p.truename + "==");
             playerProps = new PlayerProperties(p);
-            pl_gbProps.Text = "Properties for " + p.name;
+            pl_gbProps.Text = "Properties for " + p.truename;
             pl_pgProps.SelectedObject = playerProps;
             curPlayer = p;
 
@@ -120,7 +115,7 @@ public partial class Window : Form {
             pl_listBox.Items.Clear();
             Player[] players = PlayerInfo.Online.Items;
             foreach (Player p in players) {
-                pl_listBox.Items.Add(p.name);
+                pl_listBox.Items.Add(p.truename);
             }
 
             if (curPlayer == null) return;