From 08adc27b307166e0d62faef2ce662c2be3366912 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Tue, 20 Apr 2021 17:50:30 +0200 Subject: Language-Stylesheets for Print-PDF (#1156) --- lib/extensions/print_pdf.py | 16 ++++++++-- print/resources/barlow-bold.ttf | Bin 46252 -> 0 bytes print/resources/barlow-condensed-bold.ttf | Bin 47944 -> 0 bytes print/resources/barlow-condensed-extra-bold.ttf | Bin 48160 -> 0 bytes print/resources/barlow-extra-bold.ttf | Bin 48808 -> 0 bytes print/resources/barlow.ttf | Bin 45476 -> 0 bytes print/resources/barlow_condensed.ttf | Bin 45476 -> 0 bytes print/resources/fonts/FiraSansCondensed-Light.woff | Bin 0 -> 227416 bytes print/resources/fonts/FiraSansLight.woff | Bin 0 -> 78348 bytes print/resources/fonts/barlow-bold.ttf | Bin 0 -> 46252 bytes print/resources/fonts/barlow-condensed-bold.ttf | Bin 0 -> 47944 bytes .../fonts/barlow-condensed-extra-bold.ttf | Bin 0 -> 48160 bytes print/resources/fonts/barlow-extra-bold.ttf | Bin 0 -> 48808 bytes print/resources/fonts/barlow.ttf | Bin 0 -> 45476 bytes print/resources/fonts/barlow_condensed.ttf | Bin 0 -> 45476 bytes print/resources/ru.css | 21 +++++++++++++ print/resources/style.css | 33 ++++++++++----------- print/templates/index.html | 3 ++ print/templates/operator_overview.html | 2 +- print/templates/print_detail.html | 2 +- print/templates/print_overview.html | 2 +- 21 files changed, 56 insertions(+), 23 deletions(-) delete mode 100644 print/resources/barlow-bold.ttf delete mode 100644 print/resources/barlow-condensed-bold.ttf delete mode 100644 print/resources/barlow-condensed-extra-bold.ttf delete mode 100644 print/resources/barlow-extra-bold.ttf delete mode 100644 print/resources/barlow.ttf delete mode 100644 print/resources/barlow_condensed.ttf create mode 100644 print/resources/fonts/FiraSansCondensed-Light.woff create mode 100644 print/resources/fonts/FiraSansLight.woff create mode 100644 print/resources/fonts/barlow-bold.ttf create mode 100644 print/resources/fonts/barlow-condensed-bold.ttf create mode 100644 print/resources/fonts/barlow-condensed-extra-bold.ttf create mode 100644 print/resources/fonts/barlow-extra-bold.ttf create mode 100644 print/resources/fonts/barlow.ttf create mode 100644 print/resources/fonts/barlow_condensed.ttf create mode 100644 print/resources/ru.css diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index a75c781e..a1a8c6c0 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -21,6 +21,7 @@ from jinja2 import Environment, FileSystemLoader, select_autoescape from lxml import etree from ..gui import open_url +from ..i18n import get_languages from ..i18n import translation as inkstitch_translation from ..stitch_plan import patches_to_stitch_plan from ..svg import render_stitch_plan @@ -186,9 +187,11 @@ class PrintPreviewServer(Thread): class Print(InkstitchExtension): def build_environment(self): if getattr(sys, 'frozen', False): - template_dir = os.path.join(sys._MEIPASS, "print", "templates") + print_dir = os.path.join(sys._MEIPASS, "print") else: - template_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "print", "templates")) + print_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "print")) + + template_dir = os.path.join(print_dir, "templates") env = Environment( loader=FileSystemLoader(template_dir), @@ -199,6 +202,14 @@ class Print(InkstitchExtension): env.filters['datetimeformat'] = datetimeformat env.install_gettext_translations(inkstitch_translation) + languages_with_style = [] + languages = get_languages() + for lang in languages: + css_file = "%s.css" % lang + if os.path.isfile(os.path.join(print_dir, "resources", css_file)): + languages_with_style.append(lang) + env.languages = languages_with_style + return env def strip_namespaces(self, svg): @@ -280,6 +291,7 @@ class Print(InkstitchExtension): color_blocks=stitch_plan.color_blocks, palettes=ThreadCatalog().palette_names(), selected_palette=selected_palette, + languages=env.languages ) def effect(self): diff --git a/print/resources/barlow-bold.ttf b/print/resources/barlow-bold.ttf deleted file mode 100644 index af272404..00000000 Binary files a/print/resources/barlow-bold.ttf and /dev/null differ diff --git a/print/resources/barlow-condensed-bold.ttf b/print/resources/barlow-condensed-bold.ttf deleted file mode 100644 index cb5e617c..00000000 Binary files a/print/resources/barlow-condensed-bold.ttf and /dev/null differ diff --git a/print/resources/barlow-condensed-extra-bold.ttf b/print/resources/barlow-condensed-extra-bold.ttf deleted file mode 100644 index d9352f09..00000000 Binary files a/print/resources/barlow-condensed-extra-bold.ttf and /dev/null differ diff --git a/print/resources/barlow-extra-bold.ttf b/print/resources/barlow-extra-bold.ttf deleted file mode 100644 index 45456d4b..00000000 Binary files a/print/resources/barlow-extra-bold.ttf and /dev/null differ diff --git a/print/resources/barlow.ttf b/print/resources/barlow.ttf deleted file mode 100644 index 7885fbf8..00000000 Binary files a/print/resources/barlow.ttf and /dev/null differ diff --git a/print/resources/barlow_condensed.ttf b/print/resources/barlow_condensed.ttf deleted file mode 100644 index 7885fbf8..00000000 Binary files a/print/resources/barlow_condensed.ttf and /dev/null differ diff --git a/print/resources/fonts/FiraSansCondensed-Light.woff b/print/resources/fonts/FiraSansCondensed-Light.woff new file mode 100644 index 00000000..42bdafe1 Binary files /dev/null and b/print/resources/fonts/FiraSansCondensed-Light.woff differ diff --git a/print/resources/fonts/FiraSansLight.woff b/print/resources/fonts/FiraSansLight.woff new file mode 100644 index 00000000..a489c599 Binary files /dev/null and b/print/resources/fonts/FiraSansLight.woff differ diff --git a/print/resources/fonts/barlow-bold.ttf b/print/resources/fonts/barlow-bold.ttf new file mode 100644 index 00000000..af272404 Binary files /dev/null and b/print/resources/fonts/barlow-bold.ttf differ diff --git a/print/resources/fonts/barlow-condensed-bold.ttf b/print/resources/fonts/barlow-condensed-bold.ttf new file mode 100644 index 00000000..cb5e617c Binary files /dev/null and b/print/resources/fonts/barlow-condensed-bold.ttf differ diff --git a/print/resources/fonts/barlow-condensed-extra-bold.ttf b/print/resources/fonts/barlow-condensed-extra-bold.ttf new file mode 100644 index 00000000..d9352f09 Binary files /dev/null and b/print/resources/fonts/barlow-condensed-extra-bold.ttf differ diff --git a/print/resources/fonts/barlow-extra-bold.ttf b/print/resources/fonts/barlow-extra-bold.ttf new file mode 100644 index 00000000..45456d4b Binary files /dev/null and b/print/resources/fonts/barlow-extra-bold.ttf differ diff --git a/print/resources/fonts/barlow.ttf b/print/resources/fonts/barlow.ttf new file mode 100644 index 00000000..7885fbf8 Binary files /dev/null and b/print/resources/fonts/barlow.ttf differ diff --git a/print/resources/fonts/barlow_condensed.ttf b/print/resources/fonts/barlow_condensed.ttf new file mode 100644 index 00000000..7885fbf8 Binary files /dev/null and b/print/resources/fonts/barlow_condensed.ttf differ diff --git a/print/resources/ru.css b/print/resources/ru.css new file mode 100644 index 00000000..4699a49a --- /dev/null +++ b/print/resources/ru.css @@ -0,0 +1,21 @@ +@font-face { + font-family: 'FiraSans'; + font-style: normal; + font-weight: 400; + src: url(fonts/FiraSansLight.woff) format('woff'); +} + +@font-face { + font-family: 'FiraSans Condensed'; + font-style: normal; + font-weight: 400; + src: url(fonts/FiraSansCondensed-Light.woff) format('woff'); +} + +body { + font-family: 'FiraSans', sans-serif; +} + +.condensed { + font-family: 'FiraSans Condensed', sans-serif; +} diff --git a/print/resources/style.css b/print/resources/style.css index 79e34db8..ca3d393f 100644 --- a/print/resources/style.css +++ b/print/resources/style.css @@ -1,45 +1,43 @@ -@font-face { - font-family: 'Barlow Condensed'; - font-style: normal; - font-weight: 400; - src: url(barlow_condensed.ttf) format('truetype'); -} - @font-face { font-family: 'Barlow'; font-style: normal; font-weight: 400; - src: url(barlow.ttf) format('truetype'); + src: url(fonts/barlow.ttf) format('truetype'); } - @font-face { font-family: 'Barlow'; font-style: normal; font-weight: 700; - src: url(barlow-bold.ttf) format('truetype'); + src: url(fonts/barlow-bold.ttf) format('truetype'); } @font-face { font-family: 'Barlow'; font-style: normal; font-weight: 800; - src: url(barlow-extra-bold.ttf) format('truetype'); + src: url(fonts/barlow-extra-bold.ttf) format('truetype'); } +@font-face { + font-family: 'Barlow Condensed'; + font-style: normal; + font-weight: 400; + src: url(fonts/barlow_condensed.ttf) format('truetype'); +} @font-face { font-family: 'Barlow Condensed'; font-style: normal; font-weight: 700; - src: url(barlow-condensed-bold.ttf) format('truetype'); + src: url(fonts/barlow-condensed-bold.ttf) format('truetype'); } @font-face { font-family: 'Barlow Condensed'; font-style: normal; font-weight: 800; - src: url(barlow-condensed-extra-bold.ttf) format('truetype'); + src: url(fonts/barlow-condensed-extra-bold.ttf) format('truetype'); } body { @@ -51,6 +49,10 @@ body { margin-bottom: 5mm; } +.condensed { + font-family: "Barlow Condensed", sans-serif; +} + * { box-sizing: border-box; } @@ -475,7 +477,6 @@ body { display: -ms-flexbox; /* IE 10 */ width: calc(100% - 50mm); height: 50%; - font-family: "Barlow Condensed", sans-serif; font-size: 10pt; } @@ -610,7 +611,6 @@ body { color: white; display: inline-block; font-size: 16px; - font-family: "Barlow", sans-serif; padding-left: 3px; padding-right: 3px; margin: 0px 1px 0px 1px; @@ -647,8 +647,6 @@ body { } .color-swatch { - font-family: "Barlow", sans-serif; - /* white text on dark colors doesn't print well unless it's bold */ font-weight: 700; font-size: 12pt; @@ -946,7 +944,6 @@ body { right: 1em; top: 1em; color: red; - font-family: "Barlow", sans-serif; font-size: 12pt; } diff --git a/print/templates/index.html b/print/templates/index.html index 375fdc77..d4244493 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -7,6 +7,9 @@ + {% for l in languages %} + + {% endfor %} diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html index 71c5ea2e..a7f33a85 100644 --- a/print/templates/operator_overview.html +++ b/print/templates/operator_overview.html @@ -1,6 +1,6 @@
{% include 'headline.html' %} -
+

{{ _('Unique Colors') }}:{{ job.num_colors }}

diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html index f076fc04..f9082a66 100644 --- a/print/templates/print_detail.html +++ b/print/templates/print_detail.html @@ -1,6 +1,6 @@
{% include 'headline.html' %} -
+

{{ _('COLOR') }}:{{ color_block.color.thread_name }}

diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html index 34478438..04269e20 100644 --- a/print/templates/print_overview.html +++ b/print/templates/print_overview.html @@ -1,6 +1,6 @@
{% include 'headline.html' %} -
+

{{ _('Unique Colors') }}:{{ job.num_colors }}

-- cgit v1.2.3