Rearranged Buffer and View menus and changed various accelerators.

4 files changed, 44 insertions, 45 deletions

diff --git a/core/locale.conf b/core/locale.conf
index c065e785..d18fbfb3 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -96,9 +96,9 @@ gtk-save = gtk-save
 gtk-save-as = gtk-save-as
 gtk-close = gtk-close
 Close All = Close All
-Load Session... = Load Session...
+Load Session... = Loa_d Session...
 Load Session = Load Session
-Save Session... = Save Session...
+Save Session... = Sav_e Session...
 Save Session = Save Session
 gtk-quit = gtk-quit
 Edit = _Edit
@@ -153,15 +153,15 @@ Replace = _Replace
 %Replace All = Replace _All
 Find Incremental = Find _Incremental
 Find in Files = Find in Fi_les
-Goto Next File Found = Goto Next File Found
-Goto Previous File Found = Goto Previous File Found
+Goto Next File Found = Goto Nex_t File Found
+Goto Previous File Found = Goto Previou_s File Found
 gtk-jump-to = gtk-jump-to
 Tools = _Tools
 Command Entry = Command _Entry
 Select Command = Select Co_mmand
 Run = _Run
 Compile = _Compile
-Filter Through = Fi_lter Through
+Filter Through = _Filter Through
 Adeptsense = _Adeptsense
 Complete Symbol = _Complete Symbol
 Show Documentation = Show _Documentation
@@ -184,29 +184,24 @@ Show Style = Show St_yle
 Buffer = _Buffer
 Next Buffer = _Next Buffer
 Previous Buffer = _Previous Buffer
-Switch Buffer = Switch _Buffer
-Toggle View EOL = Toggle View _EOL
-Toggle Wrap Mode = Toggle _Wrap Mode
-Toggle Show Indent Guides = Toggle Show Indent _Guides
-Toggle Use Tabs = Toggle Use _Tabs
-Toggle View Whitespace = Toggle View White_space
-Toggle Virtual Space = Toggle _Virtual Space
+Switch to Buffer... = _Switch to Buffer...
 Indentation = _Indentation
 Tab width: 2 = Tab width: _2
 Tab width: 3 = Tab width: _3
 Tab width: 4 = Tab width: _4
 Tab width: 8 = Tab width: _8
+Toggle Use Tabs = _Toggle Use Tabs
 Convert Indentation = _Convert Indentation
-EOL Mode = EOL _Mode
+EOL Mode = _EOL Mode
 %CRLF = CRLF
 %CR = CR
 %LF = LF
-Encoding = En_coding
-UTF-8 Encoding = UTF-8 Encoding
-ASCII Encoding = ASCII Encoding
-ISO-8859-1 Encoding = ISO-8859-1 Encoding
-MacRoman Encoding = MacRoman Encoding
-UTF-16 Encoding = UTF-16 Encoding
+Encoding = E_ncoding
+UTF-8 Encoding = _UTF-8 Encoding
+ASCII Encoding = _ASCII Encoding
+ISO-8859-1 Encoding = _ISO-8859-1 Encoding
+MacRoman Encoding = _MacRoman Encoding
+UTF-16 Encoding = UTF-1_6 Encoding
 Refresh Syntax Highlighting = _Refresh Syntax Highlighting
 Select Lexer... = Select _Lexer...
 View = _View
@@ -217,7 +212,12 @@ Split View Horizontal = Split View _Horizontal
 Unsplit View = _Unsplit View
 Unsplit All Views = Unsplit _All Views
 Grow View = _Grow View
-Shrink View = _Shrink View
+Shrink View = Shrin_k View
+Toggle View EOL = Toggle View _EOL
+Toggle Wrap Mode = Toggle _Wrap Mode
+Toggle Show Indent Guides = Toggle Show In_dent Guides
+Toggle View Whitespace = Toggle View White_space
+Toggle Virtual Space = Toggle _Virtual Space
 Zoom In = Zoom _In
 Zoom Out = Zoom _Out
 Reset Zoom = _Reset Zoom
diff --git a/modules/textadept/keys.conf b/modules/textadept/keys.conf
index e5b79a52..d542b7ba 100644
--- a/modules/textadept/keys.conf
+++ b/modules/textadept/keys.conf
@@ -114,18 +114,13 @@ Show Style = ci
 % Buffer
 Next Buffer = c\t cpgdn
 Previous Buffer = cs\t cpgup
-Switch Buffer = cb
-Toggle View EOL = ca\n ca\n\r
-Toggle Wrap Mode = ca\\
-Toggle Show Indent Guides = caI
-Toggle Use Tabs = caT
-Toggle View Whitespace = ca\s
-Toggle Virtual Space = caV
+Switch to Buffer... = cb
 % Indentation
 Tab width: 2 =
 Tab width: 3 =
 Tab width: 4 =
 Tab width: 8 =
