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

- fixed bug in saving the maximized state

Browse Source 
- fixed bug in applying default language on first start
- on activating 'V' key shortcut (zoom fit) the mouse cursor is now jumping to origin (0, 0)
- fixed bug in saving toolbars state; the file was saved before setting the self.defaults['global_toolbar_view]
This commit is contained in:
Marius Stanciu
2019-04-06 00:10:38 +03:00
parent 13185f3944
commit e8a0fcaef1
6 changed files with 141 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
flatcamGUI/FlatCAMGUI.py
View File

@@ -567,9 +567,9 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("layout"):
layout = settings.value('layout', type=str)
if layout == 'Standard':
if layout == 'standard':
pass
elif layout == 'Compact':
elif layout == 'compact':
self.removeToolBar(self.snap_toolbar)
self.snap_toolbar.setMaximumHeight(30)
self.splitter_left.addWidget(self.snap_toolbar)
@@ -672,13 +672,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.grb_select_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select"))
### Snap Toolbar ###
# Snap GRID toolbar is always active to facilitate usage of measurements done on GRID
# self.addToolBar(self.snap_toolbar)
@@ -1616,7 +1609,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.corner_snap_btn.setVisible(False)
self.snap_magnet.setVisible(False)
elif layout == 'Compact':
elif layout == 'compact':
self.exc_edit_toolbar.setDisabled(True)
self.geo_edit_toolbar.setDisabled(True)
self.grb_edit_toolbar.setDisabled(True)
@@ -1746,12 +1739,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.geo_edit_toolbar.addSeparator()
self.geo_move_btn = self.geo_edit_toolbar.addAction(QtGui.QIcon('share/move32.png'), _("Move Objects"))
### Geometry Editor Toolbar ###
### Gerber Editor Toolbar ###
self.grb_select_btn = self.grb_edit_toolbar.addAction(QtGui.QIcon('share/pointer32.png'), _("Select"))
### Snap Toolbar ###
# Snap GRID toolbar is always active to facilitate usage of measurements done on GRID
# self.addToolBar(self.snap_toolbar)
@@ -1802,7 +1793,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.corner_snap_btn.setVisible(False)
self.snap_magnet.setVisible(False)
elif layout == 'Compact':
elif layout == 'compact':
self.exc_edit_toolbar.setVisible(True)
self.exc_edit_toolbar.setDisabled(True)
self.geo_edit_toolbar.setVisible(True)
@@ -2097,6 +2088,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# Zoom Fit
if key == QtCore.Qt.Key_V:
self.app.on_zoom_fit(None)
# and move mouse cursor to origin
self.app.on_jump_to(custom_location=(0, 0))
# Mirror on X the selected object(s)
if key == QtCore.Qt.Key_X:
@@ -2362,6 +2355,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
if key == QtCore.Qt.Key_V or key == 'V':
self.app.on_zoom_fit(None)
# and move mouse cursor to origin
self.app.on_jump_to(custom_location=(0, 0))
# Flip on X axis
if key == QtCore.Qt.Key_X or key == 'X':
@@ -2541,6 +2536,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
if key == QtCore.Qt.Key_V or key == 'V':
self.app.grb_editor.launched_from_shortcuts = True
self.app.on_zoom_fit(None)
# and move mouse cursor to origin
self.app.on_jump_to(custom_location=(0, 0))
return
# Propagate to tool
@@ -2738,6 +2735,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
if key == QtCore.Qt.Key_V or key == 'V':
self.app.exc_editor.launched_from_shortcuts = True
self.app.on_zoom_fit(None)
# and move mouse cursor to origin
self.app.on_jump_to(custom_location=(0, 0))
return
# Propagate to tool
@@ -3287,8 +3286,8 @@ class GeneralGUISetGroupUI(OptionsGroupUI):
)
self.layout_combo = FCComboBox()
# don't translate the QCombo items as they are used in QSettings and identified by name
self.layout_combo.addItem("Standard")
self.layout_combo.addItem("Compact")
self.layout_combo.addItem("standard")
self.layout_combo.addItem("compact")
# Set the current index for layout_combo
settings = QSettings("Open Source", "FlatCAM")