From 39647b27691bed6cd0d655fb6c6431bebbaf5ef1 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sat, 30 Oct 2010 15:46:09 +0200 Subject: [PATCH] Move menu entries around a bit --- gui/mainMenuBar.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index caf9fe710..fe56fcfac 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -33,12 +33,15 @@ 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 @@ -48,22 +51,16 @@ class MainMenuBar(wx.MenuBar): #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.") - clipboardMenu = wx.Menu() self.idExportDna, self.idExportEft, self.idExportXml = wx.NewId(), wx.NewId(), wx.NewId() clipboardMenu.Append(self.idExportEft, "&EFT", "Copy the EFT export of this fit to the clipboard") 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