diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 27de0eb1..bc42cded 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -149,7 +149,8 @@ class AppWindow: self.w.protocol("WM_DELETE_WINDOW", self.w.withdraw) # close button shouldn't quit app else: file_menu = tk.Menu(menubar, tearoff=tk.FALSE) - file_menu.add_command(label=_("Check for Updates..."), command=lambda:self.updater.checkForUpdates()) + if platform == 'win32': + file_menu.add_command(label=_("Check for Updates..."), command=lambda:self.updater.checkForUpdates()) file_menu.add_command(label=_("Settings"), command=lambda:prefs.PreferencesDialog(self.w, self.login)) # Item in the File menu on Windows file_menu.add_separator() file_menu.add_command(label=_("Exit"), command=self.onexit) # Item in the File menu on Windows @@ -190,7 +191,6 @@ class AppWindow: # Install hotkey monitoring self.w.bind_all('<>', self.getandsend) # user-generated - print config.getint('hotkey_code'), config.getint('hotkey_mods') hotkeymgr.register(self.w, config.getint('hotkey_code'), config.getint('hotkey_mods')) # call after credentials have changed diff --git a/hotkey.py b/hotkey.py index 4cf50551..2c01c659 100644 --- a/hotkey.py +++ b/hotkey.py @@ -371,7 +371,7 @@ else: # Linux class HotkeyMgr: - def register(self, keycode, modifiers): + def register(self, root, keycode, modifiers): pass def unregister(self): diff --git a/l10n.py b/l10n.py index 69afe699..0d0acda5 100755 --- a/l10n.py +++ b/l10n.py @@ -49,7 +49,7 @@ class Translations: if match: self.translations[match.group(1)] = match.group(2) elif not comment.match(line): - assert match, 'Bad translation: %s' % line + print 'Bad translation: %s' % line.strip() __builtin__.__dict__['_'] = self.translate if __debug__: diff --git a/prefs.py b/prefs.py index 0a4dbf21..939061ec 100644 --- a/prefs.py +++ b/prefs.py @@ -247,9 +247,10 @@ class PreferencesDialog(tk.Toplevel): config.set('password', self.password.get().strip()) config.set('output', (self.out_eddn.get() and config.OUT_EDDN or 0) + (self.out_bpc.get() and config.OUT_BPC or 0) + (self.out_td.get() and config.OUT_TD or 0) + (self.out_csv.get() and config.OUT_CSV or 0) + (self.out_ship_eds.get() and config.OUT_SHIP_EDS or 0) + (self.out_log.get() and config.OUT_LOG or 0) + (self.out_ship_coriolis.get() and config.OUT_SHIP_CORIOLIS or 0)) config.set('outdir', self.outdir.get().strip()) - config.set('hotkey_code', self.hotkey_code) - config.set('hotkey_mods', self.hotkey_mods) - config.set('hotkey_mute', int(not self.hotkey_play.get())) + if platform in ['darwin','win32']: + config.set('hotkey_code', self.hotkey_code) + config.set('hotkey_mods', self.hotkey_mods) + config.set('hotkey_mute', int(not self.hotkey_play.get())) config.set('anonymous', self.out_anon.get()) self._destroy() if credentials != (config.get('username'), config.get('password')) and self.callback: