diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e27eb56..375b3743 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ CHANGELOG for FlatCAM beta - renamed the app to FlatCAM Evo in order to make a difference from FlatCAM app which follows its own path - modified the splash image to reflect the new naming of the app - modified some of the documents (License, Readme) in the app to reflect the actual reality in 2021 +- made more changes in the names; Tools Toolbar is now Plugin Toolbar +- the detachable tabs are now not detachable by default after first install 9.1.2021 diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py index 57ef286a..9477e790 100644 --- a/appGUI/MainGUI.py +++ b/appGUI/MainGUI.py @@ -935,9 +935,9 @@ class MainGUI(QtWidgets.QMainWindow): self.toolbarshell.setObjectName('Shell_TB') self.addToolBar(self.toolbarshell) - self.toolbartools = QtWidgets.QToolBar(_('Tools Toolbar')) - self.toolbartools.setObjectName('Tools_TB') - self.addToolBar(self.toolbartools) + self.toolbarplugins = QtWidgets.QToolBar(_('Plugin Toolbar')) + self.toolbarplugins.setObjectName('Plugins_TB') + self.addToolBar(self.toolbarplugins) self.exc_edit_toolbar = QtWidgets.QToolBar(_('Excellon Editor Toolbar')) self.exc_edit_toolbar.setObjectName('ExcEditor_TB') @@ -1063,81 +1063,81 @@ class MainGUI(QtWidgets.QMainWindow): # ######################################################################## # ########################## Tools Toolbar# ############################## # ######################################################################## - self.drill_btn = self.toolbartools.addAction( + self.drill_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling Tool")) - self.mill_btn = self.toolbartools.addAction( + self.mill_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/milling_tool32.png'), _("Milling Tool")) - self.level_btn = self.toolbartools.addAction( + self.level_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/level32.png'), _("Levelling Tool")) self.level_btn.setDisabled(True) self.level_btn.setToolTip("DISABLED. Work in progress!") - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.isolation_btn = self.toolbartools.addAction( + self.isolation_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool")) - self.follow_btn = self.toolbartools.addAction( + self.follow_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow Tool")) - self.ncc_btn = self.toolbartools.addAction( + self.ncc_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/ncc32.png'), _("NCC Tool")) - self.paint_btn = self.toolbartools.addAction( + self.paint_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.cutout_btn = self.toolbartools.addAction( + self.cutout_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/cut32.png'), _("Cutout Tool")) - self.panelize_btn = self.toolbartools.addAction( + self.panelize_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/panelize32.png'), _("Panel Tool")) - self.film_btn = self.toolbartools.addAction( + self.film_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/film32.png'), _("Film Tool")) - self.dblsided_btn = self.toolbartools.addAction( + self.dblsided_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.align_btn = self.toolbartools.addAction( + self.align_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) - # self.sub_btn = self.toolbartools.addAction( + # self.sub_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.extract_btn = self.toolbartools.addAction( + self.extract_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) - self.copperfill_btn = self.toolbartools.addAction( + self.copperfill_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/copperfill32.png'), _("Copper Thieving Tool")) - self.corners_tool_btn = self.toolbartools.addAction( + self.corners_tool_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Corner Markers Tool")) - self.punch_btn = self.toolbartools.addAction( + self.punch_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber Tool")) - self.calculators_btn = self.toolbartools.addAction( + self.calculators_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - # self.solder_btn = self.toolbartools.addAction( + # self.solder_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/solderpastebis32.png'), _("SolderPaste Tool")) - # self.sub_btn = self.toolbartools.addAction( + # self.sub_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) - # self.rules_btn = self.toolbartools.addAction( + # self.rules_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/rules32.png'), _("Rules Tool")) - # self.optimal_btn = self.toolbartools.addAction( + # self.optimal_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Optimal Tool")) - # self.transform_btn = self.toolbartools.addAction( + # self.transform_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform Tool")) - # self.qrcode_btn = self.toolbartools.addAction( + # self.qrcode_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/qrcode32.png'), _("QRCode Tool")) - # self.align_btn = self.toolbartools.addAction( + # self.align_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) - # self.fiducials_btn = self.toolbartools.addAction( + # self.fiducials_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/fiducials_32.png'), _("Fiducials Tool")) - # self.cal_btn = self.toolbartools.addAction( + # self.cal_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/calibrate_32.png'), _("Calibration Tool")) - # self.invert_btn = self.toolbartools.addAction( + # self.invert_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/invert32.png'), _("Invert Gerber Tool")) - # self.etch_btn = self.toolbartools.addAction( + # self.etch_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/etch_32.png'), _("Etch Compensation Tool")) # ######################################################################## @@ -2019,9 +2019,9 @@ class MainGUI(QtWidgets.QMainWindow): self.toolbarview.setVisible(False) if tb & 8: - self.toolbartools.setVisible(True) + self.toolbarplugins.setVisible(True) else: - self.toolbartools.setVisible(False) + self.toolbarplugins.setVisible(False) if tb & 16: self.exc_edit_toolbar.setVisible(True) @@ -2282,81 +2282,81 @@ class MainGUI(QtWidgets.QMainWindow): # ######################################################################### # ######################### Tools Toolbar ################################# # ######################################################################### - self.drill_btn = self.toolbartools.addAction( + self.drill_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Drilling Tool")) - self.mill_btn = self.toolbartools.addAction( + self.mill_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/milling_tool32.png'), _("Milling Tool")) - self.level_btn = self.toolbartools.addAction( + self.level_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/level32.png'), _("Levelling Tool")) self.level_btn.setDisabled(True) self.level_btn.setToolTip("DISABLED. Work in progress!") - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.isolation_btn = self.toolbartools.addAction( + self.isolation_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/iso_16.png'), _("Isolation Tool")) - self.follow_btn = self.toolbartools.addAction( + self.follow_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/follow32.png'), _("Follow Tool")) - self.ncc_btn = self.toolbartools.addAction( + self.ncc_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/ncc32.png'), _("NCC Tool")) - self.paint_btn = self.toolbartools.addAction( + self.paint_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/paint20_1.png'), _("Paint Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.cutout_btn = self.toolbartools.addAction( + self.cutout_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/cut32.png'), _("Cutout Tool")) - self.panelize_btn = self.toolbartools.addAction( + self.panelize_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/panelize32.png'), _("Panel Tool")) - self.film_btn = self.toolbartools.addAction( + self.film_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/film32.png'), _("Film Tool")) - self.dblsided_btn = self.toolbartools.addAction( + self.dblsided_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2-Sided Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.align_btn = self.toolbartools.addAction( + self.align_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) - # self.sub_btn = self.toolbartools.addAction( + # self.sub_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - self.extract_btn = self.toolbartools.addAction( + self.extract_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/extract32.png'), _("Extract Tool")) - self.copperfill_btn = self.toolbartools.addAction( + self.copperfill_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/copperfill32.png'), _("Copper Thieving Tool")) - self.corners_tool_btn = self.toolbartools.addAction( + self.corners_tool_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Corner Markers Tool")) - self.punch_btn = self.toolbartools.addAction( + self.punch_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber Tool")) - self.calculators_btn = self.toolbartools.addAction( + self.calculators_btn = self.toolbarplugins.addAction( QtGui.QIcon(self.app.resource_location + '/calculator24.png'), _("Calculators Tool")) - self.toolbartools.addSeparator() + self.toolbarplugins.addSeparator() - # self.solder_btn = self.toolbartools.addAction( + # self.solder_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/solderpastebis32.png'), _("SolderPaste Tool")) - # self.sub_btn = self.toolbartools.addAction( + # self.sub_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/sub32.png'), _("Subtract Tool")) - # self.rules_btn = self.toolbartools.addAction( + # self.rules_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/rules32.png'), _("Rules Tool")) - # self.optimal_btn = self.toolbartools.addAction( + # self.optimal_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/open_excellon32.png'), _("Optimal Tool")) - # self.transform_btn = self.toolbartools.addAction( + # self.transform_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transform Tool")) - # self.qrcode_btn = self.toolbartools.addAction( + # self.qrcode_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/qrcode32.png'), _("QRCode Tool")) - # self.align_btn = self.toolbartools.addAction( + # self.align_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) - # self.fiducials_btn = self.toolbartools.addAction( + # self.fiducials_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/fiducials_32.png'), _("Fiducials Tool")) - # self.cal_btn = self.toolbartools.addAction( + # self.cal_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/calibrate_32.png'), _("Calibration Tool")) - # self.invert_btn = self.toolbartools.addAction( + # self.invert_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/invert32.png'), _("Invert Gerber Tool")) - # self.etch_btn = self.toolbartools.addAction( + # self.etch_btn = self.toolbarplugins.addAction( # QtGui.QIcon(self.app.resource_location + '/etch_32.png'), _("Etch Compensation Tool")) # ######################################################################## diff --git a/appGUI/preferences/PreferencesUIManager.py b/appGUI/preferences/PreferencesUIManager.py index 19edf593..0813bc53 100644 --- a/appGUI/preferences/PreferencesUIManager.py +++ b/appGUI/preferences/PreferencesUIManager.py @@ -1115,7 +1115,7 @@ class PreferencesUIManager: if self.ui.toolbarview.isVisible(): tb_status += 4 - if self.ui.toolbartools.isVisible(): + if self.ui.toolbarplugins.isVisible(): tb_status += 8 if self.ui.exc_edit_toolbar.isVisible(): diff --git a/app_Main.py b/app_Main.py index 55ec09a4..36306da8 100644 --- a/app_Main.py +++ b/app_Main.py @@ -155,9 +155,9 @@ class App(QtCore.QObject): # ############################################################################################################### # ################################### Version and VERSION DATE ################################################## # ############################################################################################################### - version = "Unstable Version" - # version = 8.994 - version_date = "2020/12/7" + version = "Unstable" + # version = 8.995 + version_date = "2021/2/7" beta = True engine = '3D' @@ -2196,7 +2196,7 @@ class App(QtCore.QObject): self.ui.popmenu_properties.triggered.connect(self.obj_properties) def connect_tools_signals_to_toolbar(self): - self.log.debug(" -> Connecting Tools Toolbar Signals") + self.log.debug(" -> Connecting Plugin Toolbar Signals") self.ui.drill_btn.triggered.connect(lambda: self.drilling_tool.run(toggle=True)) self.ui.mill_btn.triggered.connect(lambda: self.milling_tool.run(toggle=True)) @@ -2327,7 +2327,7 @@ class App(QtCore.QObject): self.ui.removeToolBar(self.ui.toolbaredit) self.ui.removeToolBar(self.ui.toolbarview) self.ui.removeToolBar(self.ui.toolbarshell) - self.ui.removeToolBar(self.ui.toolbartools) + self.ui.removeToolBar(self.ui.toolbarplugins) self.ui.removeToolBar(self.ui.exc_edit_toolbar) self.ui.removeToolBar(self.ui.geo_edit_toolbar) self.ui.removeToolBar(self.ui.grb_edit_toolbar) @@ -2350,9 +2350,9 @@ class App(QtCore.QObject): self.ui.toolbarshell.setObjectName('Shell_TB') self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbarshell) - self.ui.toolbartools = QtWidgets.QToolBar('Tools Toolbar') - self.ui.toolbartools.setObjectName('Tools_TB') - self.ui.addToolBar(Qt.LeftToolBarArea, self.ui.toolbartools) + self.ui.toolbarplugins = QtWidgets.QToolBar('Plugin Toolbar') + self.ui.toolbarplugins.setObjectName('Plugins_TB') + 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') @@ -2389,9 +2389,9 @@ class App(QtCore.QObject): self.ui.toolbarshell.setObjectName('Shell_TB') self.ui.addToolBar(self.ui.toolbarshell) - self.ui.toolbartools = QtWidgets.QToolBar('Tools Toolbar') - self.ui.toolbartools.setObjectName('Tools_TB') - self.ui.addToolBar(self.ui.toolbartools) + self.ui.toolbarplugins = QtWidgets.QToolBar('Plugin Toolbar') + self.ui.toolbarplugins.setObjectName('Plugins_TB') + self.ui.addToolBar(self.ui.toolbarplugins) self.ui.exc_edit_toolbar = QtWidgets.QToolBar('Excellon Editor Toolbar') # self.ui.exc_edit_toolbar.setVisible(False) @@ -2574,10 +2574,10 @@ class App(QtCore.QObject): self.delete_selection_shape() # hide the Tools Toolbar - tools_tb = self.ui.toolbartools - if tools_tb.isVisible(): + plugins_tb = self.ui.toolbarplugins + if plugins_tb.isVisible(): self.old_state_of_tools_toolbar = True - tools_tb.hide() + plugins_tb.hide() else: self.old_state_of_tools_toolbar = False @@ -2631,9 +2631,9 @@ class App(QtCore.QObject): if response == bt_yes: # show the Tools Toolbar - tools_tb = self.ui.toolbartools + plugins_tb = self.ui.toolbarplugins if self.old_state_of_tools_toolbar is True: - tools_tb.show() + plugins_tb.show() # clean the Tools Tab found_idx = None @@ -2742,9 +2742,9 @@ class App(QtCore.QObject): self.inform.emit('[selected] %s %s' % (obj_type, _("is updated, returning to App..."))) elif response == bt_no: # show the Tools Toolbar - tools_tb = self.ui.toolbartools + plugins_tb = self.ui.toolbarplugins if self.old_state_of_tools_toolbar is True: - tools_tb.show() + plugins_tb.show() # clean the Tools Tab found_idx = None @@ -2792,9 +2792,9 @@ class App(QtCore.QObject): # self.ui.notebook.setCurrentWidget(self.ui.properties_tab) else: # show the Tools Toolbar - tools_tb = self.ui.toolbartools + plugins_tb = self.ui.toolbarplugins if self.old_state_of_tools_toolbar is True: - tools_tb.show() + plugins_tb.show() if edited_obj.kind == 'geometry': self.geo_editor.deactivate() @@ -3091,7 +3091,7 @@ class App(QtCore.QObject): logo.setPixmap(QtGui.QPixmap(self.app.resource_location + '/flatcam_icon256.png')) title = QtWidgets.QLabel( - "FlatCAM
" + "FlatCAM Evo
" "{title}
" "
" "
" @@ -3099,7 +3099,7 @@ class App(QtCore.QObject): "{down}
" "" "{issue}
".format( - title=_("2D Computer-Aided Printed Circuit Board Manufacturing"), + title=_("PCB Manufacturing files Viewer/Editor with Plugins"), devel=_("Development"), down=_("DOWNLOAD"), issue=_("Issue tracker")) @@ -3110,7 +3110,7 @@ class App(QtCore.QObject): tab_widget = QtWidgets.QTabWidget() description_label = QtWidgets.QLabel( - "FlatCAM {version} {beta} ({date}) - {arch}
" + "FlatCAM Evo {version} {beta} ({date}) - {arch}
" "http://flatcam.org
".format( version=version, beta=('BETA' if beta else ''), diff --git a/defaults.py b/defaults.py index 28782a4a..21fb57c0 100644 --- a/defaults.py +++ b/defaults.py @@ -29,7 +29,7 @@ class FlatCAMDefaults: "root_folder_path": '', "global_serial": 0, "global_stats": dict(), - "global_tabs_detachable": True, + "global_tabs_detachable": False, "global_coordsbar_show": True, "global_delta_coordsbar_show": False,