andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Simplified table

Browse Source
This commit is contained in:
ccremers 2006-08-03 14:45:47 +00:00
parent e43a714d45
commit 524fb4c969
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gui/Scytherthread.py
View File

@ -193,7 +193,7 @@ class ResultWindow(wx.Frame):
# set up grid # set up grid
claims = mainwindow.claims claims = mainwindow.claims
self.grid = grid = wx.GridBagSizer(8,1+len(claims)) self.grid = grid = wx.GridBagSizer(7,1+len(claims))
def titlebar(x,title): def titlebar(x,title):
txt = wx.StaticText(self,-1,title + " ") txt = wx.StaticText(self,-1,title + " ")
@ -205,10 +205,9 @@ class ResultWindow(wx.Frame):
titlebar(1,"Role") titlebar(1,"Role")
titlebar(2,"Label") titlebar(2,"Label")
titlebar(3,"Claim type") titlebar(3,"Claim type")
titlebar(4,"Parameter") titlebar(4,"Status")
titlebar(5,"Status") titlebar(5,"View")
titlebar(6,"View") titlebar(6,"Remarks")
titlebar(7,"Remarks")
lastprot = None lastprot = None
lastrole = None lastrole = None
@ -227,13 +226,17 @@ class ResultWindow(wx.Frame):
lastrole = role lastrole = role
grid.Add(wx.StaticText(self,-1,str(cl.shortlabel)),(y,2)) grid.Add(wx.StaticText(self,-1,str(cl.shortlabel)),(y,2))
grid.Add(wx.StaticText(self,-1,str(cl.claimtype)),(y,3)) claimdetails = str(cl.claimtype)
grid.Add(wx.StaticText(self,-1,str(cl.parameter)),(y,4)) if cl.parameter:
claimdetails += " %s" % (cl.parameter)
grid.Add(wx.StaticText(self,-1,claimdetails),(y,3))
if cl.okay: if cl.okay:
okay = "Ok" okay = wx.StaticText(self,-1,"Ok")
okay.SetBackgroundColour("green")
else: else:
okay = "Fail" okay = wx.StaticText(self,-1,"Fail")
grid.Add(wx.StaticText(self,-1,okay),(y,5)) okay.SetBackgroundColour("red")
grid.Add(okay,(y,4))
# add view button (if needed) # add view button (if needed)
n = len(cl.attacks) n = len(cl.attacks)
@ -242,13 +245,13 @@ class ResultWindow(wx.Frame):
blabel = "%i %s" % (n,cl.stateName(n)) blabel = "%i %s" % (n,cl.stateName(n))
cl.button = wx.Button(self,-1,blabel) cl.button = wx.Button(self,-1,blabel)
grid.Add(cl.button,(y,6)) grid.Add(cl.button,(y,5))
cl.button.Disable() cl.button.Disable()
self.Bind(wx.EVT_BUTTON, self.onViewButton,cl.button) self.Bind(wx.EVT_BUTTON, self.onViewButton,cl.button)
else: else:
blabel = "%i %s" % (n,cl.stateName(n)) blabel = "%i %s" % (n,cl.stateName(n))
cl.button = wx.Button(self,-1,blabel) cl.button = wx.Button(self,-1,blabel)
grid.Add(cl.button,(y,6)) grid.Add(cl.button,(y,5))
cl.button.Disable() cl.button.Disable()
#cl.button = None #cl.button = None
@ -269,18 +272,18 @@ class ResultWindow(wx.Frame):
# there exist n states/attacks (within any number of runs) # there exist n states/attacks (within any number of runs)
remark = "exactly" remark = "exactly"
grid.Add(wx.StaticText(self,-1," (%s)" % remark),(y,7)) grid.Add(wx.StaticText(self,-1," (%s)" % remark),(y,6))
sizer.Add(grid, 0,wx.ALIGN_CENTRE|wx.ALL,5) sizer.Add(grid, 0,wx.ALIGN_CENTRE|wx.ALL,5)
# separator # # separator
line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) # line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5) # sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5)
btn = wx.Button(self, -1,"Close window") # btn = wx.Button(self, -1,"Close window")
self.Bind(wx.EVT_BUTTON,self.onCloseButton,btn) # self.Bind(wx.EVT_BUTTON,self.onCloseButton,btn)
sizer.Add(btn, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.ALIGN_RIGHT, 5) # sizer.Add(btn, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.ALIGN_RIGHT, 5)
self.SetSizer(sizer) self.SetSizer(sizer)
sizer.Fit(self) sizer.Fit(self)