Merge remote-tracking branch 'origin/master'
Conflicts: gui/mainMenuBar.py
This commit is contained in:
blitzmann
@@ -210,23 +210,26 @@ class Miscellanea(ViewColumn):
|
||||
ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus")
|
||||
radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus")
|
||||
magnet = stuff.getModifiedItemAttr("scanMagnetometricStrengthBonus")
|
||||
if grav is None or ladar is None or radar is None or magnet is None:
|
||||
displayMax = max(grav, ladar, radar, magnet)
|
||||
displayMin = min(grav, ladar, radar, magnet)
|
||||
if grav is None or ladar is None or radar is None or magnet is None or displayMax is None:
|
||||
return "", None
|
||||
display = max(grav, ladar, radar, magnet)
|
||||
if not display:
|
||||
return "", None
|
||||
text = "{0}".format(formatAmount(display, 3, 0, 3))
|
||||
ttEntries = []
|
||||
if display == grav:
|
||||
ttEntries.append("gravimetric")
|
||||
if display == ladar:
|
||||
ttEntries.append("ladar")
|
||||
if display == magnet:
|
||||
ttEntries.append("magnetometric")
|
||||
if display == radar:
|
||||
ttEntries.append("radar")
|
||||
plu = "" if len(ttEntries) == 1 else "s"
|
||||
tooltip = "{0} strength{1}".format(formatList(ttEntries), plu).capitalize()
|
||||
|
||||
if displayMax == displayMin or displayMin is None:
|
||||
text = "{0}".format(
|
||||
formatAmount(displayMax, 3, 0, 3),
|
||||
)
|
||||
else:
|
||||
text = "{0} | {1}".format(
|
||||
formatAmount(displayMax, 3, 0, 3),
|
||||
formatAmount(displayMin, 3, 0, 3),
|
||||
)
|
||||
tooltip = "ECM Jammer Strength:\n{0} Gravimetric | {1} Ladar | {2} Magnetometric | {3} Radar".format(
|
||||
formatAmount(grav, 3, 0, 3),
|
||||
formatAmount(ladar, 3, 0, 3),
|
||||
formatAmount(radar, 3, 0, 3),
|
||||
formatAmount(magnet, 3, 0, 3),
|
||||
)
|
||||
return text, tooltip
|
||||
elif itemGroup in ("Remote Sensor Booster", "Sensor Booster", "Signal Amplifier"):
|
||||
scanResBonus = stuff.getModifiedItemAttr("scanResolutionBonus")
|
||||
|
||||
@@ -84,9 +84,9 @@ class ItemStatsDialog(wx.Dialog):
|
||||
|
||||
self.SetMinSize((300, 200))
|
||||
if "wxGTK" in wx.PlatformInfo: # GTK has huge tab widgets, give it a bit more room
|
||||
self.SetSize((530, 300))
|
||||
self.SetSize((580, 500))
|
||||
else:
|
||||
self.SetSize((500, 300))
|
||||
self.SetSize((550, 500))
|
||||
#self.SetMaxSize((500, -1))
|
||||
self.mainSizer = wx.BoxSizer(wx.VERTICAL)
|
||||
self.container = ItemStatsContainer(self, victim, item, itmContext)
|
||||
@@ -341,9 +341,14 @@ class ItemParams (wx.Panel):
|
||||
|
||||
def PopulateList(self):
|
||||
self.paramList.InsertColumn(0,"Attribute")
|
||||
self.paramList.InsertColumn(1,"Value")
|
||||
self.paramList.SetColumnWidth(1,150)
|
||||
self.paramList.setResizeColumn(1)
|
||||
self.paramList.InsertColumn(1,"Current Value")
|
||||
if self.stuff is not None:
|
||||
self.paramList.InsertColumn(2,"Base Value")
|
||||
self.paramList.SetColumnWidth(0,110)
|
||||
self.paramList.SetColumnWidth(1,90)
|
||||
if self.stuff is not None:
|
||||
self.paramList.SetColumnWidth(2,90)
|
||||
self.paramList.setResizeColumn(0)
|
||||
self.imageList = wx.ImageList(16, 16)
|
||||
self.paramList.SetImageList(self.imageList,wx.IMAGE_LIST_SMALL)
|
||||
|
||||
@@ -354,9 +359,11 @@ class ItemParams (wx.Panel):
|
||||
idCount = 0
|
||||
for name in names:
|
||||
info = self.attrInfo.get(name)
|
||||
|
||||
|
||||
att = self.attrValues[name]
|
||||
|
||||
valDefault = getattr(info, "value", None)
|
||||
valueDefault = valDefault if valDefault is not None else att
|
||||
|
||||
val = getattr(att, "value", None)
|
||||
value = val if val is not None else att
|
||||
|
||||
@@ -395,8 +402,16 @@ class ItemParams (wx.Panel):
|
||||
else:
|
||||
valueUnit = formatAmount(value, 3, 0, 0)
|
||||
|
||||
if self.toggleView != 1:
|
||||
valueUnitDefault = str(valueDefault)
|
||||
elif info and info.unit:
|
||||
valueUnitDefault = self.TranslateValueUnit(valueDefault, info.unit.displayName, info.unit.name)
|
||||
else:
|
||||
valueUnitDefault = formatAmount(valueDefault, 3, 0, 0)
|
||||
|
||||
self.paramList.SetStringItem(index, 1, valueUnit)
|
||||
if self.stuff is not None:
|
||||
self.paramList.SetStringItem(index, 2, valueUnitDefault)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@ class MainMenuBar(wx.MenuBar):
|
||||
self.ssoLoginId = wx.NewId()
|
||||
self.attrEditorId = wx.NewId()
|
||||
self.toggleOverridesId = wx.NewId()
|
||||
self.importDatabaseDefaultsId = wx.NewId()
|
||||
|
||||
if 'wxMac' in wx.PlatformInfo and wx.VERSION >= (3,0):
|
||||
wx.ID_COPY = wx.NewId()
|
||||
@@ -74,8 +73,6 @@ class MainMenuBar(wx.MenuBar):
|
||||
fileMenu.Append(self.exportSkillsNeededId, "Export &Skills Needed", "Export skills needed for this fitting")
|
||||
fileMenu.Append(self.importCharacterId, "Import C&haracter File", "Import characters into pyfa from file")
|
||||
fileMenu.AppendSeparator()
|
||||
fileMenu.Append(self.importDatabaseDefaultsId, "Import D&atabase Defaults", "Imports missing database defaults")
|
||||
fileMenu.AppendSeparator()
|
||||
fileMenu.Append(wx.ID_EXIT)
|
||||
|
||||
# Edit menu
|
||||
@@ -139,11 +136,11 @@ class MainMenuBar(wx.MenuBar):
|
||||
self.Enable(self.exportToEveId, False)
|
||||
|
||||
if not gui.mainFrame.disableOverrideEditor:
|
||||
windowMenu.AppendSeparator()
|
||||
attrItem = wx.MenuItem(windowMenu, self.attrEditorId, "Attribute Overrides\tCTRL+B")
|
||||
attrItem.SetBitmap(BitmapLoader.getBitmap("fit_rename_small", "gui"))
|
||||
windowMenu.AppendItem(attrItem)
|
||||
editMenu.AppendSeparator()
|
||||
editMenu.Append(self.toggleOverridesId, "Turn Overrides On")
|
||||
windowMenu.Append(self.toggleOverridesId, "Turn Overrides On")
|
||||
|
||||
# Help menu
|
||||
helpMenu = wx.Menu()
|
||||
@@ -174,3 +171,5 @@ class MainMenuBar(wx.MenuBar):
|
||||
self.Enable(self.revertCharId, char.isDirty)
|
||||
|
||||
event.Skip()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user