From 28e59246331a2e66b68e4ee4991242bc1588cc7d Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 30 Nov 2011 16:36:29 +0000 Subject: [PATCH] Fixed help paths under a windows frozen environment. --- qt/base/platform.py | 10 +++++++--- run_template_qt.py | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qt/base/platform.py b/qt/base/platform.py index 4014284d..a6e1e26f 100644 --- a/qt/base/platform.py +++ b/qt/base/platform.py @@ -9,9 +9,13 @@ import os.path as op from hscommon.plat import ISWINDOWS, ISOSX, ISLINUX -# We want to get the absolute path or our root folder. We know that in that folder we're inside -# qt/base, so we just fo back two levels. -BASE_PATH = op.abspath(op.join(op.dirname(__file__), '..', '..')) +if op.exists(__file__): + # We want to get the absolute path or our root folder. We know that in that folder we're + # inside qt/base, so we just fo back two levels. + BASE_PATH = op.abspath(op.join(op.dirname(__file__), '..', '..')) +else: + # We're under a freezed environment. Our base path is ''. + BASE_PATH = '' HELP_PATH = op.join(BASE_PATH, 'help') if ISWINDOWS: diff --git a/run_template_qt.py b/run_template_qt.py index 29fca5cb..b40e1956 100644 --- a/run_template_qt.py +++ b/run_template_qt.py @@ -29,7 +29,11 @@ if __name__ == "__main__": QCoreApplication.setApplicationVersion(__version__) settings = QSettings() lang = settings.value('Language').toString() - locale_folder = op.join(op.dirname(__file__), 'locale') + try: + locale_folder = op.join(op.dirname(__file__), 'locale') + except NameError: + # We're in a freezed environment (no __file__) + locale_folder = 'locale' install_gettext_trans_under_qt(locale_folder, lang) # Many strings are translated at import time, so this is why we only import after the translator # has been installed