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

Sound object refactored, more invisible shorcuts, global configuration and fixed buffer navigation in invisible mode

Browse Source
This commit is contained in:
Manuel Cortez
2015-01-20 15:40:33 -06:00
parent 7b1f2f9482
commit c25412bd32
15 changed files with 173 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/controller/buffersController.py
View File

@@ -44,24 +44,24 @@ class bufferController(object):
#pass
def volume_down(self):
if config.app["app-settings"]["volume"] > 0.0:
if config.app["app-settings"]["volume"] <= 0.05:
config.app["app-settings"]["volume"] = 0.0
if self.session.settings["sound"]["volume"] > 0.0:
if self.session.settings["sound"]["volume"] <= 0.05:
self.session.settings["sound"]["volume"] = 0.0
else:
config.app["app-settings"]["volume"] -=0.05
self.session.settings["sound"]["volume"] -=0.05
if hasattr(sound.URLStream, "stream"):
sound.URLStream.stream.volume = config.app["app-settings"]["volume"]
sound.player.play("volume_changed.ogg")
sound.URLStream.stream.volume = self.session.settings["sound"]["volume"]
self.session.sound.play("volume_changed.ogg")
def volume_up(self):
if config.app["app-settings"]["volume"] < 1.0:
if config.app["app-settings"]["volume"] >= 0.95:
config.app["app-settings"]["volume"] = 1.0
if self.session.settings["sound"]["volume"] < 1.0:
if self.session.settings["sound"]["volume"] >= 0.95:
self.session.settings["sound"]["volume"] = 1.0
else:
config.app["app-settings"]["volume"] +=0.05
self.session.settings["sound"]["volume"] +=0.05
if hasattr(sound.URLStream, "stream"):
sound.URLStream.stream.volume = config.app["app-settings"]["volume"]
sound.player.play("volume_changed.ogg")
sound.URLStream.stream.volume = self.session.settings["sound"]["volume"]
self.session.sound.play("volume_changed.ogg")
def start_stream(self):
pass
@@ -223,7 +223,7 @@ class baseBufferController(bufferController):
screen_name = tweet["user"]["screen_name"]
id = tweet["id"]
users = utils.get_all_mentioned(tweet, self.session.db)
message = messages.reply(self.session, _(u"Reply"), _(u"Reply to %s") % (screen_name,), "@%s" % (screen_name,), users)
message = messages.reply(self.session, _(u"Reply"), _(u"Reply to %s") % (screen_name,), "@%s " % (screen_name,), users)
if message.message.get_response() == widgetUtils.OK:
if message.image == None:
call_threaded(self.session.api_call, call_name="update_status", _sound="reply_send.ogg", in_reply_to_status_id=id, status=message.message.get_text())
@@ -267,7 +267,7 @@ class baseBufferController(bufferController):
ts = original_date.humanize(locale=languageHandler.getLanguage())
self.buffer.list.list.SetStringItem(self.buffer.list.get_selected(), 2, ts)
if utils.is_audio(tweet):
sound.player.play("audio.ogg")
self.session.sound.play("audio.ogg")
def audio(self):
tweet = self.get_tweet()
@@ -390,6 +390,14 @@ class peopleBufferController(baseBufferController):
tweet = self.session.db[self.name]["items"][self.buffer.list.get_selected()]
return tweet
def add_new_item(self, item):
self.session.db[self.name]["items"].append(item)
tweet = self.compose_function(item, self.session.db, self.session.settings["general"]["relative_times"])
if self.session.settings["general"]["reverse_timelines"] == False:
self.buffer.list.insert_item(False, *tweet)
else:
self.buffer.list.insert_item(True, *tweet)
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))
@@ -400,7 +408,7 @@ class searchBufferController(baseBufferController):
log.debug("Number of items retrieved: %d" % (number_of_items,))
self.put_items_on_list(number_of_items)
if number_of_items > 0:
sound.player.play("search_updated.ogg")
self.session.sound.play("search_updated.ogg")
class searchPeopleBufferController(searchBufferController):
@@ -419,4 +427,4 @@ class searchPeopleBufferController(searchBufferController):
log.debug("Number of items retrieved: %d" % (number_of_items,))
self.put_items_on_list(number_of_items)
if number_of_items > 0:
sound.player.play("search_updated.ogg")
self.session.sound.play("search_updated.ogg")

76
src/controller/mainController.py
View File

