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

Create debug dialog when asked, keep some lines in buffer when dialog is not open

Browse Source
This commit is contained in:
Sebastien Helleu 2011-12-10 10:11:36 +01:00
parent dc15599ca2
commit cc80cd81ab
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qweechat/debug.py
View File

@ -45,3 +45,8 @@ class DebugDialog(QtGui.QDialog):
vbox.addWidget(self.input) vbox.addWidget(self.input)
self.setLayout(vbox) self.setLayout(vbox)
self.show()
def display_lines(self, lines):
for line in lines:
self.chat.display(*line[0], **line[1])

57
src/qweechat/qweechat.py
View File

@ -48,6 +48,9 @@ AUTHOR = 'Sébastien Helleu'
AUTHOR_MAIL= 'flashcode@flashtux.org' AUTHOR_MAIL= 'flashcode@flashtux.org'
WEECHAT_SITE = 'http://www.weechat.org/' WEECHAT_SITE = 'http://www.weechat.org/'
# number of lines in buffer for debug window
DEBUG_NUM_LINES = 50
class MainWindow(QtGui.QMainWindow): class MainWindow(QtGui.QMainWindow):
"""Main window.""" """Main window."""
@ -57,13 +60,12 @@ class MainWindow(QtGui.QMainWindow):
self.config = config.read() self.config = config.read()
self.debug_dialog = DebugDialog(self)
self.debug_dialog.input.textSent.connect(self.debug_input_text_sent)
self.debug_dialog.finished.connect(self.debug_dialog_closed)
self.resize(1000, 600) self.resize(1000, 600)
self.setWindowTitle(NAME) self.setWindowTitle(NAME)
self.debug_dialog = None
self.debug_lines = []
# network # network
self.network = Network() self.network = Network()
self.network.statusChanged.connect(self.network_status_changed) self.network.statusChanged.connect(self.network_status_changed)
@ -151,14 +153,24 @@ class MainWindow(QtGui.QMainWindow):
if self.network.is_connected(): if self.network.is_connected():
message = 'input %s %s\n' % (full_name, text) message = 'input %s %s\n' % (full_name, text)
self.network.send_to_weechat(message) self.network.send_to_weechat(message)
self.debug_dialog.chat.display(0, '<==', message, color='red') self.debug_display(0, '<==', message, color='red')
def open_preferences_dialog(self): def open_preferences_dialog(self):
pass # TODO pass # TODO
def debug_display(self, *args, **kwargs):
self.debug_lines.append((args, kwargs))
self.debug_lines = self.debug_lines[-DEBUG_NUM_LINES:]
if self.debug_dialog:
self.debug_dialog.chat.display(*args, **kwargs)
def open_debug_dialog(self): def open_debug_dialog(self):
self.debug_dialog.chat.scroll_bottom() if not self.debug_dialog:
self.debug_dialog.show() self.debug_dialog = DebugDialog(self)
self.debug_dialog.input.textSent.connect(self.debug_input_text_sent)
self.debug_dialog.finished.connect(self.debug_dialog_closed)
self.debug_dialog.display_lines(self.debug_lines)
self.debug_dialog.chat.scroll_bottom()
def debug_input_text_sent(self, text): def debug_input_text_sent(self, text):
if self.network.is_connected(): if self.network.is_connected():
@ -169,10 +181,10 @@ class MainWindow(QtGui.QMainWindow):
else: else:
text = '(debug) %s' % text text = '(debug) %s' % text
self.network.send_to_weechat(text + '\n') self.network.send_to_weechat(text + '\n')
self.debug_dialog.chat.display(0, '<==', text, color='red') self.debug_display(0, '<==', text, color='red')
def debug_dialog_closed(self, result): def debug_dialog_closed(self, result):
self.debug_dialog.hide() self.debug_dialog = None
def open_about_dialog(self): def open_about_dialog(self):
messages = ['<b>%s</b> %s' % (NAME, VERSION), messages = ['<b>%s</b> %s' % (NAME, VERSION),
@ -198,7 +210,7 @@ class MainWindow(QtGui.QMainWindow):
def network_status_changed(self, status, extra): def network_status_changed(self, status, extra):
if self.config.getboolean('look', 'statusbar'): if self.config.getboolean('look', 'statusbar'):
self.statusBar().showMessage(status) self.statusBar().showMessage(status)
self.debug_dialog.chat.display(0, '', status, color='blue') self.debug_display(0, '', status, color='blue')
self.network_status_set(status, extra) self.network_status_set(status, extra)
def network_status_set(self, status, extra): def network_status_set(self, status, extra):
@ -221,24 +233,24 @@ class MainWindow(QtGui.QMainWindow):
self.actions['disconnect'].setEnabled(True) self.actions['disconnect'].setEnabled(True)
def network_message_from_weechat(self, message): def network_message_from_weechat(self, message):
self.debug_dialog.chat.display(0, '==>', self.debug_display(0, '==>',
'message (%d bytes):\n%s' 'message (%d bytes):\n%s'
% (len(message), protocol.hex_and_ascii(message, 20)), % (len(message), protocol.hex_and_ascii(message, 20)),
color='green') color='green')
proto = protocol.Protocol() proto = protocol.Protocol()
message = proto.decode(str(message)) message = proto.decode(str(message))
if message.uncompressed: if message.uncompressed:
self.debug_dialog.chat.display(0, '==>', self.debug_display(0, '==>',
'message uncompressed (%d bytes):\n%s' 'message uncompressed (%d bytes):\n%s'
% (message.size_uncompressed, % (message.size_uncompressed,
protocol.hex_and_ascii(message.uncompressed, 20)), protocol.hex_and_ascii(message.uncompressed, 20)),
color='green') color='green')
self.debug_dialog.chat.display(0, '', 'Message: %s' % message) self.debug_display(0, '', 'Message: %s' % message)
self.parse_message(message) self.parse_message(message)
def parse_message(self, message): def parse_message(self, message):
if message.msgid.startswith('debug'): if message.msgid.startswith('debug'):
self.debug_dialog.chat.display(0, '', '(debug message, ignored)') self.debug_display(0, '', '(debug message, ignored)')
return return
if message.msgid == 'listbuffers': if message.msgid == 'listbuffers':
for obj in message.objects: for obj in message.objects:
@ -279,7 +291,8 @@ class MainWindow(QtGui.QMainWindow):
def closeEvent(self, event): def closeEvent(self, event):
self.network.disconnect_weechat() self.network.disconnect_weechat()
self.debug_dialog.close() if self.debug_dialog:
self.debug_dialog.close()
config.write(self.config) config.write(self.config)
QtGui.QMainWindow.closeEvent(self, event) QtGui.QMainWindow.closeEvent(self, event)