clean up. leave a print to debug

This commit is contained in:
Nikos Kouremenos 2006-03-28 12:39:47 +00:00
parent a573e7aa67
commit fe32959028
1 changed files with 25 additions and 25 deletions

View File

@ -1,13 +1,7 @@
## chat_control.py ## chat_control.py
## ##
## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2006 Yann Le Boulanger <asterix@lagaule.org>
## Vincent Hanquez <tab@snarc.org> ## Copyright (C) 2006 Nikos Kouremenos <kourem@gmail.com>
## Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org>
## Vincent Hanquez <tab@snarc.org>
## Nikos Kouremenos <nkour@jabber.org>
## Dimitur Kirov <dkirov@gmail.com>
## Travis Shirk <travis@pobox.com>
## Norman Rasmussen <norman@rasmussen.co.za>
## Copyright (C) 2006 Travis Shirk <travis@pobox.com> ## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
## ##
## This program is free software; you can redistribute it and/or modify ## This program is free software; you can redistribute it and/or modify
@ -210,7 +204,8 @@ class ChatControlBase(MessageControl):
else: else:
default_fg = True default_fg = True
if default_bg or default_fg: if default_bg or default_fg:
self._on_style_set_event(banner_name_label, None, default_fg, default_bg) self._on_style_set_event(banner_name_label, None, default_fg,
default_bg)
def disconnect_style_event(self, widget): def disconnect_style_event(self, widget):
if self.style_event_id: if self.style_event_id:
@ -219,8 +214,8 @@ class ChatControlBase(MessageControl):
def connect_style_event(self, widget, set_fg = False, set_bg = False): def connect_style_event(self, widget, set_fg = False, set_bg = False):
self.disconnect_style_event(widget) self.disconnect_style_event(widget)
self.style_event_id = widget.connect('style-set', self._on_style_set_event, self.style_event_id = widget.connect('style-set',
set_fg, set_bg) self._on_style_set_event, set_fg, set_bg)
def _on_style_set_event(self, widget, style, *opts): def _on_style_set_event(self, widget, style, *opts):
'''set style of widget from style class *.Frame.Eventbox '''set style of widget from style class *.Frame.Eventbox
@ -293,7 +288,8 @@ class ChatControlBase(MessageControl):
#else: # move menu just below cursor #else: # move menu just below cursor
# y -= (msg_tv.allocation.height / buf.get_line_count()) # y -= (msg_tv.allocation.height / buf.get_line_count())
return (x, y, True) # push_in True return (x, y, True) # push_in True
self.emoticons_menu.popup(None, None, set_emoticons_menu_position, 1, 0) self.emoticons_menu.popup(None, None, set_emoticons_menu_position,
1, 0)
return False return False
def _on_message_textview_key_press_event(self, widget, event): def _on_message_textview_key_press_event(self, widget, event):
@ -556,9 +552,11 @@ class ChatControlBase(MessageControl):
return False return False
def _on_history_menuitem_activate(self, widget = None, jid = None): def _on_history_menuitem_activate(self, widget = None, jid = None):
'''When history menuitem is pressed: call history window'''
print 'this is never called'
if not jid: if not jid:
jid = self.contact.jid jid = self.contact.jid
'''When history menuitem is pressed: call history window'''
if gajim.interface.instances['logs'].has_key(jid): if gajim.interface.instances['logs'].has_key(jid):
gajim.interface.instances['logs'][jid].window.present() gajim.interface.instances['logs'][jid].window.present()
else: else:
@ -755,7 +753,8 @@ class ChatControl(ChatControlBase):
self.TARGET_TYPE_URI_LIST = 80 self.TARGET_TYPE_URI_LIST = 80
self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ) ] self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ) ]
self.widget.connect('drag_data_received', self._on_drag_data_received) self.widget.connect('drag_data_received', self._on_drag_data_received)
self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION | gtk.DEST_DEFAULT_HIGHLIGHT | self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
gtk.DEST_DEFAULT_HIGHLIGHT |
gtk.DEST_DEFAULT_DROP, gtk.DEST_DEFAULT_DROP,
self.dnd_list, gtk.gdk.ACTION_COPY) self.dnd_list, gtk.gdk.ACTION_COPY)
@ -777,6 +776,7 @@ class ChatControl(ChatControlBase):
self.xml.get_widget('banner_eventbox').connect('button-press-event', self.xml.get_widget('banner_eventbox').connect('button-press-event',
self._on_banner_eventbox_button_press_event) self._on_banner_eventbox_button_press_event)
xm = gtk.glade.XML(GTKGUI_GLADE, 'avatar_eventbox', APP) xm = gtk.glade.XML(GTKGUI_GLADE, 'avatar_eventbox', APP)
xm.signal_autoconnect(self) xm.signal_autoconnect(self)
xm = gtk.glade.XML(GTKGUI_GLADE, 'gpg_togglebutton', APP) xm = gtk.glade.XML(GTKGUI_GLADE, 'gpg_togglebutton', APP)