Merge branch 'master' of evefit.org:pyfa

config.py

@@ -5,8 +5,11 @@ import sys
 debug = False
 
 # You can adjust these paths to your needs
+
 # The main pyfa directory which contains run.py 
-pyfaPath = os.path.join(os.getcwd(), os.path.dirname(sys.modules['__main__'].__file__))
+# python 2.X uses ansi by default, so we need to convert the character encoding :(
+pyfaPath = unicode(os.path.join(os.getcwd(), os.path.dirname(sys.modules['__main__'].__file__)),
+    sys.getfilesystemencoding())
 
 # Where we store the saved fits etc, default is the current users home directory
 savePath = os.path.expanduser(os.path.join("~", ".pyfa"))

gui/shipBrowser.py

@@ -941,8 +941,8 @@ class CategoryItem(wx.Window):
 
         mdc.DrawBitmap(self.shipBmp,5+(rect.height-self.shipBmp.GetHeight())/2,(rect.height-self.shipBmp.GetWidth())/2,0)
         fontSize = 8
-        if 'wxMAC' in wx.PlatformInfo:
-            fontSize = 10
+        if 'wxMac' in wx.PlatformInfo:
+            fontSize = 12
         mdc.SetFont(wx.Font(fontSize, wx.SWISS, wx.NORMAL, wx.NORMAL, False))