diff --git a/CHANGELOG.md b/CHANGELOG.md index 44277e5c..ce4eef7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta ================================================= +2.03.2021 + +- removed the spacing between icons in toolbars + 01.03.2021 - major rafactoring: replaced the name of the Gerber object data structure from 'apertures' to 'tools' to make the object data structure uniform across the app diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 237742ca..d5e42762 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -921,44 +921,54 @@ class MainGUI(QtWidgets.QMainWindow): # ## TOOLBAR INSTALLATION ### self.toolbarfile = QtWidgets.QToolBar(_('File Toolbar')) self.toolbarfile.setObjectName('File_TB') + self.toolbarfile.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.toolbarfile) self.toolbaredit = QtWidgets.QToolBar(_('Edit Toolbar')) self.toolbaredit.setObjectName('Edit_TB') + self.toolbaredit.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.toolbaredit) self.toolbarview = QtWidgets.QToolBar(_('View Toolbar')) self.toolbarview.setObjectName('View_TB') + self.toolbarview.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.toolbarview) self.toolbarshell = QtWidgets.QToolBar(_('Shell Toolbar')) self.toolbarshell.setObjectName('Shell_TB') + self.toolbarshell.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.toolbarshell) self.toolbarplugins = QtWidgets.QToolBar(_('Plugin Toolbar')) self.toolbarplugins.setObjectName('Plugins_TB') + self.toolbarplugins.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.toolbarplugins) self.exc_edit_toolbar = QtWidgets.QToolBar(_('Excellon Editor Toolbar')) self.exc_edit_toolbar.setObjectName('ExcEditor_TB') + self.exc_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.exc_edit_toolbar) self.addToolBarBreak() self.geo_edit_toolbar = QtWidgets.QToolBar(_('Geometry Editor Toolbar')) self.geo_edit_toolbar.setObjectName('GeoEditor_TB') + self.geo_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.geo_edit_toolbar) self.grb_edit_toolbar = QtWidgets.QToolBar(_('Gerber Editor Toolbar')) self.grb_edit_toolbar.setObjectName('GrbEditor_TB') + self.grb_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.addToolBar(self.grb_edit_toolbar) # ### INFOBAR TOOLBARS ################################################### self.delta_coords_toolbar = QtWidgets.QToolBar(_('Delta Coordinates Toolbar')) self.delta_coords_toolbar.setObjectName('Delta_Coords_TB') + self.delta_coords_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.coords_toolbar = QtWidgets.QToolBar(_('Coordinates Toolbar')) self.coords_toolbar.setObjectName('Coords_TB') + self.coords_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.grid_toolbar = QtWidgets.QToolBar(_('Grid Toolbar')) self.grid_toolbar.setObjectName('Snap_TB') @@ -968,6 +978,7 @@ class MainGUI(QtWidgets.QMainWindow): QToolBar QToolButton { padding: -2; margin: -2; } """ ) + self.grid_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.status_toolbar = QtWidgets.QToolBar(_('Status Toolbar')) self.status_toolbar.setStyleSheet( @@ -976,6 +987,7 @@ class MainGUI(QtWidgets.QMainWindow): QToolBar QToolButton { padding: -2; margin: -2; } """ ) + self.status_toolbar.setStyleSheet("QToolBar{spacing:0px;}") # ######################################################################## # ########################## File Toolbar# ############################### diff --git a/app_Main.py b/app_Main.py index 3694c3d7..6d143e70 100644 --- a/app_Main.py +++ b/app_Main.py @@ -2344,62 +2344,76 @@ class App(QtCore.QObject): # ## TOOLBAR INSTALLATION # ## self.ui.toolbarfile = QtWidgets.QToolBar('File Toolbar') self.ui.toolbarfile.setObjectName('File_TB') + self.ui.toolbarfile.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarfile) self.ui.toolbaredit = QtWidgets.QToolBar('Edit Toolbar') self.ui.toolbaredit.setObjectName('Edit_TB') + self.ui.toolbaredit.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbaredit) self.ui.toolbarshell = QtWidgets.QToolBar('Shell Toolbar') self.ui.toolbarshell.setObjectName('Shell_TB') + self.ui.toolbarshell.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarshell) self.ui.toolbarplugins = QtWidgets.QToolBar('Plugin Toolbar') self.ui.toolbarplugins.setObjectName('Plugins_TB') + self.ui.toolbarplugins.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarplugins) self.ui.geo_edit_toolbar = QtWidgets.QToolBar('Geometry Editor Toolbar') self.ui.geo_edit_toolbar.setObjectName('GeoEditor_TB') + self.ui.geo_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") 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.toolbarview.setStyleSheet("QToolBar{spacing:0px;}") 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.setObjectName('GrbEditor_TB') + self.ui.grb_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(Qt.RightToolBarArea, self.ui.grb_edit_toolbar) self.ui.exc_edit_toolbar = QtWidgets.QToolBar('Excellon Editor Toolbar') self.ui.exc_edit_toolbar.setObjectName('ExcEditor_TB') + self.ui.exc_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(Qt.RightToolBarArea, self.ui.exc_edit_toolbar) else: # ## TOOLBAR INSTALLATION # ## self.ui.toolbarfile = QtWidgets.QToolBar('File Toolbar') self.ui.toolbarfile.setObjectName('File_TB') + self.ui.toolbarfile.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.toolbarfile) self.ui.toolbaredit = QtWidgets.QToolBar('Edit Toolbar') self.ui.toolbaredit.setObjectName('Edit_TB') + self.ui.toolbaredit.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.toolbaredit) self.ui.toolbarview = QtWidgets.QToolBar('View Toolbar') self.ui.toolbarview.setObjectName('View_TB') + self.ui.toolbarview.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.toolbarview) self.ui.toolbarshell = QtWidgets.QToolBar('Shell Toolbar') self.ui.toolbarshell.setObjectName('Shell_TB') + self.ui.toolbarshell.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.toolbarshell) self.ui.toolbarplugins = QtWidgets.QToolBar('Plugin Toolbar') self.ui.toolbarplugins.setObjectName('Plugins_TB') + self.ui.toolbarplugins.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.toolbarplugins) self.ui.exc_edit_toolbar = QtWidgets.QToolBar('Excellon Editor Toolbar') # self.ui.exc_edit_toolbar.setVisible(False) self.ui.exc_edit_toolbar.setObjectName('ExcEditor_TB') + self.ui.exc_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.exc_edit_toolbar) self.ui.addToolBarBreak() @@ -2407,11 +2421,13 @@ class App(QtCore.QObject): self.ui.geo_edit_toolbar = QtWidgets.QToolBar('Geometry Editor Toolbar') # self.ui.geo_edit_toolbar.setVisible(False) self.ui.geo_edit_toolbar.setObjectName('GeoEditor_TB') + self.ui.geo_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.geo_edit_toolbar) self.ui.grb_edit_toolbar = QtWidgets.QToolBar('Gerber Editor Toolbar') # self.ui.grb_edit_toolbar.setVisible(False) self.ui.grb_edit_toolbar.setObjectName('GrbEditor_TB') + self.ui.grb_edit_toolbar.setStyleSheet("QToolBar{spacing:0px;}") self.ui.addToolBar(self.ui.grb_edit_toolbar) if current_layout == 'minimal':