From 89acf05fe1f5aaf4a0c7ba64e4b3322c57e44d90 Mon Sep 17 00:00:00 2001 From: ccremers Date: Tue, 8 Aug 2006 15:00:20 +0000 Subject: [PATCH] - Fixed many windows issues (including the redraw speed) --- gui/Preference.py | 6 +++--- gui/Scytherthread.py | 16 +++++++--------- gui/bin/Scyther.exe | Bin 385989 -> 385989 bytes 3 files changed, 10 insertions(+), 12 deletions(-) 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 3f4d524c841416554b037c6f29d40ba4ae201d62..1bb56b00465ea483e2731fa8d97aecedc04f04b7 100644 GIT binary patch delta 750 zcmYk4Ur5tY6vuz(>^HQfGsqPGjnr90Whp7dHk0(H)|L;3;=^PaVm=gEObk+s_AqV3 z8vD_uC6!@+pr>utt?8yzvISzk1e)wggoPPG8a*g>e(R-|^SR%1@44rD4|gV-Jrm8o zKZx4rp1X~hmF54|(hPF2ti_fF_MqotJcDrc`ePty?Nhfv_RjrMV&leHiVrtlgWD@@ zzNGcqW+_$X|30k&`Hc;h3*a5A(LoK!%&7w%eBv*3P~klqtCa-7u37vUZ__Iw(_xxb zQUm4x79Bk)i-~w!{%X;ZdX}dKpvVdH{P0N}L6~PT1I7p*BbHJ2qY=k|*j0tM6@EX3 z&r-n3-Sv10z{)ln@Bqj>?+hM9@=;^PiY%F$se96*q8`#DA+hpV5F93%4V$r&j?9=b zm}6D^+}PuiQinu+VsL9`XGq#wJvM6P9t%3u;O6_9Fg+dItk^~d+&pGOYbDru$pf_J z(JgoUXeP}0ag@*mvLMUcJ_TZv#R^{tx1^j$IBKy4a-TCZ^ zMU}#)YE>F%ouuM*l6ayJI{3{_@e2^mU1D4dulS)}u{~2Wtz6Qhb(kiZ>=H|0nulB> hLm1;t!(wzdJY~5)v5;W&iH~61x!@D|f=|8H@E72@7Zv~j delta 750 zcmYk4Ur5tY6vuz(_#4{tPmm@4TdA{%%2HB@Z6@hYtt}rcWe>_S!hA?t;ZRB~+QViG z`;A2xmsEz-LoaQ!Zq02*C0iiYOQ6Y~L|B+1q|t+7=eJ&ZIiLGI_nv#c_i(49In&V` z*@=5b+;^JrdbjUeYYWJM@>WYaSOe}0@hrlXYmb1C*)w$$WY6p`B{r>{rZ}?p0-PRc z{W+~y*2}1};P**2$geE0SO^oWRs*#lGlvE=@Qy#zK&9vK$2v(6derkj#>}&AM`j5#I9<*rSSU+ ze3}YoezyTH0hrlZBklv4=bys;NIq(fSh-uKW-42HRMbMcBqWwT34+}qvtc7v(UEB* z26D}cpS~R~DQ!s9CY&2vTSL;u@{ut!cbm|z0w>?qj2Ri=WF;0d;N&q2wpD?Zmp;I@ ze7fbf4~>LbAC3{MepIF~;m0!QV~c*&liC|ViO?B98YJ@tu<@)_X=|&n53CAKlg z!e}6s8%Zj2Bssx*5u`7~mLh1TzSUEhv5jbo;oJV~bIJ>Qa%ixwni`!-k^P=8)&lm} zl#QdB>dMSn1OX9I2IL~i%il2dK>=NUdFwPJ3iXGYNkaCGF({6af?z_ZN2=Smx iWC%}q^RO7*4x=p3D;5#-UhyHkbj*20KIc`fH2wu6s}_y`