From 529892e6403a39856b7d00b390152ecf379b5b71 Mon Sep 17 00:00:00 2001 From: ccremers Date: Tue, 8 Aug 2006 17:07:15 +0000 Subject: [PATCH] - More consistency updates --- gui/Gui/Mainwindow.py | 2 +- gui/{images => Images}/characterize-button.png | Bin gui/{images => Images}/characterize-button.svg | 0 gui/{images => Images}/scyther-gui-16.ico | Bin gui/{images => Images}/scyther-gui-32.ico | Bin gui/{images => Images}/scyther-gui-64.ico | Bin gui/{images => Images}/scyther-icon.svg | 0 gui/{images => Images}/scyther-logo.svg | 0 gui/{images => Images}/scyther-splash.png | Bin gui/{images => Images}/scyther-splash.xcf | Bin gui/{images => Images}/verify-button.png | Bin gui/{images => Images}/verify-button.svg | 0 gui/scyther-gui.py | 6 +++++- 13 files changed, 6 insertions(+), 2 deletions(-) rename gui/{images => Images}/characterize-button.png (100%) rename gui/{images => Images}/characterize-button.svg (100%) rename gui/{images => Images}/scyther-gui-16.ico (100%) rename gui/{images => Images}/scyther-gui-32.ico (100%) rename gui/{images => Images}/scyther-gui-64.ico (100%) rename gui/{images => Images}/scyther-icon.svg (100%) rename gui/{images => Images}/scyther-logo.svg (100%) rename gui/{images => Images}/scyther-splash.png (100%) rename gui/{images => Images}/scyther-splash.xcf (100%) rename gui/{images => Images}/verify-button.png (100%) rename gui/{images => Images}/verify-button.svg (100%) diff --git a/gui/Gui/Mainwindow.py b/gui/Gui/Mainwindow.py index 54b94f9..ff24629 100644 --- a/gui/Gui/Mainwindow.py +++ b/gui/Gui/Mainwindow.py @@ -117,7 +117,7 @@ class MainWindow(wx.Frame): def getBmp(name): - bmp = wx.Bitmap(os.path.join("images","%s.png" % name),wx.BITMAP_TYPE_PNG) + bmp = wx.Bitmap(os.path.join("Images","%s.png" % name),wx.BITMAP_TYPE_PNG) if not bmp.Ok(): tsize = (32,32) bmp = wx.EmptyBitmap(tsize) diff --git a/gui/images/characterize-button.png b/gui/Images/characterize-button.png similarity index 100% rename from gui/images/characterize-button.png rename to gui/Images/characterize-button.png diff --git a/gui/images/characterize-button.svg b/gui/Images/characterize-button.svg similarity index 100% rename from gui/images/characterize-button.svg rename to gui/Images/characterize-button.svg diff --git a/gui/images/scyther-gui-16.ico b/gui/Images/scyther-gui-16.ico similarity index 100% rename from gui/images/scyther-gui-16.ico rename to gui/Images/scyther-gui-16.ico diff --git a/gui/images/scyther-gui-32.ico b/gui/Images/scyther-gui-32.ico similarity index 100% rename from gui/images/scyther-gui-32.ico rename to gui/Images/scyther-gui-32.ico diff --git a/gui/images/scyther-gui-64.ico b/gui/Images/scyther-gui-64.ico similarity index 100% rename from gui/images/scyther-gui-64.ico rename to gui/Images/scyther-gui-64.ico diff --git a/gui/images/scyther-icon.svg b/gui/Images/scyther-icon.svg similarity index 100% rename from gui/images/scyther-icon.svg rename to gui/Images/scyther-icon.svg diff --git a/gui/images/scyther-logo.svg b/gui/Images/scyther-logo.svg similarity index 100% rename from gui/images/scyther-logo.svg rename to gui/Images/scyther-logo.svg diff --git a/gui/images/scyther-splash.png b/gui/Images/scyther-splash.png similarity index 100% rename from gui/images/scyther-splash.png rename to gui/Images/scyther-splash.png diff --git a/gui/images/scyther-splash.xcf b/gui/Images/scyther-splash.xcf similarity index 100% rename from gui/images/scyther-splash.xcf rename to gui/Images/scyther-splash.xcf diff --git a/gui/images/verify-button.png b/gui/Images/verify-button.png similarity index 100% rename from gui/images/verify-button.png rename to gui/Images/verify-button.png diff --git a/gui/images/verify-button.svg b/gui/Images/verify-button.svg similarity index 100% rename from gui/images/verify-button.svg rename to gui/Images/verify-button.svg diff --git a/gui/scyther-gui.py b/gui/scyther-gui.py index 65c6e15..373bc9a 100755 --- a/gui/scyther-gui.py +++ b/gui/scyther-gui.py @@ -42,7 +42,7 @@ def parseArgs(): class MySplashScreen(wx.SplashScreen): def __init__(self): - bmp = wx.Image(os.path.join("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) @@ -101,6 +101,10 @@ class ScytherApp(wx.App): def OnExit(self): """ Tear down """ + +#--------------------------------------------------------------------------- + + if __name__ == '__main__': scythergui = ScytherApp() scythergui.MainLoop()