New snapshot

src/application.py

@@ -5,7 +5,7 @@ if snapshot == False:
  version = "0.80"
  update_url = 'http://twblue.es/updates/twblue_ngen.json'
 else:
- version = "10.2"
+ version = "10.5"
  update_url = 'http://twblue.es/updates/snapshots_ngen.json'
 author = u"Manuel Cortéz, Bill Dengler"
 authorEmail = "manuel@manuelcortez.net"

src/controller/buffersController.py

@@ -2,7 +2,7 @@
 import platform
 if platform.system() == "Windows":
  import wx
- from wxUI import buffers, dialogs, commonMessageDialogs
+ from wxUI import buffers, dialogs, commonMessageDialogs, menus
  import user
 elif platform.system() == "Linux":
  from gi.repository import Gtk
@@ -142,6 +142,13 @@ class bufferController(object):
     call_threaded(self.session.api_call, call_name="update_status_with_media", status=text, media=tweet.image)
   if hasattr(tweet.message, "destroy"): tweet.message.destroy()
 
+ def save_positions(self):
+  try:
+   self.session.db[self.name+"_pos"]=self.buffer.list.get_selected()
+  except AttributeError:
+   pass
+
+
 class accountPanel(bufferController):
  def __init__(self, parent, name, account, account_id):
   super(accountPanel, self).__init__(parent, None, name)
@@ -235,6 +242,10 @@ class baseBufferController(bufferController):
    uri = tweet["long_uri"]
   try:
    tweet = self.session.twitter.twitter.show_status(id=tweet_id)
+   urls = utils.find_urls_in_text(tweet["text"])
+   for url in range(0, len(urls)):
+    try:  tweet["text"] = tweet["text"].replace(urls[url], tweet["entities"]["urls"][url]["expanded_url"])
+    except IndexError: pass
   except TwythonError as e:
    utils.twitter_error(e)
    return
@@ -246,6 +257,10 @@ class baseBufferController(bufferController):
    id = tweets.get_id(l)
    try:
     tweet = self.session.twitter.twitter.show_status(id=id)
+    urls = utils.find_urls_in_text(tweet["text"])
+    for url in range(0, len(urls)):
+     try:  tweet["text"] = tweet["text"].replace(urls[url], tweet["entities"]["urls"][url]["expanded_url"])
+     except IndexError: pass
    except TwythonError as e:
     utils.twitter_error(e)
     return
@@ -357,6 +372,61 @@ class baseBufferController(bufferController):
   widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.retweet, self.buffer.retweet)
   widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.direct_message, self.buffer.dm)
   widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.reply, self.buffer.reply)
+  # Replace for the correct way in other platforms.
+  widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_ITEM_RIGHT_CLICK, self.show_menu)
+  widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_KEY_DOWN, self.show_menu_by_key)
+
+ def show_menu(self, ev, pos=0, *args, **kwargs):
+  if self.buffer.list.get_count() == 0: return
+  if self.name == "sent_tweets" or self.name == "sent_direct_messages":
+   menu = menus.sentPanelMenu()
+  elif self.name == "direct_messages":
+   menu = menus.dmPanelMenu()
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.direct_message, menuitem=menu.reply)
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.user_actions, menuitem=menu.userActions)
+  else:
+   menu = menus.basePanelMenu()
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.reply, menuitem=menu.reply)
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.user_actions, menuitem=menu.userActions)
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.retweet, menuitem=menu.retweet)
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.fav, menuitem=menu.fav)
+   widgetUtils.connect_event(menu, widgetUtils.MENU, self.unfav, menuitem=menu.unfav)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.url_, menuitem=menu.openUrl)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.audio, menuitem=menu.play)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.view, menuitem=menu.view)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.copy, menuitem=menu.copy)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.destroy_status, menuitem=menu.remove)
+  if pos != 0:
+   self.buffer.PopupMenu(menu, pos)
+  else:
+   self.buffer.PopupMenu(menu, ev.GetPosition())
+
+ def view(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="view_item")
+
+ def copy(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="copy_to_clipboard")
+
+ def user_actions(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="follow")
+
+ def fav(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="add_to_favourites")
+
+ def unfav(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="remove_from_favourites")
+
+ def delete_item_(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="delete_item")
+
+ def url_(self, *args, **kwargs):
+  self.url()
+
+ def show_menu_by_key(self, ev):
+  if self.buffer.list.get_count() == 0:
+   return
+  if ev.GetKeyCode() == wx.WXK_WINDOWS_MENU:
+   self.show_menu(widgetUtils.MENU, pos=self.buffer.list.list.GetPosition())
 
  def get_tweet(self):
   if self.session.db[self.name][self.buffer.list.get_selected()].has_key("retweeted_status"):
