Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid name clash between inkscape plugin and inkcut itself #292

Merged
merged 1 commit into from
Dec 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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