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

- small bugs related to shortcut keys solved

Browse Source
This commit is contained in:
Marius Stanciu
2019-02-06 14:27:11 +02:00
committed by Marius
parent dedf8c09de
commit 28f11ef55f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FlatCAMGUI.py
View File

@@ -1508,6 +1508,9 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
if event.key() == QtCore.Qt.Key_3: if event.key() == QtCore.Qt.Key_3:
self.app.on_select_tab('tool') self.app.on_select_tab('tool')
if event.key() == QtCore.Qt.Key_G:
self.grid_snap_btn.trigger()
if event.key == QtCore.Qt.Key_Q: if event.key == QtCore.Qt.Key_Q:
self.app.on_toggle_units_click() self.app.on_toggle_units_click()
@@ -3726,7 +3729,7 @@ class FlatCAMInfoBar(QtWidgets.QWidget):
layout.addWidget(self.icon) layout.addWidget(self.icon)
self.text = QtWidgets.QLabel(self) self.text = QtWidgets.QLabel(self)
self.text.setText("Hello!") self.text.setText("Application started ...")
self.text.setToolTip("Hello!") self.text.setToolTip("Hello!")
layout.addWidget(self.text) layout.addWidget(self.text)
@@ -3742,7 +3745,7 @@ class FlatCAMInfoBar(QtWidgets.QWidget):
self.pmap.fill() self.pmap.fill()
if level == "ERROR" or level == "ERROR_NOTCL": if level == "ERROR" or level == "ERROR_NOTCL":
self.pmap = QtGui.QPixmap('share/redlight12.png') self.pmap = QtGui.QPixmap('share/redlight12.png')
elif level == "success": elif level == "success" or level == "SUCCESS":
self.pmap = QtGui.QPixmap('share/greenlight12.png') self.pmap = QtGui.QPixmap('share/greenlight12.png')
elif level == "WARNING" or level == "WARNING_NOTCL": elif level == "WARNING" or level == "WARNING_NOTCL":
self.pmap = QtGui.QPixmap('share/yellowlight12.png') self.pmap = QtGui.QPixmap('share/yellowlight12.png')

2
ObjectCollection.py
View File

@@ -417,7 +417,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
# Grid toggle # Grid toggle
if key == QtCore.Qt.Key_G: if key == QtCore.Qt.Key_G:
self.app.geo_editor.grid_snap_btn.trigger() self.app.ui.grid_snap_btn.trigger()
# Jump to coords # Jump to coords
if key == QtCore.Qt.Key_J: if key == QtCore.Qt.Key_J:

2
README.md
View File

@@ -19,7 +19,7 @@ CAD program, and create G-Code for Isolation routing.
- fixed the name self-insert in save dialog file for GCode; added protection in case the save path is None - fixed the name self-insert in save dialog file for GCode; added protection in case the save path is None
- fixed FlatCAM crash when trying to make drills GCode out of a file that have only slots. - fixed FlatCAM crash when trying to make drills GCode out of a file that have only slots.
- made the shell toggle shortcut key work when focused on Selected Tab; toggle units shortcut also - made the shell toggle shortcut key work when focused on Selected Tab; toggle units shortcut also
- changed the messages for Units COnversion - changed the messages for Units Conversion
5.02.3019 5.02.3019