Mercurial > repos > IBBoard.WarFoundry.GUI.GTK

diff FrmMainWindow.cs @ 135:fda46380dd68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re #329: "Points" system should be used in UI * Replace fixed "pts" or "pt" with game system's text (May be fixed, but needs more testing)
author IBBoard <dev@ibboard.co.uk>
date Sun, 09 Oct 2011 21:03:09 +0100
parents 42d2aa87dfa7
children 33962c2ef550
line wrap: on
line diff
--- a/FrmMainWindow.cs	Sun Oct 09 20:37:53 2011 +0100
+++ b/FrmMainWindow.cs	Sun Oct 09 21:03:09 2011 +0100
@@ -253,11 +253,11 @@
 
 				if (!Preferences.GetBooleanProperty("ShowCatPercentage"))
 				{
-					name = Translation.GetTranslation("categoryTreeCatName", "{0} - {1}pts", c.Name, c.Points);
+					name = Translation.GetTranslation("categoryTreeCatName", "{0} - {1}{2}", c.Name, c.Points, WarFoundryCore.CurrentGameSystem.GetPointsAbbrev(c.Points));
 				}
 				else
 				{
-					name = Translation.GetTranslation("categoryTreeCatNamePercentage", "{0} - {1}pts ({2}%)", c.Name, c.Points, (c.ParentArmy.Points > 0 ? Math.Round((c.Points / c.ParentArmy.Points) * 100) : 0));
+					name = Translation.GetTranslation("categoryTreeCatNamePercentage", "{0} - {1}{3} ({2}%)", c.Name, c.Points, (c.ParentArmy.Points > 0 ? Math.Round((c.Points / c.ParentArmy.Points) * 100) : 0), WarFoundryCore.CurrentGameSystem.GetPointsAbbrev(c.Points));
 				}
 
 				(cell as CellRendererText).Text = name;
@@ -267,7 +267,7 @@
 				if (o is WFObjects.Unit)
 				{
 					WFObjects.Unit u = (WFObjects.Unit)o;
-					string name = Translation.GetTranslation("unitTreeCatName", "{0} - {1}pts", u.Name, u.Points);
+					string name = Translation.GetTranslation("unitTreeCatName", "{0} - {1}{2}", u.Name, u.Points, WarFoundryCore.CurrentGameSystem.GetPointsAbbrev(u.Points));
 					(cell as CellRendererText).Text = name;
 				}
 
@@ -646,7 +646,7 @@
 		{
 			if (WarFoundryCore.CurrentArmy != null)
 			{
-				lblTotalPoints.Text = Translation.GetTranslation("statusPanelPoints", "{0}pts of {1} pts", WarFoundryCore.CurrentArmy.Points, WarFoundryCore.CurrentArmy.MaxPoints);
+				lblTotalPoints.Text = Translation.GetTranslation("statusPanelPoints", "{0}{2} of {1}{3}", WarFoundryCore.CurrentArmy.Points, WarFoundryCore.CurrentArmy.MaxPoints, WarFoundryCore.CurrentGameSystem.GetPointsAbbrev(WarFoundryCore.CurrentArmy.Points), WarFoundryCore.CurrentGameSystem.GetPointsAbbrev(WarFoundryCore.CurrentArmy.MaxPoints));
 			}
 			else
 			{