Updated readme; a few bugfixes; german translation is added

This commit is contained in:
2014-12-29 13:52:50 -06:00
parent b6c9edafcf
commit 4bcd8d8b4e
7 changed files with 3012 additions and 48 deletions

View File

@@ -53,6 +53,7 @@ from keystrokeEditor import gui as keystrokeEditorGUI
log = original_logger.getLogger("gui.main")
geocoder = pygeocoder.Geocoder()
function_reconnect_streams_running = False
class mainFrame(wx.Frame):
""" Main class of the Frame. This is the Main Window."""
@@ -439,25 +440,29 @@ class mainFrame(wx.Frame):
# self.stream2.disconnect()
def check_stream_up(self):
global function_reconnect_streams_running
if function_reconnect_streams_running == True: return
if not hasattr(self, "stream") and not hasattr(self, "stream2"):
function_reconnect_streams_running = True
self.init(run_streams=True)
return
try:
urllib2.urlopen("http://74.125.228.231", timeout=5)
except urllib2.URLError:
if self.stream.connected == True: self.stream.disconnect()
if hasattr(self, "stream2") and self.stream2.connected: self.stream2.disconnect()
if config.main["general"]["announce_stream_status"] == True: output.speak(_(u"Streams disconnected. TW Blue will try to reconnect in a minute."))
return
if self.stream.connected == False:
del self.stream
if config.main["general"]["announce_stream_status"] == True: output.speak(_(u"Reconnecting streams..."))
call_threaded(self.init)
self.get_home()
if hasattr(self, "stream2") and self.stream2.connected == False:
log.debug("Trying reconnects the timelines stream...")
del self.stream2
self.get_tls()
# try:
# urllib2.urlopen("http://74.125.228.231", timeout=5)
# except urllib2.URLError:
# if self.stream.connected == True: self.stream.disconnect()
# if hasattr(self, "stream2") and self.stream2.connected: self.stream2.disconnect()
# if config.main["general"]["announce_stream_status"] == True: output.speak(_(u"Streams disconnected. TW Blue will try to reconnect in a minute."))
# return
# if self.stream.connected == False:
# del self.stream
# if config.main["general"]["announce_stream_status"] == True: output.speak(_(u"Reconnecting streams..."))
# call_threaded(self.init)
# self.get_home()
# if hasattr(self, "stream2") and self.stream2.connected == False:
# log.debug("Trying reconnects the timelines stream...")
# del self.stream2
# self.get_tls()
function_reconnect_streams_running = False
### Events

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -6,8 +6,8 @@ import sys
APP_LOG_FILE = 'debug.log'
ERROR_LOG_FILE = "error.log"
MESSAGE_FORMAT = "%(asctime)s %(name)s %(levelname)s: %(message)s"
DATE_FORMAT = "%a %b %d, %Y %H:%M:%S"
MESSAGE_FORMAT = u"%(asctime)s %(name)s %(levelname)s: %(message)s"
DATE_FORMAT = u"%b %d, %Y %H:%M:%S"
formatter = logging.Formatter(MESSAGE_FORMAT, datefmt=DATE_FORMAT)

View File

@@ -36,7 +36,7 @@ import paths
import config
import commandline
import platform
#from logger import logger as logging
from logger import logger as logging
from sessionmanager import manager
from sessionmanager import gui as smGUI
manager.setup()
@@ -55,8 +55,8 @@ import languageHandler
# sys.stdout=stdout
# sys.stderr=stderr
app = wx.App()
#app = wx.App(redirect=True, useBestVisual=True, filename=paths.logs_path('tracebacks.log'))
#app = wx.App()
app = wx.App(redirect=True, useBestVisual=True, filename=paths.logs_path('tracebacks.log'))
configured = False
configs = []
for i in os.listdir(paths.config_path()):

View File

@@ -21,7 +21,6 @@
from setuptools import setup, find_packages
import py2exe
import os
import gettext, gettext_windows; gettext_windows.setup_env_windows()
import application
import platform
from glob import glob