Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle aliases in gui/launcher #717

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle aliases in gui/launcher #717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions gui/launcher.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,13 @@ function HelpPanel:add_output(output)
end
end

function HelpPanel:set_entry(entry_name, show_help)
local function HelpPanel_parse_alias_entry(text)
local firstword = get_first_word(text)
local aliased_command = "[alias] " .. firstword .. ": " .. dfhack.internal.getAliasCommand(firstword)
return aliased_command .. NEWLINE .. string.rep("-", #aliased_command) .. NEWLINE .. NEWLINE
end

function HelpPanel:set_entry(entry_name, show_help, is_alias, text)
if show_help then
self.subviews.pages:setSelected('help_label')
end
Expand All @@ -437,6 +443,9 @@ function HelpPanel:set_entry(entry_name, show_help)
end
local wrapped_help = helpdb.get_entry_long_help(entry_name,
self.frame_body.width - 5)
if is_alias then
wrapped_help = HelpPanel_parse_alias_entry(text) .. wrapped_help
end
HelpPanel_update_label(label, wrapped_help)
self.cur_entry = entry_name
end
Expand Down Expand Up @@ -636,13 +645,13 @@ function LauncherUI:init(args)
self:on_edit_input('')
end

function LauncherUI:update_help(text, firstword, show_help)
function LauncherUI:update_help(text, firstword, show_help, is_alias)
local firstword = firstword or get_first_word(text)
if firstword == self.firstword then
return
end
self.firstword = firstword
self.subviews.help:set_entry(firstword, show_help)
self.subviews.help:set_entry(firstword, show_help, is_alias, text)
end

local function extract_entry(entries, firstword)
Expand Down Expand Up @@ -734,7 +743,12 @@ end

function LauncherUI:on_edit_input(text, show_help)
local firstword = get_first_word(text)
self:update_help(text, firstword, show_help)
-- If the first word in the entry is an alias, show the appropriate autocomplete entry and help
local is_alias = dfhack.internal.isAlias(firstword)
if is_alias then
firstword = get_first_word(dfhack.internal.getAliasCommand(firstword))
end
self:update_help(text, firstword, show_help, is_alias)
self:update_autocomplete(firstword)
end

Expand Down