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

Merge https://bitbucket.org/jpcgt/flatcam/src/master into Menu_clening_icons_adding

Browse Source 
# Conflicts:
#	FlatCAMDraw.py
#	FlatCAMGUI.py
This commit is contained in:
Marius Stanciu
2018-05-31 18:31:35 +03:00
parent 090fdf2b39
commit b005058586
3 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FlatCAMApp.py
View File

@@ -575,10 +575,10 @@ class App(QtCore.QObject):
### Tools and Plugins ###
#########################
self.dblsidedtool = DblSidedTool(self)
self.dblsidedtool.install(icon=QtGui.QIcon('share:doubleside16.png'), separator=True)
self.dblsidedtool.install(icon=QtGui.QIcon('share/doubleside16.png'), separator=True)
self.measeurement_tool = Measurement(self)
self.measeurement_tool.install(icon=QtGui.QIcon('share:measure16.png'))
self.measeurement_tool.install(icon=QtGui.QIcon('share/measure16.png'))
self.ui.measure_btn.triggered.connect(self.measeurement_tool.run)