StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better alignments

This commit is contained in:
Michael Hudson-Doyle 2017-03-31 10:08:33 +13:00
parent 172bd99acc
commit d81bf74acd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subiquity/models/filesystem.py
View File

@ -231,10 +231,13 @@ class FilesystemModel(object):
]
fs_by_name = {}
longest_fs_name = 0
for t in supported_filesystems:
if len(t) > 2:
fs = t[2]
if fs.label is not None:
if len(fs.label) > longest_fs_name:
longest_fs_name = len(fs.label)
fs_by_name[fs.label] = fs
def __init__(self, prober, opts):

13
subiquity/ui/views/filesystem/filesystem.py
View File

@ -148,28 +148,29 @@ class FilesystemView(BaseView):
avail_partitions = [p for p in disk.partitions() if p.available]
if disk.available or len(avail_partitions) > 0:
disk_label = Text(disk.serial)
size = Text(_humanize_size(disk.size))
size = Text(_humanize_size(disk.size).rjust(9))
typ = Text("local disk")
col3(disk_label, size, typ)
for partition in disk.partitions():
label = "partition {}, ".format(partition.number)
fs = partition.fs()
if fs is not None:
label += fs.fstype
if fs.mount():
label += ", " + fs.mount().path
label += "%-*s"%(self.model.longest_fs_name+2, fs.fstype+',') + fs.mount().path
else:
label += fs.fstype
else:
label += "unformatted"
size = Text("{:>9} ({}%)".format(_humanize_size(partition.size), int(100*partition.size/disk.size)))
if partition.available:
part_btn = menu_btn(label=label)
connect_signal(part_btn, 'click', self.click_partition, partition)
part_btn = Color.menu_button(part_btn)
size = Text("{} ({}%)".format(_humanize_size(partition.size), int(100*partition.size/disk.size)))
col2(part_btn, size)
else:
part_btn = WidgetDisable(menu_btn(label=label))
part_btn = Color.info_minor(part_btn)
size = Color.info_minor(Text("{} ({}%)".format(_humanize_size(partition.size), int(100*partition.size/disk.size))))
size = Color.info_minor(size)
col2(part_btn, size)
if disk.available:
if disk.used > 0:
@ -181,7 +182,7 @@ class FilesystemView(BaseView):
percent = int(100*free/size)
if percent == 0:
continue
size = Text("{} ({}%)".format(_humanize_size(free), percent))
size = Text("{:>9} ({}%)".format(_humanize_size(free), percent))
col2(disk_btn, size)
else:
disk_btn = menu_btn(label="ADD FIRST PARTITION")