From f4b1034682e8b37ed431119bcb53ddb0820e3727 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Fri, 17 Aug 2012 22:46:26 +0200
Subject: Shortcuts. Fix for Bug #1035903 (adobe-illustrator-cs2 contains
 multiple display=true for EditPaste).

(bzr r11609)
---
 share/keys/adobe-illustrator-cs2.xml |  8 ++++----
 share/keys/default.xml               |  6 +++---
 share/keys/inkscape.xml              | 23 +++++++++++++++++++----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/share/keys/adobe-illustrator-cs2.xml b/share/keys/adobe-illustrator-cs2.xml
index db331a556..87bbf9f0d 100644
--- a/share/keys/adobe-illustrator-cs2.xml
+++ b/share/keys/adobe-illustrator-cs2.xml
@@ -165,7 +165,7 @@ ToolPaintBucket: Fill bounded areas -->
     
   <!--  Paste in Front, Ctrl+F -->
 
-  <bind key="f" modifiers="Ctrl" action="EditPaste" display="true"/>
+  <bind key="f" modifiers="Ctrl" action="EditPaste"/>
   <bind key="F" modifiers="Ctrl" action="EditPaste"/>
 
   <!-- Paste in Back, Ctrl+B -->
@@ -357,9 +357,9 @@ Type
 -->
 
   <bind key="t" modifiers="Ctrl" action="DialogText" display="true"/>
-  <bind key="T" modifiers="Ctrl" action="DialogText" display="true"/>
-  <bind key="t" modifiers="Alt,Ctrl" action="DialogText" display="true"/>
-  <bind key="T" modifiers="Alt,Ctrl" action="DialogText" display="true"/>
+  <bind key="T" modifiers="Ctrl" action="DialogText" />
+  <bind key="t" modifiers="Alt,Ctrl" action="DialogText" />
+  <bind key="T" modifiers="Alt,Ctrl" action="DialogText" />
 
 <!--- Help -->
 <!-- Illustrator Help, F1 -->
diff --git a/share/keys/default.xml b/share/keys/default.xml
index 8f8b2cd2a..b2cf829e5 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -70,10 +70,10 @@ override) the bindings in the main default.xml.
   <bind action="FileVacuum" />
 
   <bind key="w" modifiers="Ctrl" action="FileClose" display="true" />
-  <bind key="W" modifiers="Ctrl" action="FileClose" display="true" />
+  <bind key="W" modifiers="Ctrl" action="FileClose" />
 
   <bind key="q" modifiers="Ctrl" action="FileQuit" display="true" />
-  <bind key="Q" modifiers="Ctrl" action="FileQuit" display="true" />
+  <bind key="Q" modifiers="Ctrl" action="FileQuit" />
 
 <!-- Tools -->
 
@@ -288,7 +288,7 @@ override) the bindings in the main default.xml.
   <bind key="Y" modifiers="Ctrl" action="EditRedo" />
 
   <bind key="h" modifiers="Ctrl,Shift" action="DialogUndoHistory" display="true" />
-  <bind key="H" modifiers="Ctrl,Shift" action="DialogUndoHistory" display="true" />
+  <bind key="H" modifiers="Ctrl,Shift" action="DialogUndoHistory" />
 
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true" />
   <bind key="X" modifiers="Ctrl" action="EditCut" />
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index f143f0835..b2cf829e5 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -70,10 +70,10 @@ override) the bindings in the main default.xml.
   <bind action="FileVacuum" />
 
   <bind key="w" modifiers="Ctrl" action="FileClose" display="true" />
-  <bind key="W" modifiers="Ctrl" action="FileClose" display="true" />
+  <bind key="W" modifiers="Ctrl" action="FileClose" />
 
   <bind key="q" modifiers="Ctrl" action="FileQuit" display="true" />
-  <bind key="Q" modifiers="Ctrl" action="FileQuit" display="true" />
+  <bind key="Q" modifiers="Ctrl" action="FileQuit" />
 
 <!-- Tools -->
 
@@ -119,6 +119,9 @@ override) the bindings in the main default.xml.
 
   <bind action="ArcPrefs" />
 
+  <bind key="m" action="ToolMeasure" />
+  <bind key="M" action="ToolMeasure" display="true" />
+
   <bind key="F9" modifiers="Shift" action="ToolStar" />
   <bind key="asterisk" modifiers="Shift" action="ToolStar" /> 	 
   <bind key="asterisk" action="ToolStar" /> 	 
@@ -233,7 +236,7 @@ override) the bindings in the main default.xml.
   <bind key="KP_9" action="ZoomNext" />
   <bind key="grave" action="ZoomPrev" display="true" /> <!-- ` -->
   <bind key="KP_8" action="ZoomPrev" />
-
+  
 <!-- View -->
 
   <bind key="F11" action="FullScreen" display="true" /> 
@@ -285,7 +288,7 @@ override) the bindings in the main default.xml.
   <bind key="Y" modifiers="Ctrl" action="EditRedo" />
 
   <bind key="h" modifiers="Ctrl,Shift" action="DialogUndoHistory" display="true" />
-  <bind key="H" modifiers="Ctrl,Shift" action="DialogUndoHistory" display="true" />
+  <bind key="H" modifiers="Ctrl,Shift" action="DialogUndoHistory" />
 
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true" />
   <bind key="X" modifiers="Ctrl" action="EditCut" />
@@ -333,6 +336,9 @@ override) the bindings in the main default.xml.
   <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true" />
   <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
 
+  <bind key="a" modifiers="Shift,Alt" action="EditSelectSameObjectType" display="true" />
+  <bind key="A" modifiers="Shift,Alt" action="EditSelectSameObjectType" />
+
   <bind key="exclam" action="EditInvert" display="true" />
   <bind key="exclam" modifiers="Shift" action="EditInvert" />
 
@@ -594,4 +600,13 @@ override) the bindings in the main default.xml.
   effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add
   Nodes effect. -->
 
+ <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
+ <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
+
+ <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
+ <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
+
+ <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
+ <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
+
 </keys>
-- 
cgit v1.2.3