Handle unicode, utf8, and windows-1252

(cherry picked from commit 0d4f24a)
2016-11-26 22:57:53 -08:00
parent 38bf143704
commit 08b5abc7ad
6 changed files with 104 additions and 27 deletions
--- a/gui/bitmapLoader.py
+++ b/gui/bitmapLoader.py
@@ -31,7 +31,7 @@ except ImportError:

 class BitmapLoader(object):
    try:
-        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
+        archive = zipfile.ZipFile(config.getPyfaPath('imgs.zip'), 'r')
    except IOError:
        archive = None

@@ -85,7 +85,7 @@ class BitmapLoader(object):
            except KeyError:
                print("Missing icon file from zip: {0}".format(path))
        else:
-            path = os.path.join(config.pyfaPath, 'imgs', location, filename)
+            path = config.getPyfaPath('imgs\\' + location + "\\" + filename)

            if os.path.exists(path):
                return wx.Image(path)