Fix commit clash

This commit is contained in:
DarkPhoenix
2010-09-05 20:13:04 +04:00
parent c4f7fded7f
commit 9e954f364a

View File

@@ -378,7 +378,7 @@ class StatsPane(wx.Panel):
else:
gauge = PG.PyGauge(parent, wx.ID_ANY, 100)
gauge.SetMinSize((self.getTextExtentW("999.9k/1.3M GJ"), 23))
gauge.SetSkipDigitsFlag(True)
gauge.SetFractionDigits(2)
setattr(self, "gauge%s%s" % (panel.capitalize(),capitalizedType), gauge)
stats.Add(gauge, 0, wx.ALIGN_CENTER)
@@ -461,7 +461,7 @@ class StatsPane(wx.Panel):
lbl.SetBackgroundColour(wx.Colour(bc[0],bc[1],bc[2]))
lbl.SetBarColour(wx.Colour(fc[0],fc[1],fc[2]))
lbl.SetBarGradient()
lbl.SetSkipDigitsFlag(False)
lbl.SetFractionDigits(1)
setattr(self, "labelResistance%s%s" % (tankType.capitalize(), damageType.capitalize()), lbl)
box.Add(lbl, 0, wx.ALIGN_CENTER)
@@ -851,7 +851,7 @@ class StatsPane(wx.Panel):
hbox.Add(wx.StaticText(self.fullPanel, wx.ID_ANY, " m ISK"), 0, wx.ALIGN_LEFT)
# The custom made collapsible panel demo
# The custom made collapsible panel demo
priceTPanel = TogglePanel(self.fullPanel)
priceTPanel.SetLabel(u"Price")