- Moved okay status thing also to claims.

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 = cl.getOkay()
-                rankt = "Ok"
-            else:
-                rankt = "Fail"
             txt = wx.StaticText(self,-1,rankt)
             font = wx.Font(11,wx.NORMAL,wx.NORMAL,wx.BOLD)
             txt.SetFont(font)

gui/Scyther/Claim.py

@@ -106,9 +106,23 @@ class Claim(object):
         Returns a colour that expresses the state
         """
         colours = ['#FF0000',
-                   '#AA4000',
+                   '#800000',
-                   '#558000',
+                   '#005800',
-                   '#00C000']
+                   '#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):