X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fbind%2Fmac.bind;h=3e3dfc913c407cfd976bce79b1acba55e83180ac;hb=98a64be87297a6ea7f6257ff37c70664262ded21;hp=ab748bc302f56e3958ea9dd40856fd16b7d479f4;hpb=e34e1e55810e4c1006dbbad7f9e86d5a28ef4f42;p=lyx.git diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind index ab748bc302..3e3dfc913c 100644 --- a/lib/bind/mac.bind +++ b/lib/bind/mac.bind @@ -26,7 +26,7 @@ ### -Format 2 +Format 4 # based on the table at http://support.apple.com/kb/HT1343 # Note: these bindings assume the swapped Meta and Control modifiers standard of Qt @@ -101,6 +101,7 @@ Format 2 # -: "Shift-Command-`" # Activate the previous open window in the frontmost application # -: "Option-Command-`" # Move focus to the window drawer # +: "Command- - (minus)" # Decrease the size of the selected item +\bind "C-0" "buffer-zoom" \bind "C-minus" "buffer-zoom-out" # +: "Shift-Command-=" # Increase the size of the selected item \bind "C-plus" "buffer-zoom-in" @@ -136,7 +137,7 @@ Format 2 # +: "Option-Command-D" # Show or hide the Dock # -: "Command-Control D" # Display the definition of the selected word in the Dictionary application \bind "C-d" "buffer-view dvi" # 'd' for dvi -\bind "C-M-d" "master-buffer-view dvi" +\bind "C-M-d" "command-alternatives master-buffer-view dvi; buffer.view dvi" \bind "C-S-D" "buffer-update dvi" # 'd' for dvi # -: "Command-E" # Use the selection for a find \bind "C-e" "font-emph" @@ -152,6 +153,7 @@ Format 2 # +: "Option-Command-H" # Hide the windows of all other running applications # -: "Command-I" # Italicize the selected text or toggle italic text on or off \bind "C-i" "inset-toggle" # 'i' for Inset +\bind "C-M-i" "inset-settings" # -: "Option-Command-I" # Display an inspector window # -: "Command-J" # Scroll to a selection \bind "C-k" "line-delete-forward" @@ -162,11 +164,9 @@ Format 2 \bind "C-M-n" "command-sequence math-display; math-number-toggle;" # +: "Command-N" # Create a new document in the frontmost application \bind "C-n" "buffer-new" -\bind "C-S-N" "buffer-new-template" +\bind "C-S-N" "dialog-show lyxfiles templates" # +: "Command-O" # Display a dialog for choosing a document to open in the frontmost application \bind "C-o" "file-open" -# +: "Command-P" # Display the Print dialog -\bind "C-p" "dialog-show print" # -: "Shift-Command-P" # Display a dialog for specifying printing parameters (Page Setup) \bind "C-S-P" "font-typewriter" # 'P' for Program # +: "Command-Q" # Quit the frontmost application @@ -178,7 +178,7 @@ Format 2 \bind "C-S-S" "buffer-write-as" # -: "Command-T" # Display the Fonts window \bind "C-t" "buffer-view pdf" -\bind "C-M-t" "master-buffer-view pdf" +\bind "C-M-t" "command-alternatives master-buffer-view pdf; buffer-view pdf" # -: "Option-Command-T" # Show or hide a toolbar # -: "Command-U" # Underline the selected text or turn underlining on or off \bind "C-u" "font-underline" @@ -189,10 +189,10 @@ Format 2 # -: "Option-Shift-Command-V" # Apply the style of the surrounding text to the inserted object (Paste and Match Style) # -: "Control-Command-V" # Apply formatting settings to the selected object (Paste Ruler Command) \bind "C-M-v" "primary-selection-paste" -# ?: "Command-W" # Close the frontmost window -\bind "C-w" "buffer-close" # should be "window-close" -# +: "Shift-Command-W" # Close a file and its associated windows -\bind "C-S-w" "buffer-close" +# +: "Command-W" # Close the frontmost window - modern applications map this to close tab or window if it's the last one +\bind "C-w" "buffer-close" +# +: "Shift-Command-W" # Close a file and its associated windows - modern applications map this close window +\bind "C-S-w" "window-close" # +: "Option-Command-W" # Close all windows in the application without quitting it \bind "C-A-w" "buffer-close-all" # +: "Command-X" # Remove the selection and store in the Clipboard @@ -212,10 +212,10 @@ Format 2 \bind "C-Left" "line-begin" # +: "Command-Down Arrow" # Move the text insertion point to the end of the document \bind "C-Down" "buffer-end" -\bind "M-A-Down" "inset-end" +\bind "M-A-Down" "inset-end" # +: "Command-Up Arrow" # Move the text insertion point to the beginning of the document \bind "C-Up" "buffer-begin" -\bind "M-A-Up" "inset-begin" +\bind "M-A-Up" "inset-begin" # +: "Shift-Command-Right Arrow" # Select text between the insertion point and the end of the current line (*) \bind "S-C-Right" "line-end-select" # +: "Shift-Command-Left Arrow" # Select text between the insertion point and the beginning of the current line (*) @@ -241,11 +241,11 @@ Format 2 # +: "Shift-Option-Down Arrow" # Extend text selection to the end of the current paragraph, then to the end of the following paragraph if pressed again (*) \bind "A-Down" "paragraph-down" \bind "S-A-Down" "paragraph-down-select" -\bind "S-M-A-Down" "inset-end-select" +\bind "S-M-A-Down" "inset-end-select" # +: "Shift-Option-Up Arrow" # Extend text selection to the beginning of the current paragraph, then to the beginning of the following paragraph if pressed again (*) \bind "A-Up" "paragraph-up" \bind "S-A-Up" "paragraph-up-select" -\bind "S-M-A-Up" "inset-begin-select" +\bind "S-M-A-Up" "inset-begin-select" # -: "Control-Space" # Toggle between the current and previous input sources # -: "Option-Control-Space" # Toggle through all enabled input sources # +: "Option-Command-esc" # Force Quit @@ -255,12 +255,12 @@ Format 2 \bind "C-S-O" "font-strikeout" \bind "C-S-T" "buffer-update pdf" # (pdflatex; was "ps") \bind "C-S-R" "buffer-update" -\bind "C-M-S-T" "master-buffer-update pdf" -\bind "C-M-S-D" "master-buffer-update dvi" +\bind "C-M-S-T" "command-alternatives master-buffer-update pdf; buffer-update pdf" +\bind "C-M-S-D" "command-alternatives master-buffer-update dvi; buffer-update dvi" \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 "~S-M-quotedbl" "quote-insert inner" +\bind "~S-C-quotedbl" "quote-insert outer auto plain" \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" @@ -271,7 +271,7 @@ Format 2 #bind "F1" "help" # Not yet implemented! #bind "C-F1" "help-context" # Not yet implemented! -\bind "F2" "buffer-write" +\bind "F2" "buffer-write force" \bind "C-F4" "buffer-close" \bind "C-A-Up" "scroll line up" \bind "C-A-Down" "scroll line down" @@ -360,13 +360,14 @@ Format 2 \bind "C-period" "specialchar-insert end-of-sentence" \bind "M-period" "specialchar-insert dots" \bind "Escape" "cancel" -\bind "C-M-Up" "command-alternatives outline-up; paragraph-move-up; inset-modify tabular move-row-up" -\bind "C-M-Down" "command-alternatives outline-down; paragraph-move-down; inset-modify tabular move-row-down" -\bind "C-M-Right" "inset-modify tabular move-column-right" -\bind "C-M-Left" "inset-modify tabular move-column-left" +\bind "C-M-Up" "command-alternatives outline-up; paragraph-move-up; tabular-feature move-row-up" +\bind "C-M-Down" "command-alternatives outline-down; paragraph-move-down; tabular-feature move-row-down" +\bind "C-M-Right" "tabular-feature move-column-right" +\bind "C-M-Left" "tabular-feature move-column-left" #\bind "F9" "meta-prefix" \bind "C-M-F" "ui-toggle fullscreen" +\bind "C-A-F" "forward-search" # Include menu and math bindings