From bfcb73f34494d0a0a741bb6a87caf7d4e4fc9daf Mon Sep 17 00:00:00 2001 From: blitzman Date: Sat, 11 Feb 2017 11:12:10 -0500 Subject: [PATCH] Fixes for #952 --- gui/mainFrame.py | 2 +- gui/mainMenuBar.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index de3bffc4f..e2eb3a7c7 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -954,7 +954,7 @@ class MainFrame(wx.Frame): if graphFrame.graphFrame_enabled: self.graphFrame.Show() - else: + elif graphFrame.graphFrame_enabled: self.graphFrame.SetFocus() def openWXInspectTool(self, event): diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index da1b08772..a9b42cb4b 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -22,6 +22,7 @@ import wx import config from service.character import Character +import gui.graphFrame import gui.globalEvents as GE from gui.bitmapLoader import BitmapLoader @@ -116,6 +117,9 @@ class MainMenuBar(wx.MenuBar): graphFrameItem.SetBitmap(BitmapLoader.getBitmap("graphs_small", "gui")) windowMenu.AppendItem(graphFrameItem) + if not gui.graphFrame.graphFrame_enabled: + self.Enable(self.graphFrameId, False) + preferencesShortCut = "CTRL+," if 'wxMac' in wx.PlatformInfo else "CTRL+P" preferencesItem = wx.MenuItem(windowMenu, wx.ID_PREFERENCES, "Preferences\t" + preferencesShortCut) preferencesItem.SetBitmap(BitmapLoader.getBitmap("preferences_small", "gui"))