From: daid <daid303@gmail.com>
Date: Thu, 6 Feb 2014 12:55:58 +0000 (+0100)
Subject: Fix the wildcard filters for loading.
X-Git-Tag: 14.02-RC1~32
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=13a022c191798ef234adccf47400ed816842c20e;p=cura.git

Fix the wildcard filters for loading.
---

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index e0430f70..a64b958e 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -191,7 +191,17 @@ class SceneView(openglGui.glGuiPanel):
 	def showLoadModel(self, button = 1):
 		if button == 1:
 			dlg=wx.FileDialog(self, _("Open 3D model"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST|wx.FD_MULTIPLE)
-			dlg.SetWildcard(meshLoader.loadWildcardFilter() + imageToMesh.wildcardList() + "|GCode file (*.gcode)|*.g;*.gcode;*.G;*.GCODE")
+
+			wildcardList = ';'.join(map(lambda s: '*' + s, meshLoader.loadSupportedExtensions() + imageToMesh.supportedExtensions() + ['.g', '.gcode']))
+			wildcardFilter = "All (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
+			wildcardList = ';'.join(map(lambda s: '*' + s, meshLoader.loadSupportedExtensions()))
+			wildcardFilter += "|Mesh files (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
+			wildcardList = ';'.join(map(lambda s: '*' + s, imageToMesh.supportedExtensions()))
+			wildcardFilter += "|Image files (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
+			wildcardList = ';'.join(map(lambda s: '*' + s, ['.g', '.gcode']))
+			wildcardFilter += "|GCode files (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
+
+			dlg.SetWildcard(wildcardFilter)
 			if dlg.ShowModal() != wx.ID_OK:
 				dlg.Destroy()
 				return
@@ -206,7 +216,10 @@ class SceneView(openglGui.glGuiPanel):
 		if len(self._scene.objects()) < 1:
 			return
 		dlg=wx.FileDialog(self, _("Save 3D model"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
-		dlg.SetWildcard(meshLoader.saveWildcardFilter())
+		fileExtensions = meshLoader.saveSupportedExtensions()
+		wildcardList = ';'.join(map(lambda s: '*' + s, fileExtensions))
+		wildcardFilter = "Mesh files (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
+		dlg.SetWildcard(wildcardFilter)
 		if dlg.ShowModal() != wx.ID_OK:
 			dlg.Destroy()
 			return
diff --git a/Cura/gui/tools/imageToMesh.py b/Cura/gui/tools/imageToMesh.py
index f26f90c5..04d18303 100644
--- a/Cura/gui/tools/imageToMesh.py
+++ b/Cura/gui/tools/imageToMesh.py
@@ -8,9 +8,6 @@ from Cura.util import printableObject
 def supportedExtensions():
 	return ['.bmp', '.jpg', '.jpeg', '.png']
 
-def wildcardList():
-	return ';'.join(map(lambda s: '*' + s, supportedExtensions()))
-
 class convertImageDialog(wx.Dialog):
 	def __init__(self, parent, filename):
 		super(convertImageDialog, self).__init__(None, title="Convert image...")
diff --git a/Cura/util/meshLoader.py b/Cura/util/meshLoader.py
index cbe10067..b4b43004 100644
--- a/Cura/util/meshLoader.py
+++ b/Cura/util/meshLoader.py
@@ -19,14 +19,6 @@ def saveSupportedExtensions():
 	""" return a list of supported file extensions for saving. """
 	return ['.amf', '.stl']
 
-def loadWildcardFilter():
-	wildcardList = ';'.join(map(lambda s: '*' + s, loadSupportedExtensions()))
-	return "Mesh files (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
-
-def saveWildcardFilter():
-	wildcardList = ';'.join(map(lambda s: '*' + s, saveSupportedExtensions()))
-	return "Mesh files (%s)|%s;%s" % (wildcardList, wildcardList, wildcardList.upper())
-
 def loadMeshes(filename):
 	"""
 	loadMeshes loads 1 or more printableObjects from a file.