diff --git a/aboutData.py b/aboutData.py index c73e919ab..72c7533af 100644 --- a/aboutData.py +++ b/aboutData.py @@ -17,7 +17,7 @@ # along with pyfa. If not, see . #=============================================================================== -versionString = "1.0 beta" +versionString = "1.0 Stable RC1 - INCURSION" license = "pyfa is released under GNU GPL" licenseLocation = "gpl.txt" developers = ("cncfanatics" , "DarkPhoenix", "Darriele") diff --git a/gui/mainFrame.py b/gui/mainFrame.py index f8268eaaa..13db859d1 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -19,6 +19,7 @@ import wx import service +import config from gui import bitmapLoader from gui.mainMenuBar import MainMenuBar from gui.additionsPane import AdditionsPane @@ -33,7 +34,6 @@ from gui.patternEditor import DmgPatternEditorDlg from gui.preferenceDialog import PreferenceDialog from gui.graphFrame import GraphFrame from gui.copySelectDialog import CopySelectDialog -from gui.fleetBrowser import FleetBrowser import aboutData from wx._core import PyDeadObjectError import os.path @@ -41,6 +41,11 @@ import gui.chromeTabs from util import toClipboard, fromClipboard from builtinViews import * +#=============================================================================== +# DISABLED for Incursion release +# from gui.fleetBrowser import FleetBrowser +#=============================================================================== + #dummy panel no paint no erasebk class PFPanel(wx.Panel): def __init__(self,parent): @@ -99,8 +104,11 @@ class MainFrame(wx.Frame): self.shipBrowser = ShipBrowser(self.notebookBrowsers) self.notebookBrowsers.AddPage(self.shipBrowser, "Ships", showClose = False) - self.fleetBrowser = FleetBrowser(self.notebookBrowsers) - self.notebookBrowsers.AddPage(self.fleetBrowser, "Fleets", showClose = False) + #======================================================================= + # DISABLED for Incursion release + # self.fleetBrowser = FleetBrowser(self.notebookBrowsers) + # self.notebookBrowsers.AddPage(self.fleetBrowser, "Fleets", showClose = False) + #======================================================================= self.notebookBrowsers.SetSelection(1) @@ -257,7 +265,8 @@ class MainFrame(wx.Frame): # Quit self.Bind(wx.EVT_MENU, self.ExitApp, id=wx.ID_EXIT) # Widgets Inspector - self.Bind(wx.EVT_MENU, self.openWXInspectTool, id=911) + if config.debug: + self.Bind(wx.EVT_MENU, self.openWXInspectTool, id=911) # About self.Bind(wx.EVT_MENU, self.ShowAboutBox, id=wx.ID_ABOUT) # Char editor diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 7dcdbc21e..358c9fef1 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -18,6 +18,7 @@ #=============================================================================== import wx +import config import bitmapLoader import gui.mainFrame import gui.graphFrame @@ -87,7 +88,8 @@ class MainMenuBar(wx.MenuBar): self.Append(helpMenu, "&Help") helpMenu.Append(wx.ID_ABOUT) #helpMenu.Append(wx.ID_HELP, "User manual", "User manual") - helpMenu.Append(911,"Open Widgets Inspect tool", "Open Widgets Inspect tool") + if config.debug: + helpMenu.Append(911,"Open Widgets Inspect tool", "Open Widgets Inspect tool")