copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a TB in trayicon menu functionality. fix varname which lead to bad functionality for single message [we were doing new message] and also fix functionality for it, add %s in strings and not +, use gtkgui helper function

This commit is contained in:
Nikos Kouremenos 2006-03-08 01:27:01 +00:00
parent 27b221d9cf
commit b3f9fc764e
3 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dialogs.py
View File

@ -1,10 +1,5 @@
## dialogs.py ## dialogs.py
## ##
## Contributors for this file:
## - Yann Le Boulanger <asterix@lagaule.org>
## - Nikos Kouremenos <kourem@gmail.com>
## - Dimitur Kirov <dkirov@gmail.com>
##
## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org>
## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org> ## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org>
@ -1063,7 +1058,9 @@ class PopupNotificationWindow:
class SingleMessageWindow: class SingleMessageWindow:
'''SingleMessageWindow can send or show a received '''SingleMessageWindow can send or show a received
singled message depending on action argument''' singled message depending on action argument which can be 'send'
or 'receive'.
'''
def __init__(self, account, to = '', action = '', from_whom = '', def __init__(self, account, to = '', action = '', from_whom = '',
subject = '', message = '', resource = ''): subject = '', message = '', resource = ''):
self.account = account self.account = account

10
src/gtkgui.glade
View File

@ -10818,7 +10818,7 @@ Custom</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image1322"> <widget class="GtkImage" id="image1371">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-network</property> <property name="stock">gtk-network</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -10838,7 +10838,7 @@ Custom</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image1320"> <widget class="GtkImage" id="image1372">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-jump-to</property> <property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -10852,13 +10852,13 @@ Custom</property>
</child> </child>
<child> <child>
<widget class="GtkImageMenuItem" id="new_message_menuitem"> <widget class="GtkImageMenuItem" id="single_message_menuitem">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Send Single _Message</property> <property name="label" translatable="yes">Send Single _Message</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image1263"> <widget class="GtkImage" id="image1373">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-new</property> <property name="stock">gtk-new</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -10894,7 +10894,7 @@ Custom</property>
<signal name="activate" handler="on_show_roster_menuitem_activate" last_modification_time="Sat, 29 Oct 2005 23:55:24 GMT"/> <signal name="activate" handler="on_show_roster_menuitem_activate" last_modification_time="Sat, 29 Oct 2005 23:55:24 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image1264"> <widget class="GtkImage" id="image1374">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-home</property> <property name="stock">gtk-home</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>

70
src/systray.py
View File

