Merge branch 'master' of evefit.org:pyfa

2010-10-20 18:26:18 +03:00
parent 0a4e1f0aa9 c63bcc2b28
commit 8b77a222ef
1 changed files with 8 additions and 1 deletions
--- a/gui/builtinStatsViews/capacitorViewFull.py
+++ b/gui/builtinStatsViews/capacitorViewFull.py
@@ -125,7 +125,14 @@ class CapacitorViewFull(StatsView):
            t = "%.1f%%-%.1f%%" % capState
            s = ""
        else:
-            t = ("%ds" if not capStable else "%.1f%%") % capState
+            if capStable:
+                t = "%.1f%%" % capState
+            else:
+                if capState > 60:
+                    t = "%dm%ds" % divmod(capState, 60)
+                else:
+                    t = "%ds" % capState
+
            s = "Stable: " if capStable else "Lasts "

        getattr(self, lblNameTime % panel).SetLabel(t)