diff --git a/CHANGELOG.md b/CHANGELOG.md index 21767916..6130baae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ CHANGELOG for FlatCAM beta ================================================= +2.05.2020 + +- changed the icons for the grid snap in the status bar +- moved some of the methods from FlatCAMApp.App to flatcamGUI.FlatCAMGUI class + 01.05.2020 - added some ToolTips (strings needed to be translated too) for the Cut Z entry in Geometry Object UI that explain why is sometime disabled and reason for it's value (sometime is zero) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 7bc26d3e..6ba19076 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -506,7 +506,6 @@ class App(QtCore.QObject): QtCore.QObject.__init__(self) self.ui = FlatCAMGUI(self) - self.on_grid_snap_triggered(state=True) theme_settings = QtCore.QSettings("Open Source", "FlatCAM") if theme_settings.contains("theme"): @@ -1074,9 +1073,6 @@ class App(QtCore.QObject): # signal emitted when a tab is closed in the Plot Area self.ui.plot_tab_area.tab_closed_signal.connect(self.on_plot_area_tab_closed) - self.ui.grid_snap_btn.triggered.connect(self.on_grid_snap_triggered) - self.ui.snap_infobar_label.clicked.connect(self.on_grid_icon_snap_clicked) - # signal to close the application self.close_app_signal.connect(self.kill_app) # ################################# FINISHED CONNECTING SIGNALS ############################################# @@ -4634,7 +4630,7 @@ class App(QtCore.QObject): self.defaults.report_usage("on_toggle_grid()") self.ui.grid_snap_btn.trigger() - self.on_grid_snap_triggered(state=True) + self.ui.on_grid_snap_triggered(state=True) def on_toggle_grid_lines(self): self.defaults.report_usage("on_toggle_grd_lines()") @@ -10622,29 +10618,6 @@ class App(QtCore.QObject): update_colors=(new_color, new_line_color) ) - def on_grid_snap_triggered(self, state): - """ - - :param state: A parameter with the state of the grid, boolean - - :return: - """ - if state: - self.ui.snap_infobar_label.setPixmap(QtGui.QPixmap(self.resource_location + '/snap_filled_16.png')) - else: - self.ui.snap_infobar_label.setPixmap(QtGui.QPixmap(self.resource_location + '/snap_16.png')) - - self.ui.snap_infobar_label.clicked_state = state - - def on_grid_icon_snap_clicked(self): - """ - Slot called by clicking a GUI element, in this case a FCLabel - - :return: - """ - if isinstance(self.sender(), FCLabel): - self.ui.grid_snap_btn.trigger() - def generate_cnc_job(self, objects): """ Slot that will be called by clicking an entry in the contextual menu generated in the Project Tab tree diff --git a/assets/resources/dark_resources/flatcam_icon32_green.png b/assets/resources/dark_resources/flatcam_icon32_green.png index e52b756a..ad778285 100644 Binary files a/assets/resources/dark_resources/flatcam_icon32_green.png and b/assets/resources/dark_resources/flatcam_icon32_green.png differ diff --git a/assets/resources/dark_resources/snap_16.png b/assets/resources/dark_resources/snap_16.png index c8666a1a..cab1ab03 100644 Binary files a/assets/resources/dark_resources/snap_16.png and b/assets/resources/dark_resources/snap_16.png differ diff --git a/assets/resources/dark_resources/snap_filled_16.png b/assets/resources/dark_resources/snap_filled_16.png index 229c91fe..2e54503e 100644 Binary files a/assets/resources/dark_resources/snap_filled_16.png and b/assets/resources/dark_resources/snap_filled_16.png differ diff --git a/assets/resources/snap_16.png b/assets/resources/snap_16.png index 25bf01dd..f0bf2112 100644 Binary files a/assets/resources/snap_16.png and b/assets/resources/snap_16.png differ diff --git a/assets/resources/snap_filled_16.png b/assets/resources/snap_filled_16.png index 0db6956a..2e54503e 100644 Binary files a/assets/resources/snap_filled_16.png and b/assets/resources/snap_filled_16.png differ diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 26b08692..05c173df 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -2366,7 +2366,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # ######################################################################## # ######################## BUILD PREFERENCES ############################# # ######################################################################## - self.general_defaults_form = GeneralPreferencesUI(decimals=self.decimals) self.gerber_defaults_form = GerberPreferencesUI(decimals=self.decimals) self.excellon_defaults_form = ExcellonPreferencesUI(decimals=self.decimals) @@ -2381,7 +2380,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # ######################################################################## # ################## RESTORE THE TOOLBAR STATE from file ################# # ######################################################################## - flat_settings = QSettings("Open Source", "FlatCAM") if flat_settings.contains("saved_gui_state"): saved_gui_state = flat_settings.value('saved_gui_state') @@ -2439,15 +2437,42 @@ class FlatCAMGUI(QtWidgets.QMainWindow): del qsettings self.lock_toolbar(lock=lock_state) + self.on_grid_snap_triggered(state=True) + self.lock_action.triggered[bool].connect(self.lock_toolbar) self.pref_open_button.clicked.connect(self.on_preferences_open_folder) self.clear_btn.clicked.connect(self.on_gui_clear) + self.grid_snap_btn.triggered.connect(self.on_grid_snap_triggered) + self.snap_infobar_label.clicked.connect(self.on_grid_icon_snap_clicked) # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %%%%%%%%%%%%%%%%% GUI Building FINISHED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + def on_grid_snap_triggered(self, state): + """ + + :param state: A parameter with the state of the grid, boolean + + :return: + """ + if state: + self.snap_infobar_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/snap_filled_16.png')) + else: + self.snap_infobar_label.setPixmap(QtGui.QPixmap(self.app.resource_location + '/snap_16.png')) + + self.snap_infobar_label.clicked_state = state + + def on_grid_icon_snap_clicked(self): + """ + Slot called by clicking a GUI element, in this case a FCLabel + + :return: + """ + if isinstance(self.sender(), FCLabel): + self.grid_snap_btn.trigger() + def eventFilter(self, obj, event): """ Filter the ToolTips display based on a Preferences setting