From: Daid <Daid303@gmail.com>
Date: Mon, 22 Apr 2013 12:48:42 +0000 (+0200)
Subject: Turn the preferences window into a dialog, which fixes the window not showing up... 
X-Git-Tag: 13.05~64^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4f08d4a0f530966e7169039dfc79c9c6f3c8524f;p=cura.git

Turn the preferences window into a dialog, which fixes the window not showing up on mac.
---

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 78a49943..1c2aefba 100644
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -272,7 +272,7 @@ class mainWindow(wx.Frame):
 	def OnPreferences(self, e):
 		prefDialog = preferencesDialog.preferencesDialog(self)
 		prefDialog.Centre()
-		prefDialog.Show(True)
+		prefDialog.Show()
 
 	def _showOpenDialog(self, title, wildcard = meshLoader.wildcardFilter()):
 		dlg=wx.FileDialog(self, title, os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 5744dc01..1a8f6144 100644
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -7,9 +7,9 @@ from Cura.util import validators
 from Cura.util import machineCom
 from Cura.util import profile
 
-class preferencesDialog(wx.Frame):
+class preferencesDialog(wx.Dialog):
 	def __init__(self, parent):
-		super(preferencesDialog, self).__init__(None, title="Preferences", style=wx.DEFAULT_DIALOG_STYLE)
+		super(preferencesDialog, self).__init__(None, title="Preferences")
 		
 		wx.EVT_CLOSE(self, self.OnClose)
 		
@@ -72,15 +72,13 @@ class preferencesDialog(wx.Frame):
 
 		self.okButton = wx.Button(right, -1, 'Ok')
 		right.GetSizer().Add(self.okButton, (right.GetSizer().GetRows(), 0), flag=wx.BOTTOM, border=5)
-		self.okButton.Bind(wx.EVT_BUTTON, self.OnClose)
+		self.okButton.Bind(wx.EVT_BUTTON, lambda e: self.Close())
 		
-		self.MakeModal(True)
 		main.Fit()
 		self.Fit()
 
 	def OnClose(self, e):
 		if self.oldExtruderAmount != int(profile.getPreference('extruder_amount')):
 			wx.MessageBox('After changing the amount of extruders you need to restart Cura for full effect.', 'Extruder amount warning.', wx.OK | wx.ICON_INFORMATION)
-		self.MakeModal(False)
 		self.parent.updateProfileToControls()
 		self.Destroy()