[Bug #770681] KEY MAPPING: Comma and period hijacked by scaling.

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

(bzr r15155)

3 files changed, 44 insertions, 6 deletions

diff --git a/share/keys/default.xml b/share/keys/default.xml
index f16be0689..581716d12 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -405,6 +405,24 @@ override) the bindings in the main default.xml.
 
   <bind key="Page_Down" action="SelectionLower" display="true" />
   <bind key="KP_Page_Down" action="SelectionLower" />
+  
+  <bind key="comma" action="SelectionShrink" display="true" />
+  <bind key="less" action="SelectionShrink" />
+  
+  <bind key="comma" modifiers="Alt" action="SelectionShrinkScreen" />
+  <bind key="less" modifiers="Alt" action="SelectionShrinkScreen" />
+  
+  <bind key="comma" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  <bind key="less" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  
+  <bind key="period" action="SelectionGrow" display="true" />
+  <bind key="greater" action="SelectionGrow" />
+  
+  <bind key="period" modifiers="Alt" action="SelectionGrowScreen" />
+  <bind key="greater" modifiers="Alt" action="SelectionGrowScreen" />
+  
+  <bind key="period" modifiers="Ctrl" action="SelectionGrowDouble" />
+  <bind key="greater" modifiers="Ctrl" action="SelectionGrowDouble" />
 
   <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true" />
   <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index 07192cb37..581716d12 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -297,8 +297,7 @@ override) the bindings in the main default.xml.
   
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
   <bind key="Z" modifiers="Ctrl" action="EditUndo" />
-  <bind key="y" modifiers="Ctrl,Shift" action="EditUndo" />
-  <bind key="Y" modifiers="Ctrl,Shift" action="EditUndo" />
+  <!--Do not put in Ctrl,Shift+Y, already used-->
 
   <bind key="z" modifiers="Ctrl,Shift" action="EditRedo" display="true" />
   <bind key="Z" modifiers="Ctrl,Shift" action="EditRedo" />
@@ -384,6 +383,9 @@ override) the bindings in the main default.xml.
 
   <bind key="7" action="EditNextPathEffectParameter" display="true" />
 
+  <bind key="r" modifiers="Ctrl,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
+  <bind key="R" modifiers="Ctrl,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
+
   <!-- Objects/selection -->
 
   <bind key="h" action="ObjectFlipHorizontally" display="true" />
@@ -403,6 +405,24 @@ override) the bindings in the main default.xml.
 
   <bind key="Page_Down" action="SelectionLower" display="true" />
   <bind key="KP_Page_Down" action="SelectionLower" />
+  
+  <bind key="comma" action="SelectionShrink" display="true" />
+  <bind key="less" action="SelectionShrink" />
+  
+  <bind key="comma" modifiers="Alt" action="SelectionShrinkScreen" />
+  <bind key="less" modifiers="Alt" action="SelectionShrinkScreen" />
+  
+  <bind key="comma" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  <bind key="less" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  
+  <bind key="period" action="SelectionGrow" display="true" />
+  <bind key="greater" action="SelectionGrow" />
+  
+  <bind key="period" modifiers="Alt" action="SelectionGrowScreen" />
+  <bind key="greater" modifiers="Alt" action="SelectionGrowScreen" />
+  
+  <bind key="period" modifiers="Ctrl" action="SelectionGrowDouble" />
+  <bind key="greater" modifiers="Ctrl" action="SelectionGrowDouble" />
 
   <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true" />
   <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
diff --git a/share/keys/xara.xml b/share/keys/xara.xml
index 25ebfcb48..92a84d33e 100644
--- a/share/keys/xara.xml
+++ b/share/keys/xara.xml
@@ -263,13 +263,13 @@ Hom/end keys-select minimum or maximum feather values
   <bind key="Z" modifiers="Ctrl" action="EditUndo" display="true"/>
   <bind key="y" modifiers="Ctrl,Shift" action="EditUndo" />
   <bind key="Y" modifiers="Ctrl,Shift" action="EditUndo" />
-  <bind key="less" modifiers="Ctrl" action="EditUndo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
-  <bind key="comma" modifiers="Ctrl" action="EditUndo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
+  <bind key="less" modifiers="Ctrl" action="EditUndo" />
+  <bind key="comma" modifiers="Ctrl" action="EditUndo" />
 
   <bind key="y" modifiers="Ctrl" action="EditRedo" display="true"/>
   <bind key="Y" modifiers="Ctrl" action="EditRedo" />
-  <bind key="greater" modifiers="Ctrl" action="EditRedo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
-  <bind key="period" modifiers="Ctrl" action="EditRedo" /> <!-- FIXME: stolen by scaling, redirect that through a verb -->
+  <bind key="greater" modifiers="Ctrl" action="EditRedo" />
+  <bind key="period" modifiers="Ctrl" action="EditRedo" />
 
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true"/>
   <bind key="X" modifiers="Ctrl" action="EditCut" />