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

usage of stockitems in some menuitems and less code

Browse source
This commit is contained in:
Nikos Kouremenos 2005-07-06 14:34:59 +00:00
parent b81747f483
commit e8917d200b
2 changed files with 39 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gtkgui.glade
View file

@ -47,7 +47,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image897"> <widget class="GtkImage" id="image919">
<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>
@ -67,7 +67,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image898"> <widget class="GtkImage" id="image920">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-connect</property> <property name="stock">gtk-connect</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -93,7 +93,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image899"> <widget class="GtkImage" id="image921">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-add</property> <property name="stock">gtk-add</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -113,7 +113,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image900"> <widget class="GtkImage" id="image922">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-find</property> <property name="stock">gtk-find</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -143,7 +143,7 @@
<signal name="activate" handler="on_send_single_message_menuitem_activate" last_modification_time="Wed, 06 Jul 2005 13:20:23 GMT"/> <signal name="activate" handler="on_send_single_message_menuitem_activate" last_modification_time="Wed, 06 Jul 2005 13:20:23 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image901"> <widget class="GtkImage" id="image923">
<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>
@ -197,7 +197,7 @@
<signal name="activate" handler="on_send_server_message_menuitem_activate" last_modification_time="Wed, 06 Jul 2005 13:26:25 GMT"/> <signal name="activate" handler="on_send_server_message_menuitem_activate" last_modification_time="Wed, 06 Jul 2005 13:26:25 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image902"> <widget class="GtkImage" id="image924">
<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>
@ -245,7 +245,7 @@
<signal name="activate" handler="on_delete_motd_menuitem_activate" last_modification_time="Wed, 06 Jul 2005 13:26:25 GMT"/> <signal name="activate" handler="on_delete_motd_menuitem_activate" last_modification_time="Wed, 06 Jul 2005 13:26:25 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image903"> <widget class="GtkImage" id="image925">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-clear</property> <property name="stock">gtk-clear</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -291,7 +291,7 @@
<signal name="activate" handler="on_about_menuitem_activate" last_modification_time="Tue, 01 Mar 2005 22:56:45 GMT"/> <signal name="activate" handler="on_about_menuitem_activate" last_modification_time="Tue, 01 Mar 2005 22:56:45 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image904"> <widget class="GtkImage" id="image926">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-about</property> <property name="stock">gtk-about</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -319,7 +319,7 @@
<accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image905"> <widget class="GtkImage" id="image927">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-quit</property> <property name="stock">gtk-quit</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -354,7 +354,7 @@
<accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/> <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image906"> <widget class="GtkImage" id="image928">
<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>
@ -375,7 +375,7 @@
<signal name="activate" handler="on_profile_avatar_activate" last_modification_time="Thu, 09 Jun 2005 22:22:16 GMT"/> <signal name="activate" handler="on_profile_avatar_activate" last_modification_time="Thu, 09 Jun 2005 22:22:16 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image907"> <widget class="GtkImage" id="image929">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-properties</property> <property name="stock">gtk-properties</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -403,7 +403,7 @@
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/> <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image908"> <widget class="GtkImage" id="image930">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-preferences</property> <property name="stock">gtk-preferences</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>

57
src/roster_window.py
View file

