This commit is contained in:
Bill Dengler 2015-06-10 18:34:06 -04:00
parent 63615e41b8
commit 90e067572d
4 changed files with 11 additions and 7 deletions

View File

@ -6,6 +6,9 @@ ignored_sessions = list(default=list())
[app-settings]
language = string(default="system")
hide_gui = boolean(default=False)
use_slow_audio_algo = boolean(default=False)
use_Codeofdusk_audio_handlers = boolean(default=False)
prefer_geocodes = boolean(default=False)
voice_enabled = boolean(default=False)
ask_at_exit = boolean(default=True)
use_invisible_keyboard_shorcuts = boolean(default=True)

View File

@ -997,6 +997,8 @@ class Controller(object):
tweet = buffer.get_tweet()
if utils.is_geocoded(tweet) and config.app['app-settings']['use_Codeofdusk_audio_handlers'] and config.app['app-settings']['prefer_geocodes']:
return self.reverse_geocode()
if config.app['app-settings']['use_Codeofdusk_audio_handlers'] == False:
return buffer.url()
url=None
urls = utils.find_urls(tweet)
if len(urls) == 1:
@ -1009,9 +1011,8 @@ class Controller(object):
if hasattr(urls_list, "destroy"): urls_list.destroy()
if url != None:
output.speak("Opening media...",True)
if config.app['app-settings']['use_Codeofdusk_audio_handlers']:
if sound.URLPlayer.is_playable(url=url,play=True,volume=buffer.session.settings["sound"]["volume"]) == False:
return webbrowser.open_new_tab(url)
if sound.URLPlayer.is_playable(url=url,play=True,volume=buffer.session.settings["sound"]["volume"]) == False:
return webbrowser.open_new_tab(url)
else:
output.speak(_(u"Not actionable."), True)
buffer.session.sound.play("error.ogg")

View File

@ -61,7 +61,7 @@ class globalSettingsController(object):
self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"])
self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"])
self.dialog.set_value("general", "use_slow_audio_algo", config.app["app-settings"]["use_slow_audio_algo"])
self.dialog.set_value("general", "use_codeofdusk_audio_handlers", config.app["app-settings"]["use_codeofdusk_audio_handlers"])
self.dialog.set_value("general", "use_Codeofdusk_audio_handlers", config.app["app-settings"]["use_Codeofdusk_audio_handlers"])
self.dialog.set_value("general", "prefer_geocodes", config.app["app-settings"]["prefer_geocodes"])
self.dialog.create_proxy()
self.dialog.set_value("proxy", "server", config.app["proxy"]["server"])
@ -87,7 +87,7 @@ class globalSettingsController(object):
config.app["app-settings"]["hide_gui"] = self.dialog.get_value("general", "hide_gui")
config.app["app-settings"]["ask_at_exit"] = self.dialog.get_value("general", "ask_at_exit")
config.app["app-settings"]["play_ready_sound"] = self.dialog.get_value("general", "play_ready_sound")
config.app["app-settings"]["use_codeofdusk_audio_handlers"] = self.dialog.get_value("general", "use_codeofdusk_audio_handlers")
config.app["app-settings"]["use_Codeofdusk_audio_handlers"] = self.dialog.get_value("general", "use_Codeofdusk_audio_handlers")
config.app["app-settings"]["prefer_geocodes"] = self.dialog.get_value("general", "prefer_geocodes")
config.app["app-settings"]["speak_ready_msg"] = self.dialog.get_value("general", "speak_ready_msg")
if config.app["app-settings"]["use_slow_audio_algo"] != self.dialog.get_value("general", "use_invisible_shorcuts"):

View File

@ -31,8 +31,8 @@ class general(wx.Panel, baseDialog.BaseWXDialog):
sizer.Add(self.hide_gui, 0, wx.ALL, 5)
self.use_slow_audio_algo = wx.CheckBox(self, -1, _(u"Use slow audio tweet detection algorithm (increases audio tweet detection accuracy at the cost of significantly reduced client performance)"))
sizer.Add(self.use_slow_audio_algo, 0, wx.ALL, 5)
self.use_codeofdusk_audio_handlers = wx.CheckBox(self, -1, _(u"Use Codeofdusk's tweet interaction handlers (intelegently handle audio and geotweets, but may impact client performance on very slow connections)"))
sizer.Add(self.use_codeofdusk_audio_handlers, 0, wx.ALL, 5)
self.use_Codeofdusk_audio_handlers = wx.CheckBox(self, -1, _(u"Use Codeofdusk's tweet interaction handlers (intelegently handle audio and geotweets, but may impact client performance on very slow connections)"))
sizer.Add(self.use_Codeofdusk_audio_handlers, 0, wx.ALL, 5)
self.prefer_geocodes = wx.CheckBox(self, -1, _(u"Codeofdusk's tweet interaction handlers: always display geocode on interact, even if the tweet contains URLs"))
sizer.Add(self.prefer_geocodes, 0, wx.ALL, 5)
kmbox = wx.BoxSizer(wx.VERTICAL)