diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index ed8156a9d..d2051da99 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -42,35 +42,35 @@ class ResourcesViewFull(StatsView): def populatePanel(self, contentPanel, headerPanel): contentSizer = contentPanel.GetSizer() + root = wx.BoxSizer(wx.VERTICAL) + contentSizer.Add(root, 0, wx.EXPAND, 0) + + sizer = wx.GridSizer(1, 4) + root.Add(sizer, 0, wx.EXPAND) + root.Add(wx.StaticLine(contentPanel, wx.ID_ANY, style=wx.HORIZONTAL), 0, wx.EXPAND) + sizerResources = wx.BoxSizer(wx.HORIZONTAL) - contentSizer.Add( sizerResources, 0, wx.EXPAND, 0) + root.Add(sizerResources, 1, wx.EXPAND, 0) parent = self.panel = contentPanel self.headerPanel = headerPanel panel = "full" - sizer = wx.FlexGridSizer(2, 2) - sizer.SetMinSize(wx.Size(36 + self.getTextExtentW("400/400"), 0)) - for i in xrange(3): - sizer.AddGrowableCol(i + 1) base = sizerResources - base.Add(sizer, 0, wx.ALIGN_CENTER) #Turrets & launcher hardslots display tooltipText = {"turret":"Turret hardpoints", "drones":"Drones active", "launcher":"Launcher hardpoints", "calibration":"Calibration"} for type in ("turret", "drones", "launcher", "calibration"): - outerBox = wx.BoxSizer(wx.VERTICAL) box = wx.BoxSizer(wx.HORIZONTAL) bitmap = bitmapLoader.getStaticBitmap("%s_big" % type, parent, "icons") tooltip = wx.ToolTip(tooltipText[type]) bitmap.SetToolTip(tooltip) - outerBox.Add(bitmap, 0, wx.ALIGN_CENTER) - outerBox.Add(box, 0, wx.ALIGN_CENTER) + box.Add(bitmap, 0, wx.ALIGN_CENTER) - sizer.Add(outerBox, 0, wx.ALIGN_CENTER) + sizer.Add(box, 0, wx.ALIGN_CENTER) suffix = {'turret':'Hardpoints', 'drones':'Active', 'launcher':'Hardpoints', 'calibration':'Points'} lbl = wx.StaticText(parent, wx.ID_ANY, "0") @@ -83,7 +83,6 @@ class ResourcesViewFull(StatsView): setattr(self, "label%sTotal%s%s" % (panel.capitalize(), type.capitalize(), suffix[type].capitalize()), lbl) box.Add(lbl, 0, wx.ALIGN_CENTER) - base.Add(wx.StaticLine(parent, wx.ID_ANY, style=wx.VERTICAL), 0, wx.EXPAND | wx.LEFT, 3 if panel == "full" else 0) #PG, Cpu & drone stuff tooltipText = {"cpu":"CPU", "pg":"PowerGrid", "droneBay":"Drone bay", "droneBandwidth":"Drone bandwidth"} diff --git a/gui/builtinViewColumns/moduleTracking.py b/gui/builtinViewColumns/moduleTracking.py old mode 100755 new mode 100644 diff --git a/gui/builtinViewColumns/projectedAmmo.py b/gui/builtinViewColumns/projectedAmmo.py old mode 100755 new mode 100644 diff --git a/gui/builtinViewColumns/projectedAmmoIcon.py b/gui/builtinViewColumns/projectedAmmoIcon.py old mode 100755 new mode 100644 diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index d983bfd25..fe56fcfac 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -33,26 +33,23 @@ class MainMenuBar(wx.MenuBar): # File menu fileMenu = wx.Menu() self.Append(fileMenu, "&File") - fileMenu.Append(self.backupFitsId, "&Backup fits", "Backup all fittings to a XML file") if 'wxMSW' in wx.PlatformInfo: fileMenu.Append(wx.ID_CLOSE, "&Close\tCTRL+W", "Close the currently open fit") else: fileMenu.Append(wx.ID_CLOSE) fileMenu.Append(wx.ID_EXIT) + fileMenu.AppendSeparator() + fileMenu.Append(self.backupFitsId, "&Backup fits", "Backup all fittings to a XML file") + fileMenu.Append(wx.ID_OPEN, "&Import\tCTRL+O", "Import a fit into pyfa.") + fileMenu.Append(wx.ID_SAVEAS, "&Export\tCTRL+S", "Export the fit to another format.") # Edit menu editMenu = wx.Menu() self.Append(editMenu, "&Edit") - editMenu.Append(wx.ID_UNDO) - editMenu.Append(wx.ID_REDO) - - # Fit menu - self.fitMenu = fitMenu = wx.Menu() - self.Append(fitMenu, "F&it") - fitMenu.Append(wx.ID_OPEN, "&Import", "Import a fit into pyfa.") - fitMenu.Append(wx.ID_SAVEAS, "&Export\tCTRL+S", "Export the fit to another format.") + #editMenu.Append(wx.ID_UNDO) + #editMenu.Append(wx.ID_REDO) clipboardMenu = wx.Menu() self.idExportDna, self.idExportEft, self.idExportXml = wx.NewId(), wx.NewId(), wx.NewId() @@ -60,10 +57,10 @@ class MainMenuBar(wx.MenuBar): clipboardMenu.Append(self.idExportXml, "&XML", "Copy the XML export of this fit to the clipboard") clipboardMenu.Append(self.idExportDna, "&DNA", "Copy the DNA export of this fit to the clipboard") - copyText = "&To Clipboard" + ("\tCTRL+C" if 'wxMSW' in wx.PlatformInfo else "") - pasteText = "&From Clipboard" + ("\tCTRL+V" if 'wxMSW' in wx.PlatformInfo else "") - fitMenu.AppendMenu(wx.ID_COPY, copyText, clipboardMenu, "Export a fit to the clipboard") - fitMenu.Append(wx.ID_PASTE, pasteText, "Import a fit from the clipboard") + copyText = "Export &To Clipboard" + ("\tCTRL+C" if 'wxMSW' in wx.PlatformInfo else "") + pasteText = "Import &From Clipboard" + ("\tCTRL+V" if 'wxMSW' in wx.PlatformInfo else "") + editMenu.AppendMenu(wx.ID_COPY, copyText, clipboardMenu, "Export a fit to the clipboard") + editMenu.Append(wx.ID_PASTE, pasteText, "Import a fit from the clipboard") # Character menu @@ -75,9 +72,10 @@ class MainMenuBar(wx.MenuBar): windowMenu.AppendItem(charEditItem) damagePatternEditItem = wx.MenuItem(windowMenu, self.damagePatternEditorId, "Damage Pattern Editor\tCTRL+D") + damagePatternEditItem.SetBitmap(bitmapLoader.getBitmap("damagePattern_small", "icons")) windowMenu.AppendItem(damagePatternEditItem) - windowMenu.Append(wx.ID_PREFERENCES) + #windowMenu.Append(wx.ID_PREFERENCES) # Help menu helpMenu = wx.Menu() diff --git a/icons/damagePattern_small.png b/icons/damagePattern_small.png new file mode 100644 index 000000000..89b5322bc Binary files /dev/null and b/icons/damagePattern_small.png differ diff --git a/icons/skillGreen_big.png b/icons/skillGreen_big.png new file mode 100644 index 000000000..03904c2e0 Binary files /dev/null and b/icons/skillGreen_big.png differ diff --git a/icons/skillRed_big.png b/icons/skillRed_big.png new file mode 100644 index 000000000..d418e25b7 Binary files /dev/null and b/icons/skillRed_big.png differ