Invisible navigation fixes, URLPlayer volume fixes, shutdown fix

src/controller/buffersController.py

@@ -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

src/controller/mainController.py

@@ -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()

src/gettext_windows.py

@@ -1,105 +0,0 @@
-# Copyright (c) 2006, 2007, 2010 Alexander Belchenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-"""Helper for standard gettext.py on Windows.
-
-Module obtains user language code on Windows to use with standard
-Python gettext.py library.
-
-The module provides 2 functions: setup_env and get_language.
-
-You may use setup_env before initializing gettext functions.
-
-Or you can use get_language to get the list of language codes suitable
-to pass them to gettext.find or gettext.translation function.
-
-Usage example #1:
-
-import gettext, gettext_windows
-gettext_windows.setup_env()
-gettext.install('myapp')
-
-Usage example #2:
-
-import gettext, gettext_windows
-lang = gettext_windows.get_language()
-translation = gettext.translation('myapp', languages=lang)
-_ = translation.gettext
-"""
-
-import locale
-import os
-import sys
-
-OS_WINDOWS = (sys.platform == 'win32')
-
-
-def setup_env_windows(system_lang=True):
-    """Check environment variables used by gettext
-    and setup LANG if there is none.
-    """
-    if _get_lang_env_var() is not None:
-        return
-    lang = get_language_windows(system_lang)
-    if lang:
-        os.environ['LANGUAGE'] = ':'.join(lang)
-
-def get_language_windows(system_lang=True):
-    """Get language code based on current Windows settings.
-    @return: list of languages.
-    """
-    try:
-        import ctypes
-    except ImportError:
-        return [locale.getdefaultlocale()[0]]
-    # get all locales using windows API
-    lcid_user = ctypes.windll.kernel32.GetUserDefaultLCID()
-    lcid_system = ctypes.windll.kernel32.GetSystemDefaultLCID()
-    if system_lang and lcid_user != lcid_system:
-        lcids = [lcid_user, lcid_system]
-    else:
-        lcids = [lcid_user]
-    return filter(None, [locale.windows_locale.get(i) for i in lcids]) or None
-
-
-def setup_env_other(system_lang=True):
-    pass
-
-def get_language_other(system_lang=True):
-    lang = _get_lang_env_var()
-    if lang is not None:
-        return lang.split(':')
-    return None
-
-
-def _get_lang_env_var():
-    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
-        lang = os.environ.get(i)
-        if lang:
-            return lang
-    return None
-
-
-if OS_WINDOWS:
-    setup_env = setup_env_windows
-    get_language  = get_language_windows
-else:
-    setup_env = setup_env_other
-    get_language  = get_language_other

src/widgetUtils/gtkUtils.py

@@ -1,5 +1,6 @@
 from gi.repository import Gtk, Gdk
 
+toolkit = "gtk"
 # Code responses for GTK +3 dialogs.
 # this is when an user presses OK on a dialogue.
 OK = Gtk.ResponseType.OK

src/widgetUtils/wxUtils.py

@@ -1,5 +1,6 @@
 import wx
 
+toolkit = "wx"
 # Code responses for WX dialogs.
 # this is when an user presses OK on a dialogue.
 OK = wx.ID_OK
@@ -36,3 +37,6 @@ def connect_event(parent, event, func, menuitem=None, *args, **kwargs):
   return getattr(parent, "Bind")(event, func, *args, **kwargs)
  else:
   return getattr(parent, "Bind")(event, func, menuitem, *args, **kwargs)
+
+def connectExitFunction(exitFunction):
+ wx.GetApp().Bind(wx.EVT_END_SESSION, exitFunction)