Invisible navigation fixes, URLPlayer volume fixes, shutdown fix

This commit is contained in:
2015-01-20 22:07:13 -06:00
parent c25412bd32
commit 399de75d64
6 changed files with 130 additions and 110 deletions

View File

@@ -49,8 +49,8 @@ class bufferController(object):
self.session.settings["sound"]["volume"] = 0.0
else:
self.session.settings["sound"]["volume"] -=0.05
if hasattr(sound.URLStream, "stream"):
sound.URLStream.stream.volume = self.session.settings["sound"]["volume"]
if hasattr(sound.URLPlayer, "stream"):
sound.URLPlayer.stream.volume = self.session.settings["sound"]["volume"]
self.session.sound.play("volume_changed.ogg")
def volume_up(self):
@@ -59,9 +59,9 @@ class bufferController(object):
self.session.settings["sound"]["volume"] = 1.0
else:
self.session.settings["sound"]["volume"] +=0.05
if hasattr(sound.URLStream, "stream"):
sound.URLStream.stream.volume = self.session.settings["sound"]["volume"]
self.session.sound.play("volume_changed.ogg")
if hasattr(sound.URLPlayer, "stream"):
sound.URLPlayer.stream.volume = self.session.settings["sound"]["volume"]
self.session.sound.play("volume_changed.ogg")
def start_stream(self):
pass

View File

@@ -94,6 +94,8 @@ class Controller(object):
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)
if widgetUtils.toolkit == "wx":
widgetUtils.connectExitFunction(self.exit)
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)
widgetUtils.connect_event(self.view, widgetUtils.MENU, self.post_retweet, self.view.retweet)
@@ -359,6 +361,7 @@ class Controller(object):
if config.app["app-settings"]["use_invisible_keyboard_shorcuts"] == False:
self.register_invisible_keyboard_shorcuts(km)
self.view.Hide()
self.fix_wrong_buffer()
self.showing = False
else:
if config.app["app-settings"]["use_invisible_keyboard_shorcuts"] == False:
@@ -383,6 +386,11 @@ class Controller(object):
def buffer_changed(self, *args, **kwargs):
if self.get_current_buffer().account != self.current_account: self.current_account = self.get_current_buffer().account
def fix_wrong_buffer(self):
buffer = self.get_current_buffer()
if buffer.session == None:
self.right()
def up(self, *args, **kwargs):
page = self.get_current_buffer()
position = page.buffer.list.get_selected()