diff options
Diffstat (limited to 'src/main/python/utils')
| -rw-r--r-- | src/main/python/utils/app.py | 5 | ||||
| -rw-r--r-- | src/main/python/utils/toolbar.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/python/utils/app.py b/src/main/python/utils/app.py index 9812fda..4cc8228 100644 --- a/src/main/python/utils/app.py +++ b/src/main/python/utils/app.py @@ -5,14 +5,15 @@ Declare fbs application so that it can be imported in other modules. from fbs_runtime.application_context.PyQt5 import ApplicationContext from PyQt5.QtCore import QSettings from json import JSONEncoder, dumps, loads, dump, load +from os.path import join app = ApplicationContext() settings = QSettings(QSettings.IniFormat, QSettings.UserScope ,"FOSSEE", "Chemical-PFD") version = app.build_settings['version'] -def fileImporter(file): +def fileImporter(*file): # Helper function to fetch files from src/main/resources - return app.get_resource(file) + return app.get_resource(join(*file)) class JSON_Encoder: diff --git a/src/main/python/utils/toolbar.py b/src/main/python/utils/toolbar.py index ffb0896..90b46fb 100644 --- a/src/main/python/utils/toolbar.py +++ b/src/main/python/utils/toolbar.py @@ -120,7 +120,7 @@ class toolbarButton(QToolButton): def __init__(self, parent = None, item = None): super(toolbarButton, self).__init__(parent) #uses fbs resource manager to get icons - self.setIcon(QIcon(fileImporter(f'toolbar/{item["icon"]}'))) + self.setIcon(QIcon(fileImporter('toolbar', item['icon']))) self.setIconSize(QSize(64, 64)) #unecessary but left for future references self.dragStartPosition = None #intialize value for drag event self.itemObject = item['object'] #refer current item object, to handle drag mime |