Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some debug testing and handling of colored keys.

Browse source
This commit is contained in:
Griatch 2015-07-08 14:14:13 +02:00
parent fe810ec5f7
commit eb598921ac
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/utils/evmenu.py
View file

@ -153,6 +153,7 @@ _HELP_FULL = _("Commands: <menu option>, help, quit")
_HELP_NO_QUIT = _("Commands: <menu option>, help")
_HELP_NO_OPTIONS = _("Commands: help, quit")
_HELP_NO_OPTIONS_NO_QUIT = _("Commands: help")
_HELP_NO_OPTION_MATCH = _("Choose an option or try 'help'.")
class EvMenuError(RuntimeError):
@ -222,7 +223,7 @@ class CmdEvMenuNode(Command):
if goto:
menu.goto(goto, raw_string)
else:
caller.msg("Choose an option or try 'help'.")
caller.msg(_HELP_NO_OPTION_MATCH)
if not (options or default):
# no options - we are at the end of the menu.
@ -387,7 +388,13 @@ class EvMenu(object):
table_width_max = max(table_width_max,
max(m_len(p) for p in key.split("\n")) +
max(m_len(p) for p in desc.split("\n")) + colsep)
table.append(ANSIString(" {lc%s{lt%s{le: %s" % (key, key, desc)))
raw_key = strip_raw_ansi(key)
if raw_key != key:
# already decorations in key definition
table.append(ANSIString(" {lc%s{lt%s{le: %s" % (raw_key, key, desc)))
else:
# add a default color to key
table.append(ANSIString(" {lc%s{lt{w%s{n{le: %s" % (raw_key, raw_key, desc)))
ncols = (_MAX_TEXT_WIDTH // table_width_max) + 1 # number of ncols
nlastcol = nlist % ncols # number of elements left in last row
@ -422,6 +429,7 @@ class EvMenu(object):
total_width = max(total_width, nodetext_width_max)
separator1 = "_" * total_width + "\n\n" if nodetext_width_max else ""
separator2 = "\n" + "_" * total_width + "\n\n" if total_width else ""
print "table:", unicode(table)
return separator1 + nodetext + separator2 + unicode(table)
def _execute_node(self, nodename, raw_string):