ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-21 11:27:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Marginal/EDMarketConnector into Marginal-master

Browse Source 
# Conflicts:
#	prefs.py
This commit is contained in:
James Tandy 2016-01-04 01:23:30 +00:00
commit 406c7ac04c
3 changed files with 3 additions and 2 deletions

2
config.py

@ -7,7 +7,7 @@ from sys import platform
appname = 'EDMarketConnector'
applongname = 'E:D Market Connector'
appcmdname = 'EDMC'
appversion = '2.0.3.0'
appversion = '2.0.4.0'
update_feed = 'http://marginal.org.uk/edmarketconnector.xml'
update_interval = 47*60*60

2
prefs.py

@ -366,7 +366,7 @@ class PreferencesDialog(tk.Toplevel):
(self.out_log_edsm.get() and config.OUT_LOG_EDSM) +
(self.out_log_auto.get() and config.OUT_LOG_AUTO) +
(self.edsm_autoopen.get() and config.EDSM_AUTOOPEN))
config.set('outdir', self.outdir.get().startswith('~') and join(config.home, self.outdir.get()[1:]) or self.outdir.get())
config.set('outdir', self.outdir.get().startswith('~') and join(config.home, self.outdir.get()[2:]) or self.outdir.get())
config.set('edsm_cmdrname', self.edsm_cmdr.get().strip())
config.set('edsm_apikey', self.edsm_apikey.get().strip())

1
ttkHyperlinkLabel.py

@ -25,6 +25,7 @@ class HyperlinkLabel(platform == 'darwin' and tk.Label or ttk.Label, object):
if platform == 'darwin':
# Use tk.Label 'cos can't set ttk.Label background - http://www.tkdocs.com/tutorial/styles.html#whydifficult
kw['background'] = kw.pop('background', 'systemDialogBackgroundActive')
kw['anchor'] = kw.pop('anchor', tk.W) # like ttk.Label
tk.Label.__init__(self, master, **kw)
else:
ttk.Label.__init__(self, master, **kw)