From 8acc3d7323f1cdd0e0af2ccf91db06c93471919a Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 12 Aug 2010 18:00:39 +0200 Subject: [PATCH] Rework a few things, rename some images. --- gui/mainMenuBar.py | 16 ++++++++-------- gui/mainToolBar.py | 6 +++--- icons/character_big.png | Bin 0 -> 2052 bytes icons/{character.png => character_small.png} | Bin icons/{ship.png => ship_big.png} | Bin icons/ship_small.png | Bin 0 -> 670 bytes 6 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 icons/character_big.png rename icons/{character.png => character_small.png} (100%) rename icons/{ship.png => ship_big.png} (100%) create mode 100644 icons/ship_small.png diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index c9674fc18..90603bd0e 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -27,10 +27,6 @@ class MainMenuBar(wx.MenuBar): # File menu fileMenu = wx.Menu() self.Append(fileMenu, "&File") - - fileMenu.Append(wx.ID_OPEN, "&Import", "Import a fit into pyfa.") - fileMenu.Append(wx.ID_SAVEAS, "&Export", "Export the fit to another format.") - fileMenu.AppendSeparator() fileMenu.Append(wx.ID_EXIT) @@ -45,18 +41,22 @@ class MainMenuBar(wx.MenuBar): # Fit menu fitMenu = wx.Menu() self.Append(fitMenu, "F&it") - - fitMenu.Append(wx.ID_NEW) + shipBrowserItem = wx.MenuItem(fitMenu, wx.ID_ANY, "Ship &Browser") + shipBrowserItem.SetBitmap(bitmapLoader.getBitmap("ship_small")) + fitMenu.AppendItem(shipBrowserItem) fitMenu.Append(wx.ID_EDIT, "&Rename", "Rename this fit.") fitMenu.Append(wx.ID_COPY) fitMenu.Append(wx.ID_DELETE) + fitMenu.AppendSeparator() + fitMenu.Append(wx.ID_OPEN, "&Import", "Import a fit into pyfa.") + fitMenu.Append(wx.ID_SAVEAS, "&Export", "Export the fit to another format.") # Character menu charMenu = wx.Menu() self.Append(charMenu, "&Character") - charEditItem = wx.MenuItem(charMenu, wx.ID_ANY, "Character Editor") - charEditItem.SetBitmap(bitmapLoader.getBitmap("character")) + charEditItem = wx.MenuItem(charMenu, wx.ID_ANY, "Character &Editor") + charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small")) charMenu.AppendItem(charEditItem) # Help menu diff --git a/gui/mainToolBar.py b/gui/mainToolBar.py index e129af298..efda17fa7 100644 --- a/gui/mainToolBar.py +++ b/gui/mainToolBar.py @@ -24,8 +24,6 @@ class MainToolBar(wx.ToolBar): def __init__(self, parent): wx.ToolBar.__init__(self, parent, wx.ID_ANY) - self.AddControl(bitmapLoader.getStaticBitmap("ship", self)) - self.AddLabelTool(wx.ID_NEW, "New fit", wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR)) self.AddLabelTool(wx.ID_COPY, "Copy fit", wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR)) self.AddLabelTool(wx.ID_DELETE, "Delete fit", wx.ArtProvider.GetBitmap(wx.ART_DELETE, wx.ART_TOOLBAR)) @@ -33,5 +31,7 @@ class MainToolBar(wx.ToolBar): self.AddLabelTool(wx.ID_OPEN, "Import fit", wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR)) self.AddLabelTool(wx.ID_SAVEAS, "Export fit", wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE_AS, wx.ART_TOOLBAR)) - + self.AddSeparator() + self.AddLabelTool(wx.ID_ANY, "Ship Browser", bitmapLoader.getBitmap("ship_big")) + self.AddLabelTool(wx.ID_ANY, "Character Editor", bitmapLoader.getBitmap("character_big")) self.Realize() diff --git a/icons/character_big.png b/icons/character_big.png new file mode 100644 index 0000000000000000000000000000000000000000..67f3b6d934e707a6bb7b8c821e4c177641635f02 GIT binary patch literal 2052 zcmV+f2>bVmP)IEj07w)&46vpX|8KkwYjLx@z_8#hEqyl|dIb9Co? z&bepK58!_+%Cj6|6ii46gAtQaq5^=B5YO^0@}C%0DN%DO$*C0TPJJSfZ~-2sG7Pv3 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