filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

[~andy/gtk] / gtk / gtkrc.key.mac

diff --git a/gtk/gtkrc.key.mac b/gtk/gtkrc.key.mac
index 7b6e8d1e4f77b1c647f651ec6dc5b129a80966d0..631e0dd7a70c8a3c8a1dbbf18d19833715871968 100644 (file)
--- a/gtk/gtkrc.key.mac
+++ b/gtk/gtkrc.key.mac
@@ -1,3 +1,5 @@
+gtk-enable-mnemonics = 0
+
 binding "gtk-mac-alt-arrows"
 {
   bind "<alt>Right"           { "move-cursor" (words, 1, 0) }
@@ -81,124 +83,39 @@ binding "gtk-mac-entry"
 class "GtkEntry" binding "gtk-mac-entry"
 
 
-binding "gtk-mac-file-chooser"
-{
-  bind "<meta>v" { "location-popup-on-paste" () }
-  unbind "<ctrl>v"
-
-  bind "<meta><shift>G" { "location-popup" () }
-  bind "<meta><shift>H" { "home-folder" () }
-  bind "<meta>Up" { "up-folder" () }
-}
-
-class "GtkFileChooserDefault" binding "gtk-mac-file-chooser"
-
-
-binding "gtk-mac-tree-view"
-{
-  bind "<meta>a" { "select-all" () }
-  bind "<shift><meta>a" { "unselect-all" () }
-  bind "<meta>f" { "start-interactive-search" () }
-  bind "<meta>F" { "start-interactive-search" () }
-  unbind "<ctrl>a"
-  unbind "<shift><ctrl>a"
-  unbind "<ctrl>f"
-  unbind "<ctrl>F"
-}
-
-class "GtkTreeView" binding "gtk-mac-tree-view"
-
-
-binding "gtk-mac-icon-view"
-{
-  bind "<meta>a" { "select-all" () }
-  bind "<shift><meta>a" { "unselect-all" () }
-  unbind "<ctrl>a"
-  unbind "<shift><ctrl>a"
-}
-
-class "GtkIconView" binding "gtk-mac-icon-view"
-binding "gtk-mac-alt-arrows"
-{
-  bind "<alt>Right"           { "move-cursor" (words, 1, 0) }
-  bind "<alt>KP_Right"        { "move-cursor" (words, 1, 0) }
-  bind "<alt>Left"            { "move-cursor" (words, -1, 0) }
-  bind "<alt>KP_Left"         { "move-cursor" (words, -1, 0) }
-  bind "<shift><alt>Right"    { "move-cursor" (words, 1, 1) }
-  bind "<shift><alt>KP_Right" { "move-cursor" (words, 1, 1) }
-  bind "<shift><alt>Left"     { "move-cursor" (words, -1, 1) }
-  bind "<shift><alt>KP_Left"  { "move-cursor" (words, -1, 1) }
-}
-
-class "GtkTextView" binding "gtk-mac-alt-arrows"
-class "GtkLabel" binding "gtk-mac-alt-arrows"
-class "GtkEntry" binding "gtk-mac-alt-arrows"
-
-
-binding "gtk-mac-alt-delete"
+binding "gtk-mac-cmd-arrows"
 {
-  bind "<alt>Delete" { "delete-from-cursor" (word-ends, 1) }
-  bind "<alt>KP_Delete" { "delete-from-cursor" (word-ends, 1) }
-  bind "<alt>BackSpace" { "delete-from-cursor" (word-ends, -1) }
+  bind "<meta>Left" { "move-cursor" (paragraph-ends, -1, 0) }
+  bind "<meta>KP_Left" { "move-cursor" (paragraph-ends, -1, 0) }
+  bind "<shift><meta>Left" { "move-cursor" (paragraph-ends, -1, 1) }
+  bind "<shift><meta>KP_Left" { "move-cursor" (paragraph-ends, -1, 1) }
+  bind "<meta>Right" { "move-cursor" (paragraph-ends, 1, 0) }
+  bind "<meta>KP_Right" { "move-cursor" (paragraph-ends, 1, 0) }
+  bind "<shift><meta>Right" { "move-cursor" (paragraph-ends, 1, 1) }
+  bind "<shift><meta>KP_Right" { "move-cursor" (paragraph-ends, 1, 1) }
 }
 
-class "GtkTextView" binding "gtk-mac-alt-delete"
-class "GtkEntry" binding "gtk-mac-alt-delete"
+class "GtkTextView" binding "gtk-mac-cmd-arrows"
+class "GtkLabel" binding "gtk-mac-cmd-arrows"
+class "GtkEntry" binding "gtk-mac-cmd-arrows"
 
 
-binding "gtk-mac-cmd-c"
+binding "gtk-mac-emacs-like"
 {
-  bind "<meta>x" { "cut-clipboard" () }
-  bind "<meta>c" { "copy-clipboard" () }
-  bind "<meta>v" { "paste-clipboard" () }
-  unbind "<ctrl>x"
-  unbind "<ctrl>c"
-  unbind "<ctrl>v"
-}
+  bind "<ctrl>a" { "move-cursor" (paragraph-ends, -1, 0) }
+  bind "<shift><ctrl>a" { "move-cursor" (paragraph-ends, -1, 1) }
+  bind "<ctrl>e" { "move-cursor" (paragraph-ends, 1, 0) }
+  bind "<shift><ctrl>e" { "move-cursor" (paragraph-ends, 1, 1) }
 
-class "GtkTextView" binding "gtk-mac-cmd-c"
-class "GtkEntry" binding "gtk-mac-cmd-c"
-
-
-binding "gtk-mac-text-view"
-{
-  bind "<shift><meta>a" { "select-all" (0) }
-  bind "<meta>a" { "select-all" (1) }
-  unbind "<shift><ctrl>a"
-  unbind "<ctrl>a"
+  bind "<ctrl>b" { "move-cursor" (logical-positions, -1, 0) }
+  bind "<shift><ctrl>b" { "move-cursor" (logical-positions, -1, 1) }
+  bind "<ctrl>f" { "move-cursor" (logical-positions, 1, 0) }
+  bind "<shift><ctrl>f" { "move-cursor" (logical-positions, 1, 1) }
 }
 
-class "GtkTextView" binding "gtk-mac-text-view"
-
-
-binding "gtk-mac-label"
-{
-  bind "<meta>a" {
-    "move-cursor" (paragraph-ends, -1, 0)
-    "move-cursor" (paragraph-ends, 1, 1)
-  }
-  bind "<shift><meta>a" { "move-cursor" (paragraph-ends, 0, 0) }
-  bind "<meta>c" { "copy-clipboard" () }
-  unbind "<ctrl>a"
-  unbind "<shift><ctrl>a"
-  unbind "<ctrl>c"
-}
-
-class "GtkLabel" binding "gtk-mac-label"
-
-
-binding "gtk-mac-entry"
-{
-  bind "<meta>a" {
-    "move-cursor" (buffer-ends, -1, 0)
-    "move-cursor" (buffer-ends, 1, 1)
-  }
-  bind "<shift><meta>a" { "move-cursor" (visual-positions, 0, 0) }
-  unbind "<ctrl>a"
-  unbind "<shift><ctrl>a"
-}
-
-class "GtkEntry" binding "gtk-mac-entry"
+class "GtkTextView" binding "gtk-mac-emacs-like"
+class "GtkLabel" binding "gtk-mac-emacs-like"
+class "GtkEntry" binding "gtk-mac-emacs-like
 
 
 binding "gtk-mac-file-chooser"