mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-07-17 21:56:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'next-gen' of https://github.com/manuelcortez/TWBlue into next-gen

Browse Source
This commit is contained in:
Manuel Cortez
2015-05-02 17:22:32 -05:00
parent c50c42b895 6e294ca0da
commit ce5498ff94
6 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/controller/mainController.py
View File

@@ -530,6 +530,9 @@ class Controller(object):
if hasattr(session_.sessions[item], "main_stream"): session_.sessions[item].main_stream.disconnect()
if hasattr(session_.sessions[item], "timelinesStream"): session_.sessions[item].timelinesStream.disconnect()
session_.sessions[item].sound.cleaner.cancel()
log.debug("Shelving database for " + session_.sessions[item].session_id)
session_.sessions[item].shelve()
if system == "Windows":
self.systrayIcon.RemoveIcon()
widgetUtils.exit_application()
@@ -853,7 +856,7 @@ class Controller(object):
def up(self, *args, **kwargs):
page = self.get_current_buffer()
if not hasattr(page.buffer, "list"):
output.speak(_(u"This account is not logged in twitter."), True)
output.speak(_(u"No session is currently in focus. Focus a session with the next or previous session shortcut."), True)
return
position = page.buffer.list.get_selected()
index = position-1
@@ -871,7 +874,7 @@ class Controller(object):
def down(self, *args, **kwargs):
page = self.get_current_buffer()
if not hasattr(page.buffer, "list"):
output.speak(_(u"This account is not logged in twitter."), True)
output.speak(_(u"No session is currently in focus. Focus a session with the next or previous session shortcut."), True)
return
position = page.buffer.list.get_selected()
index = position+1
@@ -890,7 +893,7 @@ class Controller(object):
buff = self.view.get_current_buffer_pos()
buffer = self.get_current_buffer()
if not hasattr(buffer.buffer, "list"):
output.speak(_(u"This account is not logged in twitter."), True)
output.speak(_(u"No session is currently in focus. Focus a session with the next or previous session shortcut."), True)
return
if buff == self.get_first_buffer(buffer.account) or buff == 0:
self.view.change_buffer(self.get_last_buffer(buffer.account))
@@ -908,7 +911,7 @@ class Controller(object):
buff = self.view.get_current_buffer_pos()
buffer = self.get_current_buffer()
if not hasattr(buffer.buffer, "list"):
output.speak(_(u"This account is not logged in twitter."), True)
output.speak(_(u"No session is currently in focus. Focus a session with the next or previous session shortcut."), True)
return
if buff == self.get_last_buffer(buffer.account) or buff+1 == self.view.get_buffer_count():
self.view.change_buffer(self.get_first_buffer(buffer.account))
@@ -932,7 +935,7 @@ class Controller(object):
self.current_account = account
buff = self.view.search("home_timeline", account)
if buff == None:
output.speak(_(u"{0}: This account is not logged in twitter.").format(account), True)
output.speak(_(u"{0}: This account is not logged into Twitter.").format(account), True)
return
self.view.change_buffer(buff)
buffer = self.get_current_buffer()
@@ -952,7 +955,7 @@ class Controller(object):
self.current_account = account
buff = self.view.search("home_timeline", account)
if buff == None:
output.speak(_(u"{0}: This account is not logged in twitter.").format(account), True)
output.speak(_(u"{0}: This account is not logged into twitter.").format(account), True)
return
self.view.change_buffer(buff)
buffer = self.get_current_buffer()