diff --git a/gui/fittingView.py b/gui/fittingView.py index c04a833e4..25b46e7e8 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -19,7 +19,6 @@ import wx -class FittingView(wx.Panel): +class FittingView(wx.TreeCtrl): def __init__(self, parent): - wx.Panel.__init__(self, parent) - self.SetBackgroundColour('pink') + wx.TreeCtrl.__init__(self, parent, wx.ID_ANY) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 60d39cc5d..fc19a3771 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -39,7 +39,8 @@ class MainFrame(wx.Frame): self.fitMultiSwitch.AddTab() self.splitter.SplitVertically(self.marketBrowser, self.fitMultiSwitch) - self.splitter.SetMinimumPaneSize(260) + self.splitter.SetMinimumPaneSize(10) + self.splitter.SetSashPosition(200) #Show ourselves self.Show() diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index e563379ad..2a50bc50e 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -33,5 +33,4 @@ class MarketBrowser(wx.Panel): self.itemView = wx.TreeCtrl(self.splitter) self.splitter.SplitHorizontally(self.marketView, self.itemView) - self.splitter.SetSashPosition(-300, True) self.splitter.SetMinimumPaneSize(10) diff --git a/gui/statsPane.py b/gui/statsPane.py index 7d99a0c92..38ac31fab 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -18,11 +18,92 @@ #=============================================================================== import wx +from gui import bitmapLoader class StatsPane(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) - self.SetBackgroundColour('cyan') size = wx.Size() - size.SetWidth(350) + size.SetWidth(315) self.SetMinSize(size) + + self.sizerBase = wx.BoxSizer(wx.VERTICAL) + self.SetSizer(self.sizerBase) + + self.sizerResourcesHeader = wx.BoxSizer(wx.HORIZONTAL) + self.sizerBase.Add(self.sizerResourcesHeader, 0, wx.EXPAND) + + # Resources header + self.labelResources = wx.StaticText(self, wx.ID_ANY, "Resources") + font = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT) + font.SetWeight(wx.BOLD) + self.labelResources.SetFont(font) + self.sizerResourcesHeader.Add(self.labelResources, 0) + self.sizerResourcesHeader.Add(wx.StaticLine(self, wx.ID_ANY), 1, wx.EXPAND) + + # Resources stuff + self.sizerResources = wx.BoxSizer(wx.HORIZONTAL) + self.sizerBase.Add(self.sizerResources) + + # Turret slots, Launcher slots & calibration + self.sizerHardResources = wx.FlexGridSizer(3, 4) + self.sizerResources.Add(self.sizerHardResources, 0, wx.EXPAND) + + for type in ("turret", "launcher"): + self.sizerHardResources.Add(bitmapLoader.getStaticBitmap("%s_big" % type, self)) + + lbl = wx.StaticText(self, wx.ID_ANY, "0") + setattr(self, "labelAvailable%sHardpoints", lbl) + self.sizerHardResources.Add(lbl, 0, wx.ALIGN_CENTER) + + self.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) + self.sizerHardResources.Add(lbl, 0, wx.ALIGN_CENTER) + + + # Calibration points + self.sizerHardResources.Add(bitmapLoader.getStaticBitmap("calibration_big", self)) + + self.labelAvailableCalibrationPoints = wx.StaticText(self, wx.ID_ANY, "0") + self.sizerHardResources.Add(self.labelAvailableCalibrationPoints, 0, wx.ALIGN_CENTER) + + self.sizerHardResources.Add(wx.StaticText(self, wx.ID_ANY, "/"), 0, wx.ALIGN_CENTER) + + self.labelTotalCalibrationPoints = wx.StaticText(self, wx.ID_ANY, "0") + self.sizerHardResources.Add(self.labelTotalCalibrationPoints, 0, wx.ALIGN_CENTER) + + self.sizerResources.Add(wx.StaticLine(self, wx.ID_ANY, style=wx.VERTICAL), 1, wx.EXPAND) + + #PG, Cpu & drone stuff + for group in (("cpu", "pg"), ("droneBay", "droneBandwidth")): + main = wx.BoxSizer(wx.VERTICAL) + self.sizerResources.Add(main, 0, wx.EXPAND) + for type in group: + capitalizedType = type[0].capitalize() + type[1:] + + base = wx.BoxSizer(wx.HORIZONTAL) + main.Add(base, 0, wx.EXPAND) + + base.Add(bitmapLoader.getStaticBitmap(type + "_big", self), 0, wx.ALIGN_CENTER) + + stats = wx.BoxSizer(wx.VERTICAL) + base.Add(stats, 0, wx.EXPAND) + + absolute = wx.BoxSizer(wx.HORIZONTAL) + stats.Add(absolute) + + lbl = wx.StaticText(self, wx.ID_ANY, "0") + setattr(self, "labelAvailable%s" % capitalizedType, lbl) + absolute.Add(lbl, 0, wx.ALIGN_CENTER) + + absolute.Add(wx.StaticText(self, wx.ID_ANY, "/"), 0, wx.ALIGN_CENTER) + + lbl = wx.StaticText(self, wx.ID_ANY, "0") + setattr(self, "labelTotal%s" % capitalizedType, lbl) + absolute.Add(lbl, 0, wx.ALIGN_CENTER) + + gauge = wx.Gauge(self, wx.ID_ANY, 100) + setattr(self, "gauge%s" % capitalizedType, gauge) + stats.Add(gauge) diff --git a/icons/.directory b/icons/.directory new file mode 100644 index 000000000..23a15eac6 --- /dev/null +++ b/icons/.directory @@ -0,0 +1,3 @@ +[Dolphin] +ShowPreview=true +Timestamp=2010,8,13,20,51,36 diff --git a/icons/armorActive_big.png b/icons/armorActive_big.png new file mode 100644 index 000000000..7740f85d2 Binary files /dev/null and b/icons/armorActive_big.png differ diff --git a/icons/armor_big.png b/icons/armor_big.png new file mode 100644 index 000000000..f34d1a976 Binary files /dev/null and b/icons/armor_big.png differ diff --git a/icons/calibration_big.png b/icons/calibration_big.png new file mode 100644 index 000000000..b32406273 Binary files /dev/null and b/icons/calibration_big.png differ diff --git a/icons/capacitorInfo_big.png b/icons/capacitorInfo_big.png new file mode 100644 index 000000000..910c7041a Binary files /dev/null and b/icons/capacitorInfo_big.png differ diff --git a/icons/capacitorRecharge_big.png b/icons/capacitorRecharge_big.png new file mode 100644 index 000000000..b435942cc Binary files /dev/null and b/icons/capacitorRecharge_big.png differ diff --git a/icons/cpu_big.png b/icons/cpu_big.png new file mode 100644 index 000000000..1c0828ec2 Binary files /dev/null and b/icons/cpu_big.png differ diff --git a/icons/droneBandwidth_big.png b/icons/droneBandwidth_big.png new file mode 100644 index 000000000..aa6993fc2 Binary files /dev/null and b/icons/droneBandwidth_big.png differ diff --git a/icons/droneBay_big.png b/icons/droneBay_big.png new file mode 100644 index 000000000..97d7010b6 Binary files /dev/null and b/icons/droneBay_big.png differ diff --git a/icons/em_big.png b/icons/em_big.png new file mode 100644 index 000000000..aa6be08ca Binary files /dev/null and b/icons/em_big.png differ diff --git a/icons/explosive_big.png b/icons/explosive_big.png new file mode 100644 index 000000000..7c38367d9 Binary files /dev/null and b/icons/explosive_big.png differ diff --git a/icons/fittingsPrice_big.png b/icons/fittingsPrice_big.png new file mode 100644 index 000000000..2d522e7b9 Binary files /dev/null and b/icons/fittingsPrice_big.png differ diff --git a/icons/hullActive_big.png b/icons/hullActive_big.png new file mode 100644 index 000000000..2251004a1 Binary files /dev/null and b/icons/hullActive_big.png differ diff --git a/icons/hull_big.png b/icons/hull_big.png new file mode 100644 index 000000000..f8c87aa73 Binary files /dev/null and b/icons/hull_big.png differ diff --git a/icons/kinetic_big.png b/icons/kinetic_big.png new file mode 100644 index 000000000..9c6e687a3 Binary files /dev/null and b/icons/kinetic_big.png differ diff --git a/icons/launcher_big.png b/icons/launcher_big.png new file mode 100644 index 000000000..820c46fbd Binary files /dev/null and b/icons/launcher_big.png differ diff --git a/icons/mining_big.png b/icons/mining_big.png new file mode 100644 index 000000000..2e62c5298 Binary files /dev/null and b/icons/mining_big.png differ diff --git a/icons/pg_big.png b/icons/pg_big.png new file mode 100644 index 000000000..06d9296c5 Binary files /dev/null and b/icons/pg_big.png differ diff --git a/icons/shieldActive_big.png b/icons/shieldActive_big.png new file mode 100644 index 000000000..a053fc25d Binary files /dev/null and b/icons/shieldActive_big.png differ diff --git a/icons/shieldPassive_big.png b/icons/shieldPassive_big.png new file mode 100644 index 000000000..88bc258b6 Binary files /dev/null and b/icons/shieldPassive_big.png differ diff --git a/icons/shield_big.png b/icons/shield_big.png new file mode 100644 index 000000000..373395c77 Binary files /dev/null and b/icons/shield_big.png differ diff --git a/icons/thermal_big.png b/icons/thermal_big.png new file mode 100644 index 000000000..90a640fa4 Binary files /dev/null and b/icons/thermal_big.png differ diff --git a/icons/totalPrice_big.png b/icons/totalPrice_big.png new file mode 100644 index 000000000..f75f9433b Binary files /dev/null and b/icons/totalPrice_big.png differ diff --git a/icons/turret_big.png b/icons/turret_big.png new file mode 100644 index 000000000..c80b9908f Binary files /dev/null and b/icons/turret_big.png differ diff --git a/icons/volley_big.png b/icons/volley_big.png new file mode 100644 index 000000000..04b2e1201 Binary files /dev/null and b/icons/volley_big.png differ