Update default keymap to include most of the new verbsadded in trunk, sync inkscape.xml

(bzr r11780)

2 files changed, 88 insertions, 30 deletions

diff --git a/share/keys/default.xml b/share/keys/default.xml
index 1f69bd619..00bf1896a 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -122,6 +122,8 @@ override) the bindings in the main default.xml.
   <bind key="m" action="ToolMeasure" />
   <bind key="M" action="ToolMeasure" display="true" />
 
+  <bind action="MeasurePrefs" />
+
   <bind key="F9" modifiers="Shift" action="ToolStar" />
   <bind key="asterisk" modifiers="Shift" action="ToolStar" /> 	 
   <bind key="asterisk" action="ToolStar" /> 	 
@@ -193,7 +195,6 @@ override) the bindings in the main default.xml.
 
   <bind action="SprayPrefs" />
 
-
 <!-- Zoom -->
 
   <bind key="plus" action="ZoomIn" display="true" />
@@ -248,34 +249,45 @@ override) the bindings in the main default.xml.
   <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true" />
   <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="PrevWindow" />
 
+  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
+  <bind key="numbersign" action="ToggleGrid" display="true" />
+  
+  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
+  <bind key="bar" action="ToggleGuides" display="true" />
+
+  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
+  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
+
+  <bind action="ToggleCommandsToolbar" />
+  <bind action="ToggleSnapToolbar" />
+  <bind action="ToggleToolToolbar" />
+  <bind action="ToggleToolbox" />
+
   <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true" />
   <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
 
   <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
   <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
 
-  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
-  <bind key="bar" action="ToggleGuides" display="true" />
-
-  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
-  <bind key="numbersign" action="ToggleGrid" display="true" />
+  <bind action="TogglePalette" />
+  <bind action="ToggleStatusbar" />
   
-  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
-  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
-
   <bind action="ViewNew" />
   <bind action="ViewNewPreview" />
   <bind action="ViewIconPreview" />
 
+  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
+  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
+
   <bind action="ViewModeNormal" />
+  <bind action="ViewModeNoFilters" />
   <bind action="ViewModeOutline" />
-  <bind action="ViewColorModeNormal" />
-  <bind action="ViewColorModeGrayscale" />
 
-  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
-  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
   <bind key="KP_5" modifiers="Shift" action="ViewColorModeToggle" display="true" />
 
+  <bind action="ViewColorModeNormal" />
+  <bind action="ViewColorModeGrayscale" />
+
 <!-- Edit -->
 
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
@@ -326,9 +338,13 @@ override) the bindings in the main default.xml.
   <bind key="d" modifiers="Alt,Shift" action="EditUnlinkClone" display="true" />
   <bind key="D" modifiers="Alt,Shift" action="EditUnlinkClone" />
 
+  <bind action="EditRelinkClone" />
+
   <bind key="d" modifiers="Shift" action="EditCloneSelectOriginal" display="true" />
   <bind key="D" modifiers="Shift" action="EditCloneSelectOriginal" />
 
+  <bind action="EditCloneOriginalPathLPE" />
+
   <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true" />
   <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
 
@@ -337,6 +353,11 @@ 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 action="EditSelectSameFillStroke" />  
+  <bind action="EditSelectSameFillColor" />  
+  <bind action="EditSelectSameStrokeColor" />  
+  <bind action="EditSelectSameStrokeStyle" />  
+
   <bind key="a" modifiers="Shift,Alt" action="EditSelectSameObjectType" display="true" />
   <bind key="A" modifiers="Shift,Alt" action="EditSelectSameObjectType" />
 
@@ -412,6 +433,10 @@ override) the bindings in the main default.xml.
 
   <bind action="ObjectRemoveTransform" /> 
 
+  <bind action="FitCanvasToSelection" /> 
+  <bind action="FitCanvasToDrawing" /> 
+  <bind action="FitCanvasToSelectionOrDrawing" /> 
+
 <!-- Path -->
 
   <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true" />
@@ -530,18 +555,20 @@ override) the bindings in the main default.xml.
   <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" display="true" />
   <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
 
+  <bind action="LayerMoveTo" />  
+
   <bind key="l" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
   <bind key="L" modifiers="Ctrl,Shift" action="DialogLayers" />  
 
   <bind action="LayerDuplicate" />  
   <bind action="LayerDelete" />  
 
+  <bind action="LayerHideAll" />  
   <bind action="LayerSolo" />  
-
   <bind action="LayerShowAll" />  
-  <bind action="LayerHideAll" />  
 
   <bind action="LayerLockAll" />  
+  <bind action="LayerLockOthers" />  
   <bind action="LayerUnlockAll" />  
 
   <bind action="LayerToggleHide" />  
@@ -576,6 +603,8 @@ override) the bindings in the main default.xml.
   <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true" />
   <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
 
