From ae46d14ceff4edafa480f8341603cb634192da7c Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Wed, 15 Dec 2010 19:34:57 +0200
Subject: [PATCH] Disabled things that shouldn't be in RC2 (FleetBrowser/debug)

---
 config.py          | 2 +-
 gui/mainFrame.py   | 7 +++++--
 gui/mainMenuBar.py | 9 ++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/config.py b/config.py
index 1f7e9f898..c13aa9c35 100644
--- a/config.py
+++ b/config.py
@@ -2,7 +2,7 @@ import os
 import sys
 
 # Turns on debug mode
-debug = True
+debug = False
 
 # You can adjust these paths to your needs
 
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 154090014..fecca42b1 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -100,8 +100,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 RC2 RELEASE
+        # self.fleetBrowser = FleetBrowser(self.notebookBrowsers)
+        # self.notebookBrowsers.AddPage(self.fleetBrowser, "Fleets", showClose = False)
+        #=======================================================================
 
         self.notebookBrowsers.SetSelection(1)
 
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 93e97c9e4..4f0735414 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -80,9 +80,12 @@ class MainMenuBar(wx.MenuBar):
         graphFrameItem = wx.MenuItem(windowMenu, self.graphFrameId, "Graphs\tCTRL+G")
         graphFrameItem.SetBitmap(bitmapLoader.getBitmap("graphs_small", "icons"))
         windowMenu.AppendItem(graphFrameItem)
-        preferencesItem = wx.MenuItem(windowMenu, self.preferencesId, "Preferences\tCTRL+P")
-        preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons"))
-        windowMenu.AppendItem(preferencesItem)
+        #=======================================================================
+        # DISABLED FOR RC2 RELEASE
+        # preferencesItem = wx.MenuItem(windowMenu, self.preferencesId, "Preferences\tCTRL+P")
+        # preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons"))
+        # windowMenu.AppendItem(preferencesItem)
+        #=======================================================================
 #        graphFrameItem.Enable(gui.graphFrame.enabled)
 
         # Help menu