Merge d6259db9a6fe317251714ad6f839452913c7e6c4 into 5976caf736f02af9d3f4da04b5bd7ff95e9aab16

.gitignore

@@ -9,11 +9,10 @@ src/config3/
 src/dropbox/
 src/logs/
 src/documentation/
-src/sounds/iOs
 src/oggenc2.exe
 src/bootstrap.exe
 src/Microsoft.VC90.CRT
 src/Microsoft.VC90.MFC
 src/launcher.bat
-src/sounds/iOs
 release-snapshot/
+keymaps/default.keymap

src/Conf.defaults

@@ -12,7 +12,7 @@ reverse_timelines = boolean(default=False)
 time_to_check_streams = integer(default=30)
 announce_stream_status = boolean(default=True)
 retweet_mode = string(default="ask")
-persist_size = integer(default=0)
+persist_size = integer(default=1764)
 buffer_order = list(default=list('home','mentions','dm','sent_dm','sent_tweets','favorites','followers','friends','blocks','muted','events'))
 
 [sound]

src/app-configuration.defaults

@@ -14,8 +14,8 @@ speak_ready_msg = boolean(default=True)
 log_level = string(default="error")
 use_slow_audio_algo = boolean(default=False)
 load_keymap = string(default="default.keymap")
-use_Codeofdusk_audio_handlers=boolean(default=False)
-
+use_Codeofdusk_audio_handlers=boolean(default=True)
+prefer_geocodes = boolean(default=False)
 [proxy]
 server = string(default="")
 port = string(default="")

src/controller/buffersController.py

@@ -435,8 +435,7 @@ class baseBufferController(bufferController):
    try:
     sound.URLPlayer.play(url, self.session.settings["sound"]["volume"])
    except:
-    log.error("Exception while executing audio method.")
-
+    log("Exception while executing audio method.")
  @_tweets_exist
  def url(self,url='',announce=True):
   if url == '':

src/controller/mainController.py

@@ -1016,6 +1016,8 @@ class Controller(object):
   if hasattr(sound.URLPlayer,'stream'):
    return sound.URLPlayer.stop_audio(delete=True)
   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()
   url=None
   urls = utils.find_urls(tweet)
   if len(urls) == 1:
@@ -1027,11 +1029,9 @@ class Controller(object):
     url=urls_list.get_string()
    if hasattr(urls_list, "destroy"): urls_list.destroy()
   if url != None:
-   output.speak(_(u"Opening media..."), True)
+   output.speak("Opening media...",True)
    if sound.URLPlayer.is_playable(url=url,play=True,volume=buffer.session.settings["sound"]["volume"]) == False:
     return webbrowser.open_new_tab(url)
-  elif utils.is_geocoded(tweet):
-   return output.speak("Not implemented",True)
   else:
    output.speak(_(u"Not actionable."), True)
    buffer.session.sound.play("error.ogg")
@@ -1040,6 +1040,16 @@ class Controller(object):
   buffer = self.get_current_buffer()
   buffer.url()
 
+ def secondary_interact(self):
+  buffer = self.get_current_buffer()
+  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.view_reverse_geocode()
+  elif config.app['app-settings']['use_Codeofdusk_audio_handlers']:
+   return buffer.url()
+  else:
+   return buffer.audio()
+
  def audio(self, *args, **kwargs):
   self.get_current_buffer().audio()
 

src/controller/settings.py

@@ -62,6 +62,7 @@ class globalSettingsController(object):
   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", "prefer_geocodes", config.app["app-settings"]["prefer_geocodes"])
   self.dialog.create_proxy()
   self.dialog.set_value("proxy", "server", config.app["proxy"]["server"])
   self.dialog.set_value("proxy", "port", config.app["proxy"]["port"])
@@ -92,6 +93,8 @@ class globalSettingsController(object):
    #Todo: clean memmos.
   if 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")
+  if config.app["app-settings"]["prefer_geocodes"] != self.dialog.get_value("general", "prefer_geocodes"):
+   config.app["app-settings"]["prefer_geocodes"] = self.dialog.get_value("general", "prefer_geocodes")
   if config.app["proxy"]["server"] != self.dialog.get_value("proxy", "server") or config.app["proxy"]["port"] != self.dialog.get_value("proxy", "port") or config.app["proxy"]["user"] != self.dialog.get_value("proxy", "user") or config.app["proxy"]["password"] != self.dialog.get_value("proxy", "password"):
    if self.is_started == True:
     self.needs_restart = True

src/keymaps/default.keymap

@@ -2,51 +2,3 @@
 name = Default
 desc = TWBlue's default keymap.
 author = Bill Dengler <codeofdusk@gmail.com>
-
-[keymap]
-up = control+win+up
-down = control+win+down
-left = control+win+left
-right = control+win+right
-next_account = control+win+shift+right
-previous_account = control+win+shift+left
-open_conversation = control+win+c
-show_hide = control+win+m
-post_tweet = control+win+n
-post_reply = control+win+r
-post_retweet = control+win+shift+r
-send_dm = control+win+d
-add_to_favourites = alt+win+f
-remove_from_favourites = alt+shift+win+f
-follow = control+win+s
-user_details = control+win+alt+n
-view_item = control+win+v
-exit = control+win+f4
-open_timeline = control+win+i
-remove_buffer = control+win+shift+i
-interact = control+alt+win+return
-url = control+win+return
-volume_up = control+win+alt+up
-volume_down = control+win+alt+down
-go_home = control+win+home
-go_end = control+win+end
-go_page_up = control+win+pageup
-go_page_down = control+win+pagedown
-update_profile = alt+win+p
-delete = control+win+delete
-clear_buffer = control+win+shift+delete
-repeat_item = control+win+space
-copy_to_clipboard = control+win+c
-add_to_list = control+win+a
-remove_from_list = control+win+shift+a
-toggle_buffer_mute = control+win+shift+m
-toggle_session_mute = alt+win+m
-toggle_autoread = control+win+e
-search = control+win+-
-edit_keystrokes = control+win+k
-view_user_lists = control+win+l
-get_more_items = alt+win+pageup
-reverse_geocode = control+win+g
-view_reverse_geocode = control+win+shift+g
-get_trending_topics = control+win+t
-secondary_interact = control+win+alt+return

src/sessionmanager/session.py

@@ -252,7 +252,6 @@ class Session(object):
  def get_muted_users(self):
 
   """ Gets muted users (oh really?)."""
-
   self.db["muted_users"] = self.twitter.twitter.list_mute_ids()["ids"]
 
  @_require_login

src/wxUI/dialogs/configuration.py

@@ -38,6 +38,8 @@ class general(wx.Panel, baseDialog.BaseWXDialog):
   sizer.Add(kmbox, 0, wx.ALL, 5)
   self.use_slow_audio_algo= wx.CheckBox(self, -1, _(U"Use slow audio tweet detection algorithm (improves audio tweet detection accuracy at the cost of performance)"))
   sizer.Add(self.use_slow_audio_algo, 0, wx.ALL, 5)
+  self.prefer_geocodes= wx.CheckBox(self, -1, _(U"Prefer geolocation information to URLs when interacting with tweets (only applies when Codeofdusk's tweet handlers are enabled)"))
+  sizer.Add(self.prefer_geocodes, 0, wx.ALL, 5)
   self.use_Codeofdusk_audio_handlers= wx.CheckBox(self, -1, _(U"Use Codeofdusk's tweet interaction handlers (intelegently handle audio tweets, may impact client performance on very slow connections)"))
   sizer.Add(self.use_Codeofdusk_audio_handlers, 0, wx.ALL, 5)
   self.SetSizer(sizer)