diff --git a/Bookmark.py b/Bookmark.py index 77664c6a..45362abf 100644 --- a/Bookmark.py +++ b/Bookmark.py @@ -287,12 +287,12 @@ class BookmarkManager(QtWidgets.QWidget): date = date.replace(' ', '_') filter__ = "Text File (*.TXT);;All Files (*.*)" - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Bookmarks"), - directory='{l_save}/{n}_{date}'.format( - l_save=str(self.app.get_last_save_folder()), - n=_("Bookmarks"), - date=date), - ext_filter=filter__) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Bookmarks"), + directory='{l_save}/{n}_{date}'.format(l_save=str(self.app.get_last_save_folder()), + n=_("Bookmarks"), + date=date), + ext_filter=filter__) filename = str(filename) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c9305a7..b839137c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ CHANGELOG for FlatCAM beta - fixed Tcl command Isolate to not print messages on message bar in case it is run headless - fixed Tcl command Copper Clear (NCC) - fixed Tcl command Paint +- temporary fix for comboboxes not finding the the value in the items when setting themselves with a value by defaulting to the first item in the list 27.10.2020 diff --git a/appDatabase.py b/appDatabase.py index 47a15c40..c9161beb 100644 --- a/appDatabase.py +++ b/appDatabase.py @@ -2066,12 +2066,13 @@ class ToolsDB2(QtWidgets.QWidget): date = date.replace(' ', '_') filter__ = "Text File (*.TXT);;All Files (*.*)" - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Tools Database"), - directory='{l_save}/FlatCAM_{n}_{date}'.format( - l_save=str(self.app.get_last_save_folder()), - n=_("Tools_Database"), - date=date), - ext_filter=filter__) + + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Tools Database"), + directory='{l_save}/FlatCAM_{n}_{date}'.format(l_save=str(self.app.get_last_save_folder()), + n=_("Tools_Database"), + date=date), + ext_filter=filter__) filename = str(filename) diff --git a/appEditors/AppTextEditor.py b/appEditors/AppTextEditor.py index 0dfa91c3..c0b7d3b7 100644 --- a/appEditors/AppTextEditor.py +++ b/appEditors/AppTextEditor.py @@ -251,7 +251,9 @@ class AppTextEditor(QtWidgets.QWidget): ext_filter=_filter_ )[0]) except TypeError: - filename = str(FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), ext_filter=_filter_)[0]) + filename = str(FCFileSaveDialog.get_saved_filename( + caption=_("Export Code ..."), + ext_filter=_filter_)[0]) if filename == "": self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled.")) diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py index eaa40bc4..1f8e8d5f 100644 --- a/appGUI/GUIElements.py +++ b/appGUI/GUIElements.py @@ -2131,7 +2131,10 @@ class FCComboBox(QtWidgets.QComboBox): def set_value(self, val): idx = self.findText(str(val)) - self.setCurrentIndex(idx) + if idx == -1: + self.setCurrentIndex(0) + else: + self.setCurrentIndex(idx) @property def is_last(self): diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py index 304577a9..1555c34d 100644 --- a/appObjects/FlatCAMCNCJob.py +++ b/appObjects/FlatCAMCNCJob.py @@ -1653,7 +1653,9 @@ class CNCJobObject(FlatCAMObj, CNCjob): ext_filter=_filter_ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), ext_filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Code ..."), + ext_filter=_filter_) if filename == '': self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export cancelled ...")) @@ -1843,7 +1845,9 @@ class CNCJobObject(FlatCAMObj, CNCjob): ext_filter=_filter_ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), ext_filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Code ..."), + ext_filter=_filter_) if filename == '': self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export cancelled ...")) @@ -1921,7 +1925,9 @@ class CNCJobObject(FlatCAMObj, CNCjob): ext_filter=_filter_ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), ext_filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Code ..."), + ext_filter=_filter_) self.export_gcode_handler(filename, is_gcode=save_gcode) diff --git a/appTools/ToolFilm.py b/appTools/ToolFilm.py index 0cccacf4..a1207129 100644 --- a/appTools/ToolFilm.py +++ b/appTools/ToolFilm.py @@ -232,7 +232,9 @@ class Film(AppTool): directory=self.app.get_last_save_folder() + '/' + name + '_film', ext_filter=filter_ext) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export positive film")) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export positive film"), + ext_filter=filter_ext) filename = str(filename) @@ -378,7 +380,9 @@ class Film(AppTool): directory=self.app.get_last_save_folder() + '/' + name + '_film', ext_filter=filter_ext) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export negative film")) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export negative film"), + ext_filter=filter_ext) filename = str(filename) diff --git a/appTools/ToolQRCode.py b/appTools/ToolQRCode.py index c691f9ca..d92e4028 100644 --- a/appTools/ToolQRCode.py +++ b/appTools/ToolQRCode.py @@ -519,7 +519,9 @@ class QRCode(AppTool): directory=self.app.get_last_save_folder() + '/' + str(name) + '_png', ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export PNG"), ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export PNG"), + ext_filter=_filter) filename = str(filename) @@ -566,7 +568,9 @@ class QRCode(AppTool): directory=self.app.get_last_save_folder() + '/' + str(name) + '_svg', ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export SVG"), ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export SVG"), + ext_filter=_filter) filename = str(filename) diff --git a/appTools/ToolSolderPaste.py b/appTools/ToolSolderPaste.py index 8bea187a..876b63f1 100644 --- a/appTools/ToolSolderPaste.py +++ b/appTools/ToolSolderPaste.py @@ -1060,7 +1060,8 @@ class SolderPaste(AppTool): ) except TypeError: filename, _f = FCFileSaveDialog.get_saved_filename( - caption=_("Export Code ..."), ext_filter=_filter_) + caption=_("Export Code ..."), + ext_filter=_filter_) if filename == '': self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export cancelled ...")) diff --git a/app_Main.py b/app_Main.py index 10cb990f..e2119e16 100644 --- a/app_Main.py +++ b/app_Main.py @@ -2593,7 +2593,9 @@ class App(QtCore.QObject): ext_filter=filter__ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Save to file"), ext_filter=filter__) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Save to file"), + ext_filter=filter__) filename = str(filename) @@ -6866,8 +6868,9 @@ class App(QtCore.QObject): ext_filter=_filter_ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), - ext_filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Code ..."), + ext_filter=_filter_) filename = filename.rpartition('/')[0] @@ -8315,7 +8318,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + str(name) + '_svg', ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export SVG"), ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export SVG"), + ext_filter=_filter) filename = str(filename) @@ -8351,7 +8356,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/png_' + date, ext_filter=filter_) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export PNG Image"), ext_filter=filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export PNG Image"), + ext_filter=filter_) filename = str(filename) @@ -8395,7 +8402,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + name, ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Save Gerber source file"), ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Save Gerber source file"), + ext_filter=_filter) filename = str(filename) @@ -8435,7 +8444,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + name, ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Save Script source file"), ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Save Script source file"), + ext_filter=_filter) filename = str(filename) @@ -8475,8 +8486,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + name, ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Save Document source file"), - ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Save Document source file"), + ext_filter=_filter) filename = str(filename) @@ -8557,7 +8569,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + name, ext_filter=_filter) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Excellon"), ext_filter=_filter) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Excellon"), + ext_filter=_filter) filename = str(filename) @@ -8600,7 +8614,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + name, ext_filter=_filter_) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export Gerber"), ext_filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export Gerber"), + ext_filter=_filter_) filename = str(filename) @@ -8659,7 +8675,9 @@ class MenuFileHandlers(QtCore.QObject): directory=self.app.get_last_save_folder() + '/' + name, ext_filter=_filter_) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export DXF"), ext_filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Export DXF"), + ext_filter=_filter_) filename = str(filename) @@ -9048,7 +9066,9 @@ class MenuFileHandlers(QtCore.QObject): ext_filter=filter_ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Save Project As ..."), ext_filter=filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Save Project As ..."), + ext_filter=filter_) filename = str(filename) @@ -9102,7 +9122,9 @@ class MenuFileHandlers(QtCore.QObject): ext_filter=filter_ ) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Save Object as PDF ..."), ext_filter=filter_) + filename, _f = FCFileSaveDialog.get_saved_filename( + caption=_("Save Object as PDF ..."), + ext_filter=filter_) filename = str(filename)