Wire functionality to menu item
Still doesn't work
This commit is contained in:
@@ -71,6 +71,7 @@ from service.esi import Esi, LoginMethod
|
||||
from service.esiAccess import SsoMode
|
||||
from service.fit import Fit
|
||||
from service.port import EfsPort, IPortUser, Port
|
||||
from service.price import Price
|
||||
from service.settings import HTMLExportSettings, SettingsProvider
|
||||
from service.update import Update
|
||||
import gui.fitCommands as cmd
|
||||
@@ -519,6 +520,8 @@ class MainFrame(wx.Frame):
|
||||
self.Bind(wx.EVT_MENU, self.saveCharAs, id=menuBar.saveCharAsId)
|
||||
# Save current character
|
||||
self.Bind(wx.EVT_MENU, self.revertChar, id=menuBar.revertCharId)
|
||||
# Optimize fit price
|
||||
self.Bind(wx.EVT_MENU, self.optimizeFitPrice, id=menuBar.optimizeFitPrice)
|
||||
|
||||
# Browse fittings
|
||||
self.Bind(wx.EVT_MENU, self.eveFittings, id=menuBar.eveFittingsId)
|
||||
@@ -666,6 +669,17 @@ class MainFrame(wx.Frame):
|
||||
sChr.revertCharacter(charID)
|
||||
wx.PostEvent(self, GE.CharListUpdated())
|
||||
|
||||
def optimizeFitPrice(self, event):
|
||||
sPrice = Price.getInstance()
|
||||
fit = Fit.getInstance().getFit(self.getActiveFit())
|
||||
if fit:
|
||||
# TODO: block/unblock UI while pyfa is working
|
||||
|
||||
def cb():
|
||||
pass
|
||||
|
||||
sPrice.optimizeFitPrice(fit, cb, includeBetter=True, fetchTimeout=10)
|
||||
|
||||
def AdditionsTabSelect(self, event):
|
||||
selTab = self.additionsSelect.index(event.GetId())
|
||||
|
||||
|
||||
@@ -28,8 +28,6 @@ import gui.globalEvents as GE
|
||||
from gui.bitmap_loader import BitmapLoader
|
||||
|
||||
from logbook import Logger
|
||||
# from service.crest import Crest
|
||||
# from service.crest import CrestModes
|
||||
|
||||
pyfalog = Logger(__name__)
|
||||
|
||||
@@ -59,6 +57,7 @@ class MainMenuBar(wx.MenuBar):
|
||||
self.importDatabaseDefaultsId = wx.NewId()
|
||||
self.toggleIgnoreRestrictionID = wx.NewId()
|
||||
self.devToolsId = wx.NewId()
|
||||
self.optimizeFitPrice = wx.NewId()
|
||||
|
||||
# pheonix: evaluate if this is needed
|
||||
if 'wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0):
|
||||
@@ -101,6 +100,9 @@ class MainMenuBar(wx.MenuBar):
|
||||
editMenu.Append(self.revertCharId, "Revert Character")
|
||||
editMenu.AppendSeparator()
|
||||
self.ignoreRestrictionItem = editMenu.Append(self.toggleIgnoreRestrictionID, "Ignore Fitting Restrictions")
|
||||
editMenu.AppendSeparator()
|
||||
editMenu.Append(self.optimizeFitPrice, "Optimize Fit Price")
|
||||
|
||||
|
||||
# Character menu
|
||||
windowMenu = wx.Menu()
|
||||
@@ -134,8 +136,6 @@ class MainMenuBar(wx.MenuBar):
|
||||
preferencesItem.SetBitmap(BitmapLoader.getBitmap("preferences_small", "gui"))
|
||||
windowMenu.Append(preferencesItem)
|
||||
|
||||
# self.sEsi = Crest.getInstance()
|
||||
|
||||
# CREST Menu
|
||||
esiMMenu = wx.Menu()
|
||||
self.Append(esiMMenu, "EVE &SSO")
|
||||
|
||||
@@ -36,7 +36,6 @@ from eos.saveddata.ship import Ship as es_Ship
|
||||
from service.character import Character
|
||||
from service.damagePattern import DamagePattern
|
||||
from service.fitDeprecated import FitDeprecated
|
||||
from service.price import Price
|
||||
from service.settings import SettingsProvider
|
||||
from utils.deprecated import deprecated
|
||||
|
||||
|
||||
Reference in New Issue
Block a user