Merge branch 'master' into singularity

2018-05-20 00:22:24 -04:00
parent 020cc9e295 e423c9248a
commit 891c20eea7
35 changed files with 168 additions and 131 deletions
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -73,7 +73,7 @@ class BaseName(ViewColumn):
                if stuff.slot == Slot.MODE:
                    return '─ Tactical Mode ─'
                else:
-                    return '─ {} Slots ─'.format(Slot.getName(stuff.slot).capitalize())
+                    return '─ {} {} Slot{}─'.format(stuff.num, Slot.getName(stuff.slot).capitalize(), '' if stuff.num == 1 else 's')
            else:
                return ""
        elif isinstance(stuff, Module):