Skip to content

Commit

Permalink
Merge pull request #292 from raboof/avoid-inkscape-plugin-name-clash
Browse files Browse the repository at this point in the history
Avoid name clash between inkscape plugin and inkcut itself
  • Loading branch information
frmdstryr committed Dec 8, 2020
2 parents 5304b6c + ddc1f9e commit d19e21b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
"""
Inkcut, Plot HPGL directly from Inkscape.
inkcut.py
inkcut4inkscape.py
Copyright 2018 The Inkcut Team
Expand Down
2 changes: 1 addition & 1 deletion plugins/inkscape/inkcut_cut.inx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<_name>Cut selection...</_name>
<id>org.ekips.filter.inkcut.cut</id>
<dependency type="executable" location="extensions">inkcut_cut.py</dependency>
<dependency type="executable" location="extensions">inkcut.py</dependency>
<dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
<dependency type="executable" location="extensions">inkex.py</dependency>
<effect>
<object-type>all</object-type>
Expand Down
2 changes: 1 addition & 1 deletion plugins/inkscape/inkcut_cut.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
else:
inkex.localize()
import subprocess
from inkcut import contains_text, convert_objects_to_paths
from inkcut4inkscape import contains_text, convert_objects_to_paths



Expand Down
2 changes: 1 addition & 1 deletion plugins/inkscape/inkcut_open.inx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<_name>Open current document...</_name>
<id>org.ekips.filter.inkcut.open</id>
<dependency type="executable" location="extensions">inkcut_open.py</dependency>
<dependency type="executable" location="extensions">inkcut.py</dependency>
<dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
<dependency type="executable" location="extensions">inkex.py</dependency>
<effect>
<object-type>all</object-type>
Expand Down
2 changes: 1 addition & 1 deletion plugins/inkscape/inkcut_open.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
inkex.localize()
import subprocess

from inkcut import convert_objects_to_paths
from inkcut4inkscape import convert_objects_to_paths

DEBUG = False
try:
Expand Down

0 comments on commit d19e21b

Please sign in to comment.