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

fix time in tooltips

This commit is contained in:
Denis Fomin 2012-12-31 19:05:59 +04:00
parent 7f83d5324e
commit 63d0c2dcf4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tooltips.py
View File

@ -644,8 +644,10 @@ class RosterTooltip(NotificationAreaTooltip):
'tooltip_idle_color') 'tooltip_idle_color')
cs += '%s</span>' cs += '%s</span>'
properties.append((str(), None)) properties.append((str(), None))
properties.append(((cs % _("Idle since %s")) % formatted, None)) idle_since = helpers.ensure_utf8_string(cs % _("Idle since %s"))
properties.append(((cs % _("Idle for %s")) % str(diff), None)) properties.append((idle_since % formatted, None))
idle_for = helpers.ensure_utf8_string(cs % _("Idle for %s"))
properties.append((idle_for % str(diff), None))
while properties: while properties:
property_ = properties.pop(0) property_ = properties.pop(0)
@ -658,14 +660,15 @@ class RosterTooltip(NotificationAreaTooltip):
if property_[1]: if property_[1]:
label.set_markup(property_[0]) label.set_markup(property_[0])
vcard_table.attach(label, 1, 2, vcard_current_row, vcard_table.attach(label, 1, 2, vcard_current_row,
vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0, 0) vcard_current_row + 1, Gtk.AttachOptions.FILL,
vertical_fill, 0, 0)
label = Gtk.Label() label = Gtk.Label()
label.set_alignment(0, 0) label.set_alignment(0, 0)
label.set_markup(property_[1]) label.set_markup(property_[1])
label.set_line_wrap(True) label.set_line_wrap(True)
vcard_table.attach(label, 2, 3, vcard_current_row, vcard_table.attach(label, 2, 3, vcard_current_row,
vcard_current_row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, vcard_current_row + 1, Gtk.AttachOptions.EXPAND | \
vertical_fill, 0, 0) Gtk.AttachOptions.FILL, vertical_fill, 0, 0)
else: else:
if isinstance(property_[0], (unicode, str)): # FIXME: rm unicode? if isinstance(property_[0], (unicode, str)): # FIXME: rm unicode?
label.set_markup(property_[0]) label.set_markup(property_[0])
@ -673,11 +676,13 @@ class RosterTooltip(NotificationAreaTooltip):
else: else:
label = property_[0] label = property_[0]
vcard_table.attach(label, 1, 3, vcard_current_row, vcard_table.attach(label, 1, 3, vcard_current_row,
vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0) vcard_current_row + 1, Gtk.AttachOptions.FILL,
vertical_fill, 0)
self.avatar_image.set_alignment(0, 0) self.avatar_image.set_alignment(0, 0)
if table_size == 4: if table_size == 4:
vcard_table.attach(self.avatar_image, 3, 4, 2, vcard_table.attach(self.avatar_image, 3, 4, 2,
vcard_current_row + 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3) vcard_current_row + 1, Gtk.AttachOptions.FILL,
Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3)
gajim.plugin_manager.gui_extension_point('roster_tooltip_populate', gajim.plugin_manager.gui_extension_point('roster_tooltip_populate',
self, contacts, vcard_table) self, contacts, vcard_table)