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

21
flatcamGUI/FlatCAMGUI.py
View File

@@ -183,6 +183,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
QtGui.QIcon(self.app.resource_location + '/script_new16.png'), _('New Script ...'), self)
self.menufileopenscript = QtWidgets.QAction(
QtGui.QIcon(self.app.resource_location + '/open_script32.png'), _('Open Script ...'), self)
self.menufileopenscriptexample = QtWidgets.QAction(
QtGui.QIcon(self.app.resource_location + '/open_script32.png'), _('Open Example ...'), self)
self.menufilerunscript = QtWidgets.QAction(
QtGui.QIcon(self.app.resource_location + '/script16.png'), '%s\tShift+S' % _('Run Script ...'), self)
self.menufilerunscript.setToolTip(
@@ -192,6 +194,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
)
self.menufile_scripting.addAction(self.menufilenewscript)
self.menufile_scripting.addAction(self.menufileopenscript)
self.menufile_scripting.addAction(self.menufileopenscriptexample)
self.menufile_scripting.addSeparator()
self.menufile_scripting.addAction(self.menufilerunscript)
@@ -1741,7 +1744,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# F keys section
_("Open Online Manual"),
_("Open Online Tutorials"), _("Refresh Plots"), _("Delete Object"), _("Alternate: Delete Tool"),
_("(left to Key_1)Toogle Notebook Area (Left Side)"), _("En(Dis)able Obj Plot"),
_("(left to Key_1)Toggle Notebook Area (Left Side)"), _("En(Dis)able Obj Plot"),
_("Deselects all objects")
)
)
@@ -2293,13 +2296,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.rel_position_label = QtWidgets.QLabel(
"<b>Dx</b>: 0.0000&nbsp;&nbsp; <b>Dy</b>: 0.0000&nbsp;&nbsp;&nbsp;&nbsp;")
self.rel_position_label.setMinimumWidth(110)
self.rel_position_label.setToolTip(_("Relative neasurement.\nReference is last click position"))
self.rel_position_label.setToolTip(_("Relative measurement.\nReference is last click position"))
self.infobar.addWidget(self.rel_position_label)
self.position_label = QtWidgets.QLabel(
"&nbsp;&nbsp;&nbsp;&nbsp;<b>X</b>: 0.0000&nbsp;&nbsp; <b>Y</b>: 0.0000")
self.position_label.setMinimumWidth(110)
self.position_label.setToolTip(_("Absolute neasurement.\nReference is (X=0, Y= 0) position"))
self.position_label.setToolTip(_("Absolute measurement.\nReference is (X=0, Y= 0) position"))
self.infobar.addWidget(self.position_label)
self.units_label = QtWidgets.QLabel("[in]")
@@ -4284,20 +4287,24 @@ class FlatCAMInfoBar(QtWidgets.QWidget):
def set_status(self, text, level="info"):
level = str(level)
self.pmap.fill()
if level == "ERROR" or level == "ERROR_NOTCL":
self.pmap = QtGui.QPixmap(self.app.resource_location + '/redlight12.png')
elif level == "success" or level == "SUCCESS":
elif level.lower() == "success":
self.pmap = QtGui.QPixmap(self.app.resource_location + '/greenlight12.png')
elif level == "WARNING" or level == "WARNING_NOTCL":
self.pmap = QtGui.QPixmap(self.app.resource_location + '/yellowlight12.png')
elif level == "selected" or level == "SELECTED":
elif level.lower() == "selected":
self.pmap = QtGui.QPixmap(self.app.resource_location + '/bluelight12.png')
else:
self.pmap = QtGui.QPixmap(self.app.resource_location + '/graylight12.png')
self.set_text_(text)
self.icon.setPixmap(self.pmap)
try:
self.set_text_(text)
self.icon.setPixmap(self.pmap)
except Exception as e:
log.debug("FlatCAMInfoBar.set_status() --> %s" % str(e))
class FlatCAMSystemTray(QtWidgets.QSystemTrayIcon):