Append the number of skills in the skill queue to remaining time desc…

…ription fix evemondevteam#25 It will append the number of skills in the skill queue to remaining time description in the Overview tab and the bottom of Character tab.
NevarrTivianne · Mar 5, 2022 · edec5f1 · edec5f1
1 parent 44c7ff5
commit edec5f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/EVEMon.Common/Models/SkillQueue.cs b/src/EVEMon.Common/Models/SkillQueue.cs
@@ -260,6 +260,18 @@ public double GetOneDaySkillQueueWidth(int width)
             return  Math.Floor(WarningThresholdTimeSpan.TotalSeconds / totalSeconds * width);
         }
 
+        public string GetCountInSkillQueueDescription()
+        {
+            if (this.Count > 1)
+            {
+                return string.Format("{0} skills", this.Count);
+            }
+            else
+            {
+                return string.Format("{0} skill", this.Count);
+            }
+        }
+
         #endregion
     }
 }
diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs b/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs
@@ -202,7 +202,8 @@ private void UpdateSkillQueueInfo()
 
             // Update the remaining queue time label
             DateTime queueEndTime = ccpCharacter.SkillQueue.EndTime;
-            lblQueueRemaining.Text = queueEndTime.ToRemainingTimeDescription(DateTimeKind.Utc);
+            lblQueueRemaining.Text = string.Format("{0} ({1})", queueEndTime.ToRemainingTimeDescription(DateTimeKind.Utc),
+                ccpCharacter.SkillQueue.GetCountInSkillQueueDescription());
         }
 
         /// <summary>

diff --git a/src/EVEMon/Controls/OverviewItem.cs b/src/EVEMon/Controls/OverviewItem.cs
@@ -533,8 +533,9 @@ private void UpdateSkillQueueTrainingTime()
                     // More than one entry in queue ? Display total queue remaining time
                     if (ccpCharacter.SkillQueue.Count > 1)
                     {
-                        text = "Queue ends in " + ccpCharacter.SkillQueue.EndTime.
-                            ToRemainingTimeShortDescription(DateTimeKind.Utc);
+                        text = string.Format("Queue ends in {0} ({1})", ccpCharacter.SkillQueue.EndTime.
+                            ToRemainingTimeShortDescription(DateTimeKind.Utc),
+                            ccpCharacter.SkillQueue.GetCountInSkillQueueDescription());
                     }
                 }
                 // Skill queue is empty ?