@@ -423,7 +493,7 @@ class baseBufferController(bufferController):
    self._retweet_with_comment(tweet, id)
 
  def _retweet_with_comment(self, tweet, id, comment=''):
-  retweet = messages.tweet(self.session, _(u"Retweet"), _(u"Add your comment to the tweet"), u"“@%s: %s ”" % (tweet["user"]["screen_name"], tweet["text"]), max=116-len("@%s " % (tweet["user"]["screen_name"],)), messageType="retweet", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"])
+  retweet = messages.tweet(self.session, _(u"Retweet"), _(u"Add your comment to the tweet"), u"“@%s: %s ”" % (tweet["user"]["screen_name"], tweet["text"]), max=116, messageType="retweet", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"])
   if comment != '':
    retweet.message.set_text(comment)
   if retweet.message.get_response() == widgetUtils.OK:
@@ -457,10 +527,9 @@ class baseBufferController(bufferController):
    self.session.sound.play("audio.ogg")
   if utils.is_geocoded(tweet):
    self.session.sound.play("geo.ogg")
-  self.session.db[self.name+"_pos"]=self.buffer.list.get_selected()
 
- @_tweets_exist
- def audio(self,url=''):
+# @_tweets_exist
+ def audio(self, url='', *args, **kwargs):
   if hasattr(sound.URLPlayer,'stream'):
    return sound.URLPlayer.stop_audio(delete=True)
   tweet = self.get_tweet()
@@ -480,8 +549,8 @@ class baseBufferController(bufferController):
    except:
     log.error("Exception while executing audio method.")
 
- @_tweets_exist
- def url(self,url='',announce=True):
+# @_tweets_exist
+ def url(self, url='', announce=True, *args, **kwargs):
   if url == '':
    tweet = self.get_tweet()
    urls = utils.find_urls(tweet)
@@ -599,6 +668,23 @@ class eventsBufferController(bufferController):
   if dlg == widgetUtils.YES:
    self.buffer.list.clear()
 
+ def show_menu(self, ev, pos=0, *args, **kwargs):
+  if self.buffer.list.get_count() == 0: return
+  menu = menus.eventsPanelMenu()
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.view, menuitem=menu.view)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.copy, menuitem=menu.copy)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.destroy_status, menuitem=menu.remove)
+  if pos != 0:
+   self.buffer.PopupMenu(menu, pos)
+  else:
+   self.buffer.PopupMenu(menu, ev.GetPosition())
+
+ def view(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="view_item")
+
+ def copy(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="copy_to_clipboard")
+
 class peopleBufferController(baseBufferController):
  def __init__(self, parent, function, name, sessionObject, account, bufferType=None, *args, **kwargs):
   super(peopleBufferController, self).__init__(parent, function, name, sessionObject, account, bufferType="peoplePanel")
@@ -709,6 +795,22 @@ class peopleBufferController(baseBufferController):
  def interact(self):
   user.profileController(self.session, user=self.get_right_tweet()["screen_name"])
 
+ def show_menu(self, ev, pos=0, *args, **kwargs):
+  menu = menus.peoplePanelMenu()
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.direct_message, menuitem=menu.reply)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.user_actions, menuitem=menu.userActions)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.details, menuitem=menu.details)
+#  widgetUtils.connect_event(menu, widgetUtils.MENU, self.lists, menuitem=menu.lists)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.view, menuitem=menu.view)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.copy, menuitem=menu.copy)
+  if pos != 0:
+   self.buffer.PopupMenu(menu, pos)
+  else:
+   self.buffer.PopupMenu(menu, ev.GetPosition())
+
+ def details(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="user_details")
+
 class searchBufferController(baseBufferController):
  def start_stream(self):
   log.debug("Starting stream for %s buffer, %s account and %s type" % (self.name, self.account, self.type))
@@ -815,6 +917,8 @@ class trendsBufferController(bufferController):
 #  widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.retweet, self.buffer.retweet)
 #  widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.direct_message, self.buffer.dm)
 #  widgetUtils.connect_event(self.buffer, widgetUtils.BUTTON_PRESSED, self.reply, self.buffer.reply)
