diff --git a/AppEditors/FlatCAMGrbEditor.py b/AppEditors/FlatCAMGrbEditor.py index 70f386fa..3ce13f5b 100644 --- a/AppEditors/FlatCAMGrbEditor.py +++ b/AppEditors/FlatCAMGrbEditor.py @@ -3435,7 +3435,7 @@ class FlatCAMGrbEditor(QtCore.QObject): else: # deleted_tool_dia = float(self.apertures_table.item(self.apertures_table.currentRow(), 1).text()) if len(self.apertures_table.selectionModel().selectedRows()) == 0: - self.app.inform.emit('[WARNING_NOTCL]%s' % _(" Select an aperture in Aperture Table")) + self.app.inform.emit('[WARNING_NOTCL] %s' % _(" Select an aperture in Aperture Table")) return deleted_apcode_list = [] diff --git a/AppTools/ToolPanelize.py b/AppTools/ToolPanelize.py index be41ba5e..7c2325e1 100644 --- a/AppTools/ToolPanelize.py +++ b/AppTools/ToolPanelize.py @@ -438,7 +438,7 @@ class Panelize(AppTool): return "Could not retrieve object: %s" % boxname if box is None: - self.app.inform.emit('[WARNING_NOTCL]%s: %s' % (_("No object Box. Using instead"), panel_source_obj)) + self.app.inform.emit('[WARNING_NOTCL] %s: %s' % (_("No object Box. Using instead"), panel_source_obj)) self.reference_radio.set_value('bbox') if self.reference_radio.get_value() == 'bbox': diff --git a/AppTools/ToolQRCode.py b/AppTools/ToolQRCode.py index 28ea7c9f..be45f13e 100644 --- a/AppTools/ToolQRCode.py +++ b/AppTools/ToolQRCode.py @@ -788,7 +788,7 @@ class QRCode(AppTool): filename = str(filename) if filename == "": - self.app.inform.emit('[WARNING_NOTCL]%s' % _("Cancelled.")) + self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled.")) return else: self.app.worker_task.emit({'fcn': job_thread_qr_png, 'params': [self.app, filename]}) @@ -835,7 +835,7 @@ class QRCode(AppTool): filename = str(filename) if filename == "": - self.app.inform.emit('[WARNING_NOTCL]%s' % _("Cancelled.")) + self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled.")) return else: self.app.worker_task.emit({'fcn': job_thread_qr_svg, 'params': [self.app, filename]}) diff --git a/App_Main.py b/App_Main.py index c708399b..969cae16 100644 --- a/App_Main.py +++ b/App_Main.py @@ -1488,6 +1488,11 @@ class App(QtCore.QObject): self.prj_list = ['flatprj'] self.conf_list = ['flatconfig'] + # last used filters + self.last_op_gerber_filter = None + self.last_op_excellon_filter = None + self.last_op_gcode_filter = None + # global variable used by NCC Tool to signal that some polygons could not be cleared, if True # flag for polygons not cleared self.poly_not_cleared = False @@ -4088,7 +4093,7 @@ class App(QtCore.QObject): val_x = float(self.defaults['global_gridx']) val_y = float(self.defaults['global_gridy']) - self.inform.emit('[WARNING_NOTCL]%s' % _("Cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled.")) self.preferencesUiManager.defaults_read_form() @@ -5735,7 +5740,7 @@ class App(QtCore.QObject): name = obj.options["name"] except AttributeError: log.debug("on_copy_name() --> No object selected to copy it's name") - self.inform.emit('[WARNING_NOTCL]%s' % + self.inform.emit('[WARNING_NOTCL] %s' % _(" No object selected to copy it's name")) return @@ -6559,11 +6564,13 @@ class App(QtCore.QObject): try: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Open Gerber"), directory=self.get_last_folder(), - filter=_filter_) + filter=_filter_, + initialFilter=self.last_op_gerber_filter) except TypeError: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Open Gerber"), filter=_filter_) filenames = [str(filename) for filename in filenames] + self.last_op_gerber_filter = _f else: filenames = [name] self.splash.showMessage('%s: %ssec\n%s' % (_("Canvas initialization started.\n" @@ -6597,10 +6604,12 @@ class App(QtCore.QObject): try: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Open Excellon"), directory=self.get_last_folder(), - filter=_filter_) + filter=_filter_, + initialFilter=self.last_op_excellon_filter) except TypeError: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Open Excellon"), filter=_filter_) filenames = [str(filename) for filename in filenames] + self.last_op_excellon_filter = _f else: filenames = [str(name)] self.splash.showMessage('%s: %ssec\n%s' % (_("Canvas initialization started.\n" @@ -6610,7 +6619,7 @@ class App(QtCore.QObject): color=QtGui.QColor("gray")) if len(filenames) == 0: - self.inform.emit('[WARNING_NOTCL]%s' % _("Cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled.")) else: for filename in filenames: if filename != '': @@ -6638,11 +6647,13 @@ class App(QtCore.QObject): try: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Open G-Code"), directory=self.get_last_folder(), - filter=_filter_) + filter=_filter_, + initialFilter=self.last_op_gcode_filter) except TypeError: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Open G-Code"), filter=_filter_) filenames = [str(filename) for filename in filenames] + self.last_op_gcode_filter = _f else: filenames = [name] self.splash.showMessage('%s: %ssec\n%s' % (_("Canvas initialization started.\n" @@ -6803,7 +6814,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit('[WARNING_NOTCL]%s' % _("Cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled.")) return else: self.export_svg(name, filename) diff --git a/CHANGELOG.md b/CHANGELOG.md index c30e4c7b..f9ac1c1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta 31.05.2020 - structural changes in Preferences from David Robertson +- made last filter selected for open file to be used next time when opening files (for Excellon, GCode and Gerber files, for now) 30.05.2020