diff --git a/src/application.py b/src/application.py index f39d4f2a..d3f8328f 100644 --- a/src/application.py +++ b/src/application.py @@ -5,7 +5,7 @@ if snapshot == False: version = "0.80" update_url = 'http://twblue.es/updates/twblue_ngen.json' else: - version = "9.2" + version = "9.4" update_url = 'http://twblue.es/updates/snapshots_ngen.json' author = u"Manuel Cortéz, Bill Dengler" authorEmail = "manuel@manuelcortez.net" diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index 4415f0f1..6521bb48 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -100,9 +100,9 @@ class bufferController(object): output.speak(_(u"Opening media..."), True) if sound.URLPlayer.is_playable(url=url, play=True, volume=self.session.settings["sound"]["volume"]) == False: return webbrowser.open_new_tab(url) - else: - output.speak(_(u"Not actionable."), True) - self.session.sound.play("error.ogg") +# else: +# output.speak(_(u"Not actionable."), True) +# self.session.sound.play("error.ogg") def start_stream(self): pass @@ -556,6 +556,15 @@ class listBufferController(baseBufferController): self.users.append(i["id"]) next_cursor = users["next_cursor"] + def remove_buffer(self): + dlg = commonMessageDialogs.remove_buffer() + if dlg == widgetUtils.YES: + if self.name[:-5] in self.session.settings["other_buffers"]["lists"]: + self.session.settings["other_buffers"]["lists"].remove(self.name[:-5]) + return True + elif dlg == widgetUtils.NO: + return False + class eventsBufferController(bufferController): def __init__(self, parent, name, session, account, *args, **kwargs): super(eventsBufferController, self).__init__(parent, *args, **kwargs) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index 7e008d78..e2e55976 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -305,7 +305,7 @@ class Controller(object): self.buffers.append(blocks) self.view.insert_buffer(blocks.buffer, name=_(u"Blocked users"), pos=self.view.search(session.db["user_name"], session.db["user_name"])) elif i == 'muted': - muted = buffersController.peopleBufferController(self.view.nb, "get_muted_users_list", "muted", session, session.db["user_name"]) + muted = buffersController.peopleBufferController(self.view.nb, "list_mutes", "muted", session, session.db["user_name"]) self.buffers.append(muted) self.view.insert_buffer(muted.buffer, name=_(u"Muted users"), pos=self.view.search(session.db["user_name"], session.db["user_name"])) elif i == 'events': diff --git a/src/extra/autocompletionUsers/wx_settings.py b/src/extra/autocompletionUsers/wx_settings.py index 036cd0c1..a469d7e6 100644 --- a/src/extra/autocompletionUsers/wx_settings.py +++ b/src/extra/autocompletionUsers/wx_settings.py @@ -2,6 +2,7 @@ import wx import widgetUtils import application + class autocompletionSettingsDialog(widgetUtils.BaseDialog): def __init__(self): super(autocompletionSettingsDialog, self).__init__(parent=None, id=-1, title=_(u"Autocomplete users’ settings")) diff --git a/src/mysc/thread_utils.py b/src/mysc/thread_utils.py index cf343abc..f400516b 100644 --- a/src/mysc/thread_utils.py +++ b/src/mysc/thread_utils.py @@ -24,10 +24,10 @@ def call_threaded(func, *args, **kwargs): def stream_threaded(func, *args, **kwargs): def new_func(*a, **k): -# try: - func(**k) -# except: -# pub.sendMessage("streamError", session=a[0]) + try: + func(**k) + except: + pub.sendMessage("streamError", session=a[0]) thread = threading.Thread(target=new_func, args=args, kwargs=kwargs) thread.daemon = True thread.start() diff --git a/src/update/updater.py b/src/update/updater.py index cd7e8ccc..28760e5a 100644 --- a/src/update/updater.py +++ b/src/update/updater.py @@ -8,8 +8,8 @@ import output logger = logging.getLogger("updater") def do_update(): - try: - return update.perform_update(endpoint=application.update_url, current_version=application.version, app_name=application.name, update_available_callback=available_update_dialog, progress_callback=progress_callback, update_complete_callback=update_finished) - except: - logger.exception("Update failed.") - output.speak("An exception occurred while attempting to update " + application.name + ". If this message persists, contact the " + application.name + " developers. More information about the exception has been written to the error log.",True) \ No newline at end of file +# try: + return update.perform_update(endpoint=application.update_url, current_version=application.version, app_name=application.name, update_available_callback=available_update_dialog, progress_callback=progress_callback, update_complete_callback=update_finished) +# except: +# logger.exception("Update failed.") +# output.speak("An exception occurred while attempting to update " + application.name + ". If this message persists, contact the " + application.name + " developers. More information about the exception has been written to the error log.",True) \ No newline at end of file diff --git a/src/wxUI/dialogs/configuration.py b/src/wxUI/dialogs/configuration.py index 085809e1..c6b6f100 100644 --- a/src/wxUI/dialogs/configuration.py +++ b/src/wxUI/dialogs/configuration.py @@ -6,6 +6,7 @@ import application from multiplatform_widgets import widgets import output import config + class general(wx.Panel, baseDialog.BaseWXDialog): def __init__(self, parent, languages,keymaps): super(general, self).__init__(parent)