+  widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_ITEM_RIGHT_CLICK, self.show_menu)
+  widgetUtils.connect_event(self.buffer.list.list, wx.EVT_LIST_KEY_DOWN, self.show_menu_by_key)
 
  def get_message(self):
   return self.compose_function(self.trends[self.buffer.list.get_selected()])[0]
@@ -832,6 +936,48 @@ class trendsBufferController(bufferController):
  def interact(self, *args, **kwargs):
   self.searchfunction(value=self.get_message())
 
+ def show_menu(self, ev, pos=0, *args, **kwargs):
+  menu = menus.trendsPanelMenu()
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.tweet_about_this_trend, menuitem=menu.tweetThisTrend)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.view, menuitem=menu.view)
+  widgetUtils.connect_event(menu, widgetUtils.MENU, self.copy, menuitem=menu.copy)
+  if pos != 0:
+   self.buffer.PopupMenu(menu, pos)
+  else:
+   self.buffer.PopupMenu(menu, ev.GetPosition())
+
+ def view(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="view_item")
+
+ def copy(self, *args, **kwargs):
+  pub.sendMessage("execute-action", action="copy_to_clipboard")
+
+ def tweet_about_this_trend(self, *args, **kwargs):
+  if self.buffer.list.get_count() == 0: return
+  title = _(u"Tweet")
+  caption = _(u"Write the tweet here")
+  tweet = messages.tweet(self.session, title, caption, self.get_message()+ " ", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"])
+  tweet.message.set_cursor_at_end()
+  if tweet.message.get_response() == widgetUtils.OK:
+   self.session.settings["mysc"]["twishort_enabled"] = tweet.message.long_tweet.GetValue()
+   text = tweet.message.get_text()
+   if len(text) > 140 and tweet.message.get("long_tweet") == True:
+    if tweet.image == None:
+     text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
+    else:
+     text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text, 1)
+   if tweet.image == None:
+    call_threaded(self.session.api_call, call_name="update_status", status=text)
+   else:
+    call_threaded(self.session.api_call, call_name="update_status_with_media", status=text, media=tweet.image)
+  if hasattr(tweet.message, "destroy"): tweet.message.destroy()
+
+ def show_menu_by_key(self, ev):
+  if self.buffer.list.get_count() == 0:
+   return
+  if ev.GetKeyCode() == wx.WXK_WINDOWS_MENU:
+   self.show_menu(widgetUtils.MENU, pos=self.buffer.list.list.GetPosition())
+
 class conversationBufferController(searchBufferController):
 
  def start_stream(self, start=False):

src/controller/mainController.py

@@ -97,7 +97,7 @@ class Controller(object):
  def get_buffers_for_account(self, account):
   results = []
   buffers = self.view.get_buffers()
-  [results.append(self.search_buffer(i.name, i.account)) for i in buffers if i.account == account]
+  [results.append(self.search_buffer(i.name, i.account)) for i in buffers if i.account == account and (i.type != "account")]
   return results
 
  def bind_stream_events(self):
@@ -125,10 +125,10 @@ class Controller(object):
   log.debug("Binding other application events...")
   pub.subscribe(self.logout_account, "logout")
   pub.subscribe(self.login_account, "login")
-  pub.subscribe(self.manage_stream_errors, "stream-error")
+  pub.subscribe(self.manage_stream_errors, "streamError")
   pub.subscribe(self.create_new_buffer, "create-new-buffer")
   pub.subscribe(self.restart_streams, "restart-streams")
-
+  pub.subscribe(self.execute_action, "execute-action")
   if system == "Windows":
    pub.subscribe(self.invisible_shorcuts_changed, "invisible-shorcuts-changed")
    widgetUtils.connect_event(self.view, widgetUtils.MENU, self.show_hide, menuitem=self.view.show_hide)
@@ -235,7 +235,6 @@ class Controller(object):
     self.create_ignored_session_buffer(session_.sessions[i])
     continue
    self.create_buffers(session_.sessions[i])
-   self.set_buffer_positions(session_.sessions[i])
 
   # Connection checker executed each minute.
   self.checker_function = RepeatingTimer(60, self.check_connection)
@@ -246,6 +245,7 @@ class Controller(object):
   for i in session_.sessions:
    if session_.sessions[i].is_logged == False: continue
    self.start_buffers(session_.sessions[i])