@@ -2,6 +2,7 @@
from wxUI import (view, dialogs, commonMessageDialogs)
import buffersController
import messages
import settings
from sessionmanager import session as session_
from pubsub import pub
import sound
@@ -56,14 +57,14 @@ class Controller(object):
def get_first_buffer(self, account):
for i in self.buffers:
if i.account == account:
if i.account == account and i.invisible == True:
buff = i
break
return self.view.search(buff.name, buff.account)
def get_last_buffer(self, account):
results = []
[results.append(i) for i in self.buffers if i.account == account]
[results.append(i) for i in self.buffers if i.account == account and i.invisible == True]
return self.view.search(results[-1].name, results[-1].account)
def bind_stream_events(self):
@@ -91,6 +92,7 @@ class Controller(object):
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.show_hide, menuitem=self.view.show_hide)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.search, menuitem=self.view.menuitem_search)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.learn_sounds, menuitem=self.view.sounds_tutorial)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.configuration, menuitem=self.view.prefs)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.exit, menuitem=self.view.close)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.post_tweet, self.view.compose)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.post_reply, self.view.reply)
@@ -113,6 +115,13 @@ class Controller(object):
self.view.prepare()
self.bind_stream_events()
self.bind_other_events()
if config.app["app-settings"]["hide_gui"] == True:
self.show_hide()
self.view.Show()
self.view.Hide()
if config.app["app-settings"]["use_invisible_keyboard_shorcuts"] == True:
km = self.create_invisible_keyboard_shorcuts()
self.register_invisible_keyboard_shorcuts(km)
self.do_work()
def do_work(self):
@@ -121,7 +130,7 @@ class Controller(object):
log.debug("Working on session %s" % (i,))
self.create_buffers(session_.sessions[i])
call_threaded(self.start_buffers, session_.sessions[i])
sound.player.play("tweet_timeline.ogg")
session_.sessions[session_.sessions.keys()[0]].sound.play("tweet_timeline.ogg")
self.checker_function = RepeatingTimer(60, self.check_connection)
self.checker_function.start()
@@ -138,11 +147,11 @@ class Controller(object):
mentions = buffersController.baseBufferController(self.view.nb, "get_mentions_timeline", "mentions", session, session.db["user_name"])
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"]))
sound.player.play("mention_received.ogg")
session.sound.play("mention_received.ogg")
dm = buffersController.baseBufferController(self.view.nb, "get_direct_messages", "direct_messages", session, session.db["user_name"], bufferType="dmPanel")
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"]))
sound.player.play("dm_received.ogg")
session.sound.play("dm_received.ogg")
sent_dm = buffersController.baseBufferController(self.view.nb, "get_sent_messages", "sent_direct_messages", session, session.db["user_name"], bufferType="dmPanel")
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"]))
@@ -220,7 +229,8 @@ class Controller(object):
dlg.Destroy()
def learn_sounds(self, *args, **kwargs):
SoundsTutorial.soundsTutorial()
buffer = self.get_best_buffer()
SoundsTutorial.soundsTutorial(buffer.session)
def view_user_lists(self, users):
pass
@@ -234,8 +244,11 @@ class Controller(object):
def lists_manager(self):
pass
def configuration(self):
pass
def configuration(self, *args, **kwargs):
d = settings.globalSettingsController()
if d.response == widgetUtils.OK:
d.save_configuration()
def update_profile(self):
pass
@@ -259,14 +272,19 @@ class Controller(object):
buffer.destroy_status()
def exit(self, *args, **kwargs):
if config.app["app-settings"]["ask_at_exit"] == True:
answer = commonMessageDialogs.exit_dialog()
if answer == widgetUtils.NO: return
log.debug("Exiting...")
log.debug("Saving global configuration...")
config.app.write()
for item in session_.sessions:
log.debug("Saving config for %s session" % (session_.sessions[item].session_id,))
session_.sessions[item].settings.write()
log.debug("Disconnecting streams for %s session" % (session_.sessions[item].session_id,))
session_.sessions[item].main_stream.disconnect()
session_.sessions[item].timelinesStream.disconnect()
sound.player.cleaner.cancel()
session_.sessions[item].sound.cleaner.cancel()
widgetUtils.exit_application()
def action(self, do_action):
@@ -317,7 +335,8 @@ class Controller(object):
buffer = self.get_current_buffer()
if buffer.type == "baseBuffer" or buffer.type == "favourites_timeline" or buffer.type == "list" or buffer.type == "search":
try:
tweet = buffer.get_right_tweet()
tweet_id = buffer.get_right_tweet()["id"]
tweet = buffer.session.twitter.twitter.show_status(id=tweet_id)
msg = messages.viewTweet(tweet, )
except TwythonError:
non_tweet = buffer.get_message()
@@ -373,7 +392,7 @@ class Controller(object):
except:
pass
if position == page.buffer.list.get_selected():
sound.player.play("limit.ogg")
page.session.sound.play("limit.ogg")
try:
output.speak(page.get_message())
except:
@@ -388,7 +407,7 @@ class Controller(object):
except:
pass
if position == page.buffer.list.get_selected():
sound.player.play("limit.ogg")
page.session.sound.play("limit.ogg")
try:
output.speak(page.get_message())
except:
@@ -458,6 +477,17 @@ class Controller(object):
msg = _(u"%s. Empty") % (self.view.get_buffer_text(),)
output.speak(msg)
def url(self, *args, **kwargs):
self.get_current_buffer().url()
def audio(self, *args, **kwargs):
self.get_current_buffer().audio()
def volume_down(self, *args, **kwargs):
self.get_current_buffer().volume_down()
def volume_up(self, *args, **kwargs):
self.get_current_buffer().volume_up()
def create_invisible_keyboard_shorcuts(self):
keymap = {}
for i in config.app["keymap"]:
@@ -476,9 +506,9 @@ class Controller(object):
except AttributeError:
pass
def notify(self, play_sound=None, message=None, notification=False):
def notify(self, session, play_sound=None, message=None, notification=False):
if play_sound != None:
sound.player.play(play_sound)
session.sound.play(play_sound)
if message != None:
output.speak(message)
@@ -486,45 +516,45 @@ class Controller(object):
buffer = self.search_buffer("home_timeline", user)
play_sound = "tweet_received.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def manage_mentions(self, data, user):
buffer = self.search_buffer("mentions", user)
play_sound = "mention_received.ogg"
buffer.add_new_item(data)
message = _(u"New mention")
self.notify(play_sound=play_sound, message=message)
self.notify(buffer.session, play_sound=play_sound, message=message)
def manage_direct_messages(self, data, user):
buffer = self.search_buffer("direct_messages", user)
play_sound = "dm_received.ogg"
buffer.add_new_item(data)
message = _(u"New direct message")
self.notify(play_sound=play_sound, message=message)
self.notify(buffer.session, play_sound=play_sound, message=message)
def manage_sent_dm(self, data, user):
buffer = self.search_buffer("sent_direct_messages", user)
play_sound = "dm_sent.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def manage_sent_tweets(self, data, user):
buffer = self.search_buffer("sent_tweets", user)
play_sound = "tweet_send.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def manage_events(self, data, user):
buffer = self.search_buffer("events", user)
play_sound = "new_event.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def manage_followers(self, data, user):
buffer = self.search_buffer("followers", user)
play_sound = "update_followers.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def manage_friend(self, data, user):
buffer = self.search_buffer("friends", user)
@@ -539,7 +569,7 @@ class Controller(object):
buffer = self.search_buffer("favourites", user)
play_sound = "favourite.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def manage_unfavourite(self, item, user):
buffer = self.search_buffer("favourites", user)
@@ -557,7 +587,7 @@ class Controller(object):
buffer = self.search_buffer("%s-timeline" % (who,), user)
play_sound = "tweet_timeline.ogg"
buffer.add_new_item(data)
self.notify(play_sound=play_sound)
self.notify(buffer.session, play_sound=play_sound)
def editing_keystroke(self, action, parentDialog):
print "i've pressed"

