From 5c08d0e2e3df358ffc79cf217f5998b84b0249c8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Ouellet Date: Fri, 25 Nov 2016 00:03:05 -0500 Subject: [PATCH] DRY Qubes[Disp]VmLabels --- core/qubes.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/qubes.py b/core/qubes.py index f3be12d3..1ed74c1d 100755 --- a/core/qubes.py +++ b/core/qubes.py @@ -935,14 +935,8 @@ QubesVmLabels = { } QubesDispVmLabels = { - "red": QubesVmLabel(1, "0xcc0000", "red", dispvm=True), - "orange": QubesVmLabel(2, "0xf57900", "orange", dispvm=True), - "yellow": QubesVmLabel(3, "0xedd400", "yellow", dispvm=True), - "green": QubesVmLabel(4, "0x73d216", "green", dispvm=True), - "gray": QubesVmLabel(5, "0x555753", "gray", dispvm=True), - "blue": QubesVmLabel(6, "0x3465a4", "blue", dispvm=True), - "purple": QubesVmLabel(7, "0x75507b", "purple", dispvm=True), - "black": QubesVmLabel(8, "0x000000", "black", dispvm=True), + k: QubesVmLabel(index=v.index, color=v.color, name=v.name, dispvm=True) + for k, v in QubesVmLabels.iteritems() } defaults["appvm_label"] = QubesVmLabels["red"]