diff options
author | mitchell <70453897+667e-11@users.noreply.github.com> | 2019-09-23 12:53:29 -0400 |
---|---|---|
committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2019-09-23 12:53:29 -0400 |
commit | 1b774a49521eff00bab0cc611f0f54b3b7f4d23b (patch) | |
tree | 3aec8b245d62744f2b8da941966a9bc8bfb321c7 | |
parent | 8d691eedfb6c62c231fc95d1be786de6cc945cb7 (diff) |
Replaced `textadept.macros.*_recording()` with `textadept.macros.record()`.
Also updated keybindings.
-rw-r--r-- | core/locale.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.ar.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.de.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.es.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.fr.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.it.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.pl.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.ru.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.sv.conf | 3 | ||||
-rw-r--r-- | core/locales/locale.zh.conf | 3 | ||||
-rw-r--r-- | modules/textadept/keys.lua | 5 | ||||
-rw-r--r-- | modules/textadept/macros.lua | 34 | ||||
-rw-r--r-- | modules/textadept/menu.lua | 4 |
13 files changed, 28 insertions, 45 deletions
diff --git a/core/locale.conf b/core/locale.conf index 73acc90c..f915372f 100644 --- a/core/locale.conf +++ b/core/locale.conf @@ -245,8 +245,7 @@ _Previous Bookmark = _Previous Bookmark _Goto Bookmark... = _Goto Bookmark... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf index 25e87169..a2688a22 100644 --- a/core/locales/locale.ar.conf +++ b/core/locales/locale.ar.conf @@ -245,8 +245,7 @@ _Previous Bookmark = العلامة ال_سابقة _Goto Bookmark... = ا_ذهب إلى العلامة .. # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf index 17e09b75..b031fb10 100644 --- a/core/locales/locale.de.conf +++ b/core/locales/locale.de.conf @@ -246,8 +246,7 @@ _Previous Bookmark = Vorheriges Lesezeichen _Goto Bookmark... = Gehe zu Lesezeichen... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf index 9def85f6..2ae75965 100644 --- a/core/locales/locale.es.conf +++ b/core/locales/locale.es.conf @@ -245,8 +245,7 @@ _Previous Bookmark = Marcador _anterior _Goto Bookmark... = _Ir a marcador... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf index 58dac7fa..e138839b 100644 --- a/core/locales/locale.fr.conf +++ b/core/locales/locale.fr.conf @@ -246,8 +246,7 @@ _Previous Bookmark = Signet _précédent _Goto Bookmark... = _Aller au signet... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf index 47e8ca9a..f3aa47e5 100644 --- a/core/locales/locale.it.conf +++ b/core/locales/locale.it.conf @@ -245,8 +245,7 @@ _Previous Bookmark = Segnalibro _precedente _Goto Bookmark... = _Vai al segnalibro... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf index dcb6ae13..533f3313 100644 --- a/core/locales/locale.pl.conf +++ b/core/locales/locale.pl.conf @@ -246,8 +246,7 @@ _Previous Bookmark = _Poprzednia zakładka _Goto Bookmark... = Prz_ejdź do zakładki... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf index e69a7d2f..75686807 100644 --- a/core/locales/locale.ru.conf +++ b/core/locales/locale.ru.conf @@ -245,8 +245,7 @@ _Previous Bookmark = П_редыдущая закладка _Goto Bookmark... = П_ерейти к закладке... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf index 8047e0ec..47fee4e2 100644 --- a/core/locales/locale.sv.conf +++ b/core/locales/locale.sv.conf @@ -245,8 +245,7 @@ _Previous Bookmark = _Föregående bokmärke _Goto Bookmark... = _Gå till bokmärke... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/core/locales/locale.zh.conf b/core/locales/locale.zh.conf index cc2b2a73..20edb72a 100644 --- a/core/locales/locale.zh.conf +++ b/core/locales/locale.zh.conf @@ -245,8 +245,7 @@ _Previous Bookmark = 上一个书签(_P) _Goto Bookmark... = 转到书签(_G)... # Menu items for recording, playing back, saving, and loading macros. _Macros = _Macros -_Start Recording = _Start Recording -Sto_p Recording = Sto_p Recording +Start/Stop _Recording = Start/Stop _Recording _Play = _Play Sa_ve... = Sa_ve... _Load... = _Load... diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index e2968ab6..d3cc7350 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -398,9 +398,8 @@ keys.f2 = m_bookmark[_L['_Next Bookmark']][2] keys[GUI and 'sf2' or 'f3'] = m_bookmark[_L['_Previous Bookmark']][2] keys[GUI and 'af2' or 'f4'] = textadept.bookmarks.goto_mark -- Macros. -keys.f9 = textadept.macros.start_recording -keys[GUI and 'sf9' or 'f10'] = textadept.macros.stop_recording -keys[GUI and 'af9' or 'f12'] = textadept.macros.play +keys.f9 = textadept.macros.record +keys[GUI and 'sf9' or 'f10'] = textadept.macros.play -- Quick Open. local m_quick_open = m_tools[_L['Quick _Open']] keys[not OSX and 'cu' or 'mu'] = m_quick_open[_L['Quickly Open _User Home']][2] diff --git a/modules/textadept/macros.lua b/modules/textadept/macros.lua index 2d44c54a..476a6b44 100644 --- a/modules/textadept/macros.lua +++ b/modules/textadept/macros.lua @@ -15,10 +15,12 @@ local recording, macro -- ultimately executed will be recorded in some form. local ignore events.connect(events.INITIALIZED, function() + local m_tools = textadept.menu.menubar[_L['_Tools']] ignore = { textadept.menu.menubar[_L['_Search']][_L['_Find']][2], ui.find.find_incremental, - textadept.menu.menubar[_L['_Tools']][_L['Select Co_mmand']][2], + m_tools[_L['Select Co_mmand']][2], + m_tools[_L['_Macros']][_L['Start/Stop _Recording']][2] } end) @@ -47,24 +49,18 @@ local event_recorders = { } --- --- Begins recording a macro. --- @name start_recording -function M.start_recording() - if recording then return end - macro = {} - for event, f in pairs(event_recorders) do events.connect(event, f, 1) end - recording = true - ui.statusbar_text = _L['Macro recording'] -end - ---- --- Stops recording a macro. --- @name stop_recording -function M.stop_recording() - if not recording then return end - for event, f in pairs(event_recorders) do events.disconnect(event, f) end - recording = false - ui.statusbar_text = _L['Macro stopped recording'] +-- Toggles between starting and stopping macro recording. +-- @name record +function M.record() + if not recording then + macro = {} + for event, f in pairs(event_recorders) do events.connect(event, f, 1) end + ui.statusbar_text = _L['Macro recording'] + else + for event, f in pairs(event_recorders) do events.disconnect(event, f) end + ui.statusbar_text = _L['Macro stopped recording'] + end + recording = not recording end --- diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua index 9b4cb9a4..059af354 100644 --- a/modules/textadept/menu.lua +++ b/modules/textadept/menu.lua @@ -216,9 +216,7 @@ local default_menubar = { }, { title = _L['_Macros'], - {_L['_Start Recording'], textadept.macros.start_recording}, - {_L['Sto_p Recording'], textadept.macros.stop_recording}, - SEPARATOR, + {_L['Start/Stop _Recording'], textadept.macros.record}, {_L['_Play'], textadept.macros.play}, SEPARATOR, {_L['Sa_ve...'], textadept.macros.save}, |