Fixed some missing chrome tab stuff, as well as more conversion issues
This commit is contained in:
@@ -26,7 +26,7 @@ class HandledList(list):
|
||||
def filteredItemPreAssign(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.preAssignItemAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -34,7 +34,7 @@ class HandledList(list):
|
||||
def filteredItemIncrease(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.increaseItemAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -42,7 +42,7 @@ class HandledList(list):
|
||||
def filteredItemMultiply(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.multiplyItemAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -50,7 +50,7 @@ class HandledList(list):
|
||||
def filteredItemBoost(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.boostItemAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -58,7 +58,7 @@ class HandledList(list):
|
||||
def filteredItemForce(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.forceItemAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -66,7 +66,7 @@ class HandledList(list):
|
||||
def filteredChargePreAssign(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.preAssignChargeAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -74,7 +74,7 @@ class HandledList(list):
|
||||
def filteredChargeIncrease(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.increaseChargeAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -82,7 +82,7 @@ class HandledList(list):
|
||||
def filteredChargeMultiply(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.multiplyChargeAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -90,7 +90,7 @@ class HandledList(list):
|
||||
def filteredChargeBoost(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.boostChargeAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
@@ -98,7 +98,7 @@ class HandledList(list):
|
||||
def filteredChargeForce(self, filter, *args, **kwargs):
|
||||
for element in self:
|
||||
try:
|
||||
if list(filter(element)):
|
||||
if filter(element):
|
||||
element.forceChargeAttr(*args, **kwargs)
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
@@ -1488,9 +1488,9 @@ class Fit(object):
|
||||
def __repr__(self):
|
||||
return "Fit(ID={}, ship={}, name={}) at {}".format(
|
||||
self.ID, self.ship.item.name, self.name, hex(id(self))
|
||||
).encode('utf8')
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return "{} ({})".format(
|
||||
self.name, self.ship.item.name
|
||||
).encode('utf8')
|
||||
)
|
||||
|
||||
@@ -678,13 +678,14 @@ class FittingView(d.Display):
|
||||
pyfalog.critical(e)
|
||||
|
||||
def OnShow(self, event):
|
||||
if event.GetShow():
|
||||
try:
|
||||
self.MakeSnapshot()
|
||||
except Exception as e:
|
||||
pyfalog.critical("Failed to make snapshot")
|
||||
pyfalog.critical(e)
|
||||
event.Skip()
|
||||
pass
|
||||
# if event.Show():
|
||||
# try:
|
||||
# self.MakeSnapshot()
|
||||
# except Exception as e:
|
||||
# pyfalog.critical("Failed to make snapshot")
|
||||
# pyfalog.critical(e)
|
||||
# event.Skip()
|
||||
|
||||
def Snapshot(self):
|
||||
return self.FVsnapshot
|
||||
|
||||
@@ -222,6 +222,18 @@ class ChromeNotebook(wx.Panel):
|
||||
self._active_page = win
|
||||
self.ShowActive(True)
|
||||
|
||||
def DisablePage(self, page, toggle):
|
||||
idx = self.GetPageIndex(page)
|
||||
|
||||
if toggle and page == self._active_page:
|
||||
try:
|
||||
# Set page to the first non-disabled page
|
||||
self.SetSelection(next(i for i, _ in enumerate(self._pages) if not self.tabs_container.tabs[i].disabled))
|
||||
except StopIteration:
|
||||
self.SetSelection(0)
|
||||
|
||||
self.tabs_container.DisableTab(idx, toggle)
|
||||
|
||||
def SetSelection(self, page):
|
||||
old_selection = self.GetSelection()
|
||||
if old_selection != page:
|
||||
@@ -848,6 +860,13 @@ class _TabsContainer(wx.Panel):
|
||||
for tab in self.tabs:
|
||||
if self.CheckTabClose(tab, mposx, mposy):
|
||||
return
|
||||
|
||||
def DisableTab(self, tab, disabled=True):
|
||||
tb_renderer = self.tabs[tab]
|
||||
tb_renderer.disabled = disabled
|
||||
|
||||
self.AdjustTabsSize()
|
||||
self.Refresh()
|
||||
|
||||
def GetSelectedTab(self):
|
||||
for tab in self.tabs:
|
||||
|
||||
Reference in New Issue
Block a user