@ -1,18 +1,11 @@
## systray.py ## systray.py
## ##
## Contributors for this file: ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org>
## - Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
## - Nikos Kouremenos <kourem@gmail.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org>
## - Dimitur Kirov <dkirov@gmail.com> ## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
## ## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com>
## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2005 Norman Rasmussen <norman@rasmussen.co.za>
## Vincent Hanquez <tab@snarc.org>
## 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>
## ##
## This program is free software; you can redistribute it and/or modify ## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published ## it under the terms of the GNU General Public License as published
@ -61,7 +54,7 @@ class Systray:
def __init__(self): def __init__(self):
self.jids = [] # Contain things like [account, jid, type_of_msg] self.jids = [] # Contain things like [account, jid, type_of_msg]
self.new_message_handler_id = None self.single_message_handler_id = None
self.t = None self.t = None
self.img_tray = gtk.Image() self.img_tray = gtk.Image()
self.status = 'offline' self.status = 'offline'
@ -103,17 +96,16 @@ class Systray:
def start_chat(self, widget, account, jid): def start_chat(self, widget, account, jid):
contact = gajim.contacts.get_first_contact_from_jid(account, jid) contact = gajim.contacts.get_first_contact_from_jid(account, jid)
if gajim.interface.msg_win_mgr.has_window(jid, account): if gajim.interface.msg_win_mgr.has_window(jid, account):
gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(jid, account) gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
jid, account)
gajim.interface.msg_win_mgr.get_window(jid, account).present() gajim.interface.msg_win_mgr.get_window(jid, account).present()
elif contact: elif contact:
gajim.interface.roster.new_chat(gajim.contacts[account][jid][0], gajim.interface.roster.new_chat(contact, account)
account) gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(
gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab(jid, account) jid, account)
def on_new_message_menuitem_activate(self, widget, account): def on_single_message_menuitem_activate(self, widget, account):
"""When new message menuitem is activated: dialogs.SingleMessageWindow(account, action = 'send')
call the NewMessageDialog class"""
dialogs.NewMessageDialog(account)
def make_menu(self, event = None): def make_menu(self, event = None):
'''create chat with and new message (sub) menus/menuitems '''create chat with and new message (sub) menus/menuitems
@ -121,13 +113,13 @@ class Systray:
''' '''
chat_with_menuitem = self.xml.get_widget('chat_with_menuitem') chat_with_menuitem = self.xml.get_widget('chat_with_menuitem')
new_message_menuitem = self.xml.get_widget('new_message_menuitem') single_message_menuitem = self.xml.get_widget('single_message_menuitem')
status_menuitem = self.xml.get_widget('status_menu') status_menuitem = self.xml.get_widget('status_menu')
if self.new_message_handler_id: if self.single_message_handler_id:
new_message_menuitem.handler_disconnect( single_message_menuitem.handler_disconnect(
self.new_message_handler_id) self.single_message_handler_id)
self.new_message_handler_id = None self.single_message_handler_id = None
sub_menu = gtk.Menu() sub_menu = gtk.Menu()
status_menuitem.set_submenu(sub_menu) status_menuitem.set_submenu(sub_menu)
@ -170,26 +162,26 @@ class Systray:
iskey = len(gajim.connections) > 0 iskey = len(gajim.connections) > 0
chat_with_menuitem.set_sensitive(iskey) chat_with_menuitem.set_sensitive(iskey)
new_message_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey)
if len(gajim.connections) >= 2: # 2 or more connections? make submenus if len(gajim.connections) >= 2: # 2 or more connections? make submenus
account_menu_for_chat_with = gtk.Menu() account_menu_for_chat_with = gtk.Menu()
chat_with_menuitem.set_submenu(account_menu_for_chat_with) chat_with_menuitem.set_submenu(account_menu_for_chat_with)
account_menu_for_new_message = gtk.Menu() account_menu_for_single_message = gtk.Menu()
new_message_menuitem.set_submenu(account_menu_for_new_message) single_message_menuitem.set_submenu(account_menu_for_single_message)
for account in gajim.connections: for account in gajim.connections:
#for chat_with #for chat_with
item = gtk.MenuItem(_('using account ') + account) item = gtk.MenuItem(_('using account %s') % account)
account_menu_for_chat_with.append(item) account_menu_for_chat_with.append(item)
group_menu = self.make_groups_submenus_for_chat_with(account) group_menu = self.make_groups_submenus_for_chat_with(account)
item.set_submenu(group_menu) item.set_submenu(group_menu)
#for new_message #for single message
item = gtk.MenuItem(_('using account ') + account) item = gtk.MenuItem(_('using account %s') % account)
item.connect('activate', item.connect('activate',
self.on_new_message_menuitem_activate, account) self.on_single_message_menuitem_activate, account)
account_menu_for_new_message.append(item) account_menu_for_single_message.append(item)
elif len(gajim.connections) == 1: # one account elif len(gajim.connections) == 1: # one account
# one account, no need to show 'as jid' # one account, no need to show 'as jid'
@ -199,9 +191,9 @@ class Systray:
group_menu = self.make_groups_submenus_for_chat_with(account) group_menu = self.make_groups_submenus_for_chat_with(account)
chat_with_menuitem.set_submenu(group_menu) chat_with_menuitem.set_submenu(group_menu)
# for new message # for single message
self.new_message_handler_id = new_message_menuitem.connect( self.single_message_handler_id = single_message_menuitem.connect(
'activate', self.on_new_message_menuitem_activate, account) 'activate', self.on_single_message_menuitem_activate, account)
if event is None: if event is None:
# None means windows (we explicitly popup in systraywin32.py) # None means windows (we explicitly popup in systraywin32.py)
@ -256,7 +248,7 @@ class Systray:
if group in contact.groups and contact.show != 'offline' and \ if group in contact.groups and contact.show != 'offline' and \
contact.show != 'error': contact.show != 'error':
at_least_one = True at_least_one = True
s = contact.get_shown_name().replace('_', '__') # two _ show one _ and no underline happens s = gtkgui_helpers.escape_underscore(contact.get_shown_name())
item = gtk.ImageMenuItem(s) item = gtk.ImageMenuItem(s)
# any given gtk widget can only be used in one place # any given gtk widget can only be used in one place
# (here we use it in status menu too) # (here we use it in status menu too)