diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/ext/menu.lua | 37 | ||||
| -rw-r--r-- | core/locale.conf | 38 |
2 files changed, 36 insertions, 39 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 }, diff --git a/core/locale.conf b/core/locale.conf index b4abb7ef..41fd2c29 100644 --- a/core/locale.conf +++ b/core/locale.conf @@ -356,60 +356,60 @@ MENU_EDIT_SEL_IN_INDENTED_BLOCK "_Indented Block" MENU_EDIT_SEL_IN_SCOPE "S_cope" % core/ext/menu.lua -% "_Search" -MENU_SEARCH_TITLE "_Search" +% "_Tools" +MENU_TOOLS_TITLE "_Tools" + +% core/ext/menu.lua +% "_Find" +MENU_TOOLS_SEARCH_TITLE "_Find" % core/ext/menu.lua % "gtk-find" -MENU_SEARCH_FIND "gtk-find" +MENU_TOOLS_SEARCH_FIND "gtk-find" % core/ext/menu.lua % "Find _Next" -MENU_SEARCH_FIND_NEXT "Find _Next" +MENU_TOOLS_SEARCH_FIND_NEXT "Find _Next" % core/ext/menu.lua % "Find _Previous" -MENU_SEARCH_FIND_PREV "Find _Previous" +MENU_TOOLS_SEARCH_FIND_PREV "Find _Previous" % core/ext/menu.lua % "gtk-find-and-replace" -MENU_SEARCH_FIND_AND_REPLACE "gtk-find-and-replace" +MENU_TOOLS_SEARCH_FIND_AND_REPLACE "gtk-find-and-replace" % core/ext/menu.lua % "Replace" -MENU_SEARCH_REPLACE "Replace" +MENU_TOOLS_SEARCH_REPLACE "Replace" % core/ext/menu.lua % "Replace _All" -MENU_SEARCH_REPLACE_ALL "Replace _All" +MENU_TOOLS_SEARCH_REPLACE_ALL "Replace _All" % core/ext/menu.lua % "Find _Incremental" -MENU_SEARCH_FIND_INCREMENTAL "Find _Incremental" +MENU_TOOLS_SEARCH_FIND_INCREMENTAL "Find _Incremental" % core/ext/menu.lua % "Find in Fi_les" -MENU_SEARCH_FIND_IN_FILES "Find in Fi_les" +MENU_TOOLS_SEARCH_FIND_IN_FILES "Find in Fi_les" % core/ext/menu.lua % "Goto Next File Found" -MENU_SEARCH_GOTO_NEXT_FILE_FOUND "Goto Next File Found" +MENU_TOOLS_SEARCH_GOTO_NEXT_FILE_FOUND "Goto Next File Found" % core/ext/menu.lua % "Goto Previous File Found" -MENU_SEARCH_GOTO_PREV_FILE_FOUND "Goto Previous File Found" +MENU_TOOLS_SEARCH_GOTO_PREV_FILE_FOUND "Goto Previous File Found" % core/ext/menu.lua % "gtk-jump-to" -MENU_SEARCH_GOTO_LINE "gtk-jump-to" - -% core/ext/menu.lua -% "_Tools" -MENU_TOOLS_TITLE "_Tools" +MENU_TOOLS_SEARCH_GOTO_LINE "gtk-jump-to" % core/ext/menu.lua -% "Focus _Command Entry" -MENU_TOOLS_FOCUS_COMMAND_ENTRY "Focus _Command Entry" +% "Command _Entry" +MENU_TOOLS_FOCUS_COMMAND_ENTRY "Command _Entry" % core/ext/menu.lua % "_Run" |