From e14d165816f9cf0493e827e88ae713f555ba35b9 Mon Sep 17 00:00:00 2001 From: ccremers Date: Tue, 8 Aug 2006 17:04:26 +0000 Subject: [PATCH] - Some reshuffling should restore matters. --- gui/{bin => Scyther}/Scyther.exe | Bin gui/Scyther/Scyther.py | 4 ++-- gui/{bin => Scyther}/scyther | Bin gui/scyther-gui.py | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) rename gui/{bin => Scyther}/Scyther.exe (100%) rename gui/{bin => Scyther}/scyther (100%) diff --git a/gui/bin/Scyther.exe b/gui/Scyther/Scyther.exe similarity index 100% rename from gui/bin/Scyther.exe rename to gui/Scyther/Scyther.exe diff --git a/gui/Scyther/Scyther.py b/gui/Scyther/Scyther.py index 6b9b080..497279b 100755 --- a/gui/Scyther/Scyther.py +++ b/gui/Scyther/Scyther.py @@ -26,12 +26,12 @@ class Scyther(object): if sys.platform.startswith('win'): """ Windows """ # TODO hardcoded for now, bad - self.program = os.path.join("bin","Scyther.exe") + self.program = "Scyther.exe" if not os.path.isfile(self.program): print "I can't find the Scyther executable at %s" % (self.program) else: """ Non-windows """ - self.program = os.path.join("bin","scyther") + self.program = "scyther" # Init self.spdl = None diff --git a/gui/bin/scyther b/gui/Scyther/scyther similarity index 100% rename from gui/bin/scyther rename to gui/Scyther/scyther diff --git a/gui/scyther-gui.py b/gui/scyther-gui.py index 2df64b3..65c6e15 100755 --- a/gui/scyther-gui.py +++ b/gui/scyther-gui.py @@ -5,6 +5,7 @@ """ Import externals """ import wx import sys +import os from optparse import OptionParser, SUPPRESS_HELP #--------------------------------------------------------------------------- @@ -41,7 +42,7 @@ def parseArgs(): class MySplashScreen(wx.SplashScreen): def __init__(self): - bmp = wx.Image(Misc.mypath("images/scyther-splash.png")).ConvertToBitmap() + bmp = wx.Image(os.path.join("images","scyther-splash.png")).ConvertToBitmap() wx.SplashScreen.__init__(self, bmp, wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT, 5000, None, -1)