+   self.set_buffer_positions(session_.sessions[i])
   if config.app["app-settings"]["play_ready_sound"] == True:
    session_.sessions[session_.sessions.keys()[0]].sound.play("ready.ogg")
   if config.app["app-settings"]["speak_ready_msg"] == True:
@@ -263,6 +263,7 @@ class Controller(object):
   for i in session_.sessions:
    if session_.sessions[i].session_id == session_id: session = session_.sessions[i]
   session.login()
+  session.db = dict()
   self.create_buffers(session, False)
   self.start_buffers(session)
 
@@ -286,11 +287,11 @@ class Controller(object):
     self.buffers.append(mentions)
     self.view.insert_buffer(mentions.buffer, name=_(u"Mentions"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
    elif i == 'dm':
-    dm = buffersController.baseBufferController(self.view.nb, "get_direct_messages", "direct_messages", session, session.db["user_name"], bufferType="dmPanel", sound="dm_received.ogg")
+    dm = buffersController.baseBufferController(self.view.nb, "get_direct_messages", "direct_messages", session, session.db["user_name"], bufferType="dmPanel", sound="dm_received.ogg", full_text=True)
     self.buffers.append(dm)
     self.view.insert_buffer(dm.buffer, name=_(u"Direct messages"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
    elif i == 'sent_dm':
-    sent_dm = buffersController.baseBufferController(self.view.nb, "get_sent_messages", "sent_direct_messages", session, session.db["user_name"], bufferType="dmPanel")
+    sent_dm = buffersController.baseBufferController(self.view.nb, "get_sent_messages", "sent_direct_messages", session, session.db["user_name"], bufferType="dmPanel", full_text=True)
     self.buffers.append(sent_dm)
     self.view.insert_buffer(sent_dm.buffer, name=_(u"Sent direct messages"), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
    elif i == 'sent_tweets':
@@ -360,41 +361,28 @@ class Controller(object):
    buffer.start_stream()
    buffer.searchfunction = self.search
    self.buffers.append(buffer)
-   self.view.insert_buffer(buffer.buffer, name=_(u"Trending topics for %s") % (buffer.name_), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
+   self.view.insert_buffer(buffer.buffer, name=_(u"Trending topics for %s") % (buffer.name), pos=self.view.search(session.db["user_name"], session.db["user_name"]))
    buffer.timer = RepeatingTimer(300, buffer.start_stream)
    buffer.timer.start()
 
  def set_buffer_positions(self,session):
   "Sets positions for buffers if values exist in the database."
   for i in self.buffers:
-   if i.name+"_pos" in session.db and hasattr(i.buffer,'list'):
+   if i.account == session.db["user_name"] and session.db.has_key(i.name+"_pos") and hasattr(i.buffer,'list'):
     i.buffer.list.select_item(session.db[str(i.name+"_pos")])
 
  def logout_account(self, session_id):
   for i in session_.sessions:
    if session_.sessions[i].session_id == session_id: session = session_.sessions[i]
   user = session.db["user_name"]
-  self.destroy_buffer("home_timeline", user)
-  self.destroy_buffer("mentions", user)
-  self.destroy_buffer("direct_messages", user)
-  self.destroy_buffer("sent_direct_messages", user)
-  self.destroy_buffer("sent_tweets", user)
-  self.destroy_buffer("favourites", user)
-  self.destroy_buffer("followers", user)
-  self.destroy_buffer("friends", user)
-  self.destroy_buffer("blocked", user)
-  self.destroy_buffer("muted", user)
-  self.destroy_buffer("events", user)
-  self.destroy_buffer("timelines", user)
-  for i in session.settings["other_buffers"]["timelines"]:
-   self.destroy_buffer("%s-timeline" % (i,), user)
-  self.destroy_buffer("favs_timelines", user)
-  self.destroy_buffer("searches", user)
-  for i in session.settings["other_buffers"]["tweet_searches"]:
-   self.destroy_buffer("%s-searchterm" % (i,), user)
-  for i in session.settings["other_buffers"]["trending_topic_buffers"]:
-   self.destroy_buffer("%s_tt" % (i,), user)
-  
+  delete_buffers = []
+  for i in self.buffers:
+   if i.account == user and i.name != user:
+    delete_buffers.append(i.name)
+  for i in delete_buffers:
+   self.destroy_buffer(i, user)
+  session.db = None
+
  def destroy_buffer(self, buffer_name, account):
   buffer = self.search_buffer(buffer_name, account)
   if buffer == None: return
@@ -561,6 +549,7 @@ class Controller(object):
    self.exit_()
 
  def exit_(self, *args, **kwargs):
+  for i in self.buffers: i.save_positions()
   log.debug("Exiting...")
   log.debug("Saving global configuration...")
   config.app.write()
@@ -718,8 +707,7 @@ class Controller(object):
    users = [tweet["screen_name"]]
   dlg = dialogs.userSelection.selectUserDialog(users=users, default=default)
   if dlg.get_response() == widgetUtils.OK:
-   buffer = self.get_best_buffer()
-   usr = utils.if_user_exists(buffer.session.twitter.twitter, dlg.get_user())
+   usr = utils.if_user_exists(buff.session.twitter.twitter, dlg.get_user())
    if usr != None:
     if usr["protected"] == True:
      if usr["following"] == False:
@@ -728,32 +716,38 @@ class Controller(object):
      answer = commonMessageDialogs.protected_user()
      if answer == widgetUtils.NO: return
     if dlg.get_action() == "tweets":
-     if dlg.get_user() in buffer.session.settings["other_buffers"]["timelines"]:
+     if usr["statuses_count"] == 0:
+      commonMessageDialogs.no_tweets()
+      return
+     if dlg.get_user() in buff.session.settings["other_buffers"]["timelines"]:
       commonMessageDialogs.timeline_exist()
       return
-     tl = buffersController.baseBufferController(self.view.nb, "get_user_timeline", "%s-timeline" % (dlg.get_user(),), buffer.session, buffer.session.db["user_name"], bufferType=None, screen_name=dlg.get_user())
+     tl = buffersController.baseBufferController(self.view.nb, "get_user_timeline", "%s-timeline" % (dlg.get_user(),), buff.session, buff.session.db["user_name"], bufferType=None, screen_name=dlg.get_user())
      tl.start_stream()
-     pos=self.view.search("timelines", buffer.session.db["user_name"])
+     pos=self.view.search("timelines", buff.session.db["user_name"])
      self.insert_buffer(tl, pos+1)
 #     self.buffers.insert(pos+1, tl)
      self.view.insert_buffer(tl.buffer, name=_(u"Timeline for {}").format(dlg.get_user()), pos=pos)
-     buffer.session.settings["other_buffers"]["timelines"].append(dlg.get_user())
-     pub.sendMessage("restart-streams", streams=["timelinesStream"], session=buffer.session)
+     buff.session.settings["other_buffers"]["timelines"].append(dlg.get_user())
+     pub.sendMessage("restart-streams", streams=["timelinesStream"], session=buff.session)
      buffer.session.sound.play("create_timeline.ogg")
     else:
+     if usr["favourites_count"] == 0:
+      commonMessageDialogs.no_favs()
+      return
      if dlg.get_user() in buffer.session.settings["other_buffers"]["favourites_timelines"]:
       commonMessageDialogs.timeline_exist()
       return
-     tl = buffersController.baseBufferController(self.view.nb, "get_favorites", "%s-favorite" % (dlg.get_user(),), buffer.session, buffer.session.db["user_name"], bufferType=None, screen_name=dlg.get_user())
-     pos=self.view.search("favs_timelines", buffer.session.db["user_name"])
+     tl = buffersController.baseBufferController(self.view.nb, "get_favorites", "%s-favorite" % (dlg.get_user(),), buff.session, buff.session.db["user_name"], bufferType=None, screen_name=dlg.get_user())
+     pos=self.view.search("favs_timelines", buff.session.db["user_name"])
      self.insert_buffer(tl, pos+1)
 #     self.buffers.insert(pos+1, tl)
      self.view.insert_buffer(buffer=tl.buffer, name=_(u"Favourites timeline for {}").format(dlg.get_user()), pos=pos)
      tl.start_stream()
      tl.timer = RepeatingTimer(300, tl.start_stream)
      tl.timer.start()
-     buffer.session.settings["other_buffers"]["favourites_timelines"].append(dlg.get_user())
-     buffer.session.sound.play("create_timeline.ogg")
+     buff.session.settings["other_buffers"]["favourites_timelines"].append(dlg.get_user())
+     buff.session.sound.play("create_timeline.ogg")
    else:
     commonMessageDialogs.user_not_exist()
 
@@ -1202,11 +1196,15 @@ class Controller(object):
   log.debug("Starting the streaming endpoint")
   session.start_streaming()
 
+ def set_positions(self):
+  for i in session_.sessions:
+   self.set_buffer_positions(i)
+
  def manage_stream_errors(self, session):
-  log.error("An error ocurred with the stream for the %s session. It will be destroyed" % (session,))
+  log.debug(" Restarting %s session streams. It will be destroyed" % (session,))
   s = session_.sessions[session]
   for i in self.buffers:
-   if i.invisible == True and i.session.session_id == s.session_id:
+   if i.invisible == True and i.session.session_id == s.session_id and i.type != "people":
     i.start_stream()
   s.listen_stream_error()
 
@@ -1350,5 +1348,9 @@ class Controller(object):
  def repeat_item(self, *args, **kwargs):
   output.speak(self.get_current_buffer().get_message())
 
+ def execute_action(self, action):
+  if hasattr(self, action):
+   getattr(self, action)()
+
  def __del__(self):
   config.app.write()

src/controller/messages.py

@@ -25,6 +25,7 @@ class basicTweet(object):
   widgetUtils.connect_event(self.message.spellcheck, widgetUtils.BUTTON_PRESSED, self.spellcheck)
   widgetUtils.connect_event(self.message.attach, widgetUtils.BUTTON_PRESSED, self.attach)
 #  if system == "Windows":
+#  if messageType != "dm":
   widgetUtils.connect_event(self.message.text, widgetUtils.ENTERED_TEXT, self.text_processor)
   self.text_processor()
   widgetUtils.connect_event(self.message.shortenButton, widgetUtils.BUTTON_PRESSED, self.shorten)
@@ -97,6 +98,7 @@ class basicTweet(object):
   checker = SpellChecker.spellchecker.spellChecker(text, "")
   if hasattr(checker, "fixed_text"):
    self.message.set_text(checker.fixed_text)
+   self.message.text_focus()
 
  def attach(self, *args, **kwargs):
   def completed_callback():
@@ -109,6 +111,7 @@ class basicTweet(object):
     output.speak(_(u"Unable to upload the audio"))
    dlg.cleanup()
   dlg = audioUploader.audioUploader(self.session.settings, completed_callback)
+  self.message.text_focus()
 
 class tweet(basicTweet):
  def __init__(self, session, title, caption, text, twishort_enabled, messageType="tweet", max=140):
@@ -130,6 +133,7 @@ class tweet(basicTweet):
    self.image = self.message.get_image()
    if self.image != None:
     self.message.set("upload_image", _(u"Discard image"))
+  self.message.text_focus()
 
  def autocomplete_users(self, *args, **kwargs):
   c = autocompletionUsers.completion.autocompletionUsers(self.message, self.session.session_id)
@@ -151,7 +155,7 @@ class reply(tweet):
 
 class dm(basicTweet):
  def __init__(self, session, title, caption, text):
-  super(dm, self).__init__(session, title, caption, text, messageType="dm")
+  super(dm, self).__init__(session, title, caption, text, messageType="dm", max=10000)
   widgetUtils.connect_event(self.message.autocompletionButton, widgetUtils.BUTTON_PRESSED, self.autocomplete_users)
 
  def autocomplete_users(self, *args, **kwargs):

src/keystrokeEditor/keystrokeEditor.py

@@ -3,6 +3,7 @@ import widgetUtils
 import config
 import wx_ui
 import constants
+from pubsub import pub
 
 class KeystrokeEditor(object):
  def __init__(self):
@@ -14,6 +15,7 @@ class KeystrokeEditor(object):
   self.hold_map = self.map.copy()
   self.dialog.put_keystrokes(constants.actions, self.map)
   widgetUtils.connect_event(self.dialog.edit, widgetUtils.BUTTON_PRESSED, self.edit_keystroke)
+  widgetUtils.connect_event(self.dialog.execute, widgetUtils.BUTTON_PRESSED, self.execute_action)
   self.dialog.get_response()
 
  def edit_keystroke(self, *args, **kwargs):
@@ -52,3 +54,7 @@ class KeystrokeEditor(object):
    wx_ui.no_key()
    return
   return "+".join(keys)
+
+ def execute_action(self, *args, **kwargs):
+  action = self.dialog.actions[self.dialog.get_action()]
+  pub.sendMessage("execute-action", action=action)

src/keystrokeEditor/wx_ui.py

@@ -13,18 +13,20 @@ class keystrokeEditorDialog(baseDialog.BaseWXDialog):
   self.keys = widgets.list(self, _(u"Action"), _(u"Keystroke"), style=wx.LC_REPORT|wx.LC_SINGLE_SEL, size=(400, 450))
   self.keys.list.SetFocus()
   firstSizer = wx.BoxSizer(wx.HORIZONTAL)
-  firstSizer.Add(keysText)
-  firstSizer.Add(self.keys.list)
+  firstSizer.Add(keysText, 0, wx.ALL, 5)
+  firstSizer.Add(self.keys.list, 0, wx.ALL, 5)
   self.edit = wx.Button(panel, -1, _(u"Edit"))
   self.edit.SetDefault()
-
+  self.execute = wx.Button(panel, -1, _(u"Execute action"))
   close = wx.Button(panel, wx.ID_CANCEL, _(u"Close"))
   secondSizer = wx.BoxSizer(wx.HORIZONTAL)
-  secondSizer.Add(self.edit)
-  secondSizer.Add(close)
-  sizer.Add(firstSizer)
-  sizer.Add(secondSizer)
-  panel.SetSizerAndFit(sizer)
+  secondSizer.Add(self.edit, 0, wx.ALL, 5)
+  secondSizer.Add(self.execute, 0, wx.ALL, 5)
+  secondSizer.Add(close, 0, wx.ALL, 5)
+  sizer.Add(firstSizer, 0, wx.ALL, 5)
+  sizer.Add(secondSizer, 0, wx.ALL, 5)
+  panel.SetSizer(sizer)
+  self.SetClientSize(sizer.CalcMin())
 
  def put_keystrokes(self, actions, keystrokes):
   for i in keystrokes:

src/sessionmanager/session.py

@@ -119,7 +119,8 @@ class Session(object):
 #   self.settings = None
 
  def init_sound(self):
-  self.sound = sound.soundSystem(self.settings["sound"])
+  try: self.sound = sound.soundSystem(self.settings["sound"])
+  except: pass
 
  @_require_configuration
  def login(self, verify_credentials=True):
@@ -344,6 +345,7 @@ class Session(object):
    self.logged = False
    self.twitter = twitter.twitter.twitter()
    self.login(False)
+   pub.sendMessage("streamError", session=self.session_id)
   if self.reconnection_function_active == True:  return
   self.reconnection_function_active = True
   if not hasattr(self, "main_stream"):

src/widgetUtils/wxUtils.py

@@ -1,4 +1,7 @@
 import wx
+import paths
+import languageHandler
+import sys
 
 toolkit = "wx"
 
@@ -108,6 +111,15 @@ class mainLoopObject(wx.App):
 
 	def __init__(self):
 		self.app = wx.App()
+		self.lc = wx.Locale()
+		lang=languageHandler.getLanguage()
+		wxLang=self.lc.FindLanguageInfo(lang)
+		if not wxLang and '_' in lang:
+			wxLang=self.lc.FindLanguageInfo(lang.split('_')[0])
+		if hasattr(sys,'frozen'):
+			self.lc.AddCatalogLookupPathPrefix(paths.app_path("locales"))
+		if wxLang:
+			self.lc.Init(wxLang.Language)
 
 	def run(self):
 		self.app.MainLoop()

src/wxUI/commonMessageDialogs.py

@@ -52,3 +52,9 @@ def no_following():
 def donation():
  dlg = wx.MessageDialog(None, _(u"If you like {0} we need your help to keep it going. Help us by donating to the project. This will help us pay for the server, the domain and some other things to ensure that {0} will be actively maintained. Your donation will give us the means to continue the development of {0}, and to keep {0} free. Would you like to donate now?").format(application.name), _(u"We need your help"), wx.ICON_QUESTION|wx.YES_NO)
  return dlg.ShowModal()
+
+def no_tweets():
+ return wx.MessageDialog(None, _(u"This user has no tweets. {0} can't create a timeline.").format(application.name), _(u"Error"), wx.ICON_ERROR).ShowModal()
+
+def no_favs():
+ return wx.MessageDialog(None, _(u"This user has no favorited tweets. {0} can't create a timeline.").format(application.name), _(u"Error"), wx.ICON_ERROR).ShowModal()

src/wxUI/dialogs/message.py

@@ -216,7 +216,8 @@ class dm(textLimited):
   self.buttonsBox3.Add(cancelButton, 0, wx.ALL, 5)
   self.mainBox.Add(self.buttonsBox3, 0, wx.ALL, 5)
   self.panel.SetSizer(self.mainBox)
-  
+#  self.SetClientSize(self.mainBox.CalcMin())
+
  def __init__(self, title, message,  users):
   super(dm, self).__init__()
   self.createControls(message, title, users)

src/wxUI/menus.py

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+import wx
+
+class basePanelMenu(wx.Menu):
+ def __init__(self):
+  super(basePanelMenu, self).__init__()
+  self.retweet = wx.MenuItem(self, wx.NewId(), _(u"&Retweet"))
+  self.AppendItem(self.retweet)
+  self.reply = wx.MenuItem(self, wx.NewId(), _(u"Re&ply"))
+  self.AppendItem(self.reply)
+  self.fav = wx.MenuItem(self, wx.NewId(), _(u"Add to &favourites"))
+  self.AppendItem(self.fav)
+  self.unfav = wx.MenuItem(self, wx.NewId(), _(u"Remove from favo&urites"))
+  self.AppendItem(self.unfav)
+  self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL"))
+  self.AppendItem(self.openUrl)
+  self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio"))
+  self.AppendItem(self.play)
+  self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show tweet"))
+  self.AppendItem(self.view)
+  self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
+  self.AppendItem(self.copy)
+  self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
+  self.AppendItem(self.remove)
+  self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions..."))
+  self.AppendItem(self.userActions)
+
+class dmPanelMenu(wx.Menu):
+ def __init__(self):
+  super(dmPanelMenu, self).__init__()
+  self.reply = wx.MenuItem(self, wx.NewId(), _(u"Re&ply"))
+  self.AppendItem(self.reply)
+  self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL"))
+  self.AppendItem(self.openUrl)
+  self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio"))
+  self.AppendItem(self.play)
+  self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show direct message"))
+  self.AppendItem(self.view)
+  self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
+  self.AppendItem(self.copy)
+  self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
+  self.AppendItem(self.remove)
+  self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions..."))
+  self.AppendItem(self.userActions)
+
+class sentPanelMenu(wx.Menu):
+ def __init__(self):
+  super(sentPanelMenu, self).__init__()
+  self.openUrl = wx.MenuItem(self, wx.NewId(), _(u"&Open URL"))
+  self.AppendItem(self.openUrl)
+  self.play = wx.MenuItem(self, wx.NewId(), _(u"&Play audio"))
+  self.AppendItem(self.play)
+  self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show tweet"))
+  self.AppendItem(self.view)
+  self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
+  self.AppendItem(self.copy)
+  self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
+  self.AppendItem(self.remove)
+
+class eventsPanelMenu(wx.Menu):
+ def __init__(self):
+  super(eventsPanelMenu, self).__init__()
+  self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show event"))
+  self.AppendItem(self.view)
+  self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
+  self.AppendItem(self.copy)
+  self.remove = wx.MenuItem(self, wx.NewId(), _(u"&Delete"))
+  self.AppendItem(self.remove)
+
+class peoplePanelMenu(wx.Menu):
+ def __init__(self):
+  super(peoplePanelMenu, self).__init__()
+  self.reply = wx.MenuItem(self, wx.NewId(), _(u"Direct &message"))
+  self.AppendItem(self.reply)
+  self.lists = wx.MenuItem(self, wx.NewId(), _(u"&View lists"))
+  self.AppendItem(self.lists)
+  self.lists.Enable(False)
+  self.details = wx.MenuItem(self, wx.NewId(), _(u"Show user &profile"))
+  self.AppendItem(self.details)
+  self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show user"))
+  self.AppendItem(self.view)
+  self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
+  self.AppendItem(self.copy)
+  self.userActions = wx.MenuItem(self, wx.NewId(), _(u"&User actions..."))
+  self.AppendItem(self.userActions)
+
+class trendsPanelMenu(wx.Menu):
+ def __init__(self):
+  super(trendsPanelMenu, self).__init__()
+  self.tweetThisTrend = wx.MenuItem(self, wx.NewId(), _(u"&Tweet about this trend"))
+  self.AppendItem(self.tweetThisTrend)
+  self.view = wx.MenuItem(self, wx.NewId(), _(u"&Show item"))
+  self.AppendItem(self.view)
+  self.copy = wx.MenuItem(self, wx.NewId(), _(u"&Copy to clipboard"))
+  self.AppendItem(self.copy)