Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.

CURA-2917
This commit is contained in:
Simon Edwards 2016-12-12 16:05:35 +01:00
parent 5884509af1
commit 74e5798509
20 changed files with 134 additions and 128 deletions

View file

@ -124,7 +124,6 @@ class CuraApplication(QtApplication):
Q_ENUMS(ResourceTypes)
def __init__(self):
super().__init__(name = "cura", version = CuraVersion, buildtype = CuraBuildType)
Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources"))
if not hasattr(sys, "frozen"):
@ -187,6 +186,7 @@ class CuraApplication(QtApplication):
self._additional_components = {} # Components to add to certain areas in the interface
super().__init__(name = "cura", version = CuraVersion, buildtype = CuraBuildType)
self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))