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

- Settings are now passed correctly.

Browse Source
This commit is contained in:
ccremers 2006-08-02 22:07:29 +00:00
parent e19d13619c
commit cd193e548e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/Attackwindow.py
View File

@ -14,9 +14,10 @@ import Icon
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
class AttackDisplay(wx.ScrolledWindow): class AttackDisplay(wx.ScrolledWindow):
def __init__(self, daddy, parent, claim,attack): def __init__(self, daddy, parent, attack):
self.win = daddy self.win = daddy
self.attack = attack
wx.ScrolledWindow.__init__(self,parent,id=-1) wx.ScrolledWindow.__init__(self,parent,id=-1)
# Wait for the attack to be computed # Wait for the attack to be computed
@ -105,7 +106,7 @@ class AttackWindow(wx.Frame):
if self.claim.failed <= 1: if self.claim.failed <= 1:
# Just a single window # Just a single window
self.tabs = None self.tabs = None
self.displays.append(AttackDisplay(self,self,self.claim,self.claim.attacks[0])) self.displays.append(AttackDisplay(self,self,self.claim.attacks[0]))
else: else:
# Multiple tabs # Multiple tabs
self.tabs = wx.Notebook(self,-1) self.tabs = wx.Notebook(self,-1)

2
gui/Scytherthread.py
View File

@ -72,6 +72,8 @@ class ScytherThread(threading.Thread):
""" """
scyther = Scyther.Scyther() scyther = Scyther.Scyther()
scyther.options = self.win.settings.ScytherArguments()
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
scyther.program = "c:\\Scyther.exe" scyther.program = "c:\\Scyther.exe"
if not os.path.isfile(scyther.program): if not os.path.isfile(scyther.program):