+Toggle Use Tabs = caT
 Convert Indentation =
 % EOL Mode
 CRLF =
@@ -149,6 +144,11 @@ Unsplit View = caw
 Unsplit All Views = caW
 Grow View = ca+ ca=
 Shrink View = ca-
+Toggle View EOL = ca\n ca\n\r
+Toggle Wrap Mode = ca\\
+Toggle Show Indent Guides = caI
+Toggle View Whitespace = ca\s
+Toggle Virtual Space = caV
 Zoom In = c=
 Zoom Out = c-
 Reset Zoom = c0
diff --git a/modules/textadept/keys.osx.conf b/modules/textadept/keys.osx.conf
index ba4358f6..37e1c5ed 100644
--- a/modules/textadept/keys.osx.conf
+++ b/modules/textadept/keys.osx.conf
@@ -114,18 +114,13 @@ Show Style = ci
 % Buffer
 Next Buffer = m`
 Previous Buffer = m~
-Switch Buffer = cb
-Toggle View EOL = m\n
-Toggle Wrap Mode = m\\
-Toggle Show Indent Guides = mI
-Toggle Use Tabs = mT
-Toggle View Whitespace = m\s
-Toggle Virtual Space = mV
+Switch to Buffer... = cb
 % Indentation
 Tab width: 2 =
 Tab width: 3 =
 Tab width: 4 =
 Tab width: 8 =
+Toggle Use Tabs = mT
 Convert Indentation =
 % EOL Mode
 CRLF =
@@ -149,6 +144,11 @@ Unsplit View = mw
 Unsplit All Views = mW
 Grow View = m+ m=
 Shrink View = m-
+Toggle View EOL = m\n
+Toggle Wrap Mode = m\\
+Toggle Show Indent Guides = mI
+Toggle View Whitespace = m\s
+Toggle Virtual Space = mV
 Zoom In = c=
 Zoom Out = c-
 Reset Zoom = c0
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index e11c837f..82b8cc65 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -262,16 +262,7 @@ menubar = {
   { title = L('Buffer'),
     menuitem('Next Buffer', { _view.goto_buffer, _view, 1, false }),
     menuitem('Previous Buffer', { _view.goto_buffer, _view, -1, false }),
-    menuitem('Switch Buffer', gui.switch_buffer),
-    SEPARATOR,
-    menuitem('Toggle View EOL', { toggle_setting, 'view_eol' }),
-    menuitem('Toggle Wrap Mode', { toggle_setting, 'wrap_mode' }),
-    menuitem('Toggle Show Indent Guides',
-             { toggle_setting, 'indentation_guides' }),
-    menuitem('Toggle Use Tabs', { toggle_setting, 'use_tabs' }),
-    menuitem('Toggle View Whitespace', { toggle_setting, 'view_ws' }),
-    menuitem('Toggle Virtual Space',
-             { toggle_setting, 'virtual_space_options', 2 }),
+    menuitem('Switch to Buffer...', gui.switch_buffer),
     SEPARATOR,
     { title = L('Indentation'),
       menuitem('Tab width: 2', { set_indentation, 2 }),
@@ -279,6 +270,7 @@ menubar = {
       menuitem('Tab width: 4', { set_indentation, 4 }),
       menuitem('Tab width: 8', { set_indentation, 8 }),
       SEPARATOR,
+      menuitem('Toggle Use Tabs', { toggle_setting, 'use_tabs' }),
       menuitem('Convert Indentation', m_editing.convert_indentation),
     },
     { title = L('EOL Mode'),
@@ -306,12 +298,19 @@ menubar = {
     menuitem('Split View Horizontal', { _view.split, _view, false }),
     menuitem('Unsplit View', function() view:unsplit() end),
     menuitem('Unsplit All Views', function() while view:unsplit() do end end),
-    SEPARATOR,
     menuitem('Grow View',
              function() if view.size then view.size = view.size + 10 end end),
     menuitem('Shrink View',
              function() if view.size then view.size = view.size - 10 end end),
     SEPARATOR,
+    menuitem('Toggle View EOL', { toggle_setting, 'view_eol' }),
+    menuitem('Toggle Wrap Mode', { toggle_setting, 'wrap_mode' }),
+    menuitem('Toggle Show Indent Guides',
+             { toggle_setting, 'indentation_guides' }),
+    menuitem('Toggle View Whitespace', { toggle_setting, 'view_ws' }),
+    menuitem('Toggle Virtual Space',
+             { toggle_setting, 'virtual_space_options', 2 }),
+    SEPARATOR,
     menuitem('Zoom In', _buffer.zoom_in),
     menuitem('Zoom Out', _buffer.zoom_out),
     menuitem('Reset Zoom', function() buffer.zoom = 0 end),