Merge branch 'master' of evefit.org:pyfa

aboutData.py

@@ -17,7 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-versionString = "1.0 beta"
+versionString = "1.0 Stable RC1 - INCURSION"
 license = "pyfa is released under GNU GPL"
 licenseLocation = "gpl.txt"
 developers = ("cncfanatics" , "DarkPhoenix", "Darriele")

gui/builtinStatsViews/targetingMiscViewFull.py

@@ -130,7 +130,7 @@ class TargetingMiscViewFull(StatsView):
                 elif labelName is "labelSensorStr":
                     label.SetToolTip(wx.ToolTip("Type: %s - %.1f" % (fit.scanType, value)))
                 elif labelName is "labelFullSigRadius":
-                    label.SetToolTip(wx.ToolTip("Probe Size: %.3f" % fit.probeSize))
+                    label.SetToolTip(wx.ToolTip("Probe Size: %.3f" % (fit.probeSize or 0) ))
                 elif labelName is "labelFullWarpSpeed":
                     label.SetToolTip(wx.ToolTip("Max Warp Distance: %.1f AU" % 
                         fit.maxWarpDistance))

gui/builtinViews/fittingView.py

@@ -29,6 +29,7 @@ import gui.multiSwitch
 from eos.types import Slot
 from gui.builtinViewColumns.state import State
 from gui import bitmapLoader
+import gui.builtinViews.emptyView
 
 import gui.globalEvents as GE
 
@@ -64,7 +65,7 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
                     index = self.multiSwitch.GetPageIndex(page)
                     self.multiSwitch.SetSelection(index)
                     return
-                elif isinstance(page, gui.multiSwitch.BlankPage):
+                elif isinstance(page, gui.builtinViews.emptyView.BlankPage):
                     view = FittingView(self.multiSwitch)
                     self.multiSwitch.ReplaceActivePage(view)
                     view.handleDrag(type, fitID)

gui/characterEditor.py

@@ -504,7 +504,6 @@ class APIView (wx.Panel):
         wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 300), style=wx.TAB_TRAVERSAL)
         self.Parent.Parent.Bind(CHAR_CHANGED, self.charChanged)
         pmainSizer = wx.BoxSizer(wx.VERTICAL)
-        self.removing = False
 
         fgSizerInput = wx.FlexGridSizer(3, 2, 0, 0)
         fgSizerInput.AddGrowableCol(1)
@@ -516,7 +515,6 @@ class APIView (wx.Panel):
         fgSizerInput.Add(self.m_staticIDText, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.inputID = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
-        self.inputID.Bind(wx.EVT_TEXT, self.removeStyle)
         fgSizerInput.Add(self.inputID, 1, wx.ALL | wx.EXPAND, 5)
 
         self.m_staticKeyText = wx.StaticText(self, wx.ID_ANY, u"API key:", wx.DefaultPosition, wx.DefaultSize, 0)
@@ -524,7 +522,6 @@ class APIView (wx.Panel):
         fgSizerInput.Add(self.m_staticKeyText, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
 
         self.inputKey = wx.TextCtrl(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
-        self.inputKey.Bind(wx.EVT_TEXT, self.removeStyle)
         fgSizerInput.Add(self.inputKey, 0, wx.ALL | wx.EXPAND, 5)
 
         pmainSizer.Add(fgSizerInput, 0, wx.EXPAND, 5)
@@ -560,19 +557,6 @@ class APIView (wx.Panel):
         self.Layout()
         self.charChanged(None)
 
-    def removeStyle(self, event):
-        if self.removing:
-            return
-
-        self.removing = True
-        object = event.GetEventObject()
-        value = object.GetLineText(0)
-        object.Clear()
-        object.ChangeValue(value)
-        object.SetModified(True)
-        self.removing = False
-        event.Skip()
-
     def charChanged(self, event):
         cChar = service.Character.getInstance()
         ID, key = cChar.getApiDetails(self.Parent.Parent.getActiveCharacter())
@@ -582,6 +566,9 @@ class APIView (wx.Panel):
             event.Skip()
 
     def fetchCharList(self, event):
+        if self.inputID.GetLineText(0) == "" or self.inputKey.GetLineText(0) == "":
+            return
+
         cChar = service.Character.getInstance()
         list = cChar.charList(self.Parent.Parent.getActiveCharacter(), self.inputID.GetLineText(0), self.inputKey.GetLineText(0))
         self.charList.DeleteAllItems()

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

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")