From 8985e3a830df5524011d2e576ccbc4cc201d1030 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 3 Sep 2010 13:38:00 +0300 Subject: [PATCH 1/4] Fixed alignment of hardpoints/calib statictext sizer ->aligned to left --- gui/statsPane.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/statsPane.py b/gui/statsPane.py index 58e4463e8..3c9eac4cc 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -313,7 +313,7 @@ class StatsPane(wx.Panel): box = wx.BoxSizer(wx.HORIZONTAL) sizer.Add(bitmap, 0, wx.ALIGN_CENTER) - sizer.Add(box, 0, wx.ALIGN_CENTER) + sizer.Add(box, 0, wx.ALIGN_CENTER_VERTICAL) suffix = "Points" if type == "calibration" else "Hardpoints" lbl = wx.StaticText(parent, wx.ID_ANY, "0") From eb72b18a07986f3b6ca243d5240b6fd075310486 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 3 Sep 2010 13:48:17 +0300 Subject: [PATCH 2/4] Added tooltips to gauges that shows the true values --- gui/pygauge.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gui/pygauge.py b/gui/pygauge.py index 395a75ea9..6bce7b144 100644 --- a/gui/pygauge.py +++ b/gui/pygauge.py @@ -61,7 +61,9 @@ class PyGauge(wx.PyWindow): self._overdriveTimerStarted=False self.SetBarGradient((wx.Colour(153,153,153),wx.Colour(204,204,204))) self.SetBackgroundColour(wx.Colour(102,102,102)) - + self._tooltip = wx.ToolTip("") + self.SetToolTip(self._tooltip) + self._tooltip.SetTip("0/100") self.Bind(wx.EVT_PAINT, self.OnPaint) self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) @@ -264,7 +266,7 @@ class PyGauge(wx.PyWindow): if self._overdrive > self._range: value = self._overdrive - + self._tooltip.SetTip("%.2f/%.2f" % (value, self._range)) if self._skipDigits == True: dc.DrawLabel("%d%%" % (value*100/self._range), rect, wx.ALIGN_CENTER) else: From 98d638adba06b68fa9863bfbc5c575113f812a9f Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 3 Sep 2010 14:00:25 +0300 Subject: [PATCH 3/4] Added tooltips for EHP statictext controls --- gui/statsPane.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gui/statsPane.py b/gui/statsPane.py index 3c9eac4cc..3ee040e48 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -169,10 +169,12 @@ class StatsPane(wx.Panel): if ehp is not None: total += ehp[tankType] lbl.SetLabel(shorten(ehp[tankType], 2)) + lbl.SetToolTip(wx.ToolTip("%s: %d" % (tankType.capitalize(), ehp[tankType]))) else: lbl.SetLabel("0") self.labelEhp.SetLabel(shorten(total, 2)) + self.labelEhp.SetToolTip(wx.ToolTip("Effective: %d" % total)) damagePattern = fit.damagePattern if fit is not None else None for damageType in ("em", "thermal", "kinetic", "explosive"): From f333454e38906ffc51875778c475fb4843dd77a7 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 3 Sep 2010 14:19:36 +0300 Subject: [PATCH 4/4] Added tooltips for the rest of statictext controls (~90%) --- gui/statsPane.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/statsPane.py b/gui/statsPane.py index 3ee040e48..fa9391f0c 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -89,15 +89,17 @@ class StatsPane(wx.Panel): value = value if value is not None else 0 if isinstance(value, basestring): label.SetLabel(value) + label.SetToolTip(wx.ToolTip(value)) else: label.SetLabel(shorten(value, rounding)) + label.SetToolTip(wx.ToolTip("%.1f" % value)) for labelName, value, rounding in stats: label = getattr(self, labelName) value = value() if fit is not None else 0 value = value if value is not None else 0 label.SetLabel(shorten(value, rounding)) - + label.SetToolTip(wx.ToolTip("%.1f" % value)) # cap stuff capState = fit.capState if fit is not None else 0 capStable = fit.capStable if fit is not None else False