From 1c451af3c47ecd25f0201d2bdeb09c365eaf6e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20B=C3=B6lter?= Date: Sat, 13 Nov 2010 20:01:29 +0100 Subject: [PATCH 1/3] Fixed fontSize hack for shipBrowser on mac (until darriele finds a proper solution) --- gui/shipBrowser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 4fa790b10..da2a3d103 100644 --- a/gui/shipBrowser.py +++ b/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)) From 60efc1f332464bfe1477db33f8038b1553c8858c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20B=C3=B6lter?= Date: Sat, 13 Nov 2010 20:17:59 +0100 Subject: [PATCH 2/3] Fixed unicode support in config.py --- config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.py b/config.py index 86fb2ea64..c8f02f134 100644 --- a/config.py +++ b/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 = os.path.join(unicode(os.getcwd(), sys.getfilesystemencoding()), + unicode(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")) From 8d28e35876ad094cb23e4ca680ca5f59dcfe4d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20B=C3=B6lter?= Date: Sat, 13 Nov 2010 20:26:06 +0100 Subject: [PATCH 3/3] Streamlined config.py (thanks cncfanatics) --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index c8f02f134..7fefad355 100644 --- a/config.py +++ b/config.py @@ -8,8 +8,8 @@ debug = False # The main pyfa directory which contains run.py # python 2.X uses ansi by default, so we need to convert the character encoding :( -pyfaPath = os.path.join(unicode(os.getcwd(), sys.getfilesystemencoding()), - unicode(os.path.dirname(sys.modules['__main__'].__file__), sys.getfilesystemencoding())) +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"))