ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-03 09:01:13 +03:00
Code Issues Projects Releases Wiki Activity

Disable update on docking option if no netLog

Browse Source
This commit is contained in:
Jonathan Harris 2016-07-20 12:58:24 +01:00
parent 60e3478cad
commit 6dfaf515bc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edproxy.py
View File

@ -138,7 +138,7 @@ class _EDProxy:
timestamp = timegm(datetime.strptime(msg['DateUtc'], '%Y-%m-%d %H:%M:%S').utctimetuple()) timestamp = timegm(datetime.strptime(msg['DateUtc'], '%Y-%m-%d %H:%M:%S').utctimetuple())
else: else:
timestamp = mktime(strptime(msg['Date'], '%Y-%m-%d %H:%M:%S')) # from local time timestamp = mktime(strptime(msg['Date'], '%Y-%m-%d %H:%M:%S')) # from local time
self.last_event = (timestamp, msg['System']) self.last_event = (timestamp, msg['System'], None)
self.root.event_generate('<<ProxyJump>>', when="tail") self.root.event_generate('<<ProxyJump>>', when="tail")
except: except:
if __debug__: print_exc() if __debug__: print_exc()

9
prefs.py
View File

@ -304,16 +304,17 @@ class PreferencesDialog(tk.Toplevel):
self.out_log_auto_text['text'] = '' self.out_log_auto_text['text'] = ''
self.edsm_log_auto_text['text'] = '' self.edsm_log_auto_text['text'] = ''
if monitor.logdir or proxyaddr: if monitor.logdir or proxyaddr:
log = self.out_log_file.get() self.out_auto_button['state'] = monitor.logdir and tk.NORMAL or tk.DISABLED # edproxy doesn't send docking status
self.out_log_auto_button['state'] = log and tk.NORMAL or tk.DISABLED self.out_log_auto_button['state'] = self.out_log_file.get() and tk.NORMAL or tk.DISABLED
if log and self.out_log_auto.get() and proxyaddr: if self.out_log_file.get() and self.out_log_auto.get() and proxyaddr:
self.out_log_auto_text['text'] = _('Connected to {EDPROXY} at {ADDR}').format(EDPROXY = 'edproxy', ADDR = proxyaddr) # Output settings self.out_log_auto_text['text'] = _('Connected to {EDPROXY} at {ADDR}').format(EDPROXY = 'edproxy', ADDR = proxyaddr) # Output settings
self.edsm_log_auto_button['state'] = edsm_state self.edsm_log_auto_button['state'] = edsm_state
if self.out_log_edsm.get() and self.out_log_auto.get() and proxyaddr: if self.out_log_edsm.get() and self.out_log_auto.get() and proxyaddr:
self.edsm_log_auto_text['text'] = _('Connected to {EDPROXY} at {ADDR}').format(EDPROXY = 'edproxy', ADDR = proxyaddr) # Output settings self.edsm_log_auto_text['text'] = _('Connected to {EDPROXY} at {ADDR}').format(EDPROXY = 'edproxy', ADDR = proxyaddr) # Output settings
else: else:
self.out_log_auto_button['state'] = tk.DISABLED self.out_auto_button['state'] = tk.DISABLED
self.out_log_auto_button['state'] = tk.DISABLED
self.edsm_log_auto_button['state'] = tk.DISABLED self.edsm_log_auto_button['state'] = tk.DISABLED
def outbrowse(self): def outbrowse(self):