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

- fixed the layouts to include toolbars breaks where it was needed

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-14 13:41:15 +03:00
committed by Marius
parent 666d84c964
commit 1ab16f2d6f
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FlatCAMApp.py
View File

@@ -5518,17 +5518,19 @@ class App(QtCore.QObject):
self.ui.addToolBar(self.ui.toolbartools) self.ui.addToolBar(self.ui.toolbartools)
self.ui.exc_edit_toolbar = QtWidgets.QToolBar('Excellon Editor Toolbar') self.ui.exc_edit_toolbar = QtWidgets.QToolBar('Excellon Editor Toolbar')
self.ui.exc_edit_toolbar.setVisible(False) # self.ui.exc_edit_toolbar.setVisible(False)
self.ui.exc_edit_toolbar.setObjectName('ExcEditor_TB') self.ui.exc_edit_toolbar.setObjectName('ExcEditor_TB')
self.ui.addToolBar(self.ui.exc_edit_toolbar) self.ui.addToolBar(self.ui.exc_edit_toolbar)
self.ui.addToolBarBreak()
self.ui.geo_edit_toolbar = QtWidgets.QToolBar('Geometry Editor Toolbar') self.ui.geo_edit_toolbar = QtWidgets.QToolBar('Geometry Editor Toolbar')
self.ui.geo_edit_toolbar.setVisible(False) # self.ui.geo_edit_toolbar.setVisible(False)
self.ui.geo_edit_toolbar.setObjectName('GeoEditor_TB') self.ui.geo_edit_toolbar.setObjectName('GeoEditor_TB')
self.ui.addToolBar(self.ui.geo_edit_toolbar) self.ui.addToolBar(self.ui.geo_edit_toolbar)
self.ui.grb_edit_toolbar = QtWidgets.QToolBar('Gerber Editor Toolbar') self.ui.grb_edit_toolbar = QtWidgets.QToolBar('Gerber Editor Toolbar')
self.ui.grb_edit_toolbar.setVisible(False) # self.ui.grb_edit_toolbar.setVisible(False)
self.ui.grb_edit_toolbar.setObjectName('GrbEditor_TB') self.ui.grb_edit_toolbar.setObjectName('GrbEditor_TB')
self.ui.addToolBar(self.ui.grb_edit_toolbar) self.ui.addToolBar(self.ui.grb_edit_toolbar)
@@ -5544,12 +5546,11 @@ class App(QtCore.QObject):
self.ui.toolbarfile = QtWidgets.QToolBar('File Toolbar') self.ui.toolbarfile = QtWidgets.QToolBar('File Toolbar')
self.ui.toolbarfile.setObjectName('File_TB') self.ui.toolbarfile.setObjectName('File_TB')
self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarfile) self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarfile)
self.ui.toolbargeo = QtWidgets.QToolBar('Edit Toolbar') self.ui.toolbargeo = QtWidgets.QToolBar('Edit Toolbar')
self.ui.toolbargeo.setObjectName('Edit_TB') self.ui.toolbargeo.setObjectName('Edit_TB')
self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbargeo) self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbargeo)
self.ui.toolbarview = QtWidgets.QToolBar('View Toolbar')
self.ui.toolbarview.setObjectName('View_TB')
self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarview)
self.ui.toolbarshell = QtWidgets.QToolBar('Shell Toolbar') self.ui.toolbarshell = QtWidgets.QToolBar('Shell Toolbar')
self.ui.toolbarshell.setObjectName('Shell_TB') self.ui.toolbarshell.setObjectName('Shell_TB')
@@ -5564,6 +5565,12 @@ class App(QtCore.QObject):
self.ui.geo_edit_toolbar.setObjectName('GeoEditor_TB') self.ui.geo_edit_toolbar.setObjectName('GeoEditor_TB')
self.ui.addToolBar(Qt.RightToolBarArea, self.ui.geo_edit_toolbar) self.ui.addToolBar(Qt.RightToolBarArea, self.ui.geo_edit_toolbar)
self.ui.toolbarview = QtWidgets.QToolBar('View Toolbar')
self.ui.toolbarview.setObjectName('View_TB')
self.ui.addToolBar(Qt.RightToolBarArea, self.ui.toolbarview)
self.ui.addToolBarBreak(area=Qt.RightToolBarArea)
self.ui.grb_edit_toolbar = QtWidgets.QToolBar('Gerber Editor Toolbar') self.ui.grb_edit_toolbar = QtWidgets.QToolBar('Gerber Editor Toolbar')
# self.ui.grb_edit_toolbar.setVisible(False) # self.ui.grb_edit_toolbar.setVisible(False)
self.ui.grb_edit_toolbar.setObjectName('GrbEditor_TB') self.ui.grb_edit_toolbar.setObjectName('GrbEditor_TB')

1
README.md
View File

@@ -18,6 +18,7 @@ CAD program, and create G-Code for Isolation routing.
- minor changes in the 'FlatCAM About' GUI - minor changes in the 'FlatCAM About' GUI
- added a new shortcut key F5 for doing the 'Plot All' - added a new shortcut key F5 for doing the 'Plot All'
- updated the google-translated Spanish translation strings - updated the google-translated Spanish translation strings
- fixed the layouts to include toolbars breaks where it was needed
13.09.2019 13.09.2019

8
flatcamGUI/FlatCAMGUI.py
View File

@@ -599,6 +599,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.exc_edit_toolbar.setObjectName('ExcEditor_TB') self.exc_edit_toolbar.setObjectName('ExcEditor_TB')
self.addToolBar(self.exc_edit_toolbar) self.addToolBar(self.exc_edit_toolbar)
self.addToolBarBreak()
self.geo_edit_toolbar = QtWidgets.QToolBar(_('Geometry Editor Toolbar')) self.geo_edit_toolbar = QtWidgets.QToolBar(_('Geometry Editor Toolbar'))
self.geo_edit_toolbar.setObjectName('GeoEditor_TB') self.geo_edit_toolbar.setObjectName('GeoEditor_TB')
self.addToolBar(self.geo_edit_toolbar) self.addToolBar(self.geo_edit_toolbar)
@@ -2228,11 +2230,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
if settings.contains("layout"): if settings.contains("layout"):
layout = settings.value('layout', type=str) layout = settings.value('layout', type=str)
if layout == 'standard': if layout == 'standard':
self.exc_edit_toolbar.setVisible(False) self.exc_edit_toolbar.setVisible(True)
self.exc_edit_toolbar.setDisabled(True) self.exc_edit_toolbar.setDisabled(True)
self.geo_edit_toolbar.setVisible(False) self.geo_edit_toolbar.setVisible(True)
self.geo_edit_toolbar.setDisabled(True) self.geo_edit_toolbar.setDisabled(True)
self.grb_edit_toolbar.setVisible(False) self.grb_edit_toolbar.setVisible(True)
self.grb_edit_toolbar.setDisabled(True) self.grb_edit_toolbar.setDisabled(True)
self.corner_snap_btn.setVisible(False) self.corner_snap_btn.setVisible(False)