[gnome-builder] keybindings: fix some broken keybindings

[Christian Hergert <chergert src gnome org>]

commit 39065f347e728dced03e8c525058a658300b7c37
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jul 19 17:52:51 2017 -0700

    keybindings: fix some broken keybindings
    
    There are plenty more things to fix, but this is a short list of things I
    saw while perusing the current state of things.

 data/keybindings/default.css              |   15 ---------------
 data/keybindings/emacs.css                |   24 ++++++++++++------------
 data/keybindings/vim.css                  |    7 ++-----
 libide/editor/ide-editor-view-shortcuts.c |    4 ++--
 4 files changed, 16 insertions(+), 34 deletions(-)
---
diff --git a/data/keybindings/default.css b/data/keybindings/default.css
index 43382f5..c6f9cbc 100644
--- a/data/keybindings/default.css
+++ b/data/keybindings/default.css
@@ -9,16 +9,8 @@
                   "clear-snippets" ()
                   "hide-completion" ()
                   "remove-cursors" () };
-  bind "<shift>F7" { "action" ("frame", "show-spellcheck", "1") };
   bind "<ctrl><shift>e" { "add-cursor" (column) };
   bind "<ctrl><shift>d" { "add-cursor" (match) };
-  bind "<ctrl>h" { "action" ("editor-view", "find-replace", "") };
-  bind "<ctrl>o" { "action" ("win", "open-with-dialog", "") };
-  bind "<ctrl>s" { "action" ("view", "save", "") };
-  bind "<ctrl><shift>s" { "action" ("view", "save-as", "") };
-  bind "<alt><shift>Left" { "action" ("view-stack", "go-backward", "") };
-  bind "<alt><shift>Right" { "action" ("view-stack", "go-forward", "") };
-  bind "<ctrl>w" { "action" ("view", "close", "") };
   bind "<alt>period" { "goto-definition" () };
   bind "<ctrl>k" { "action" ("view-stack", "show-list", "") };
   bind "<ctrl>d" { "delete-from-cursor" (paragraphs, 1) };
@@ -49,13 +41,6 @@
               "clear-selection" () };
   bind "F4" { "action" ("win", "find-other-file", "") };
 
-  bind "<alt>n" { "move-error" (down) };
-  bind "<alt>p" { "move-error" (up) };
-
-  bind "<ctrl>g" { "move-search" (down, 0, 1, 1, 1, -1) };
-  bind "<ctrl><shift>g" { "move-search" (up, 0, 1, 0, 1, -1) };
-  bind "<ctrl><shift>k" { "clear-search" () };
-
   bind "<ctrl><alt>i" { "reindent" () };
 }
 
diff --git a/data/keybindings/emacs.css b/data/keybindings/emacs.css
index 9ac7fbb..6ea5405 100644
--- a/data/keybindings/emacs.css
+++ b/data/keybindings/emacs.css
@@ -68,7 +68,7 @@
   bind "<alt>n" { "move-error" (down) };
   bind "<alt>p" { "move-error" (up) };
   bind "<ctrl>j" { "action" ("view-grid", "focus-neighbor", "3") };
