Commit 33fa0018 authored by Saul Ibarra's avatar Saul Ibarra

Rename FileTransfer to BlinkFileTransfer and related notifications


There is a name clash with the FileTransferDidEnd notification, because
we listen to it by name in the main and filetransfer windows.
parent 02824abb
...@@ -50,8 +50,8 @@ class FileTransferWindow(base_class, ui_class): ...@@ -50,8 +50,8 @@ class FileTransferWindow(base_class, ui_class):
self.model.modelReset.connect(self.update_status) self.model.modelReset.connect(self.update_status)
notification_center = NotificationCenter() notification_center = NotificationCenter()
notification_center.add_observer(self, name='FileTransferWillRetry') notification_center.add_observer(self, name='BlinkFileTransferWillRetry')
notification_center.add_observer(self, name='FileTransferDidEnd') notification_center.add_observer(self, name='BlinkFileTransferDidEnd')
def show(self, activate=True): def show(self, activate=True):
settings = BlinkSettings() settings = BlinkSettings()
...@@ -74,10 +74,10 @@ class FileTransferWindow(base_class, ui_class): ...@@ -74,10 +74,10 @@ class FileTransferWindow(base_class, ui_class):
handler = getattr(self, '_NH_%s' % notification.name, Null) handler = getattr(self, '_NH_%s' % notification.name, Null)
handler(notification) handler(notification)
def _NH_FileTransferWillRetry(self, notification): def _NH_BlinkFileTransferWillRetry(self, notification):
self.update_status() self.update_status()
def _NH_FileTransferDidEnd(self, notification): def _NH_BlinkFileTransferDidEnd(self, notification):
self.update_status() self.update_status()
def _SH_ContextMenuRequested(self, pos): def _SH_ContextMenuRequested(self, pos):
......
...@@ -54,8 +54,8 @@ class MainWindow(base_class, ui_class): ...@@ -54,8 +54,8 @@ class MainWindow(base_class, ui_class):
notification_center.add_observer(self, name='SIPAccountGotPendingWatcher') notification_center.add_observer(self, name='SIPAccountGotPendingWatcher')
notification_center.add_observer(self, name='BlinkSessionNewOutgoing') notification_center.add_observer(self, name='BlinkSessionNewOutgoing')
notification_center.add_observer(self, name='BlinkSessionDidReinitializeForOutgoing') notification_center.add_observer(self, name='BlinkSessionDidReinitializeForOutgoing')
notification_center.add_observer(self, name='FileTransferNewIncoming') notification_center.add_observer(self, name='BlinkFileTransferNewIncoming')
notification_center.add_observer(self, name='FileTransferNewOutgoing') notification_center.add_observer(self, name='BlinkFileTransferNewOutgoing')
notification_center.add_observer(self, sender=AccountManager()) notification_center.add_observer(self, sender=AccountManager())
icon_manager = IconManager() icon_manager = IconManager()
...@@ -907,10 +907,10 @@ class MainWindow(base_class, ui_class): ...@@ -907,10 +907,10 @@ class MainWindow(base_class, ui_class):
def _NH_BlinkSessionDidReinitializeForOutgoing(self, notification): def _NH_BlinkSessionDidReinitializeForOutgoing(self, notification):
self.search_box.clear() self.search_box.clear()
def _NH_FileTransferNewIncoming(self, notification): def _NH_BlinkFileTransferNewIncoming(self, notification):
self.filetransfer_window.show(activate=QApplication.activeWindow() is not None) self.filetransfer_window.show(activate=QApplication.activeWindow() is not None)
def _NH_FileTransferNewOutgoing(self, notification): def _NH_BlinkFileTransferNewOutgoing(self, notification):
self.filetransfer_window.show(activate=QApplication.activeWindow() is not None) self.filetransfer_window.show(activate=QApplication.activeWindow() is not None)
del ui_class, base_class del ui_class, base_class
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment