diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2010-04-21 13:29:38 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2010-04-21 13:29:38 -0400 |
| commit | 7e593d0b0a01c64b723a134418c215ed3593021f (patch) | |
| tree | 4c167fbc287a210cf7a3624eaa3931ebec2a3eab /core/ext | |
| parent | 8adff5c59a8936473fa97d75207b3135fbcbedcb (diff) | |
| download | textadept-7e593d0b0a01c64b723a134418c215ed3593021f.tar.gz textadept-7e593d0b0a01c64b723a134418c215ed3593021f.zip | |
Moved 'Search' menu into 'Tools' to resolve Alt+S key command conflict.
Diffstat (limited to 'core/ext')
| -rw-r--r-- | core/ext/menu.lua | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/core/ext/menu.lua b/core/ext/menu.lua index 00afc946..9c71383e 100644 --- a/core/ext/menu.lua +++ b/core/ext/menu.lua @@ -62,7 +62,7 @@ local ID = { SELECT_IN_PARAGRAPH = 242, SELECT_IN_INDENTED_BLOCK = 243, SELECT_IN_SCOPE = 244, - -- Search + -- Tools FIND = 301, FIND_NEXT = 302, FIND_PREV = 303, @@ -74,7 +74,6 @@ local ID = { GOTO_NEXT_FILE_FOUND = 309, GOTO_PREV_FILE_FOUND = 310, GOTO_LINE = 307, - -- Tools FOCUS_COMMAND_ENTRY = 401, RUN = 420, COMPILE = 421, @@ -193,23 +192,22 @@ local menubar = { }, }, gtkmenu { - title = l.MENU_SEARCH_TITLE, - { l.MENU_SEARCH_FIND, ID.FIND }, - { l.MENU_SEARCH_FIND_NEXT, ID.FIND_NEXT }, - { l.MENU_SEARCH_FIND_PREV, ID.FIND_PREV }, - { l.MENU_SEARCH_FIND_AND_REPLACE, ID.FIND_AND_REPLACE }, - { l.MENU_SEARCH_REPLACE, ID.REPLACE }, - { l.MENU_SEARCH_REPLACE_ALL, ID.REPLACE_ALL }, - { l.MENU_SEARCH_FIND_INCREMENTAL, ID.FIND_INCREMENTAL }, - { SEPARATOR, ID.SEPARATOR }, - { l.MENU_SEARCH_FIND_IN_FILES, ID.FIND_IN_FILES }, - { l.MENU_SEARCH_GOTO_NEXT_FILE_FOUND, ID.GOTO_NEXT_FILE_FOUND }, - { l.MENU_SEARCH_GOTO_PREV_FILE_FOUND, ID.GOTO_PREV_FILE_FOUND }, - { SEPARATOR, ID.SEPARATOR }, - { l.MENU_SEARCH_GOTO_LINE, ID.GOTO_LINE }, - }, - gtkmenu { title = l.MENU_TOOLS_TITLE, + { title = l.MENU_TOOLS_SEARCH_TITLE, + { l.MENU_TOOLS_SEARCH_FIND, ID.FIND }, + { l.MENU_TOOLS_SEARCH_FIND_NEXT, ID.FIND_NEXT }, + { l.MENU_TOOLS_SEARCH_FIND_PREV, ID.FIND_PREV }, + { l.MENU_TOOLS_SEARCH_FIND_AND_REPLACE, ID.FIND_AND_REPLACE }, + { l.MENU_TOOLS_SEARCH_REPLACE, ID.REPLACE }, + { l.MENU_TOOLS_SEARCH_REPLACE_ALL, ID.REPLACE_ALL }, + { l.MENU_TOOLS_SEARCH_FIND_INCREMENTAL, ID.FIND_INCREMENTAL }, + { SEPARATOR, ID.SEPARATOR }, + { l.MENU_TOOLS_SEARCH_FIND_IN_FILES, ID.FIND_IN_FILES }, + { l.MENU_TOOLS_SEARCH_GOTO_NEXT_FILE_FOUND, ID.GOTO_NEXT_FILE_FOUND }, + { l.MENU_TOOLS_SEARCH_GOTO_PREV_FILE_FOUND, ID.GOTO_PREV_FILE_FOUND }, + { SEPARATOR, ID.SEPARATOR }, + { l.MENU_TOOLS_SEARCH_GOTO_LINE, ID.GOTO_LINE }, + }, { l.MENU_TOOLS_FOCUS_COMMAND_ENTRY, ID.FOCUS_COMMAND_ENTRY }, { SEPARATOR, ID.SEPARATOR }, { l.MENU_TOOLS_RUN, ID.RUN }, @@ -405,7 +403,7 @@ local actions = { [ID.SELECT_IN_PARAGRAPH] = { m_editing.select_paragraph }, [ID.SELECT_IN_INDENTED_BLOCK] = { m_editing.select_indented_block }, [ID.SELECT_IN_SCOPE] = { m_editing.select_scope }, - -- Search + -- Tools [ID.FIND] = { t.find.focus }, [ID.FIND_NEXT] = { t.find.call_find_next }, [ID.FIND_PREV] = { t.find.call_find_prev }, @@ -422,7 +420,6 @@ local actions = { [ID.GOTO_NEXT_FILE_FOUND] = { t.find.goto_file_in_list, true }, [ID.GOTO_PREV_FILE_FOUND] = { t.find.goto_file_in_list, false }, [ID.GOTO_LINE] = { m_editing.goto_line }, - -- Tools [ID.FOCUS_COMMAND_ENTRY] = { t.command_entry.focus }, [ID.RUN] = { m_run.run }, [ID.COMPILE] = { m_run.compile }, |