summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/elements/satin_column.py1
-rw-r--r--lib/extensions/auto_satin.py2
-rw-r--r--lib/extensions/break_apart.py1
-rw-r--r--lib/extensions/cleanup.py8
-rw-r--r--lib/extensions/convert_to_stroke.py1
-rw-r--r--lib/extensions/cutwork_segmentation.py3
-rw-r--r--lib/extensions/density_map.py1
-rw-r--r--lib/extensions/display_stacking_order.py1
-rw-r--r--lib/extensions/install_custom_palette.py6
-rw-r--r--lib/extensions/lettering_along_path.py3
-rw-r--r--lib/extensions/lettering_custom_font_dir.py1
-rw-r--r--lib/extensions/lettering_force_lock_stitches.py1
-rw-r--r--lib/extensions/lettering_generate_json.py5
-rw-r--r--lib/extensions/lettering_remove_kerning.py1
-rw-r--r--lib/extensions/lettering_update_json_glyphlist.py1
-rw-r--r--lib/extensions/letters_to_font.py1
-rw-r--r--lib/extensions/outline.py1
-rw-r--r--lib/extensions/select_elements.py2
-rw-r--r--lib/extensions/stitch_plan_preview.py1
-rw-r--r--lib/extensions/troubleshoot.py1
-rw-r--r--lib/extensions/unlink_clone.py1
21 files changed, 29 insertions, 14 deletions
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py
index 7fe2869a..a714ad38 100644
--- a/lib/elements/satin_column.py
+++ b/lib/elements/satin_column.py
@@ -368,7 +368,6 @@ class SatinColumn(EmbroideryElement):
'All stitches must be within this distance from the path. '
'A lower tolerance means stitches will be closer together. '
'A higher tolerance means sharp corners may be rounded. '
- 'Defaults to stitch length.'
),
unit='mm',
group=_('Contour Underlay'),
diff --git a/lib/extensions/auto_satin.py b/lib/extensions/auto_satin.py
index badc9d55..495ee989 100644
--- a/lib/extensions/auto_satin.py
+++ b/lib/extensions/auto_satin.py
@@ -18,7 +18,7 @@ class AutoSatin(CommandsExtension):
def __init__(self, *args, **kwargs):
CommandsExtension.__init__(self, *args, **kwargs)
-
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-p", "--preserve_order", dest="preserve_order", type=inkex.Boolean, default=False)
def get_starting_point(self):
diff --git a/lib/extensions/break_apart.py b/lib/extensions/break_apart.py
index b5104dc7..3412f64d 100644
--- a/lib/extensions/break_apart.py
+++ b/lib/extensions/break_apart.py
@@ -22,6 +22,7 @@ class BreakApart(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-m", "--method", type=int, default=1, dest="method")
self.minimum_size = 5
diff --git a/lib/extensions/cleanup.py b/lib/extensions/cleanup.py
index 307b489a..d5816b5f 100644
--- a/lib/extensions/cleanup.py
+++ b/lib/extensions/cleanup.py
@@ -14,6 +14,7 @@ from .base import InkstitchExtension
class Cleanup(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-f", "--rm_fill", dest="rm_fill", type=Boolean, default=True)
self.arg_parser.add_argument("-s", "--rm_stroke", dest="rm_stroke", type=Boolean, default=True)
self.arg_parser.add_argument("-a", "--fill_threshold", dest="fill_threshold", type=int, default=20)
@@ -67,10 +68,13 @@ class Cleanup(InkstitchExtension):
errormsg(f" - { group.label }: {group.get_id()}")
def _remove(self):
- errormsg(_("%s elements removed" % len(self.elements_to_remove)))
+ num_elements_removed = len(self.elements_to_remove)
+ num_groups_removed = len(self.groups_to_remove)
+
+ errormsg(_("{num_elements_removed} elements removed").format(num_elements_removed=num_elements_removed))
for element in self.elements_to_remove:
element.getparent().remove(element)
- errormsg(_("%s groups/layers removed" % len(self.groups_to_remove)))
+ errormsg(_("{num_groups_removed} groups/layers removed").format(num_groups_removed=num_groups_removed))
for group in self.groups_to_remove:
group.getparent().remove(group)
diff --git a/lib/extensions/convert_to_stroke.py b/lib/extensions/convert_to_stroke.py
index ea732f1c..d5b1bec0 100644
--- a/lib/extensions/convert_to_stroke.py
+++ b/lib/extensions/convert_to_stroke.py
@@ -16,6 +16,7 @@ class ConvertToStroke(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-k", "--keep_satin", type=inkex.Boolean, default=False, dest="keep_satin")
def effect(self):
diff --git a/lib/extensions/cutwork_segmentation.py b/lib/extensions/cutwork_segmentation.py
index 6e9e17a3..bea14472 100644
--- a/lib/extensions/cutwork_segmentation.py
+++ b/lib/extensions/cutwork_segmentation.py
@@ -23,8 +23,7 @@ class CutworkSegmentation(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
- self.arg_parser.add_argument("-o", "--options", type=str, default=None, dest="page_1")
- self.arg_parser.add_argument("-i", "--info", type=str, default=None, dest="page_2")
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-as", "--a_start", type=int, default=112, dest="a_start")
self.arg_parser.add_argument("-ae", "--a_end", type=int, default=157, dest="a_end")
self.arg_parser.add_argument("-ac", "--a_color", type=inkex.Color, default=inkex.Color(0x990000ff), dest="a_color")
diff --git a/lib/extensions/density_map.py b/lib/extensions/density_map.py
index e4963bf9..13906861 100644
--- a/lib/extensions/density_map.py
+++ b/lib/extensions/density_map.py
@@ -20,6 +20,7 @@ from .base import InkstitchExtension
class DensityMap(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-v", "--layer-visibility", type=int, default=0, dest="layer_visibility")
self.arg_parser.add_argument("-l", "--num-neighbors-red", type=int, default=6, dest="num_neighbors_red")
self.arg_parser.add_argument("-r", "--density-radius-red", type=float, default=0.5, dest="radius_red")
diff --git a/lib/extensions/display_stacking_order.py b/lib/extensions/display_stacking_order.py
index 2906c2f8..a5ce70f2 100644
--- a/lib/extensions/display_stacking_order.py
+++ b/lib/extensions/display_stacking_order.py
@@ -14,6 +14,7 @@ from .base import InkstitchExtension
class DisplayStackingOrder(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-s", "--font_size", type=int, default=4, dest="font_size")
def effect(self):
diff --git a/lib/extensions/install_custom_palette.py b/lib/extensions/install_custom_palette.py
index da546cad..1636d1fd 100644
--- a/lib/extensions/install_custom_palette.py
+++ b/lib/extensions/install_custom_palette.py
@@ -16,6 +16,7 @@ from .base import InkstitchExtension
class InstallCustomPalette(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-f", "--filepath", type=str, default="", dest="filepath")
def effect(self):
@@ -35,7 +36,10 @@ class InstallCustomPalette(InkstitchExtension):
if not os.path.isdir(palette_path):
inkex.errormsg(_("Ink/Stitch cannot find your palette folder automatically. Please install your palette manually."))
dest = os.path.join(palette_path, palette_name)
- shutil.copyfile(gpl, dest)
+ try:
+ shutil.copyfile(gpl, dest)
+ except shutil.SameFileError:
+ pass
if not os.path.isfile(dest):
inkex.errormsg("Something wwent wrong. Ink/Stitch wasn't able to copy your palette "
diff --git a/lib/extensions/lettering_along_path.py b/lib/extensions/lettering_along_path.py
index 07142081..c7b950b1 100644
--- a/lib/extensions/lettering_along_path.py
+++ b/lib/extensions/lettering_along_path.py
@@ -24,8 +24,7 @@ class LetteringAlongPath(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
- self.arg_parser.add_argument("-o", "--options", type=str, default=None, dest="page_1")
- self.arg_parser.add_argument("-i", "--info", type=str, default=None, dest="page_2")
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-s", "--stretch-spaces", type=Boolean, default=False, dest="stretch_spaces")
def effect(self):
diff --git a/lib/extensions/lettering_custom_font_dir.py b/lib/extensions/lettering_custom_font_dir.py
index b73d23a6..1568e391 100644
--- a/lib/extensions/lettering_custom_font_dir.py
+++ b/lib/extensions/lettering_custom_font_dir.py
@@ -19,6 +19,7 @@ class LetteringCustomFontDir(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-d", "--path", type=str, default="", dest="path")
def effect(self):
diff --git a/lib/extensions/lettering_force_lock_stitches.py b/lib/extensions/lettering_force_lock_stitches.py
index 17033ce9..c835bc72 100644
--- a/lib/extensions/lettering_force_lock_stitches.py
+++ b/lib/extensions/lettering_force_lock_stitches.py
@@ -20,6 +20,7 @@ class LetteringForceLockStitches(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-s", "--satin_only", type=inkex.Boolean, dest="satin_only")
self.arg_parser.add_argument("-a", "--max_distance", type=float, default=3, dest="max_distance")
self.arg_parser.add_argument("-i", "--min_distance", type=float, default=1, dest="min_distance")
diff --git a/lib/extensions/lettering_generate_json.py b/lib/extensions/lettering_generate_json.py
index a884ccac..5ff64c41 100644
--- a/lib/extensions/lettering_generate_json.py
+++ b/lib/extensions/lettering_generate_json.py
@@ -21,10 +21,7 @@ class LetteringGenerateJson(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
- self.arg_parser.add_argument("--options")
- self.arg_parser.add_argument("--general")
- self.arg_parser.add_argument("--settings")
- self.arg_parser.add_argument("--kerning")
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-n", "--font-name", type=str, default="Font", dest="font_name")
self.arg_parser.add_argument("-d", "--font-description", type=str, default="Description", dest="font_description")
diff --git a/lib/extensions/lettering_remove_kerning.py b/lib/extensions/lettering_remove_kerning.py
index 21a8eda3..7507c024 100644
--- a/lib/extensions/lettering_remove_kerning.py
+++ b/lib/extensions/lettering_remove_kerning.py
@@ -17,6 +17,7 @@ class LetteringRemoveKerning(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-p", "--font-files", type=str, default="", dest="paths")
def effect(self):
diff --git a/lib/extensions/lettering_update_json_glyphlist.py b/lib/extensions/lettering_update_json_glyphlist.py
index 4dea6d51..d80ef9ea 100644
--- a/lib/extensions/lettering_update_json_glyphlist.py
+++ b/lib/extensions/lettering_update_json_glyphlist.py
@@ -18,6 +18,7 @@ class LetteringUpdateJsonGlyphlist(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-f", "--font-file", type=str, default="", dest="font_file")
self.arg_parser.add_argument("-j", "--json-file", type=str, default="", dest="json_file")
diff --git a/lib/extensions/letters_to_font.py b/lib/extensions/letters_to_font.py
index e779b5d1..8345af75 100644
--- a/lib/extensions/letters_to_font.py
+++ b/lib/extensions/letters_to_font.py
@@ -24,6 +24,7 @@ class LettersToFont(InkstitchExtension):
'''
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-d", "--font-dir", type=str, default="", dest="font_dir")
self.arg_parser.add_argument("-f", "--file-format", type=str, default="", dest="file_format")
self.arg_parser.add_argument("-c", "--import-commands", type=str, default="params", dest="import_commands")
diff --git a/lib/extensions/outline.py b/lib/extensions/outline.py
index a4026017..45292f64 100644
--- a/lib/extensions/outline.py
+++ b/lib/extensions/outline.py
@@ -18,6 +18,7 @@ from .base import InkstitchExtension
class Outline(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-k", "--keep-original", type=Boolean, default=False, dest="keep_original")
self.arg_parser.add_argument("-b", "--buffer", type=float, default=0.001, dest="buffer")
self.arg_parser.add_argument("-s", "--smoothness", type=float, default=0.3, dest="smoothness")
diff --git a/lib/extensions/select_elements.py b/lib/extensions/select_elements.py
index 59e3d06d..2c2de242 100644
--- a/lib/extensions/select_elements.py
+++ b/lib/extensions/select_elements.py
@@ -17,7 +17,7 @@ from .base import InkstitchExtension
class SelectElements(InkstitchExtension):
def add_arguments(self, pars):
- self.arg_parser.add_argument("--options", type=str, dest="notebook")
+ self.arg_parser.add_argument("--notebook", type=str, dest="notebook")
pars.add_argument("--stitch-type", type=str, dest="stitch_type")
pars.add_argument("--info", type=str, dest="info")
diff --git a/lib/extensions/stitch_plan_preview.py b/lib/extensions/stitch_plan_preview.py
index 75b8e497..42fa37d4 100644
--- a/lib/extensions/stitch_plan_preview.py
+++ b/lib/extensions/stitch_plan_preview.py
@@ -25,6 +25,7 @@ from .utils.inkex_command import inkscape
class StitchPlanPreview(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-s", "--move-to-side", type=Boolean, default=True, dest="move_to_side")
self.arg_parser.add_argument("-v", "--layer-visibility", type=str, default="unchanged", dest="layer_visibility")
self.arg_parser.add_argument("-n", "--needle-points", type=Boolean, default=False, dest="needle_points")
diff --git a/lib/extensions/troubleshoot.py b/lib/extensions/troubleshoot.py
index 01629069..51a33abf 100644
--- a/lib/extensions/troubleshoot.py
+++ b/lib/extensions/troubleshoot.py
@@ -21,6 +21,7 @@ class Troubleshoot(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-p", "--pointer-size", type=float, default=5, dest="pointer_size_mm")
self.arg_parser.add_argument("-f", "--font-size", type=float, default=2, dest="font_size_mm")
diff --git a/lib/extensions/unlink_clone.py b/lib/extensions/unlink_clone.py
index e361da14..0c187808 100644
--- a/lib/extensions/unlink_clone.py
+++ b/lib/extensions/unlink_clone.py
@@ -15,6 +15,7 @@ from typing import List, Tuple
class UnlinkClone(InkstitchExtension):
def __init__(self, *args, **kwargs):
InkstitchExtension.__init__(self, *args, **kwargs)
+ self.arg_parser.add_argument("--notebook")
self.arg_parser.add_argument("-r", "--recursive", dest="recursive", type=Boolean, default=True)
def effect(self):
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 16:21:03 +0000