@ -339,7 +339,10 @@ class RosterWindow:
newitem = gtk.MenuItem() # seperator newitem = gtk.MenuItem() # seperator
sub_menu.append(newitem) sub_menu.append(newitem)
newitem = gtk.MenuItem(_('Manage Bookmarks...')) newitem = gtk.ImageMenuItem(_('Manage Bookmarks...'))
img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES,
gtk.ICON_SIZE_MENU)
newitem.set_image(img)
sub_menu.append(newitem) sub_menu.append(newitem)
newitem.connect('activate', self.on_bookmarks_menuitem_activate) newitem.connect('activate', self.on_bookmarks_menuitem_activate)
sub_menu.show_all() sub_menu.show_all()
@ -396,7 +399,8 @@ class RosterWindow:
gajim.connections.keys()[0]) gajim.connections.keys()[0])
if not self.have_new_message_accel: if not self.have_new_message_accel:
ag = gtk.accel_groups_from_object(self.window)[0] ag = gtk.accel_groups_from_object(self.window)[0]
new_message_menuitem.add_accelerator('activate', ag, gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) new_message_menuitem.add_accelerator('activate', ag,
gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
self.have_new_message_accel = True self.have_new_message_accel = True
if at_least_one_account_connected: if at_least_one_account_connected:
@ -516,25 +520,27 @@ class RosterWindow:
'''When an agent is requested to log in or off''' '''When an agent is requested to log in or off'''
gajim.connections[account].send_agent_status(jid, state) gajim.connections[account].send_agent_status(jid, state)
def on_edit_agent(self, widget, user, account): def on_edit_agent(self, widget, contact, account):
'''When we want to modify the agent registration''' '''When we want to modify the agent registration'''
gajim.connections[account].request_register_agent_info(user.jid) gajim.connections[account].request_register_agent_info(contact.jid)
def on_remove_agent(self, widget, user, account): def on_remove_agent(self, widget, contact, account):
'''When an agent is requested to log in or off''' '''When an agent is requested to log in or off'''
window = dialogs.ConfirmationDialog(_('Transport "%s" will be removed') % user.jid, _('You will no longer be able to send and receive messages to contacts from %s.' % user.jid)) window = dialogs.ConfirmationDialog(_('Transport "%s" will be removed') % user.jid, _('You will no longer be able to send and receive messages to contacts from %s.' % contact.jid))
if window.get_response() == gtk.RESPONSE_OK: if window.get_response() == gtk.RESPONSE_OK:
gajim.connections[account].unsubscribe_agent(user.jid + '/' \ gajim.connections[account].unsubscribe_agent(contact.jid + '/' \
+ user.resource) + contact.resource)
# remove transport from treeview # remove transport from treeview
self.remove_user(user, account) self.remove_user(contact, account)
# remove transport's contacts from treeview # remove transport's contacts from treeview
for jid, contacts in self.contacts[account].items(): for jid, contacts in self.contacts[account].items():
contact = contacts[0] contact = contacts[0]
if jid.endswith('@' + user.jid): if jid.endswith('@' + contact.jid):
gajim.log.debug('REMOVE user %s due to unregistered transport %s' % (contact.jid, user.name)) gajim.log.debug(
'Removing contact %s due to unregistered transport %s'\
% (contact.jid, contact.name))
self.remove_user(contact, account) self.remove_user(contact, account)
del self.contacts[account][user.jid] del self.contacts[account][contact.jid]
def on_rename(self, widget, iter, path): def on_rename(self, widget, iter, path):
model = self.tree.get_model() model = self.tree.get_model()
@ -587,7 +593,7 @@ class RosterWindow:
dialogs.SingleMessageWindow(self, account, contact, 'send') dialogs.SingleMessageWindow(self, account, contact, 'send')
def mk_menu_user(self, event, iter): def mk_menu_user(self, event, iter):
'''Make user's popup menu''' '''Make contact's popup menu'''
model = self.tree.get_model() model = self.tree.get_model()
jid = model.get_value(iter, 3) jid = model.get_value(iter, 3)
path = model.get_path(iter) path = model.get_path(iter)
@ -666,14 +672,10 @@ class RosterWindow:
menu = gtk.Menu() menu = gtk.Menu()
rename_item = gtk.MenuItem() rename_item = gtk.ImageMenuItem(_('Rename'))
rename_icon = gtk.Image() rename_icon = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
rename_icon.set_from_stock(gtk.STOCK_REFRESH, gtk.ICON_SIZE_MENU) gtk.ICON_SIZE_MENU)
label = gtk.Label(_('Rename')) rename_item.set_image(rename_icon)
rename_hbox = gtk.HBox(False, 3)
rename_hbox.pack_start(rename_icon, False, False)
rename_hbox.pack_start(label, False, False)
rename_item.add(rename_hbox)
menu.append(rename_item) menu.append(rename_item)
rename_item.connect('activate', self.on_rename, iter, path) rename_item.connect('activate', self.on_rename, iter, path)
@ -690,9 +692,7 @@ class RosterWindow:
menu = gtk.Menu() menu = gtk.Menu()
item = gtk.ImageMenuItem(_('_Log on')) item = gtk.ImageMenuItem(_('_Log on'))
icon = gtk.Image() icon = gtk.image_new_from_stock(icon)
icon.set_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU)
item.set_image(icon)
menu.append(item) menu.append(item)
show = self.contacts[account][jid][0].show show = self.contacts[account][jid][0].show
if show != 'offline' and show != 'error': if show != 'offline' and show != 'error':
@ -700,8 +700,7 @@ class RosterWindow:
item.connect('activate', self.on_agent_logging, jid, None, account) item.connect('activate', self.on_agent_logging, jid, None, account)
item = gtk.ImageMenuItem(_('Log _off')) item = gtk.ImageMenuItem(_('Log _off'))
icon = gtk.Image() icon = gtk.image_new_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU)
icon.set_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU)
item.set_image(icon) item.set_image(icon)
menu.append(item) menu.append(item)
if show == 'offline' or show == 'error': if show == 'offline' or show == 'error':
@ -713,15 +712,13 @@ class RosterWindow:
menu.append(item) menu.append(item)
item = gtk.ImageMenuItem(_('Edit')) item = gtk.ImageMenuItem(_('Edit'))
icon = gtk.Image() icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
icon.set_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
item.set_image(icon) item.set_image(icon)
menu.append(item) menu.append(item)
item.connect('activate', self.on_edit_agent, user, account) item.connect('activate', self.on_edit_agent, user, account)
item = gtk.ImageMenuItem(_('_Remove from Roster')) item = gtk.ImageMenuItem(_('_Remove from Roster'))
icon = gtk.Image() icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU)
icon.set_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU)
item.set_image(icon) item.set_image(icon)
menu.append(item) menu.append(item)
item.connect('activate', self.on_remove_agent, user, account) item.connect('activate', self.on_remove_agent, user, account)