diff --git a/gui/Preference.py b/gui/Preference.py index 3daf437..13e7d54 100644 --- a/gui/Preference.py +++ b/gui/Preference.py @@ -52,7 +52,7 @@ class Preferences(dict): key = line[:split].strip() data = line[(split+1):] self[key] = data.decode("string_escape") - print "Read %s=%s" % (key,self[key]) + #print "Read %s=%s" % (key,self[key]) def load(self,file=""): if file == None: @@ -110,13 +110,13 @@ def init(): sp = wx.StandardPaths.Get() confdir = sp.GetConfigDir() confdir += "/scyther" - print confdir + #print confdir userconfdir = sp.GetUserConfigDir() userconfdir += "/" if sys.platform.startswith("lin"): userconfdir += "." userconfdir += "scyther" - print userconfdir + #print userconfdir preflocs = [confdir,userconfdir] diff --git a/gui/Scytherthread.py b/gui/Scytherthread.py index 060cffb..28301dd 100644 --- a/gui/Scytherthread.py +++ b/gui/Scytherthread.py @@ -256,7 +256,6 @@ class ResultWindow(wx.Frame): def BuildTable(self): # Now continue with the normal construction of the dialog # contents - sizer = wx.BoxSizer(wx.VERTICAL) # For these claims... claims = self.parent.claims @@ -283,10 +282,8 @@ class ResultWindow(wx.Frame): for index in range(0,len(claims)): self.BuildClaim(grid,claims[index],index+1) - sizer.Add(grid, 0,wx.ALIGN_CENTER|wx.ALL,5) - - self.SetSizer(sizer) - sizer.Fit(self) + self.SetSizer(grid) + self.Fit() def BuildClaim(self,grid,cl,ypos): # a support function @@ -392,7 +389,6 @@ class ScytherRun(object): # Great, we verified stuff, progress to the claim report title = "Scyther results : %s" % mode self.resultwin = resultwin = ResultWindow(self,mainwin,title) - resultwin.Show(True) def attackDone(attack,total,done): if done < total: @@ -405,14 +401,16 @@ class ScytherRun(object): def claimDone(claim): if claim.button and len(claim.attacks) > 0: claim.button.Enable() - resultwin.Refresh() + #resultwin.Refresh() + + resultwin.Center() + resultwin.Show(True) + wx.Yield() t = AttackThread(self,resultwin,claimDone,attackDone) t.start() resultwin.thread = t - resultwin.Center() - resultwin.Show(True) else: # Darn, some errors. report. diff --git a/gui/bin/Scyther.exe b/gui/bin/Scyther.exe index 3f4d524..1bb56b0 100644 Binary files a/gui/bin/Scyther.exe and b/gui/bin/Scyther.exe differ