From 2deeca9602c756f8723b0111f589eb09184a5096 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 1 Jun 2018 08:21:28 +0200 Subject: [PATCH] Material: Editor and import, fix openfile and savefile if no filename is given, make open and save work the same way --- src/Mod/Material/MaterialEditor.py | 8 +++++--- src/Mod/Material/importFCMat.py | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index abe7a107a8..8a1e671b8b 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -261,11 +261,12 @@ class MaterialEditor: def openfile(self): "Opens a FCMat file" - filename = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(),'Open FreeCAD Material file','*.FCMat') + filetuple = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(),'Open FreeCAD Material file','*.FCMat') + filename = filetuple[0] # a tuple of two empty strings returns True, so use the filename directly if filename: self.clearEditor() import importFCMat - d = importFCMat.read(filename[0]) + d = importFCMat.read(filename) if d: self.updateContents(d) @@ -275,7 +276,8 @@ class MaterialEditor: name = str(self.widget.Editor.findItems(translate("Material","Name"),QtCore.Qt.MatchRecursive,0)[0].text(1)) if not name: name = "Material" - filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(),'Save FreeCAD Material file',name+'.FCMat') + filetuple = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(),'Save FreeCAD Material file',name+'.FCMat') + filename = filetuple[0] # a tuple of two empty strings returns True, so use the filename directly if filename: d = self.getDict() if d: diff --git a/src/Mod/Material/importFCMat.py b/src/Mod/Material/importFCMat.py index da42a6b45a..f12a77b72f 100644 --- a/src/Mod/Material/importFCMat.py +++ b/src/Mod/Material/importFCMat.py @@ -122,7 +122,6 @@ def write(filename,dictionary): user[k] = i # write header rev = FreeCAD.ConfigGet("BuildVersionMajor")+"."+FreeCAD.ConfigGet("BuildVersionMinor")+" "+FreeCAD.ConfigGet("BuildRevision") - filename = filename[0] if isinstance(filename,unicode): import sys filename = filename.encode(sys.getfilesystemencoding())