bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed issue #394 - the saveDialog in Linux did not added the selected extension

Browse Source 
- fixed issue #389 - in previous commits
- fixed issue #391 - in previous commits
This commit is contained in:
Marius Stanciu
2020-04-11 02:55:32 +03:00
committed by Marius
parent 418ebd6606
commit abce81d802
9 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flatcamEditors/FlatCAMTextEditor.py
View File

@@ -5,14 +5,14 @@
# MIT Licence #
# ##########################################################
from flatcamGUI.GUIElements import *
from PyQt5 import QtPrintSupport
from flatcamGUI.GUIElements import FCFileSaveDialog, FCEntry, FCTextAreaExtended, FCTextAreaLineNumber
from PyQt5 import QtPrintSupport, QtWidgets, QtCore, QtGui
from reportlab.platypus import SimpleDocTemplate, Paragraph
from reportlab.lib.styles import getSampleStyleSheet
from reportlab.lib.units import inch, mm
from io import StringIO
# from io import StringIO
import gettext
import FlatCAMTranslation as fcTranslate
@@ -211,13 +211,13 @@ class TextEditor(QtWidgets.QWidget):
_filter_ = "FlatConfig Files (*.FlatConfig);;PDF Files (*.pdf);;All Files (*.*)"
try:
filename = str(QtWidgets.QFileDialog.getSaveFileName(
filename = str(FCFileSaveDialog.get_saved_filename(
caption=_("Export Code ..."),
directory=self.app.defaults["global_last_folder"] + '/' + str(obj_name),
filter=_filter_
)[0])
except TypeError:
filename = str(QtWidgets.QFileDialog.getSaveFileName(caption=_("Export Code ..."), filter=_filter_)[0])
filename = str(FCFileSaveDialog.get_saved_filename(caption=_("Export Code ..."), filter=_filter_)[0])
if filename == "":
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Export Code cancelled."))
@@ -236,7 +236,7 @@ class TextEditor(QtWidgets.QWidget):
styles = getSampleStyleSheet()
styleN = styles['Normal']
styleH = styles['Heading1']
# styleH = styles['Heading1']
story = []
if self.app.defaults['units'].lower() == 'mm':