+  <bind action="DialogObjectAttributes" />
+
   <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true" />
   <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />
 
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index 1f69bd619..00bf1896a 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -122,6 +122,8 @@ override) the bindings in the main default.xml.
   <bind key="m" action="ToolMeasure" />
   <bind key="M" action="ToolMeasure" display="true" />
 
+  <bind action="MeasurePrefs" />
+
   <bind key="F9" modifiers="Shift" action="ToolStar" />
   <bind key="asterisk" modifiers="Shift" action="ToolStar" /> 	 
   <bind key="asterisk" action="ToolStar" /> 	 
@@ -193,7 +195,6 @@ override) the bindings in the main default.xml.
 
   <bind action="SprayPrefs" />
 
-
 <!-- Zoom -->
 
   <bind key="plus" action="ZoomIn" display="true" />
@@ -248,34 +249,45 @@ override) the bindings in the main default.xml.
   <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true" />
   <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="PrevWindow" />
 
+  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
+  <bind key="numbersign" action="ToggleGrid" display="true" />
+  
+  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
+  <bind key="bar" action="ToggleGuides" display="true" />
+
+  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
+  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
+
+  <bind action="ToggleCommandsToolbar" />
+  <bind action="ToggleSnapToolbar" />
+  <bind action="ToggleToolToolbar" />
+  <bind action="ToggleToolbox" />
+
   <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true" />
   <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
 
   <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
   <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
 
-  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
-  <bind key="bar" action="ToggleGuides" display="true" />
-
-  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
-  <bind key="numbersign" action="ToggleGrid" display="true" />
+  <bind action="TogglePalette" />
+  <bind action="ToggleStatusbar" />
   
-  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
-  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
-
   <bind action="ViewNew" />
   <bind action="ViewNewPreview" />
   <bind action="ViewIconPreview" />
 
+  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
+  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
+
   <bind action="ViewModeNormal" />
+  <bind action="ViewModeNoFilters" />
   <bind action="ViewModeOutline" />
-  <bind action="ViewColorModeNormal" />
-  <bind action="ViewColorModeGrayscale" />
 
-  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
-  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
   <bind key="KP_5" modifiers="Shift" action="ViewColorModeToggle" display="true" />
 
+  <bind action="ViewColorModeNormal" />
+  <bind action="ViewColorModeGrayscale" />
+
 <!-- Edit -->
 
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
@@ -326,9 +338,13 @@ override) the bindings in the main default.xml.
   <bind key="d" modifiers="Alt,Shift" action="EditUnlinkClone" display="true" />
   <bind key="D" modifiers="Alt,Shift" action="EditUnlinkClone" />
 
+  <bind action="EditRelinkClone" />
+
   <bind key="d" modifiers="Shift" action="EditCloneSelectOriginal" display="true" />
   <bind key="D" modifiers="Shift" action="EditCloneSelectOriginal" />
 
+  <bind action="EditCloneOriginalPathLPE" />
+
   <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true" />
   <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
 
@@ -337,6 +353,11 @@ 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 action="EditSelectSameFillStroke" />  
+  <bind action="EditSelectSameFillColor" />  
+  <bind action="EditSelectSameStrokeColor" />  
+  <bind action="EditSelectSameStrokeStyle" />  
+
   <bind key="a" modifiers="Shift,Alt" action="EditSelectSameObjectType" display="true" />
   <bind key="A" modifiers="Shift,Alt" action="EditSelectSameObjectType" />
 
@@ -412,6 +433,10 @@ override) the bindings in the main default.xml.
 
   <bind action="ObjectRemoveTransform" /> 
 
+  <bind action="FitCanvasToSelection" /> 
+  <bind action="FitCanvasToDrawing" /> 
+  <bind action="FitCanvasToSelectionOrDrawing" /> 
+
 <!-- Path -->
 
   <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true" />
@@ -530,18 +555,20 @@ override) the bindings in the main default.xml.
   <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" display="true" />
   <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
 
+  <bind action="LayerMoveTo" />  
+
   <bind key="l" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
   <bind key="L" modifiers="Ctrl,Shift" action="DialogLayers" />  
 
   <bind action="LayerDuplicate" />  
   <bind action="LayerDelete" />  
 
+  <bind action="LayerHideAll" />  
   <bind action="LayerSolo" />  
-
   <bind action="LayerShowAll" />  
-  <bind action="LayerHideAll" />  
 
   <bind action="LayerLockAll" />  
+  <bind action="LayerLockOthers" />  
   <bind action="LayerUnlockAll" />  
 
   <bind action="LayerToggleHide" />  
@@ -576,6 +603,8 @@ override) the bindings in the main default.xml.
   <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true" />
   <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
 
+  <bind action="DialogObjectAttributes" />
+
   <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true" />
   <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />