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

markup needs set_markup and not set_text and some other minor fixes

This commit is contained in:
Nikos Kouremenos 2005-03-18 00:47:50 +00:00
parent 266cff9d3b
commit ec7e22fdfb
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/gtkgui/dialogs.py
View File

@ -3,8 +3,8 @@
## Gajim Team:
## - Yann Le Boulanger <asterix@lagaule.org>
## - Vincent Hanquez <tab@snarc.org>
## - Nikos Kouremenos <nkour@jabber.org>
## - Alex Podaras <bigpod@jabber.org>
## - Nikos Kouremenos <kourem@gmail.com>
## - Alex Podaras <bigpod@gmail.com>
##
## Copyright (C) 2003-2005 Gajim Team
##
@ -217,8 +217,10 @@ class Edit_groups_dialog:
self.account = account
self.user = user
self.list = self.xml.get_widget('groups_treeview')
self.xml.get_widget('nickname_label').set_text(_('<b>Edit groups for %s</b>') % user.name)
self.xml.get_widget('jid_label').set_text(user.jid)
self.xml.get_widget('nickname_label').set_markup(\
_('Contact\'s name: <i>%s</i>') % user.name)
self.xml.get_widget('jid_label').set_markup(\
_('JID: <i>%s</i>') % user.jid)
self.xml.signal_autoconnect(self)
self.init_list()
@ -529,7 +531,8 @@ class About_dialog:
dlg.set_comments('A GTK jabber client')
dlg.set_website('http://www.gajim.org')
authors = ['Yann Le Boulanger', 'Vincent Hanquez', 'Nikos Kouremenos', 'Alex Podaras']
authors = ['Yann Le Boulanger <asterix@lagaule.org>', 'Vincent Hanquez <tab@snarc.org>', 'Nikos Kouremenos <kourem@gmail.com>', 'Alex Podaras <bigpod@gmail.com>']
dlg.set_authors(authors)
dlg.set_logo(gtk.gdk.pixbuf_new_from_file('plugins/gtkgui/pixmaps/logo.png'))
dlg.set_translator_credits(_('translator_credits'))

8
plugins/gtkgui/gtkgui.glade
View File

@ -1843,7 +1843,7 @@
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes">I would like to add you to my contact list, please.</property>
<property name="text" translatable="yes">I would like to add you to my contact list.</property>
</widget>
</child>
</widget>
@ -8355,7 +8355,7 @@ Custom</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
@ -8414,7 +8414,7 @@ Custom</property>
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@ -8435,7 +8435,7 @@ Custom</property>
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>

8
plugins/gtkgui/roster_window.py
View File

@ -197,7 +197,7 @@ class roster_window:
model.set_value(iter, 0, img)
model.set_value(iter, 1, name)
def makemenu(self):
def make_menu(self):
"""create the browse agents, add contact & join groupchat sub menus"""
# try to avoid WIDGET_REALIZED_FOR_EVENT failed which freezes gajim
new_message_menuitem = self.xml.get_widget('new_message_menuitem')
@ -289,7 +289,7 @@ class roster_window:
def draw_roster(self):
"""Clear and draw roster"""
self.makemenu()
self.make_menu()
self.tree.get_model().clear()
for acct in self.contacts.keys():
self.add_account_to_roster(acct)
@ -444,10 +444,8 @@ class roster_window:
item = gtk.MenuItem(_('Rerequest authorization from'))
sub_menu.append(item)
item.connect('activate', self.req_sub, jid, \
_('I would like to add you to my contact list, please.'), account)
_('I would like to add you to my contact list.'), account)
item = gtk.MenuItem()
menu.append(item)
item = gtk.MenuItem(_('Remove'))
menu.append(item)
item.connect('activate', self.on_req_usub, user, account)