menus, keys, prefs changes for Layers

diff --git a/share/keys/default.xml b/share/keys/default.xml
index f2df9c563c91f2af9523537324563e874779bb06..497acf43fe38ebf6b30a8e3235bff031c31a64a1 100644 (file)
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -442,6 +442,8 @@ 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 key="L" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
+
 <!-- Dialogs -->
 
   <bind key="x" modifiers="Ctrl,Shift" action="DialogXMLEditor" display="true"/>

diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index f2df9c563c91f2af9523537324563e874779bb06..497acf43fe38ebf6b30a8e3235bff031c31a64a1 100644 (file)
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -442,6 +442,8 @@ 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 key="L" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
+
 <!-- Dialogs -->
 
   <bind key="x" modifiers="Ctrl,Shift" action="DialogXMLEditor" display="true"/>

diff --git a/share/keys/xara.xml b/share/keys/xara.xml
index a2d7c40d56aa78f7fc1a157f53ee47f4219a9b56..f32d124d3515ad2eee88d7ddd7c0d354131440de 100644 (file)
--- a/share/keys/xara.xml
+++ b/share/keys/xara.xml
@@ -31,7 +31,6 @@ Push Tool  SHIFT+F8 or ALT+X
 Clipart Gallery  SHIFT+F10
 Fill Gallery  SHIFT+F11
 Frame Gallery  SHIFT+F12
-Layer Gallery  F10
 Bitmap Gallery  F11
 Line Gallery  F12  // stroke style?
 Name Gallery  CTRL+SHIFT+F9
@@ -502,6 +501,8 @@ Hom/end keys-select minimum or maximum feather values
   <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
   <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
 
+  <bind key="F10" action="DialogLayers" display="true" />
+
 <!-- Dialogs -->
 
   <bind key="x" modifiers="Ctrl,Shift" action="DialogXMLEditor" display="true"/>

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 7d516ec1a9cbdbdd7b7362c88317d5c0dbf3412c..986b36edfc65c725e48163c9f764371407f9df38 100644 (file)
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -129,7 +129,6 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"NextWindow\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"ViewNew\" />\n"
-"       <verb verb-id=\"DialogLayers\" />\n"
 "       <verb verb-id=\"ViewIconPreview\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Layer") "\">\n"
@@ -148,6 +147,8 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"LayerToBottom\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"LayerDelete\" />\n"
+"       <separator/>\n"
+"       <verb verb-id=\"DialogLayers\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Object") "\">\n"
 "       <verb verb-id=\"DialogFillStroke\" />\n"

diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 073fdbb78801262386f13f5c0e76c749f7f88078..d709173d85f2d3c6b50eaf387ddfafa52d053df9 100644 (file)
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -140,7 +140,7 @@ static char const preferences_skeleton[] =
 "    <group id=\"iconpreview\" />\n"
 "    <group id=\"aboutextensions\" />\n"
 "    <group id=\"treeeditor\" />\n"
-"    <group id=\"layereditor\" />\n"
+"    <group id=\"layers\" />\n"
 "    <group id=\"extensioneditor\" />\n"
 "    <group id=\"trace\" />\n"
 "    <group id=\"script\" />\n"

diff --git a/src/ui/dialog/layer-editor.cpp b/src/ui/dialog/layer-editor.cpp
index 03a546a89561bdaf7ae4cbe976e0e070c561e951..79c4fbcc2cf98ccf3c8b1701df899331959f3085 100644 (file)
--- a/src/ui/dialog/layer-editor.cpp
+++ b/src/ui/dialog/layer-editor.cpp
@@ -21,7 +21,7 @@ namespace UI {
 namespace Dialog {
 
 LayerEditor::LayerEditor() 
-    : Dialog ("dialogs.layereditor", SP_VERB_NONE /*FIXME*/)
+    : Dialog ("dialogs.layers", SP_VERB_NONE /*FIXME*/)
 {
     // TODO:  Insert widgets