gfx data_path fixes
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Mon, 10 Mar 2014 13:14:31 +0100
changeset 92bc1255abd544
parent 91 a26757850ea9
child 93 8fe521017397
gfx data_path fixes
OpenSecurity/bin/about.py
OpenSecurity/bin/launch.pyw
OpenSecurity/bin/opensecurity_dialog.py
OpenSecurity/bin/opensecurity_tray.pyw
     1.1 --- a/OpenSecurity/bin/about.py	Mon Mar 10 13:01:08 2014 +0100
     1.2 +++ b/OpenSecurity/bin/about.py	Mon Mar 10 13:14:31 2014 +0100
     1.3 @@ -111,7 +111,7 @@
     1.4          super(About, self).__init__(parent, flags)
     1.5          
     1.6          # setup image search path
     1.7 -        QtCore.QDir.setSearchPaths("image", QtCore.QStringList(os.path.join(Environment('opensecurity').data_path, '..', 'gfx')));
     1.8 +        QtCore.QDir.setSearchPaths("image", QtCore.QStringList(os.path.join(Environment('opensecurity').data_path, 'gfx')));
     1.9          
    1.10          self.setWindowTitle('About OpenSecurity ...')
    1.11          self.setup_ui()
     2.1 --- a/OpenSecurity/bin/launch.pyw	Mon Mar 10 13:01:08 2014 +0100
     2.2 +++ b/OpenSecurity/bin/launch.pyw	Mon Mar 10 13:14:31 2014 +0100
     2.3 @@ -195,7 +195,7 @@
     2.4      """ask the user for VM and app to start"""
     2.5      
     2.6      # prebuild the pixmap cache: fetch all jpg, png and jpeg images and load them
     2.7 -    image_path = os.path.join(Environment("OpenSecurity").data_path, '..', 'gfx')
     2.8 +    image_path = os.path.join(Environment("OpenSecurity").data_path, 'gfx')
     2.9      for file in os.listdir(image_path):
    2.10          if file.lower().rpartition('.')[2] in ('jpg', 'png', 'jpeg'):
    2.11              QtGui.QPixmapCache.insert(file.lower().rpartition('.')[0], QtGui.QPixmap(os.path.join(image_path, file)))
     3.1 --- a/OpenSecurity/bin/opensecurity_dialog.py	Mon Mar 10 13:01:08 2014 +0100
     3.2 +++ b/OpenSecurity/bin/opensecurity_dialog.py	Mon Mar 10 13:14:31 2014 +0100
     3.3 @@ -62,7 +62,7 @@
     3.4      
     3.5      # prebuild the pixmap cache: fetch all jpg, png and jpeg images and load them
     3.6      data_path = Environment("OpenSecurity").data_path
     3.7 -    image_path = os.path.join(data_path, '..', 'gfx')
     3.8 +    image_path = os.path.join(data_path, 'gfx')
     3.9      for file in os.listdir(image_path):
    3.10          if file.lower().rpartition('.')[2] in ('jpg', 'png', 'jpeg'):
    3.11              QtGui.QPixmapCache.insert(file.lower().rpartition('.')[0], QtGui.QPixmap(os.path.join(image_path, file)))
     4.1 --- a/OpenSecurity/bin/opensecurity_tray.pyw	Mon Mar 10 13:01:08 2014 +0100
     4.2 +++ b/OpenSecurity/bin/opensecurity_tray.pyw	Mon Mar 10 13:14:31 2014 +0100
     4.3 @@ -163,7 +163,7 @@
     4.4      app = QtGui.QApplication(sys.argv)
     4.5  
     4.6      # prebuild the pixmap cache: fetch all jpg, png and jpeg images and load them
     4.7 -    image_path = os.path.join(Environment("OpenSecurity").data_path, '..', 'gfx')
     4.8 +    image_path = os.path.join(Environment("OpenSecurity").data_path, 'gfx')
     4.9      for file in os.listdir(image_path):
    4.10          if file.lower().rpartition('.')[2] in ('jpg', 'png', 'jpeg'):
    4.11              QtGui.QPixmapCache.insert(file.lower().rpartition('.')[0], QtGui.QPixmap(os.path.join(image_path, file)))