diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-02-15 18:31:38 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-02-15 18:31:38 +0000 |
| commit | c7f7afed83fc8453859ec98162537c7dc395568f (patch) | |
| tree | ed0592d8973b5c0c09cfc757263a934772cb3c2a /share | |
| parent | first steps (diff) | |
| parent | Adjust timeout for snap tool tips to 4 seconds (diff) | |
| download | inkscape-c7f7afed83fc8453859ec98162537c7dc395568f.tar.gz inkscape-c7f7afed83fc8453859ec98162537c7dc395568f.zip | |
update to trunk
(bzr r13645.1.11)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/extensions/gimp_xcf.py | 10 | ||||
| -rw-r--r-- | share/palettes/Gray.gpl | 1 | ||||
| -rw-r--r-- | share/palettes/LaTeX-Beamer.gpl | 1 | ||||
| -rw-r--r-- | share/palettes/MATLAB-Jet-72.gpl | 2 | ||||
| -rw-r--r-- | share/palettes/inkscape.gpl | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/share/extensions/gimp_xcf.py b/share/extensions/gimp_xcf.py index 11c9d041f..bdb0d1e4c 100755 --- a/share/extensions/gimp_xcf.py +++ b/share/extensions/gimp_xcf.py @@ -34,6 +34,10 @@ class GimpXCFError(Exception): pass class GimpXCFExpectedIOError(GimpXCFError): pass +class GimpXCFInkscapeNotInstalled(GimpXCFError): + def __init__(self): + inkex.errormsg(_('Inkscape must be installed and set in your path variable.')) + class GimpXCFGimpNotInstalled(GimpXCFError): def __init__(self): inkex.errormsg(_('Gimp must be installed and set in your path variable.')) @@ -166,7 +170,11 @@ class MyEffect(inkex.Effect): f.close() err.close() stdin.close() - + + if return_code != 0: + self.clear_tmp() + raise GimpXCFInkscapeNotInstalled + if os.name == 'nt': filename = filename.replace("\\", "/") pngs.append(filename) diff --git a/share/palettes/Gray.gpl b/share/palettes/Gray.gpl index 7022935e3..a3c6f2c42 100644 --- a/share/palettes/Gray.gpl +++ b/share/palettes/Gray.gpl @@ -1,6 +1,5 @@ GIMP Palette Name: Gray -Columns: 3 # 0 0 0 00 hex (0) 1 1 1 01 hex (1) diff --git a/share/palettes/LaTeX-Beamer.gpl b/share/palettes/LaTeX-Beamer.gpl index ae338e68f..e580a42aa 100644 --- a/share/palettes/LaTeX-Beamer.gpl +++ b/share/palettes/LaTeX-Beamer.gpl @@ -1,6 +1,5 @@ GIMP Palette Name: LaTeX Beamer -Columns: 0 # 24 28 87 default outer 1 37 43 130 default outer 2 diff --git a/share/palettes/MATLAB-Jet-72.gpl b/share/palettes/MATLAB-Jet-72.gpl index ac69f1675..7ee5cfd00 100644 --- a/share/palettes/MATLAB-Jet-72.gpl +++ b/share/palettes/MATLAB-Jet-72.gpl @@ -1,6 +1,6 @@ GIMP Palette Name: MATLAB Jet (72) -Columns: 3 +Columns: 6 # 0 0 127 0 0 0 127 #1 diff --git a/share/palettes/inkscape.gpl b/share/palettes/inkscape.gpl index 3bf431b96..219615bbc 100644 --- a/share/palettes/inkscape.gpl +++ b/share/palettes/inkscape.gpl @@ -1,6 +1,6 @@ GIMP Palette Name: Inkscape default -Columns: 3 +Columns: 27 # generated by PaletteGen.py 0 0 0 Black 26 26 26 90% Gray |