- hidden the snap magnet entry and snap magnet toggle from the main view; they are now active only in Editor Mode
This commit is contained in:
parent
d1780acad9
commit
093f210c25
|
@ -921,8 +921,8 @@ class App(QtCore.QObject):
|
|||
|
||||
# start with GRID activated
|
||||
self.ui.grid_snap_btn.trigger()
|
||||
self.ui.corner_snap_btn.setEnabled(False)
|
||||
self.ui.snap_max_dist_entry.setEnabled(False)
|
||||
self.ui.corner_snap_btn.setVisible(False)
|
||||
self.ui.snap_magnet.setVisible(False)
|
||||
self.ui.g_editor_cmenu.setEnabled(False)
|
||||
self.ui.e_editor_cmenu.setEnabled(False)
|
||||
|
||||
|
|
|
@ -1890,8 +1890,8 @@ class FlatCAMGeoEditor(QtCore.QObject):
|
|||
self.app = app
|
||||
self.canvas = app.plotcanvas
|
||||
|
||||
self.app.ui.geo_edit_toolbar.setDisabled(disabled)
|
||||
self.app.ui.snap_max_dist_entry.setDisabled(disabled)
|
||||
self.app.ui.geo_edit_toolbar.setDisabled(True)
|
||||
self.app.ui.snap_magnet.setVisible(False)
|
||||
|
||||
self.app.ui.geo_add_circle_menuitem.triggered.connect(lambda: self.select_tool('circle'))
|
||||
self.app.ui.geo_add_arc_menuitem.triggered.connect(lambda: self.select_tool('arc'))
|
||||
|
@ -2048,8 +2048,8 @@ class FlatCAMGeoEditor(QtCore.QObject):
|
|||
self.shapes.enabled = True
|
||||
self.tool_shape.enabled = True
|
||||
self.app.app_cursor.enabled = True
|
||||
self.app.ui.snap_max_dist_entry.setDisabled(False)
|
||||
self.app.ui.corner_snap_btn.setEnabled(True)
|
||||
self.app.ui.snap_magnet.setVisible(True)
|
||||
self.app.ui.corner_snap_btn.setVisible(True)
|
||||
|
||||
self.app.ui.geo_editor_menu.setDisabled(False)
|
||||
self.app.ui.geo_editor_menu.menuAction().setVisible(True)
|
||||
|
@ -2061,8 +2061,8 @@ class FlatCAMGeoEditor(QtCore.QObject):
|
|||
self.clear()
|
||||
self.app.ui.geo_edit_toolbar.setDisabled(True)
|
||||
self.app.ui.geo_edit_toolbar.setVisible(False)
|
||||
self.app.ui.snap_max_dist_entry.setDisabled(True)
|
||||
self.app.ui.corner_snap_btn.setEnabled(False)
|
||||
self.app.ui.snap_magnet.setVisible(False)
|
||||
self.app.ui.corner_snap_btn.setVisible(False)
|
||||
# never deactivate the snap toolbar - MS
|
||||
# self.app.ui.snap_toolbar.setDisabled(True) # TODO: Combine and move into tool
|
||||
|
||||
|
@ -4185,8 +4185,8 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|||
self.shapes.enabled = True
|
||||
self.tool_shape.enabled = True
|
||||
# self.app.app_cursor.enabled = True
|
||||
self.app.ui.snap_max_dist_entry.setDisabled(False)
|
||||
self.app.ui.corner_snap_btn.setEnabled(True)
|
||||
self.app.ui.snap_magnet.setVisible(True)
|
||||
self.app.ui.corner_snap_btn.setVisible(True)
|
||||
|
||||
self.app.ui.exc_editor_menu.setDisabled(False)
|
||||
self.app.ui.exc_editor_menu.menuAction().setVisible(True)
|
||||
|
@ -4199,8 +4199,8 @@ class FlatCAMExcEditor(QtCore.QObject):
|
|||
self.clear()
|
||||
self.app.ui.exc_edit_toolbar.setDisabled(True)
|
||||
self.app.ui.exc_edit_toolbar.setVisible(False)
|
||||
self.app.ui.snap_max_dist_entry.setDisabled(True)
|
||||
self.app.ui.corner_snap_btn.setEnabled(False)
|
||||
self.app.ui.snap_magnet.setVisible(False)
|
||||
self.app.ui.corner_snap_btn.setVisible(False)
|
||||
|
||||
# Disable visuals
|
||||
self.shapes.enabled = False
|
||||
|
|
|
@ -501,10 +501,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
|
||||
self.corner_snap_btn = self.snap_toolbar.addAction(QtGui.QIcon('share/corner32.png'), 'Snap to corner')
|
||||
|
||||
self.snap_max_dist_entry = QtWidgets.QLineEdit()
|
||||
self.snap_max_dist_entry = FCEntry()
|
||||
self.snap_max_dist_entry.setMaximumWidth(70)
|
||||
self.snap_max_dist_entry.setToolTip("Max. magnet distance")
|
||||
self.snap_toolbar.addWidget(self.snap_max_dist_entry)
|
||||
self.snap_magnet = self.snap_toolbar.addWidget(self.snap_max_dist_entry)
|
||||
|
||||
self.grid_snap_btn.setCheckable(True)
|
||||
self.corner_snap_btn.setCheckable(True)
|
||||
|
|
|
@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||
- added a parameter ('Fast plunge' in Edit -> Preferences -> Geometry Options and Excellon Options) to control if the fast move to Z_move is done or not
|
||||
- added new function to toggle fullscreen status in Menu -> View -> Toggle Full Screen. Shortcut key: Alt+F10
|
||||
- added key shortcuts for Enable Plots, Disable Plots and Disable other plots functions (Alt+1, Alt+2, Alt+3)
|
||||
- hidden the snap magnet entry and snap magnet toggle from the main view; they are now active only in Editor Mode
|
||||
|
||||
30.01.2019
|
||||
|
||||
|
|
Loading…
Reference in New Issue