Просмотр исходного кода

- small bugs related to shortcut keys solved

Marius Stanciu 7 лет назад
Родитель
Сommit
28f11ef55f
3 измененных файлов с 7 добавлено и 4 удалено
  1. 5 2
      FlatCAMGUI.py
  2. 1 1
      ObjectCollection.py
  3. 1 1
      README.md

+ 5 - 2
FlatCAMGUI.py

@@ -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')

+ 1 - 1
ObjectCollection.py

@@ -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:

+ 1 - 1
README.md

@@ -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