diff options
Diffstat (limited to 'lib/inx')
| -rw-r--r-- | lib/inx/__init__.py | 2 | ||||
| -rwxr-xr-x | lib/inx/about.py | 7 | ||||
| -rwxr-xr-x | lib/inx/extensions.py | 11 | ||||
| -rw-r--r-- | lib/inx/generate.py | 4 | ||||
| -rwxr-xr-x | lib/inx/info.py | 9 | ||||
| -rwxr-xr-x | lib/inx/inputs.py | 2 | ||||
| -rw-r--r-- | lib/inx/outputs.py | 13 | ||||
| -rw-r--r-- | lib/inx/utils.py | 31 |
8 files changed, 58 insertions, 21 deletions
diff --git a/lib/inx/__init__.py b/lib/inx/__init__.py index 32b8bfae..cc2b039d 100644 --- a/lib/inx/__init__.py +++ b/lib/inx/__init__.py @@ -1 +1 @@ -from generate import generate_inx_files +from .generate import generate_inx_files diff --git a/lib/inx/about.py b/lib/inx/about.py new file mode 100755 index 00000000..6db13865 --- /dev/null +++ b/lib/inx/about.py @@ -0,0 +1,7 @@ +from .utils import build_environment, write_inx_file + + +def generate_about_inx_file(): + env = build_environment() + template = env.get_template('about.xml') + write_inx_file("about", template.render()) diff --git a/lib/inx/extensions.py b/lib/inx/extensions.py index 030e8aa6..379e98cd 100755 --- a/lib/inx/extensions.py +++ b/lib/inx/extensions.py @@ -1,10 +1,11 @@ import pyembroidery -from .utils import build_environment, write_inx_file -from .outputs import pyembroidery_output_formats -from ..extensions import extensions, Input, Output -from ..commands import LAYER_COMMANDS, OBJECT_COMMANDS, GLOBAL_COMMANDS, COMMANDS +from ..commands import (COMMANDS, GLOBAL_COMMANDS, LAYER_COMMANDS, + OBJECT_COMMANDS) +from ..extensions import Input, Output, extensions from ..threads import ThreadCatalog +from .outputs import pyembroidery_output_formats +from .utils import build_environment, write_inx_file def layer_commands(): @@ -41,7 +42,7 @@ def generate_extension_inx_files(): continue name = extension.name() - template = env.get_template('%s.inx' % name) + template = env.get_template('%s.xml' % name) write_inx_file(name, template.render(formats=pyembroidery_output_formats(), debug_formats=pyembroidery_debug_formats(), threadcatalog=threadcatalog(), diff --git a/lib/inx/generate.py b/lib/inx/generate.py index 941596de..8a5b9569 100644 --- a/lib/inx/generate.py +++ b/lib/inx/generate.py @@ -1,6 +1,7 @@ +from .info import generate_info_inx_files +from .extensions import generate_extension_inx_files from .inputs import generate_input_inx_files from .outputs import generate_output_inx_files -from .extensions import generate_extension_inx_files from .utils import iterate_inx_locales @@ -9,3 +10,4 @@ def generate_inx_files(): generate_input_inx_files() generate_output_inx_files() generate_extension_inx_files() + generate_info_inx_files() diff --git a/lib/inx/info.py b/lib/inx/info.py new file mode 100755 index 00000000..f391b546 --- /dev/null +++ b/lib/inx/info.py @@ -0,0 +1,9 @@ +from .utils import build_environment, write_inx_file + + +def generate_info_inx_files(): + env = build_environment() + info_inx_files = ['about', 'embroider'] + for info in info_inx_files: + template = env.get_template('%s.xml' % info) + write_inx_file(info, template.render()) diff --git a/lib/inx/inputs.py b/lib/inx/inputs.py index d40ffeaf..b50ec9f9 100755 --- a/lib/inx/inputs.py +++ b/lib/inx/inputs.py @@ -11,7 +11,7 @@ def pyembroidery_input_formats(): def generate_input_inx_files(): env = build_environment() - template = env.get_template('input.inx') + template = env.get_template('input.xml') for format, description in pyembroidery_input_formats(): name = "input_%s" % format.upper() diff --git a/lib/inx/outputs.py b/lib/inx/outputs.py index aef0c8b5..ccb323c7 100644 --- a/lib/inx/outputs.py +++ b/lib/inx/outputs.py @@ -5,14 +5,17 @@ from .utils import build_environment, write_inx_file def pyembroidery_output_formats(): for format in pyembroidery.supported_formats(): - if 'writer' in format and format['category'] == 'embroidery': - yield format['extension'], format['description'] + if 'writer' in format: + description = format['description'] + if format['category'] != "embroidery": + description = "%s [DEBUG]" % description + yield format['extension'], description, format['mimetype'], format['category'] def generate_output_inx_files(): env = build_environment() - template = env.get_template('output.inx') + template = env.get_template('output.xml') - for format, description in pyembroidery_output_formats(): + for format, description, mimetype, category in pyembroidery_output_formats(): name = "output_%s" % format.upper() - write_inx_file(name, template.render(format=format, description=description)) + write_inx_file(name, template.render(format=format, mimetype=mimetype, description=description)) diff --git a/lib/inx/utils.py b/lib/inx/utils.py index a7c98a60..2fb6b21b 100644 --- a/lib/inx/utils.py +++ b/lib/inx/utils.py @@ -6,11 +6,13 @@ from os.path import dirname from jinja2 import Environment, FileSystemLoader -from ..i18n import N_, locale_dir, translation as default_translation +from ..i18n import N_, locale_dir +from ..i18n import translation as default_translation _top_path = dirname(dirname(dirname(os.path.realpath(__file__)))) inx_path = os.path.join(_top_path, "inx") template_path = os.path.join(_top_path, "templates") +version_path = _top_path current_translation = default_translation current_locale = "en_US" @@ -26,16 +28,29 @@ def build_environment(): env.install_gettext_translations(current_translation) env.globals["locale"] = current_locale + with open(os.path.join(version_path, 'LICENSE'), 'r') as license: + env.globals["inkstitch_license"] = "".join(license.readlines()) + if "BUILD" in os.environ: # building a ZIP release, with inkstitch packaged as a binary + # About extension: add version information + with open(os.path.join(version_path, 'VERSION'), 'r') as version: + env.globals["inkstitch_version"] = "%s %s" % (version.readline(), current_locale) + # Command tag and icons path if sys.platform == "win32": - env.globals["command_tag"] = '<command reldir="extensions">inkstitch/bin/inkstitch.exe</command>' + env.globals["command_tag"] = '<command location="inx">inkstitch/bin/inkstitch.exe</command>' + env.globals["image_path"] = 'inkstitch/bin/icons/' + elif sys.platform == "darwin": + env.globals["command_tag"] = '<command location="inx">inkstitch.app/Contents/MacOS/inkstitch</command>' + env.globals["image_path"] = 'inkstitch.app/Contents/MacOS/icons/' else: - env.globals["command_tag"] = '<command reldir="extensions">inkstitch/bin/inkstitch</command>' + env.globals["command_tag"] = '<command location="inx">inkstitch/bin/inkstitch</command>' + env.globals["image_path"] = 'inkstitch/bin/icons/' else: # user is running inkstitch.py directly as a developer - env.globals["command_tag"] = '<command reldir="extensions" interpreter="python">inkstitch.py</command>' - + env.globals["command_tag"] = '<command location="inx" interpreter="python">../../inkstitch.py</command>' + env.globals["image_path"] = '../../icons/' + env.globals["inkstitch_version"] = "Manual Install" return env @@ -49,8 +64,8 @@ def write_inx_file(name, contents): raise inx_file_name = "inkstitch_%s.inx" % name - with open(os.path.join(inx_locale_dir, inx_file_name), 'w') as inx_file: - print >> inx_file, contents.encode("utf-8") + with open(os.path.join(inx_locale_dir, inx_file_name), 'w', encoding="utf-8") as inx_file: + print(contents, file=inx_file) def iterate_inx_locales(): @@ -64,7 +79,7 @@ def iterate_inx_locales(): # generate menu items for this language in Inkscape's "Extensions" # menu. magic_string = N_("Generate INX files") - translated_magic_string = translation.ugettext(magic_string) + translated_magic_string = translation.gettext(magic_string) if translated_magic_string != magic_string or locale == "en_US": current_translation = translation |