From 2126cf01f4b4c0ce6e3a42ace82b443a8a849e4d Mon Sep 17 00:00:00 2001 From: ccremers Date: Fri, 11 Aug 2006 09:58:20 +0000 Subject: [PATCH] - Moved okay status thing also to claims. --- gui/Gui/Scytherthread.py | 5 +---- gui/Scyther/Claim.py | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gui/Gui/Scytherthread.py b/gui/Gui/Scytherthread.py index 0704dfa..77deb57 100644 --- a/gui/Gui/Scytherthread.py +++ b/gui/Gui/Scytherthread.py @@ -381,10 +381,7 @@ class ResultWindow(wx.Frame): else: # new style text control Ok/Fail rankc = cl.getColour() - if cl.okay: - rankt = "Ok" - else: - rankt = "Fail" + rankt = cl.getOkay() txt = wx.StaticText(self,-1,rankt) font = wx.Font(11,wx.NORMAL,wx.NORMAL,wx.BOLD) txt.SetFont(font) diff --git a/gui/Scyther/Claim.py b/gui/Scyther/Claim.py index f4c2ff7..432b7b1 100644 --- a/gui/Scyther/Claim.py +++ b/gui/Scyther/Claim.py @@ -106,9 +106,23 @@ class Claim(object): Returns a colour that expresses the state """ colours = ['#FF0000', - '#AA4000', - '#558000', - '#00C000'] + '#800000', + '#005800', + '#00B000'] + return colours[self.getRank()] + + def getOkay(self): + """ + Returns a very brief statement about the claim. + + Originally the two mid options had a question mark appended, but + from a users' point of view this might only be more confusing, + so I took them out again. + """ + colours = ['Fail', + 'Fail', + 'Ok', + 'Ok'] return colours[self.getRank()] def getComment(self):