diff options
author | 2009-04-02 17:47:53 -0400 | |
---|---|---|
committer | 2009-04-02 17:47:53 -0400 | |
commit | e6cac1c716ce3cadab1a7ed45ec2dbb963270acb (patch) | |
tree | 8f44171dc33f0a7936c4eec98b7585ef5270f2a7 /core | |
parent | 480acebc578b95d553ffb5061f773a03a3a1a731 (diff) | |
download | textadept-e6cac1c716ce3cadab1a7ed45ec2dbb963270acb.tar.gz textadept-e6cac1c716ce3cadab1a7ed45ec2dbb963270acb.zip |
Removed macro support; just use Lua for scripting.
Diffstat (limited to 'core')
-rw-r--r-- | core/events.lua | 8 | ||||
-rw-r--r-- | core/ext/key_commands.lua | 2 | ||||
-rw-r--r-- | core/ext/menu.lua | 13 | ||||
-rw-r--r-- | core/ext/pm/macro_browser.lua | 47 | ||||
-rw-r--r-- | core/locale.conf | 48 |
5 files changed, 0 insertions, 118 deletions
diff --git a/core/events.lua b/core/events.lua index 9deb4b86..ab664f87 100644 --- a/core/events.lua +++ b/core/events.lua @@ -32,10 +32,6 @@ module('textadept.events', package.seeall) -- position: the position of the beginning of the line clicked. -- line: the line clicked. -- update_ui() --- macro_record(message, wParam, lParam) --- message: the SCI_* message. --- wParam: wParam in SCI_*. --- lParam: lParam in SCI_*. -- margin_click(margin, modifiers, position) -- margin: the margin number. -- modifiers: mouse modifiers. @@ -121,9 +117,6 @@ end function update_ui() return handle('update_ui') end -function macro_record(n) - return handle('macro_record', n.message, n.wParam, n.lParam) -end function margin_click(n) return handle('margin_click', n.margin, n.modifiers, n.position) end @@ -148,7 +141,6 @@ local scnnotifications = { [c.SCN_SAVEPOINTLEFT] = save_point_left, [c.SCN_DOUBLECLICK] = double_click, [c.SCN_UPDATEUI] = update_ui, - [c.SCN_MACRORECORD] = macro_record, [c.SCN_MARGINCLICK] = margin_click, [c.SCN_USERLISTSELECTION] = user_list_selection, [c.SCN_URIDROPPED] = uri_dropped, diff --git a/core/ext/key_commands.lua b/core/ext/key_commands.lua index 4a40ea5a..9f449679 100644 --- a/core/ext/key_commands.lua +++ b/core/ext/key_commands.lua @@ -173,7 +173,6 @@ if not MAC then c = { pm_activate, 'ctags' }, b = { pm_activate, 'buffers' }, f = { pm_activate, '/' }, - -- TODO: { pm_activate, 'macros' } m = { pm_activate, 'modules' }, } @@ -361,7 +360,6 @@ else c = { pm_activate, 'ctags' }, b = { pm_activate, 'buffers' }, f = { pm_activate, '/' }, - -- TODO: { pm_activate, 'macros' } m = { pm_activate, 'modules' }, } diff --git a/core/ext/menu.lua b/core/ext/menu.lua index 963967ab..81e9f473 100644 --- a/core/ext/menu.lua +++ b/core/ext/menu.lua @@ -97,9 +97,6 @@ local ID = { CLEAR_BOOKMARKS = 417, GOTO_NEXT_BOOKMARK = 418, GOTO_PREV_BOOKMARK = 419, - START_RECORDING_MACRO = 413, - STOP_RECORDING_MACRO = 414, - PLAY_MACRO = 415, -- Buffer NEXT_BUFFER = 501, PREV_BUFFER = 502, @@ -244,11 +241,6 @@ local menubar = { { l.MENU_TOOLS_BM_NEXT, ID.GOTO_NEXT_BOOKMARK }, { l.MENU_TOOLS_BM_PREV, ID.GOTO_PREV_BOOKMARK }, }, - { title = l.MENU_TOOLS_MACROS_TITLE, - { l.MENU_TOOLS_MACROS_START, ID.START_RECORDING_MACRO }, - { l.MENU_TOOLS_MACROS_STOP, ID.STOP_RECORDING_MACRO }, - { l.MENU_TOOLS_MACROS_PLAY, ID.PLAY_MACRO }, - }, }, gtkmenu { title = l.MENU_BUF_TITLE, @@ -306,7 +298,6 @@ local m_snippets = _m.textadept.lsnippets local m_editing = _m.textadept.editing local m_mlines = _m.textadept.mlines local m_bookmarks = _m.textadept.bookmarks -local m_macros = _m.textadept.macros local m_run = _m.textadept.run local function set_encoding(encoding) @@ -428,10 +419,6 @@ local actions = { [ID.CLEAR_BOOKMARKS] = { m_bookmarks.clear }, [ID.GOTO_NEXT_BOOKMARK] = { m_bookmarks.goto_next }, [ID.GOTO_PREV_BOOKMARK] = { m_bookmarks.goto_prev }, - -- Tools -> Macros - [ID.START_RECORDING_MACRO] = { m_macros.start_recording }, - [ID.STOP_RECORDING_MACRO] = { m_macros.stop_recording }, - [ID.PLAY_MACRO] = { m_macros.play }, -- Buffer [ID.NEXT_BUFFER] = { 'goto_buffer', v, 1, false }, [ID.PREV_BUFFER] = { 'goto_buffer', v, -1, false }, diff --git a/core/ext/pm/macro_browser.lua b/core/ext/pm/macro_browser.lua deleted file mode 100644 index d7cde6bd..00000000 --- a/core/ext/pm/macro_browser.lua +++ /dev/null @@ -1,47 +0,0 @@ --- Copyright 2007-2009 Mitchell mitchell<att>caladbolg.net. See LICENSE. - -local textadept = _G.textadept -local locale = _G.locale - ---- --- Macro browser for the Textadept project manager. --- It is enabled with the prefix 'macros' in the project manager entry field. -module('textadept.pm.browsers.macro', package.seeall) - -if not RESETTING then textadept.pm.add_browser('macros') end - -function matches(entry_text) - return entry_text:sub(1, 7) == 'macros' -end - -function get_contents_for() - local m_macros = _m.textadept.macros - local contents = {} - for name in pairs(m_macros.list) do contents[name] = { text = name } end - return contents -end - -function perform_action(selected_item) - _m.textadept.macros.play(selected_item[2]) - view:focus() -end - -local ID = { DELETE = 1 } - -function get_context_menu(selected_item) - return { { locale.PM_BROWSER_MACRO_DELETE, ID.DELETE } } -end - -function perform_menu_action(menu_id, selected_item) - local m_macros = _m.textadept.macros - if menu_id == ID.DELETE then - m_macros.delete(selected_item[2]) - end - textadept.pm.activate() -end - -local function update_view() - if matches(textadept.pm.entry_text) then textadept.pm.activate() end -end -textadept.events.add_handler('macro_saved', update_view) -textadept.events.add_handler('macro_deleted', update_view) diff --git a/core/locale.conf b/core/locale.conf index 4004e4ff..5edabdaa 100644 --- a/core/locale.conf +++ b/core/locale.conf @@ -512,22 +512,6 @@ MENU_TOOLS_BM_NEXT "_Next" MENU_TOOLS_BM_PREV "_Previous" % core/ext/menu.lua -% "M_acros" -MENU_TOOLS_MACROS_TITLE "M_acros" - -% core/ext/menu.lua -% "_Start Recording" -MENU_TOOLS_MACROS_START "_Start Recording" - -% core/ext/menu.lua -% "S_top Recording" -MENU_TOOLS_MACROS_STOP "S_top Recording" - -% core/ext/menu.lua -% "_Play Macro" -MENU_TOOLS_MACROS_PLAY "_Play Macro" - -% core/ext/menu.lua % "_Buffer" MENU_BUF_TITLE "_Buffer" @@ -703,10 +687,6 @@ PM_BROWSER_FILE_INFO_OK "OK" % "Show Dot Files" PM_BROWSER_FILE_SHOW_DOT_FILES "Show _Dot Files" -% core/ext/pm/macro_browser.lua -% "_Delete" -PM_BROWSER_MACRO_DELETE "_Delete" - % core/ext/pm/modules_browser.lua % "_New Module" PM_BROWSER_MODULE_NEW "_New Module" @@ -767,34 +747,6 @@ M_TEXTADEPT_EDITING_GOTO_TITLE "Go To" % "Line Number:" M_TEXTADEPT_EDITING_GOTO_TEXT "Line Number:" -% modules/textadept/macros.lua -% "Macro recording" -M_TEXTADEPT_MACRO_RECORDING "Macro recording" - -% modules/textadept/macros.lua -% "Macro name?" -M_TEXTADEPT_MACRO_SAVE_TITLE "Macro name?" - -% modules/textadept/macros.lua -% "Macro name" -M_TEXTADEPT_MACRO_SAVE_TEXT "Macro name" - -% modules/textadept/macros.lua -% "Macro saved" -M_TEXTADEPT_MACRO_SAVED "Macro saved" - -% modules/textadept/macros.lua -% "Macro not saved" -M_TEXTADEPT_MACRO_NOT_SAVED "Macro not saved" - -% modules/textadept/macros.lua -% "Select a Macro" -M_TEXTADEPT_MACRO_SELECT_TITLE "Select a Macro" - -% modules/textadept/macros.lua -% "Macro name:" -M_TEXTADEPT_MACRO_SELECT_TEXT "Macro name:" - % modules/textadept/run.lua % "The file "%s" does not exist." M_TEXTADEPT_RUN_FILE_DOES_NOT_EXIST "The file "%s" does not exist." |