giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- 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

This commit is contained in:
Marius Stanciu 2020-10-28 15:46:33 +02:00 committed by Marius
parent 9c97ce49b9
commit 86a931ace5
10 changed files with 80 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bookmark.py
View File

@ -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)

1
CHANGELOG.md
View File

@ -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

13
appDatabase.py
View File

@ -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)

4
appEditors/AppTextEditor.py
View File

@ -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."))

5
appGUI/GUIElements.py
View File

@ -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):

12
appObjects/FlatCAMCNCJob.py
View File

@ -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)

8
appTools/ToolFilm.py
View File

@ -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)

8
appTools/ToolQRCode.py
View File

@ -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)

3
appTools/ToolSolderPaste.py
View File

@ -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 ..."))

50
app_Main.py
View File

@ -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)