dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Stuff already there but ppl have no eyes to see it. Closes #277

Browse Source
This commit is contained in:
HomeWorld
2010-11-02 23:08:17 +02:00
parent 0b3d1d0e2a
commit 5edb712fae
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/mainFrame.py
View File

@@ -112,6 +112,9 @@ class MainFrame(wx.Frame):
self.SetSizer(mainSizer)
self.addTabId = wx.NewId()
self.closeTabId = wx.NewId()
#Add menu
self.SetMenuBar(MainMenuBar())
#self.SetToolBar(MainToolBar(self))
@@ -246,17 +249,16 @@ class MainFrame(wx.Frame):
#Clipboard exports
self.Bind(wx.EVT_MENU, self.exportToClipboard, id=wx.ID_COPY)
addTabId = wx.NewId()
toggleShipMarketId = wx.NewId()
# Close Tab
self.Bind(wx.EVT_MENU, self.CloseCurrentFit, id=wx.ID_CLOSE)
self.Bind(wx.EVT_MENU,self.HAddTab, id = addTabId)
self.Bind(wx.EVT_MENU, self.CloseCurrentFit, id=self.closeTabId)
self.Bind(wx.EVT_MENU,self.HAddTab, id = self.addTabId)
self.Bind(wx.EVT_MENU,self.toggleShipMarket, id = toggleShipMarketId)
actb = [(wx.ACCEL_CTRL, ord('T'), addTabId),
(wx.ACCEL_CMD, ord('T'), addTabId),
(wx.ACCEL_CTRL, ord("W"), wx.ID_CLOSE),
(wx.ACCEL_CMD, ord("W"), wx.ID_CLOSE),
actb = [(wx.ACCEL_CTRL, ord('T'), self.addTabId),
(wx.ACCEL_CMD, ord('T'), self.addTabId),
(wx.ACCEL_CTRL, ord("W"), self.closeTabId),
(wx.ACCEL_CMD, ord("W"), self.closeTabId),
(wx.ACCEL_CTRL, ord(" "), toggleShipMarketId),
(wx.ACCEL_CMD, ord(" "), toggleShipMarketId)]
atable = wx.AcceleratorTable(actb)

16
gui/mainMenuBar.py
View File

@@ -28,21 +28,25 @@ class MainMenuBar(wx.MenuBar):
self.damagePatternEditorId = wx.NewId()
self.backupFitsId = wx.NewId()
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
wx.MenuBar.__init__(self)
# File menu
fileMenu = wx.Menu()
self.Append(fileMenu, "&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.Append(self.mainFrame.addTabId, "New fitting tab\tCTRL+T", "Close the currently open fit")
fileMenu.Append(self.mainFrame.closeTabId, "Close current fitting tab\tCTRL+W", "Close the currently open fit")
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.")
fileMenu.AppendSeparator()
fileMenu.Append(wx.ID_EXIT)
# Edit menu
editMenu = wx.Menu()
@@ -79,7 +83,7 @@ class MainMenuBar(wx.MenuBar):
helpMenu.Append(911,"Open Widgets Inspect tool", "Open Widgets Inspect tool")
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.mainFrame.Bind(gui.fittingView.FIT_CHANGED, self.fitChanged)
def fitChanged(self, event):