From 76f1f1f94a4daa8c4eebd36238b0d98e196ffffc Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sun, 8 Jul 2007 13:19:42 +0000 Subject: [PATCH] updated to new command-as-meta stuff svn: r6860 --- collects/framework/private/main.ss | 6 +++--- collects/framework/private/preferences.ss | 12 +++++++----- .../string-constants/english-string-constants.ss | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index 3d58fc731b..b4ed1da5dd 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -52,9 +52,9 @@ boolean?) (color-prefs:set-default/color-scheme 'framework:basic-canvas-background "white" "black") - (preferences:set-default 'framework:special-option-key #f boolean?) - (preferences:add-callback 'framework:special-option-key (λ (p v) (special-option-key v))) - (special-option-key (preferences:get 'framework:special-option-key)) + (preferences:set-default 'framework:special-meta-key #f boolean?) + (preferences:add-callback 'framework:special-meta-key (λ (p v) (map-command-as-meta-key v))) + (map-command-as-meta-key (preferences:get 'framework:special-meta-key)) (preferences:set-default 'framework:fraction-snip-style 'mixed (λ (x) (memq x '(mixed improper)))) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index e51e1ceb4b..1ec5b30329 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -383,19 +383,21 @@ the state transitions / contracts are: 'framework:open-here? (string-constant reuse-existing-frames) values values) + (make-check editor-panel 'framework:menu-bindings (string-constant enable-keybindings-in-menus) values values) + (when (memq (system-type) '(macosx)) + (make-check editor-panel + 'framework:special-meta-key + (string-constant command-as-meta) + values values)) + (make-check editor-panel 'framework:coloring-active (string-constant online-coloring-active) values values) - (when (memq (system-type) '(macos macosx)) - (make-check editor-panel - 'framework:special-option-key - (string-constant option-as-meta) - values values)) (unless (eq? (system-type) 'unix) (make-check editor-panel 'framework:print-output-mode diff --git a/collects/string-constants/english-string-constants.ss b/collects/string-constants/english-string-constants.ss index 27d768e244..a5135674c5 100644 --- a/collects/string-constants/english-string-constants.ss +++ b/collects/string-constants/english-string-constants.ss @@ -408,7 +408,7 @@ please adhere to these guidelines: (show-character-offsets "Show character offsets") ; used for popup menu; right click on line/column box in bottom of drs window (enable-keybindings-in-menus "Enable keybindings in menus") (automatically-to-ps "Automatically print to PostScript file") - (option-as-meta "Treat option key as meta") ;; macos/macos x only + (command-as-meta "Treat command key as meta") ;; macos/macos x only (separate-dialog-for-searching "Use separate dialog for searching") (reuse-existing-frames "Reuse existing frames when opening new files") (default-fonts "Default Fonts")