new pm popup window now show "From nick"

This commit is contained in:
Yann Leboulanger 2005-10-11 13:59:41 +00:00
parent 5c6562860a
commit 9ad6103ada
1 changed files with 6 additions and 3 deletions

View File

@ -787,7 +787,6 @@ class PopupNotificationWindow:
txt = gajim.contacts[account][self.jid][0].name txt = gajim.contacts[account][self.jid][0].name
else: else:
txt = self.jid txt = self.jid
event_description_label.set_text(txt)
# set colors [ http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html ] # set colors [ http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html ]
self.window.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('black')) self.window.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('black'))
@ -796,10 +795,12 @@ class PopupNotificationWindow:
limegreen = gtk.gdk.color_parse('limegreen') limegreen = gtk.gdk.color_parse('limegreen')
close_button.modify_bg(gtk.STATE_NORMAL, limegreen) close_button.modify_bg(gtk.STATE_NORMAL, limegreen)
eventbox.modify_bg(gtk.STATE_NORMAL, limegreen) eventbox.modify_bg(gtk.STATE_NORMAL, limegreen)
event_description_label.set_text(txt)
elif event_type == _('Contact Signed Out'): elif event_type == _('Contact Signed Out'):
red = gtk.gdk.color_parse('red') red = gtk.gdk.color_parse('red')
close_button.modify_bg(gtk.STATE_NORMAL, red) close_button.modify_bg(gtk.STATE_NORMAL, red)
eventbox.modify_bg(gtk.STATE_NORMAL, red) eventbox.modify_bg(gtk.STATE_NORMAL, red)
event_description_label.set_text(txt)
elif event_type in [_('New Message'), _('New Single Message'), elif event_type in [_('New Message'), _('New Single Message'),
_('New Private Message')]: _('New Private Message')]:
dodgerblue = gtk.gdk.color_parse('dodgerblue') dodgerblue = gtk.gdk.color_parse('dodgerblue')
@ -809,6 +810,7 @@ class PopupNotificationWindow:
txt = _('From %s') % jid.split('/', 1)[1] # Nickname txt = _('From %s') % jid.split('/', 1)[1] # Nickname
else: else:
txt = _('From %s') % txt txt = _('From %s') % txt
event_description_label.set_text(txt)
elif event_type == _('File Transfer Request'): elif event_type == _('File Transfer Request'):
bg_color = gtk.gdk.color_parse('khaki') bg_color = gtk.gdk.color_parse('khaki')
close_button.modify_bg(gtk.STATE_NORMAL, bg_color) close_button.modify_bg(gtk.STATE_NORMAL, bg_color)
@ -819,6 +821,7 @@ class PopupNotificationWindow:
bg_color = gtk.gdk.color_parse('firebrick') bg_color = gtk.gdk.color_parse('firebrick')
close_button.modify_bg(gtk.STATE_NORMAL, bg_color) close_button.modify_bg(gtk.STATE_NORMAL, bg_color)
eventbox.modify_bg(gtk.STATE_NORMAL, bg_color) eventbox.modify_bg(gtk.STATE_NORMAL, bg_color)
event_description_label.set_text(txt)
elif event_type in [_('File Transfer Completed'), _('File Transfer Stopped')]: elif event_type in [_('File Transfer Completed'), _('File Transfer Stopped')]:
bg_color = gtk.gdk.color_parse('yellowgreen') bg_color = gtk.gdk.color_parse('yellowgreen')
close_button.modify_bg(gtk.STATE_NORMAL, bg_color) close_button.modify_bg(gtk.STATE_NORMAL, bg_color)