Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 9191: Unable to select Unicode UTF-8 encoding on command line

Browse Source 
Make the option descriptions line up when the value is shorter than 10
characters. Also make the value and description headings line up with the
list and put "Available values are:" first.
This commit is contained in:
John Ralls 2016-01-22 13:39:37 -08:00
parent a947bd3598
commit 65442c2da8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps/cli/plug/__init__.py
View File

@ -413,7 +413,13 @@ class CommandLineReport(object):
elif isinstance(option, EnumeratedListOption): elif isinstance(option, EnumeratedListOption):
ilist = [] ilist = []
for (value, description) in option.get_items(): for (value, description) in option.get_items():
ilist.append("%s\t%s" % (value, description)) tabs = '\t'
try:
tabs = '\t\t' if len(value) < 10 else '\t'
except TypeError: #Value is a number, use just one tab.
pass
val = "%s%s%s" % (value, tabs, description)
ilist.append(val)
self.options_help[name].append(ilist) self.options_help[name].append(ilist)
elif isinstance(option, Option): elif isinstance(option, Option):
self.options_help[name].append(option.get_help()) self.options_help[name].append(option.get_help())
@ -587,8 +593,8 @@ class CommandLineReport(object):
elif self.show in self.options_help: elif self.show in self.options_help:
opt = self.options_help[self.show] opt = self.options_help[self.show]
tabs = '\t\t' if len(self.show) < 10 else '\t' tabs = '\t\t' if len(self.show) < 10 else '\t'
print(' %s%s%s (%s)' % (self.show, tabs, opt[1], opt[0]))
print(_(" Available values are:")) print(_(" Available values are:"))
print(' %s%s%s (%s)' % (self.show, tabs, opt[1], opt[0]))
vals = opt[2] vals = opt[2]
if isinstance(vals, (list, tuple)): if isinstance(vals, (list, tuple)):
for val in vals: for val in vals: