From a97bf3449ea2ce909a3d77f5d528bac1813b46c6 Mon Sep 17 00:00:00 2001
From: lohanandrade <lohanandrade@gmail.com>
Date: Fri, 17 Jun 2016 08:39:34 +0200
Subject: [Bug #1580583] update corel draw x8 shortcut.

Fixed bugs:
  - https://launchpad.net/bugs/1580583

(bzr r14994)
---
 share/keys/Makefile.am       |   1 +
 share/keys/corel-draw-x8.xml | 175 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)
 create mode 100644 share/keys/corel-draw-x8.xml

(limited to 'share')

diff --git a/share/keys/Makefile.am b/share/keys/Makefile.am
index f4a08d595..98b720c2b 100644
--- a/share/keys/Makefile.am
+++ b/share/keys/Makefile.am
@@ -9,6 +9,7 @@ keys_DATA = \
 	adobe-illustrator-cs2.xml \
 	right-handed-illustration.xml \
 	corel-draw-x4.xml \
+	corel-draw-x8.xml \
 	zoner-draw.xml \
 	acd-canvas.xml
 
diff --git a/share/keys/corel-draw-x8.xml b/share/keys/corel-draw-x8.xml
new file mode 100644
index 000000000..cd4cf4304
--- /dev/null
+++ b/share/keys/corel-draw-x8.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<keys name="Corel DRAW X8">
+<!--  
+This file contains a profile of keyboard shortcuts for Inkscape 
+in the style of Corel DRAW X8. See default.xml for more information.  
+-->
+
+<!-- File -->
+<bind key="i" modifiers="Ctrl" action="FileImport" display="true"/>
+<bind key="I" modifiers="Ctrl" action="FileImport" />
+  
+<bind key="n" modifiers="Ctrl" action="FileNew" display="true"/>
+<bind key="N" modifiers="Ctrl" action="FileNew" />
+
+<bind key="o" modifiers="Ctrl" action="FileOpen" display="true"/>
+<bind key="O" modifiers="Ctrl" action="FileOpen" />
+
+<bind key="p" modifiers="Ctrl" action="FilePrint" display="true"/>
+<bind key="P" modifiers="Ctrl" action="FilePrint" />
+
+<bind key="s" modifiers="Ctrl" action="FileSave" display="true"/>
+<bind key="S" modifiers="Ctrl" action="FileSave" />
+
+<bind key="s" modifiers="Ctrl,Shift" action="FileSaveAs" display="true"/>
+<bind key="S" modifiers="Ctrl,Shift" action="FileSaveAs" />
+
+<!-- Edit -->
+<bind key="c" modifiers="Ctrl" action="EditCopy" display="true"/>
+<bind key="C" modifiers="Ctrl" action="EditCopy" />
+
+<bind key="x" modifiers="Ctrl" action="EditCut" display="true"/>
+<bind key="X" modifiers="Ctrl" action="EditCut" />
+
+<bind key="Delete" action="EditDelete" display="true"/>
+
+<bind key="d" modifiers="Ctrl" action="EditDuplicate" display="true"/>
+<bind key="D" modifiers="Ctrl" action="EditDuplicate" />
+
+<bind key="v" modifiers="Ctrl" action="EditPasteInPlace" display="true" />
+<bind key="V" modifiers="Ctrl" action="EditPasteInPlace" />
+
+<bind key="z" modifiers="Ctrl,Shift" action="EditRedo" display="true"/>
+<bind key="Z" modifiers="Ctrl,Shift" action="EditRedo" />
+
+<bind key="a" modifiers="Ctrl" action="EditSelectAllInAllLayers" display="true"/>
+<bind key="A" modifiers="Ctrl" action="EditSelectAllInAllLayers" />
+
+<bind key="z" modifiers="Ctrl" action="EditUndo" display="true"/>
+<bind key="Z" modifiers="Ctrl" action="EditUndo" />
+
+<!-- Selection -->
+<bind key="k" modifiers="Ctrl" action="SelectionBreakApart" display="true"/>
+<bind key="K" modifiers="Ctrl" action="SelectionBreakApart" />
+
+<bind key="l" modifiers="Ctrl" action="SelectionCombine" display="true"/>
+<bind key="L" modifiers="Ctrl" action="SelectionCombine" />
+
+<bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true"/>
+<bind key="G" modifiers="Ctrl" action="SelectionGroup" />
+
+<bind key="Page_Down" modifiers="Ctrl" action="SelectionLower" display="true" />
+
+<bind key="Page_Up" modifiers="Ctrl" action="SelectionRaise" display="true" />
+
+<bind key="End" modifiers="Ctrl" action="SelectionToBack" display="true" />
+
+<bind key="Home" modifiers="Ctrl" action="SelectionToFront" display="true" />
+
+<bind key="u" modifiers="Ctrl" action="SelectionUnGroup" display="true"/>
+<bind key="U" modifiers="Ctrl" action="SelectionUnGroup" />
+
+<bind key="q" modifiers="Ctrl,Shift" action="StrokeToPath" display="true" />
+<bind key="Q" modifiers="Ctrl,Shift" action="StrokeToPath" />
+
+<!-- Layer -->
+
+
+
+<!-- Object -->
+
+<bind key="q" modifiers="Ctrl" action="ObjectToPath" display="true"/>
+<bind key="Q" modifiers="Ctrl" action="ObjectToPath" />
+
+<!-- Context -->
+
+<bind key="c" action="AlignHorizontalCenter" display="true" />
+<bind key="C" action="AlignHorizontalCenter" />
+
+<bind key="l" action="AlignHorizontalLeft" display="true" />
+<bind key="L" action="AlignHorizontalLeft" />
+
+<bind key="r" action="AlignHorizontalRight" display="true" />
+<bind key="R" action="AlignHorizontalRight" />
+
+<bind key="b" action="AlignVerticalBottom" display="true" />
+<bind key="B" action="AlignVerticalBottom" />
+
+<bind key="e" action="AlignVerticalCenter" display="true" />
+<bind key="E" action="AlignVerticalCenter" />
+
+<bind key="t" action="AlignVerticalTop" display="true" />
+<bind key="T" action="AlignVerticalTop" />
+
+<bind key="F7" action="ToolArc" display="true"/>
+
+<bind key="x" action="ToolEraser" display="true" />
+<bind key="X" action="ToolEraser" />
+
+<bind key="m" action="ToolMesh" display="true" />
+<bind key="M" action="ToolMesh" />
+
+<bind key="F10" action="ToolNode" display="true"/>
+
+<bind key="F12" action="ToolPen" display="true"/>
+
+<bind key="F5" action="ToolPencil" display="true"/>
+
+<bind key="F6" action="ToolRect" display="true"/>
+
+<bind key="A" action="ToolSpiral" display="true"/>
+<bind key="a" action="ToolSpiral" />
+
+<bind key="F8" action="ToolText" display="true"/>
+
+<bind key="z" action="ToolZoom" display="true" />
+<bind key="Z" action="ToolZoom" />
+
+<!-- View -->
+
+<bind key="F9" action="FullScreenFocus" display="true" />
+
+<bind key="F9" modifiers="Shift" action="ViewModeToggle" display="true" />
+
+<bind key="F4" action="ZoomDrawing" display="true"/>
+
+<bind key="F2" action="ZoomIn" display="true" />
+
+<bind key="F3" action="ZoomOut" display="true"/>
+
+<bind key="F4" modifiers="Shift" action="ZoomPage" display="true"/>
+
+<bind key="F2" modifiers="Shift" action="ZoomSelection" display="true" />
+
+<!-- Dialog -->
+<bind key="Enter" modifiers="Alt" action="DialogDocumentProperties" display="true"/>
+
+<bind key="e" modifiers="Ctrl" action="DialogExport" display="true" />
+<bind key="E" modifiers="Ctrl" action="DialogExport" />
+
+<bind key="F11" action="DialogFillStroke" display="true" />
+
+<bind key="f" modifiers="Ctrl" action="DialogFind" display="true" />
+<bind key="F" modifiers="Ctrl" action="DialogFind" />
+
+<bind key="j" modifiers="Ctrl" action="DialogPreferences" display="true"/>
+<bind key="J" modifiers="Ctrl" action="DialogPreferences" />
+
+<bind key="t" modifiers="Ctrl,Shift" action="DialogText" display="true"/>
+<bind key="T" modifiers="Ctrl,Shift" action="DialogText" /> 
+
+<bind key="F8" modifiers="Alt" action="DialogTransform" display="true" />
+
+<!-- Help -->
+
+
+
+<!-- Extensions -->
+
+<bind key="F1" action="org.inkscape.help.manual" display="true" />
+
+<!-- Filters -->
+
+
+	 
+</keys>
-- 
cgit v1.2.3


From 19f956f4e808c2c97dfeee599266c6d9680c2f3d Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 17 Jun 2016 08:44:20 +0200
Subject: [Bug #1454910] Compressed SVG with media error.

Fixed bugs:
  - https://launchpad.net/bugs/1454910

(bzr r14995)
---
 share/extensions/svg_and_media_zip_output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py
index fb1ddd823..e021bfd4e 100755
--- a/share/extensions/svg_and_media_zip_output.py
+++ b/share/extensions/svg_and_media_zip_output.py
@@ -111,7 +111,7 @@ class CompressedMediaOutput(inkex.Effect):
                 url = urlparse.urlparse(xlink)
                 href = urllib.url2pathname(url.path)
                 
-                if (href != None):
+                if (href != None and os.path.isfile(href)):
                     absref = os.path.realpath(href)
 
                 absref = unicode(absref, "utf-8")
-- 
cgit v1.2.3