change key-bindings to support cmd-plus/minus text size adjust on mac

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35006 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in
index 0ee4aac593ce28f837fa192142b0b19204003dfe..d8b1aa590e84ec30108778e3725cd223b37c633b 100644 (file)
--- a/development/MacOSX/lyxrc.dist.in
+++ b/development/MacOSX/lyxrc.dist.in
@@ -30,6 +30,8 @@
 \open_buffers_in_tabs false
 \mac_like_word_movement true
 
 \open_buffers_in_tabs false
 \mac_like_word_movement true
 

+\scroll_wheel_zoom "off"
+

 #
 # COLOR SECTION ###################################
 #
 #
 # COLOR SECTION ###################################
 #


@@ -65,7 +67,7 @@
 # SPELLCHECKER SECTION ##############################
 #
 
 # SPELLCHECKER SECTION ##############################
 #
 

-\spell_command "aspell"
+\spell_command "native"

 
 #
 # LANGUAGE SUPPORT SECTION ##########################
 
 #
 # LANGUAGE SUPPORT SECTION ##########################

diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index e20215744876784c86f76d1f07eca0c8ff7f8c37..dbf68eaec44c35802b75feb5bac1c2d9b29d2fd3 100644 (file)
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -89,7 +89,8 @@
 \bind "C-S-E"                  "changes-track"  # it's what MS Word uses
 \bind "~S-M-quotedbl"          "quote-insert single"
 \bind "~S-C-quotedbl"          "self-insert \""
 \bind "C-S-E"                  "changes-track"  # it's what MS Word uses
 \bind "~S-M-quotedbl"          "quote-insert single"
 \bind "~S-C-quotedbl"          "self-insert \""

-\bind "C-minus"                        "command-alternatives math-macro-fold;specialchar-insert hyphenation"
+\bind "C-minus"        "specialchar-insert hyphenation"
+\bind "C-S-underscore"         "math-macro-fold"

 \bind "C-M-minus"              "specialchar-insert nobreakdash"
 \bind "M-S-Right"              "depth-increment"
 \bind "M-S-Left"               "depth-decrement"
 \bind "C-M-minus"              "specialchar-insert nobreakdash"
 \bind "M-S-Right"              "depth-increment"
 \bind "M-S-Left"               "depth-decrement"


@@ -119,9 +120,9 @@
 
 \bind "F11"                    "ui-toggle fullscreen"
 
 
 \bind "F11"                    "ui-toggle fullscreen"
 

-\bind "M-equal"                        "buffer-zoom-in"
-\bind "M-plus"                 "buffer-zoom-in"
-\bind "M-minus"                        "buffer-zoom-out"
+\bind "M-equal"        "buffer-zoom-in"
+\bind "M-plus"         "buffer-zoom-in"
+\bind "M-minus"        "buffer-zoom-out"

 
 #
 # Motion group
 
 #
 # Motion group

diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 6a9be64f597fffe264b5ff79b0e7a18f76a0cba7..13d81f8cccdb2341b8ebe815a48e011e6dc827e3 100644 (file)
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -79,7 +79,7 @@
 \bind "C-S-E"                  "changes-track"  # it's what MS Word uses
 \bind "~S-M-quotedbl"  "quote-insert single"
 \bind "~S-C-quotedbl"  "self-insert \""
 \bind "C-S-E"                  "changes-track"  # it's what MS Word uses
 \bind "~S-M-quotedbl"  "quote-insert single"
 \bind "~S-C-quotedbl"  "self-insert \""

-\bind "C-minus"                        "command-alternatives math-macro-fold;specialchar-insert hyphenation"
+\bind "C-S-underscore"                 "command-alternatives math-macro-fold;specialchar-insert hyphenation"

 \bind "C-M-minus"              "specialchar-insert nobreakdash"
 \bind "M-C-Right"              "depth-increment"
 \bind "M-C-Left"               "depth-decrement"
 \bind "C-M-minus"              "specialchar-insert nobreakdash"
 \bind "M-C-Right"              "depth-increment"
 \bind "M-C-Left"               "depth-decrement"


@@ -103,9 +103,8 @@
 \bind "M-x"                            "command-execute"
 \bind "M-o"                            "dialog-show toc"
 
 \bind "M-x"                            "command-execute"
 \bind "M-o"                            "dialog-show toc"
 

-\bind "M-equal"                        "buffer-zoom-in"
-\bind "M-plus"                 "buffer-zoom-in"
-\bind "M-minus"                        "buffer-zoom-out"
+\bind "C-plus"                 "buffer-zoom-in"
+\bind "C-minus"                "buffer-zoom-out"

 
 #
 # Motion group
 
 #
 # Motion group

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index e5b21b4d148783640fc1d1ebf34499713720a834..0630f3674874fb802ccdc0b44dcdb27d42c3462d 100644 (file)
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -141,7 +141,7 @@
 #\bind "C-Tab"          "cell-split"
 
 # math-macros
 #\bind "C-Tab"          "cell-split"
 
 # math-macros

-\bind "C-plus"         "math-macro-unfold"
+\bind "C-S-asterisk"         "math-macro-unfold"

 # Defined in cua.bind as command-alternative to specialchar-insert hyphenation
 #\bind "C-minus"        "math-macro-fold"
 
 # Defined in cua.bind as command-alternative to specialchar-insert hyphenation
 #\bind "C-minus"        "math-macro-fold"