From 0b9f95ed88f6d4eb47c774c69e4fa9a03546b4b5 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Wed, 6 Mar 2019 17:49:43 +0100
Subject: keep color when convert to satin column

---
 lib/extensions/convert_to_satin.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib/extensions')

diff --git a/lib/extensions/convert_to_satin.py b/lib/extensions/convert_to_satin.py
index 2b586e36..1227b207 100644
--- a/lib/extensions/convert_to_satin.py
+++ b/lib/extensions/convert_to_satin.py
@@ -40,6 +40,7 @@ class ConvertToSatin(InkstitchExtension):
             index = parent.index(element.node)
             correction_transform = get_correction_transform(element.node)
             style_args = self.join_style_args(element)
+            path_style = self.path_style(element)
 
             for path in element.paths:
                 path = self.remove_duplicate_points(path)
@@ -62,7 +63,7 @@ class ConvertToSatin(InkstitchExtension):
 
                     return
 
-                parent.insert(index, self.satin_to_svg_node(rails, rungs, correction_transform))
+                parent.insert(index, self.satin_to_svg_node(rails, rungs, correction_transform, path_style))
 
             parent.remove(element.node)
 
@@ -273,7 +274,11 @@ class ConvertToSatin(InkstitchExtension):
 
         return rungs
 
-    def satin_to_svg_node(self, rails, rungs, correction_transform):
+    def path_style(self, element):
+        color = element.get_style('stroke', '#000000')
+        return "stroke:%s;stroke-width:1px;fill:none" % (color)
+
+    def satin_to_svg_node(self, rails, rungs, correction_transform, path_style):
         d = ""
         for path in chain(rails, rungs):
             d += "M"
@@ -284,7 +289,7 @@ class ConvertToSatin(InkstitchExtension):
         return inkex.etree.Element(SVG_PATH_TAG,
                                    {
                                        "id": self.uniqueId("path"),
-                                       "style": "stroke:#000000;stroke-width:1px;fill:none",
+                                       "style": path_style,
                                        "transform": correction_transform,
                                        "d": d,
                                        "embroider_satin_column": "true",
-- 
cgit v1.2.3


From f435520663d59378546426ea7263e78d51362c44 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Tue, 26 Mar 2019 18:24:02 +0100
Subject: Add Custom Page to Print PDF (#418)

---
 lib/extensions/print_pdf.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/extensions')

diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py
index c718fa09..4913a32a 100644
--- a/lib/extensions/print_pdf.py
+++ b/lib/extensions/print_pdf.py
@@ -353,7 +353,13 @@ class Print(InkstitchExtension):
         template = env.get_template('index.html')
 
         return template.render(
-            view={'client_overview': False, 'client_detailedview': False, 'operator_overview': True, 'operator_detailedview': True},
+            view={
+                'client_overview': False,
+                'client_detailedview': False,
+                'operator_overview': True,
+                'operator_detailedview': True,
+                'custom_page': False
+            },
             logo={'src': '', 'title': 'LOGO'},
             date=date.today(),
             client="",
-- 
cgit v1.2.3


From 75fdfe22deddbfc8a875840cde48844207b7b76e Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:42:49 +0200
Subject: fix base file name bug

---
 lib/extensions/base.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/extensions')

diff --git a/lib/extensions/base.py b/lib/extensions/base.py
index 98673541..6b846aeb 100644
--- a/lib/extensions/base.py
+++ b/lib/extensions/base.py
@@ -2,6 +2,7 @@ from collections import MutableMapping
 from copy import deepcopy
 import json
 import re
+import os
 
 import inkex
 from stringcase import snakecase
@@ -187,10 +188,7 @@ class InkstitchExtension(inkex.Effect):
     def get_base_file_name(self):
         svg_filename = self.document.getroot().get(inkex.addNS('docname', 'sodipodi'), "embroidery.svg")
 
-        if svg_filename.endswith('.svg'):
-            svg_filename = svg_filename[:-4]
-
-        return svg_filename
+        return os.path.splitext(svg_filename)[0]
 
     def uniqueId(self, prefix, make_new_id=True):
         """Override inkex.Effect.uniqueId with a nicer naming scheme."""
-- 
cgit v1.2.3