From 24b56b2bb1bc192b7619792f5c42d2b0fc38829e Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Wed, 27 May 2015 22:49:44 +0200 Subject: [PATCH] Configtool: take account of Mac OS X's limited wildcard support. According to documentation this shouldn't be neccessary, but testing on Mac OS X 10.4.11 works only this way. This helps a bit on issue #152. --- configtool/boardpanel.py | 7 ++++++- configtool/printerpanel.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 81bf179..3457672 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -3,6 +3,7 @@ import os import wx import re +from sys import platform from configtool.data import (defineValueFormat, defineBoolFormat, defineHeaterFormat, reCommDefBL, reCommDefBoolBL, reHelpTextStart, reHelpTextEnd, @@ -185,7 +186,11 @@ class BoardPanel(wx.Panel): if not self.confirmLoseChanges("load a new board configuration"): return - wildcard = "Board configuration (board.*.h)|board.*.h" + if platform == "darwin": + # Mac OS X appears to be a bit limited on wildcards. + wildcard = "Board configuration (board.*.h)|*.h" + else: + wildcard = "Board configuration (board.*.h)|board.*.h" dlg = wx.FileDialog(self, message = "Choose a board config file", defaultDir = self.dir, defaultFile = "", diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py index ac3ebc0..abccb49 100644 --- a/configtool/printerpanel.py +++ b/configtool/printerpanel.py @@ -3,6 +3,7 @@ import os import wx import re +from sys import platform from configtool.data import (defineValueFormat, defineBoolFormat, reCommDefBL, reCommDefBoolBL, reHelpTextStart, reHelpTextEnd, reDefine, reDefineBL, reDefQS, reDefQSm, @@ -146,7 +147,11 @@ class PrinterPanel(wx.Panel): if not self.confirmLoseChanges("load a new printer configuration"): return - wildcard = "Printer configuration (printer.*.h)|printer.*.h" + if platform == "darwin": + # Mac OS X appears to be a bit limited on wildcards. + wildcard = "Printer configuration (printer.*.h)|*.h" + else: + wildcard = "Printer configuration (printer.*.h)|printer.*.h" dlg = wx.FileDialog(self, message = "Choose a printer config file", defaultDir = self.dir, defaultFile = "",