roughly shape test window to instrument (extra clearance)

Signed-off-by: Richard Hughes <richard@hughsie.com>
Coherent display kind enum ordering

The main UI routine doesn't properly assign an enum position
if no radiobutton has been clicked by the user.

Resulting in CRT (instead of LCD) being passed as display type
by default to dispcal.

Signed-off-by: Richard Hughes <richard@hughsie.com>