-  bind "<shift><ctrl>j" { "action" ("view-stack", "split-down", "") };
+  bind "<shift><ctrl>j" { "action" ("layoutstack", "split-view", "") };
   bind "F2" { "clear-selection" ()
               "movement" (previous-word-end, 0, 1, 1)
               "movement" (next-word-start, 0, 1, 0)
@@ -96,10 +96,10 @@
   bind "<alt>o" { "action" ("win", "find-other-file", "") };
 
   /* cycle "tabs" */
-  bind "<ctrl><alt>Page_Up" { "action" ("view-stack", "previous-view", "") };
-  bind "<ctrl><alt>KP_Page_Up" { "action" ("view-stack", "previous-view", "") };
-  bind "<ctrl><alt>Page_Down" { "action" ("view-stack", "next-view", "") };
-  bind "<ctrl><alt>KP_Page_Down" { "action" ("view-stack", "next-view", "") };
+  bind "<ctrl><alt>Page_Up" { "action" ("layoutstack", "previous-view", "") };
+  bind "<ctrl><alt>KP_Page_Up" { "action" ("layoutstack", "previous-view", "") };
+  bind "<ctrl><alt>Page_Down" { "action" ("layoutstack", "next-view", "") };
+  bind "<ctrl><alt>KP_Page_Down" { "action" ("layoutstack", "next-view", "") };
 
   bind "<alt>0" { "append-to-count" (0) };
   bind "<alt>1" { "append-to-count" (1) };
@@ -121,16 +121,16 @@
 @binding-set builder-emacs-source-view-x
 {
   bind "<ctrl>c" { "action" ("app", "quit", "") };
-  bind "0" { "action" ("view", "close", "") };
-  bind "k" { "action" ("view", "close", "") };
+  bind "0" { "action" ("layoutstack", "close-view", "") };
+  bind "k" { "action" ("layoutstack", "close-view", "") };
   bind "<ctrl>f" { "action" ("win", "open-with-dialog", "") };
-  bind "<ctrl>s" { "action" ("view", "save", "") };
+  bind "<ctrl>s" { "action" ("editor-view", "save", "") };
   bind "s" { "action" ("win", "save-all", "") };
-  bind "<ctrl>b" { "action" ("view-stack", "show-list", "") };
-  bind "<ctrl>w" { "action" ("view", "save-as", "") };
+  bind "<ctrl>b" { "action" ("layoutstack", "show-list", "") };
+  bind "<ctrl>w" { "action" ("editor-view", "save-as", "") };
   bind "u" { "redo" () };
-  bind "2" { "action" ("view-stack", "split-down", "") };
-  bind "3" { "action" ("view-stack", "split-right", "") };
+  bind "2" { "action" ("lyaoutstack", "split-view", "") };
+  bind "3" { "action" ("layoutstack", "open-in-new-frame", "") };
   bind "o" { "action" ("view-grid", "focus-neighbor", "0") };
   bind "grave" { "move-error" (down) };
   bind "h" { "select-all" (1) };
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index 3c52fe7..71e0851 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -101,9 +101,6 @@
                    "hide-completion" ()
                    "set-mode" ("vim-normal", permanent) };
 
-  bind "<ctrl>s" { "action" ("view", "save", "") };
-  bind "<ctrl><shift>s" { "action" ("view", "save-as", "") };
-  bind "<ctrl><shift>o" { "action" ("win", "open-with-dialog", "") };
   bind "<ctrl>k" { "action" ("layoutstack", "show-list", "") };
   bind "<ctrl>minus" { "decrease-font-size" () };
   bind "<ctrl>plus" { "increase-font-size" () };
@@ -1850,8 +1847,8 @@
 
 @binding-set builder-vim-source-view-normal-ctrl-w
 {
-  bind "v" { "action" ("layoutstack", "split-right", "") "grab_focus" () };
-  bind "<ctrl>v" { "action" ("layoutstack", "split-right", "") "grab_focus" () };
+  bind "v" { "action" ("layoutstack", "open-in-new-frame", "") "grab_focus" () };
+  bind "<ctrl>v" { "action" ("layoutstack", "open-in-new-frame", "") "grab_focus" () };
 
   bind "c" { "action" ("layoutstack", "close-view", "") };
 
diff --git a/libide/editor/ide-editor-view-shortcuts.c b/libide/editor/ide-editor-view-shortcuts.c
index b138bcb..51c674d 100644
--- a/libide/editor/ide-editor-view-shortcuts.c
+++ b/libide/editor/ide-editor-view-shortcuts.c
@@ -70,14 +70,14 @@ static DzlShortcutEntry editor_view_shortcuts[] = {
 
   { "org.gnome.builder.editor-view.next-error",
     DZL_SHORTCUT_PHASE_BUBBLE,
-    NULL,
+    "<alt>n",
     N_("Editor"),
     N_("Find and replace"),
     N_("Move to the next error") },
 
   { "org.gnome.builder.editor-view.prev-error",
     DZL_SHORTCUT_PHASE_BUBBLE,
-    NULL,
+    "<alt>p",
     N_("Editor"),
     N_("Find and replace"),
     N_("Move to the previous error") },