josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Markus Hitter 2015-05-27 22:49:44 +02:00
parent 8efc804cf3
commit 24b56b2bb1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configtool/boardpanel.py
View File

@ -3,6 +3,7 @@ import os
import wx import wx
import re import re
from sys import platform
from configtool.data import (defineValueFormat, from configtool.data import (defineValueFormat,
defineBoolFormat, defineHeaterFormat, reCommDefBL, defineBoolFormat, defineHeaterFormat, reCommDefBL,
reCommDefBoolBL, reHelpTextStart, reHelpTextEnd, reCommDefBoolBL, reHelpTextStart, reHelpTextEnd,
@ -185,7 +186,11 @@ class BoardPanel(wx.Panel):
if not self.confirmLoseChanges("load a new board configuration"): if not self.confirmLoseChanges("load a new board configuration"):
return 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", dlg = wx.FileDialog(self, message = "Choose a board config file",
defaultDir = self.dir, defaultFile = "", defaultDir = self.dir, defaultFile = "",

7
configtool/printerpanel.py
View File

@ -3,6 +3,7 @@ import os
import wx import wx
import re import re
from sys import platform
from configtool.data import (defineValueFormat, defineBoolFormat, reCommDefBL, from configtool.data import (defineValueFormat, defineBoolFormat, reCommDefBL,
reCommDefBoolBL, reHelpTextStart, reHelpTextEnd, reCommDefBoolBL, reHelpTextStart, reHelpTextEnd,
reDefine, reDefineBL, reDefQS, reDefQSm, reDefine, reDefineBL, reDefQS, reDefQSm,
@ -146,7 +147,11 @@ class PrinterPanel(wx.Panel):
if not self.confirmLoseChanges("load a new printer configuration"): if not self.confirmLoseChanges("load a new printer configuration"):
return 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", dlg = wx.FileDialog(self, message = "Choose a printer config file",
defaultDir = self.dir, defaultFile = "", defaultDir = self.dir, defaultFile = "",