bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Beta' of https://bitbucket.org/jpcgt/flatcam into extract-prefs-code-from-app-class

Browse Source
This commit is contained in:
David Robertson
2020-04-29 02:57:17 +01:00
parent a05c174ec8 c03844443b
commit db37714025
657 changed files with 750 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flatcamObjects/ObjectCollection.py
View File

@@ -247,12 +247,12 @@ class ObjectCollection(QtCore.QAbstractItemModel):
}
icon_files = {
"gerber": "share/flatcam_icon16.png",
"excellon": "share/drill16.png",
"cncjob": "share/cnc16.png",
"geometry": "share/geometry16.png",
"script": "share/script_new16.png",
"document": "share/notes16_1.png"
"gerber": "assets/resources/flatcam_icon16.png",
"excellon": "assets/resources/drill16.png",
"cncjob": "assets/resources/cnc16.png",
"geometry": "assets/resources/geometry16.png",
"script": "assets/resources/script_new16.png",
"document": "assets/resources/notes16_1.png"
}
# will emit the name of the object that was just selected
@@ -272,7 +272,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
self.icons = {}
for kind in ObjectCollection.icon_files:
self.icons[kind] = QtGui.QPixmap(
ObjectCollection.icon_files[kind].replace('share', self.app.resource_location))
ObjectCollection.icon_files[kind].replace('assets/resources', self.app.resource_location))
# Create root tree view item
self.root_item = TreeItem(["root"])