From c135c4c5029651355942403c2b18089ebb0db79b Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Fri, 17 Jul 2015 12:59:01 +0200 Subject: [PATCH] Configtool: simpler regex on OS X in the Save As... dialog as well. Not neccessary on vintage Mac OS X 10.4, but might help with issue #165. --- configtool/boardpanel.py | 6 +++++- configtool/printerpanel.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 6c06cdc..0b85c09 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -217,7 +217,11 @@ class BoardPanel(wx.Panel): return self.saveConfigFile(path) def onSaveConfigAs(self, evt): - wildcard = "Board configuration (board.*.h)|board.*.h" + if platform.startswith("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 = "Save as ...", defaultDir = self.dir, defaultFile = "", wildcard = wildcard, diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py index b17a51b..297349c 100644 --- a/configtool/printerpanel.py +++ b/configtool/printerpanel.py @@ -198,7 +198,11 @@ class PrinterPanel(wx.Panel): return self.saveConfigFile(path) def onSaveConfigAs(self, evt): - wildcard = "Printer configuration (printer.*.h)|printer.*.h" + if platform.startswith("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 = "Save as ...", defaultDir = self.dir, defaultFile = "", wildcard = wildcard,