emdee/qweechat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add signals "upgrade" and "upgrade_ended"

Browse source
This commit is contained in:
Sebastien Helleu 2012-05-17 11:28:15 +02:00
parent 070c41a8cd
commit beaa87758b
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/qweechat/network.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright (C) 2011 Sebastien Helleu <flashcode@flashtux.org> # Copyright (C) 2011-2012 Sebastien Helleu <flashcode@flashtux.org>
# #
# This file is part of QWeeChat, a Qt remote GUI for WeeChat. # This file is part of QWeeChat, a Qt remote GUI for WeeChat.
# #
@ -28,8 +28,8 @@ import qt_compat
QtCore = qt_compat.import_module('QtCore') QtCore = qt_compat.import_module('QtCore')
QtNetwork = qt_compat.import_module('QtNetwork') QtNetwork = qt_compat.import_module('QtNetwork')
_PROTO_INIT_CMDS = ['init password=%(password)s,compression=gzip', _PROTO_INIT_CMD = ['init password=%(password)s,compression=gzip']
'(listbuffers) hdata buffer:gui_buffers(*) number,full_name,short_name,type,nicklist,title,local_variables', _PROTO_SYNC_CMDS = ['(listbuffers) hdata buffer:gui_buffers(*) number,full_name,short_name,type,nicklist,title,local_variables',
'(listlines) hdata buffer:gui_buffers(*)/own_lines/first_line(*)/data date,displayed,prefix,message', '(listlines) hdata buffer:gui_buffers(*)/own_lines/first_line(*)/data date,displayed,prefix,message',
'(nicklist) nicklist', '(nicklist) nicklist',
'sync', 'sync',
@ -61,7 +61,7 @@ class Network(QtCore.QObject):
"""Slot: socket connected.""" """Slot: socket connected."""
self.statusChanged.emit(self.status_connected, None) self.statusChanged.emit(self.status_connected, None)
if self._password: if self._password:
self._socket.write('\n'.join(_PROTO_INIT_CMDS) % {'password': str(self._password)}) self._socket.write('\n'.join(_PROTO_INIT_CMD + _PROTO_SYNC_CMDS) % {'password': str(self._password)})
def _socket_error(self, error): def _socket_error(self, error):
"""Slot: socket error.""" """Slot: socket error."""
@ -121,6 +121,12 @@ class Network(QtCore.QObject):
def send_to_weechat(self, message): def send_to_weechat(self, message):
self._socket.write(str(message)) self._socket.write(str(message))
def desync_weechat(self):
self._socket.write('desync\n')
def sync_weechat(self):
self._socket.write('\n'.join(_PROTO_SYNC_CMDS))
def status_icon(self, status): def status_icon(self, status):
icon = {self.status_disconnected: 'dialog-close.png', icon = {self.status_disconnected: 'dialog-close.png',
self.status_connecting: 'dialog-close.png', self.status_connecting: 'dialog-close.png',

6
src/qweechat/qweechat.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright (C) 2011 Sebastien Helleu <flashcode@flashtux.org> # Copyright (C) 2011-2012 Sebastien Helleu <flashcode@flashtux.org>
# #
# This file is part of QWeeChat, a Qt remote GUI for WeeChat. # This file is part of QWeeChat, a Qt remote GUI for WeeChat.
# #
@ -322,6 +322,10 @@ class MainWindow(QtGui.QMainWindow):
self.buffers[index].update_prompt() self.buffers[index].update_prompt()
elif message.msgid == '_buffer_closing': elif message.msgid == '_buffer_closing':
self.remove_buffer(index) self.remove_buffer(index)
elif message.msgid == '_upgrade':
self.network.desync_weechat()
elif message.msgid == '_upgrade_ended':
self.network.sync_weechat()
def create_buffer(self, item): def create_buffer(self, item):
buf = Buffer(item) buf = Buffer(item)