From 123613c1c7b62a28077d948540eb2d1f65c01630 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sat, 14 Aug 2010 17:21:42 +0200 Subject: [PATCH] Add two extra icons and make our grids a bit prettier --- gui/statsPane.py | 58 +++++++++++++++++++++++++++++----- icons/regenReinforced_big.png | Bin 0 -> 1328 bytes icons/regenSustained_big.png | Bin 0 -> 1283 bytes 3 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 icons/regenReinforced_big.png create mode 100644 icons/regenSustained_big.png diff --git a/gui/statsPane.py b/gui/statsPane.py index b1689645a..40859266e 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -47,20 +47,23 @@ class StatsPane(wx.Panel): # Turret slots, Launcher slots & calibration sizerHardResources = wx.FlexGridSizer(3, 4) - sizerResources.Add(sizerHardResources, 0, wx.ALIGN_CENTER) + for i in xrange(3): + sizerHardResources.AddGrowableCol(i+1) + + sizerResources.Add(sizerHardResources, 1, wx.ALIGN_CENTER) for type in ("turret", "launcher"): sizerHardResources.Add(bitmapLoader.getStaticBitmap("%s_big" % type, self)) lbl = wx.StaticText(self, wx.ID_ANY, "0") setattr(self, "labelAvailable%sHardpoints", lbl) - sizerHardResources.Add(lbl, 0, wx.ALIGN_CENTER) + sizerHardResources.Add(lbl, 1, wx.ALIGN_CENTER) sizerHardResources.Add(wx.StaticText(self, wx.ID_ANY, "/"), 0, wx.ALIGN_CENTER) lbl = wx.StaticText(self, wx.ID_ANY, "0") setattr(self, "labelTotal%sHardpoints", lbl) - sizerHardResources.Add(lbl, 0, wx.ALIGN_CENTER) + sizerHardResources.Add(lbl, 1, wx.ALIGN_CENTER) # Calibration points @@ -74,12 +77,12 @@ class StatsPane(wx.Panel): self.labelTotalCalibrationPoints = wx.StaticText(self, wx.ID_ANY, "0") sizerHardResources.Add(self.labelTotalCalibrationPoints, 0, wx.ALIGN_CENTER) - sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 1, wx.EXPAND) + sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND) #PG, Cpu & drone stuff for group in (("cpu", "pg"), ("droneBay", "droneBandwidth")): main = wx.BoxSizer(wx.VERTICAL) - sizerResources.Add(main, 0, wx.EXPAND) + sizerResources.Add(main, 0, wx.ALIGN_CENTER) for type in group: capitalizedType = type[0].capitalize() + type[1:] @@ -109,7 +112,7 @@ class StatsPane(wx.Panel): stats.Add(gauge) if "cpu" in group: - sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 1, wx.EXPAND) + sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND) # Resistances sizerHeaderResistances = wx.BoxSizer(wx.HORIZONTAL) @@ -131,7 +134,10 @@ class StatsPane(wx.Panel): sizerHeaderResistances.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.EXPAND) # Display table - sizerResistances = wx.GridSizer(4, 6) + sizerResistances = wx.FlexGridSizer(4, 6) + for i in xrange(5): + sizerResistances.AddGrowableCol(i+1) + self.sizerBase.Add(sizerResistances, 0, wx.EXPAND) # Add an empty label, then the rest. @@ -147,7 +153,7 @@ class StatsPane(wx.Panel): for damageType in ("em", "thermal", "kinetic", "explosive"): box = wx.BoxSizer(wx.HORIZONTAL) - sizerResistances.Add(box, 1, wx.EXPAND) + sizerResistances.Add(box, 1, wx.ALIGN_CENTER) lbl = wx.StaticText(self, wx.ID_ANY, "0.00") setattr(self, "labelResistance%s%s" % (tankType, damageType), lbl) @@ -158,3 +164,39 @@ class StatsPane(wx.Panel): lbl = wx.StaticText(self, wx.ID_ANY, "0") setattr(self, "labelResistance%sEhp" % tankType, lbl) sizerResistances.Add(lbl, 0, wx.ALIGN_CENTER) + + # Resistances + sizerHeaderRechargeRates = wx.BoxSizer(wx.HORIZONTAL) + self.sizerBase.Add(sizerHeaderRechargeRates, 0, wx.EXPAND) + + labelRecharge = wx.StaticText(self, wx.ID_ANY, "Recharge Rates") + font = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT) + font.SetWeight(wx.BOLD) + labelRecharge.SetFont(font) + + sizerHeaderRechargeRates.Add(labelRecharge, 0, wx.ALIGN_CENTER) + sizerHeaderRechargeRates.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.EXPAND) + + sizerTankStats = wx.FlexGridSizer(3, 5) + for i in xrange(4): + sizerTankStats.AddGrowableCol(i+1) + + self.sizerBase.Add(sizerTankStats, 1, wx.EXPAND) + + #Add an empty label first for correct alignment. + sizerTankStats.Add(wx.StaticText(self, wx.ID_ANY, ""), 0) + for tankType in ("shieldPassive", "shieldActive", "armorActive", "hullActive"): + sizerTankStats.Add(bitmapLoader.getStaticBitmap("%s_big" % tankType, self), 1, wx.ALIGN_CENTER) + + for stability in ("reinforced", "sustained"): + sizerTankStats.Add(bitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), self), 0, wx.ALIGN_CENTER) + for tankType in ("shieldPassive", "shieldActive", "armorActive", "hullActive"): + tankTypeCap = tankType[0].capitalize() + tankType[1:] + lbl = wx.StaticText(self, wx.ID_ANY, "0.0") + setattr(self, "labelTank%s%s" % (stability.capitalize(), tankTypeCap), lbl) + + box = wx.BoxSizer(wx.HORIZONTAL) + box.Add(lbl, 1, wx.ALIGN_CENTER) + box.Add(wx.StaticText(self, wx.ID_ANY, " HP/s"), 0, wx.ALIGN_CENTER) + + sizerTankStats.Add(box, 1, wx.ALIGN_CENTER) diff --git a/icons/regenReinforced_big.png b/icons/regenReinforced_big.png new file mode 100644 index 0000000000000000000000000000000000000000..23d003162779f91decb63aaf12fa93e995d0164b GIT binary patch literal 1328 zcmXYx4^&cD9LKSjsEP9rdW2QFWXsOc2EsYDmcjBE)BgXNn-v}r!8+-p`Da_pe3{4S z52fZmNRwsDd1fn{wPxBN5h-QTj&;asVnZ^lCPWGfyt_;AJMX^x?tAz9dEei?zxPgU z-}-sbqW2f!aJZn zwvcz1F?*H~XbA~)20Snam}U`)#38*L1x^3}i@DAtjETr93a9vF`gk;|STTVh25Gf| zualB`l2F&Y$~tcxXvkfaCw=pJL?;xB#halXh_+BXiorrQK8MX-&R&(no_kZH@B<|! zF7)}6F`#E2ooAu{{6tJz(A^KI1gK448uU)ai|IQL02!m-XvcJw&!~~1VKqQ~|IM!5 zTWq$oxsh0Ff2!2cmA-|?cWT9P2fSwY2T&*!B7z{7Z%U5+`P)ryeo8(DI@IsA|GM|n zi!)lSP{RUF`#x@~p;yzpVnCrV%X~IDJ!;-Pp$|e)0zin*%L5sYRgS9{8;2(%YO!st ze+f7p#t=l-jw@@tx@73g>gXuU<&c%a5S5lbi@USN!{|99kxJ4@FqVjml(8QjaRIAg zM80xUi>p94fl;Zwv-<5D{=NQtw;9FbPte(Hwg8XE7s2LJSm0%th|AgR7CFFN5fS0z zkH_csnqDn-0sUk!h-zXDI_HO|Cn{tmz-2f3G6Mb7QFweGv<>QcT&`USb83K=D9DE| z+&)NN=z)Ov?b6-5!At*d1ba3Z-E8x`>R_Ol10 zJTP)>yhbxhM@wQ!8~Z_*W&GnI)7smlv0|*pEP58L>`NOU4K^`V3iD*J(xykH+Zq$q z=E-R}`ht1PUEyv={83Xw45N6gPiXC*-w;@%Gj$jtb{{fp> zOF@u8ij~y|UWJ_&9xomRoV)qb^_68+_eO>cR`qpOCZyem8Ma?)@Ox)022Zvy7%S@p z`-+#V`t50wS`(dt82aC)$Yg%2G!9u54^&iC9}Pl~GIDsw<;7kHG6R`J0t_0*VYg)( z)N;azgiJ2PFaV^mdUw@`q%($>kwE1;M;ac+3KELxye>{-wz>HB_-Wv&4C%2Ud&?KB0#03H7*$xs{Xr z?Ir2S%Fo``3-#m@r~PnUX=zp@f+zzE-Ko;N^E&6tP1$_zIHpy6pj9Xo{Wy#122~ZPP7{`Orh_a{D@BhB<0Jv&1!?Mm~*xy|6 z`IEZa9ilTBe*XBtP@ra#$>gU4QUn+Q0L;K|EFje(He(^pYM+&b>G0-35D$EJ;XqPw zaBDDPn(COG8tE1tUXxg=8GE5f;qiD|a2}jy(JaK{^f1!FurRN%H3!2Cnv#~;;KT_N zGOFwc1A*C7Oyv1Ba`23%E<7uQvz#TipRqXVU*`d!V19MgMn#d`(#3Z6B|z4xiQdK1 z>G+2iW7oSPO3^C@U_5VoHv6b=Vy)%|K;Nf1 zDv|;_TYNlP+*W$aKN%mPn-G8{z%cwO7KZf&$@4y|Zaph3E#)}k&z=vgwgh%A0H(vS-+*Ak*UG=kAxMh&la8;? zdR}u}?XYB4Y|g)$Yg8BCt(S39`fXI#bgn}W0Dyo}xmL(ub>K$Dj`Ud$tNE0p5^;B? z%E-u*A{gT(qPhI~6JG|>St~euo3gY?hTdp_t(L#4XT-Ayw-qakvD9&EzVg{K!{B`u z=x_dURNWX719o~g7ayW@hhBW4IDcpOD^Rh% zQ2jgG<6Y)jQJthOEmI;WZamX?rScta%s{D-9%Alk0H`F&9B$omw%}Ek`=2uXgI>;v z_WpZsWW}W&$3pgQzLTmwuc`_*eUIXXl;D39)|mU>3<`&E%aO4$1(UCC27MTC&AHbp zU}^%Q)LN6K@Z)^%0J+GysxTXlf3rU}HXi+?(@CUw>+#-dZ7eAk)%elr)^tC=Wpp~- z@d!8d+HV(kgZhfE4Z@-_I4&c3u(>B(noJ7wauK3Mt1ZPwtva~hs8dVboc+sB{zPCZ zMDxWG28PPodqHf`ByWQ7&q}qi~@%LB(H@i5~MfWr>&0O~(ePq|lEc)|Rb& bxvz)>>-dumK5gUA%<+hgTSIRL!>9fO$m)F9 literal 0 HcmV?d00001