2
src/controller/messages.py
View File

@@ -76,7 +76,7 @@ class basicTweet(object):
self.message.disable_button("shortenButton")
self.message.disable_button("unshortenButton")
if len(self.message.get_text()) > 140:
sound.player.play("max_length.ogg")
self.session.sound.play("max_length.ogg")
def spellcheck(self, event=None):
text = self.message.get_text()

39
src/controller/settings.py Normal file
View File

@@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
import widgetUtils
import config
import languageHandler
from wxUI.dialogs import configuration
from pubsub import pub
import logging
log = logging.getLogger("Settings")
class globalSettingsController(object):
def __init__(self):
super(globalSettingsController, self).__init__()
self.dialog = configuration.configurationDialog()
self.langs = languageHandler.getAvailableLanguages()
langs = []
[langs.append(i[1]) for i in self.langs]
self.codes = []
[self.codes.append(i[0]) for i in self.langs]
id = self.codes.index(config.app["app-settings"]["language"])
self.dialog.create_general(langs)
self.dialog.general.language.SetSelection(id)
self.dialog.set_value("general", "ask_at_exit", config.app["app-settings"]["ask_at_exit"])
self.dialog.set_value("general", "use_invisible_shorcuts", config.app["app-settings"]["use_invisible_keyboard_shorcuts"])
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.realize()
self.needs_restart = False
self.response = self.dialog.get_response()
def save_configuration(self):
if self.codes[self.dialog.general.language.GetSelection()] != config.app["app-settings"]["language"]:
config.app["app-settings"]["language"] = self.codes[self.dialog.general.language.GetSelection()]
languageHandler.setLanguage(config.app["app-settings"]["language"])
self.needs_restart = True
if config.app["app-settings"]["use_invisible_keyboard_shorcuts"] != self.dialog.get_value("general", "use_invisible_shorcuts"):
config.app["app-settings"]["use_invisible_keyboard_shorcuts"] = self.dialog.get_value("general", "use_invisible_shorcuts")
pub.sendMessage("invisible-shorcuts-changed", registered=self.dialog.get_value("general", "use_invisible_shorcuts"))
config.app["app-settings"]["voice_enabled"] = self.dialog.get_value("general", "disable_sapi5")
config.app["app-settings"]["hide_gui"] = self.dialog.get_value("general", "hide_gui")