Commits April 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8092 - in trunk: data/glade src
by asterix＠gajim.org 22 Apr '07

22 Apr '07

Author: asterix Date: 2007-04-22 12:23:23 +0200 (Sun, 22 Apr 2007) New Revision: 8092 Modified: trunk/data/glade/vcard_information_window.glade trunk/src/gtkgui_helpers.py trunk/src/profile_window.py trunk/src/vcard.py Log: add ability to set an avatar for a contact. fixes #2967 Modified: trunk/data/glade/vcard_information_window.glade =================================================================== --- trunk/data/glade/vcard_information_window.glade 2007-04-21 12:31:44 UTC (rev 8091) +++ trunk/data/glade/vcard_information_window.glade 2007-04-22 10:23:23 UTC (rev 8092) @@ -392,9 +392,59 @@ <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">6</property> <child> + <widget class="GtkLabel" id="label59"> + <property name="visible">True</property> + <property name="label" translatable="yes">User avatar:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="no_user_avatar_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">None</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkEventBox" id="PHOTO_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> @@ -417,6 +467,65 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label60"> + <property name="visible">True</property> + <property name="label" translatable="yes">Configured avatar:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="PHOTO_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="button_press_event" handler="on_PHOTO_button_press_event" last_modification_time="Sat, 21 Apr 2007 23:35:12 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="NOPHOTO_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Click to force avatar</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_NOPHOTO_button_clicked" last_modification_time="Sat, 21 Apr 2007 23:25:59 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2007-04-21 12:31:44 UTC (rev 8091) +++ trunk/src/gtkgui_helpers.py 2007-04-22 10:23:23 UTC (rev 8092) @@ -528,7 +528,7 @@ scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER) return scaled_buf -def get_avatar_pixbuf_from_cache(fjid, is_fake_jid = False): +def get_avatar_pixbuf_from_cache(fjid, is_fake_jid = False, use_local = True): '''checks if jid has cached avatar and if that avatar is valid image (can be shown) returns None if there is no image in vcard @@ -545,8 +545,21 @@ if is_fake_jid: puny_nick = helpers.sanitize_filename(nick) path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_nick) + local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid, + puny_nick) + '_local' else: path = os.path.join(gajim.VCARD_PATH, puny_jid) + local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ + '_local' + if use_local: + for extension in ('.png', '.jpeg'): + local_avatar_path = local_avatar_basepath + extension + if os.path.isfile(local_avatar_path): + avatar_file = open(local_avatar_path) + avatar_data = avatar_file.read() + avatar_file.close() + return get_pixbuf_from_data(avatar_data) + if not os.path.isfile(path): return 'ask' @@ -591,6 +604,10 @@ if jid: puny_jid = helpers.sanitize_filename(jid) path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + suffix + filepath, extension = os.path.splitext(path_to_file) + path_to_local_file = filepath + '_local' + extension + if os.path.exists(path_to_local_file): + return path_to_local_file if os.path.exists(path_to_file): return path_to_file return os.path.abspath(generic) @@ -773,7 +790,7 @@ is_fake = False if account and gajim.contacts.is_pm_from_jid(account, jid): is_fake = True - pixbuf = get_avatar_pixbuf_from_cache(jid, is_fake) + pixbuf = get_avatar_pixbuf_from_cache(jid, is_fake, False) ext = file_path.split('.')[-1] type_ = '' if not ext: Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2007-04-21 12:31:44 UTC (rev 8091) +++ trunk/src/profile_window.py 2007-04-22 10:23:23 UTC (rev 8092) @@ -118,15 +118,16 @@ def on_ok(widget, path_to_file): must_delete = False filesize = os.path.getsize(path_to_file) # in bytes - #FIXME: use messages for invalid file for 0.11 invalid_file = False msg = '' if os.path.isfile(path_to_file): stat = os.stat(path_to_file) if stat[6] == 0: invalid_file = True + msg = _('File is emty') else: invalid_file = True + msg = _('File does not exist') if not invalid_file and filesize > 16384: # 16 kb try: pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) @@ -183,7 +184,8 @@ menu = gtk.Menu() # Try to get pixbuf - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.jid) + pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.jid, + use_local = False) if pixbuf: nick = gajim.config.get_per('accounts', self.account, 'name') Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-04-21 12:31:44 UTC (rev 8091) +++ trunk/src/vcard.py 2007-04-22 10:23:23 UTC (rev 8092) @@ -21,8 +21,11 @@ import base64 import time import locale +import os import gtkgui_helpers +import dialogs +import message_control from common import helpers from common import gajim @@ -67,6 +70,27 @@ self.account = account self.gc_contact = gc_contact + self.xml.get_widget('no_user_avatar_label').set_no_show_all(True) + self.xml.get_widget('no_user_avatar_label').hide() + self.xml.get_widget('PHOTO_image').set_no_show_all(True) + self.xml.get_widget('PHOTO_image').hide() + image = gtk.Image() + self.photo_button = self.xml.get_widget('PHOTO_button') + self.photo_button.set_image(image) + self.nophoto_button = self.xml.get_widget('NOPHOTO_button') + puny_jid = helpers.sanitize_filename(contact.jid) + local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ + '_local' + for extension in ('.png', '.jpeg'): + local_avatar_path = local_avatar_basepath + extension + if os.path.isfile(local_avatar_path): + image.set_from_file(local_avatar_path) + self.nophoto_button.set_no_show_all(True) + self.nophoto_button.hide() + break + else: + self.photo_button.set_no_show_all(True) + self.photo_button.hide() self.avatar_mime_type = None self.avatar_encoded = None self.vcard_arrived = False @@ -88,6 +112,104 @@ self.progressbar.pulse() return True # loop forever + def update_avatar_in_gui(self): + jid = self.contact.jid + # Update roster + gajim.interface.roster.draw_avatar(jid, self.account) + # Update chat window + if gajim.interface.msg_win_mgr.has_window(jid, self.account): + win = gajim.interface.msg_win_mgr.get_window(jid, self.account) + ctrl = win.get_control(jid, self.account) + if win and ctrl.type_id != message_control.TYPE_GC: + ctrl.show_avatar() + + def on_NOPHOTO_button_clicked(self, button): + def on_ok(widget, path_to_file): + filesize = os.path.getsize(path_to_file) # in bytes + invalid_file = False + msg = '' + if os.path.isfile(path_to_file): + stat = os.stat(path_to_file) + if stat[6] == 0: + invalid_file = True + msg = _('File is emty') + else: + invalid_file = True + msg = _('File does not exist') + if invalid_file: + dialogs.ErrorDialog(_('Could not load image'), msg) + return + pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) + if filesize > 16384: # 16 kb + try: + # get the image at 'notification size' + # and use that user did not specify in ACE crazy size + pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'tooltip') + except gobject.GError, msg: # unknown format + # msg should be string, not object instance + msg = str(msg) + invalid_file = True + puny_jid = helpers.sanitize_filename(self.contact.jid) + path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + '_local.png' + pixbuf.save(path_to_file, 'png') + self.dialog.destroy() + self.update_avatar_in_gui() + + # rescale it + pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'vcard') + image = self.photo_button.get_image() + image.set_from_pixbuf(pixbuf) + self.photo_button.show() + self.nophoto_button.hide() + + def on_clear(widget): + self.dialog.destroy() + self.on_clear_button_clicked(widget) + + self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok, + on_response_clear = on_clear) + + def on_clear_button_clicked(self, widget): + # empty the image + image = self.photo_button.get_image() + image.set_from_pixbuf(None) + self.photo_button.hide() + self.nophoto_button.show() + # Delete file: + puny_jid = helpers.sanitize_filename(self.contact.jid) + path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + '_local.png' + try: + os.remove(path_to_file) + except OSError: + gajim.log.debug('Cannot remove %s' % path_to_file) + self.update_avatar_in_gui() + + def on_PHOTO_button_press_event(self, widget, event): + '''If right-clicked, show popup''' + if event.button == 3 and self.avatar_encoded: # right click + menu = gtk.Menu() + + # Try to get pixbuf +# pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.jid) + +# if pixbuf: +# nick = self.contact.get_shown_name() +# menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) +# menuitem.connect('activate', +# gtkgui_helpers.on_avatar_save_as_menuitem_activate, self.jid, +# None, nick + '.jpeg') +# menu.append(menuitem) + # show clear + menuitem = gtk.ImageMenuItem(gtk.STOCK_CLEAR) + menuitem.connect('activate', self.on_clear_button_clicked) + menu.append(menuitem) + menu.connect('selection-done', lambda w:w.destroy()) + # show the menu + menu.show_all() + menu.popup(None, None, None, event.button, event.time) + elif event.button == 1: # left click + self.on_set_avatar_button_clicked(widget) + def on_vcard_information_window_destroy(self, widget): if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) @@ -100,7 +222,6 @@ connection.annotations[self.contact.jid] = annotation connection.store_annotations() - def on_vcard_information_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.window.destroy() @@ -137,12 +258,15 @@ pass def set_values(self, vcard): + if not 'PHOTO' in vcard: + self.xml.get_widget('no_user_avatar_label').show() for i in vcard.keys(): if i == 'PHOTO' and self.xml.get_widget('information_notebook').\ get_n_pages() > 4: pixbuf, self.avatar_encoded, self.avatar_mime_type = \ get_avatar_pixbuf_encoded_mime(vcard[i]) image = self.xml.get_widget('PHOTO_image') + image.show() if not pixbuf: image.set_from_icon_name('stock_person', gtk.ICON_SIZE_DIALOG)

1 0

[commit-gajim] r8091 - trunk/src
by asterix＠gajim.org 21 Apr '07

21 Apr '07

Author: asterix Date: 2007-04-21 14:31:44 +0200 (Sat, 21 Apr 2007) New Revision: 8091 Modified: trunk/src/roster_window.py Log: [tristil] avant window navigator support. fixes #3081 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-21 11:58:55 UTC (rev 8090) +++ trunk/src/roster_window.py 2007-04-21 12:31:44 UTC (rev 8091) @@ -21,6 +21,7 @@ import time import urllib +import dbus import common.sleepy import history_window import dialogs @@ -3012,6 +3013,23 @@ self._music_track_changed_signal = None self._music_track_changed(None, None) + def _change_awn_icon_status(self, status): + iconset = gajim.config.get('iconset') + prefix = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32') + if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'): + status = status + '.png' + elif status == 'online': + prefix = os.path.join(gajim.DATA_DIR, 'pixmaps') + status = 'gajim.png' + path = os.path.join(prefix, status) + try: + bus = dbus.SessionBus() + obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') + awn = dbus.Interface(obj, 'com.google.code.Awn') + awn.SetTaskIconByName('Gajim', os.path.abspath(path)) + except dbus.DBusException: + pass + def _music_track_changed(self, unused_listener, music_track_info): accounts = gajim.connections.keys() if music_track_info is None: @@ -3043,6 +3061,7 @@ # in the combobox self.combobox_callback_active = False self.status_combobox.set_active(table[show]) + self._change_awn_icon_status(show) self.combobox_callback_active = True if gajim.interface.systray_enabled: gajim.interface.systray.change_status(show)

1 0

[commit-gajim] r8090 - trunk/src/common/zeroconf
by asterix＠gajim.org 21 Apr '07

21 Apr '07

Author: asterix Date: 2007-04-21 13:58:55 +0200 (Sat, 21 Apr 2007) New Revision: 8090 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: fix TB with [8088] and zeroconf. fixes #3114 Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-21 11:45:23 UTC (rev 8089) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-21 11:58:55 UTC (rev 8090) @@ -283,7 +283,7 @@ else: self.reannounce() - def change_status(self, show, msg, sync = False, auto = False): + def change_status(self, show, msg, sync = False, auto = False, to = None): if not show in STATUS_LIST: return -1 self.status = show

1 0

[commit-gajim] r8089 - trunk/src
by asterix＠gajim.org 21 Apr '07

21 Apr '07

Author: asterix Date: 2007-04-21 13:45:23 +0200 (Sat, 21 Apr 2007) New Revision: 8089 Modified: trunk/src/roster_window.py Log: ability to send custom status to a whole group. see #342 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-21 11:29:55 UTC (rev 8088) +++ trunk/src/roster_window.py 2007-04-21 11:45:23 UTC (rev 8089) @@ -1814,7 +1814,7 @@ state_images = self.load_iconset(path) status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) status_menuitem.connect('activate', self.on_send_custom_status, - account, contact.jid, s) + [(contact, account)], s) icon = state_images[s] status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) @@ -2179,6 +2179,25 @@ group_message_to_all_item.connect('activate', self.on_send_single_message_menuitem_activate, account, list_) + send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) + # add a special img for this menuitem + icon = gtk.image_new_from_stock(gtk.STOCK_GO_UP, gtk.ICON_SIZE_MENU) + send_custom_status_menuitem.set_image(icon) + status_menuitems = gtk.Menu() + send_custom_status_menuitem.set_submenu(status_menuitems) + iconset = gajim.config.get('iconset') + path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16') + for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']: + # icon MUST be different instance for every item + state_images = self.load_iconset(path) + status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem.connect('activate', self.on_send_custom_status, list_, + s) + icon = state_images[s] + status_menuitem.set_image(icon) + status_menuitems.append(status_menuitem) + menu.append(send_custom_status_menuitem) + event_button = gtkgui_helpers.get_possible_button_event(event) menu.attach_to_widget(self.tree, None) @@ -2880,12 +2899,13 @@ else: change(None, account, status) - def on_send_custom_status(self, widget, account, jid, show): + def on_send_custom_status(self, widget, contact_list, show): '''send custom status''' dlg = dialogs.ChangeStatusMessageDialog(show) message = dlg.run() if message is not None: # None if user pressed Cancel - self.send_status(account, show, message, to = jid) + for (contact, account) in contact_list: + self.send_status(account, show, message, to = contact.jid) def on_status_combobox_changed(self, widget): '''When we change our status via the combobox'''

1 0

[commit-gajim] r8088 - in trunk: data/glade src src/common
by asterix＠gajim.org 21 Apr '07

21 Apr '07

Author: asterix Date: 2007-04-21 13:29:55 +0200 (Sat, 21 Apr 2007) New Revision: 8088 Modified: trunk/data/glade/roster_contact_context_menu.glade trunk/src/common/connection.py trunk/src/roster_window.py Log: [roidelapluie & I] ability to send custom status to contacts. fixes #342 Modified: trunk/data/glade/roster_contact_context_menu.glade =================================================================== --- trunk/data/glade/roster_contact_context_menu.glade 2007-04-19 21:23:50 UTC (rev 8087) +++ trunk/data/glade/roster_contact_context_menu.glade 2007-04-21 11:29:55 UTC (rev 8088) @@ -12,7 +12,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1511"> + <widget class="GtkImage" id="image1569"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -26,13 +26,33 @@ </child> <child> + <widget class="GtkImageMenuItem" id="send_custom_status_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Send cus_tom status</property> + <property name="use_underline">True</property> + + <child internal-child="image"> + <widget class="GtkImage" id="image1570"> + <property name="visible">True</property> + <property name="stock">gtk-go-up</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Send Single _Message</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1512"> + <widget class="GtkImage" id="image1571"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -52,7 +72,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1513"> + <widget class="GtkImage" id="image1572"> <property name="visible">True</property> <property name="stock">gtk-go-back</property> <property name="icon_size">1</property> @@ -71,7 +91,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1514"> + <widget class="GtkImage" id="image1573"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -104,7 +124,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1515"> + <widget class="GtkImage" id="image1574"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -124,7 +144,7 @@ <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate" last_modification_time="Thu, 30 Jun 2005 22:57:59 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1516"> + <widget class="GtkImage" id="image1575"> <property name="visible">True</property> <property name="stock">gtk-dialog-authentication</property> <property name="icon_size">1</property> @@ -144,7 +164,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1517"> + <widget class="GtkImage" id="image1576"> <property name="visible">True</property> <property name="stock">gtk-info</property> <property name="icon_size">1</property> @@ -164,7 +184,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1467"> + <widget class="GtkImage" id="image1577"> <property name="visible">True</property> <property name="stock">gtk-execute</property> <property name="icon_size">1</property> @@ -189,7 +209,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1518"> + <widget class="GtkImage" id="image1578"> <property name="visible">True</property> <property name="stock">gtk-dialog-question</property> <property name="icon_size">1</property> @@ -210,7 +230,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1519"> + <widget class="GtkImage" id="image1579"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -230,7 +250,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1520"> + <widget class="GtkImage" id="image1580"> <property name="visible">True</property> <property name="stock">gtk-go-down</property> <property name="icon_size">1</property> @@ -250,7 +270,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1521"> + <widget class="GtkImage" id="image1581"> <property name="visible">True</property> <property name="stock">gtk-stop</property> <property name="icon_size">1</property> @@ -273,7 +293,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1522"> + <widget class="GtkImage" id="image1582"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -292,7 +312,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1523"> + <widget class="GtkImage" id="image1583"> <property name="visible">True</property> <property name="stock">gtk-remove</property> <property name="icon_size">1</property> @@ -324,7 +344,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1524"> + <widget class="GtkImage" id="image1584"> <property name="visible">True</property> <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-04-19 21:23:50 UTC (rev 8087) +++ trunk/src/common/connection.py 2007-04-21 11:29:55 UTC (rev 8088) @@ -731,7 +731,7 @@ self.awaiting_answers[id] = (PRIVACY_ARRIVED, ) self.connection.send(iq) - def change_status(self, show, msg, auto = False): + def change_status(self, show, msg, auto = False, to = None): if not show in STATUS_LIST: return -1 sshow = helpers.get_xmpp_show(show) @@ -780,7 +780,8 @@ self.connection.send(iq) self.activate_privacy_rule('visible') priority = unicode(gajim.get_priority(self.name, sshow)) - p = common.xmpp.Presence(typ = None, priority = priority, show = sshow) + p = common.xmpp.Presence(typ = None, priority = priority, show = sshow, + to = to) p = self.add_sha(p) if msg: p.setStatus(msg) @@ -789,7 +790,8 @@ if self.connection: self.connection.send(p) self.priority = priority - self.dispatch('STATUS', show) + if not to: + self.dispatch('STATUS', show) def _on_disconnected(self): ''' called when a disconnect request has completed successfully''' Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-19 21:23:50 UTC (rev 8087) +++ trunk/src/roster_window.py 2007-04-21 11:29:55 UTC (rev 8088) @@ -1733,6 +1733,8 @@ 'roster_contact_context_menu') start_chat_menuitem = xml.get_widget('start_chat_menuitem') + send_custom_status_menuitem = xml.get_widget( + 'send_custom_status_menuitem') send_single_message_menuitem = xml.get_widget( 'send_single_message_menuitem') invite_menuitem = xml.get_widget('invite_menuitem') @@ -1802,6 +1804,20 @@ item = gtk.SeparatorMenuItem() # separator invite_to_submenu.append(item) + # One or several resource, we do the same for send_custom_status + status_menuitems = gtk.Menu() + send_custom_status_menuitem.set_submenu(status_menuitems) + iconset = gajim.config.get('iconset') + path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16') + for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']: + # icon MUST be different instance for every item + state_images = self.load_iconset(path) + status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem.connect('activate', self.on_send_custom_status, + account, contact.jid, s) + icon = state_images[s] + status_menuitem.set_image(icon) + status_menuitems.append(status_menuitem) if len(contacts) > 1: # several resources def resources_submenu(action, room_jid = None, room_account = None): ''' Build a submenu with contact's resources. @@ -2721,7 +2737,7 @@ if gajim.interface.systray_enabled: gajim.interface.systray.change_status('connecting') - def send_status(self, account, status, txt, auto = False): + def send_status(self, account, status, txt, auto = False, to = None): model = self.tree.get_model() accountIter = self.get_account_iter(account) if status != 'offline': @@ -2812,7 +2828,7 @@ gajim.sleeper_state[account] = 'online' elif gajim.sleeper_state[account] not in ('autoaway', 'autoxa'): gajim.sleeper_state[account] = 'off' - gajim.connections[account].change_status(status, txt, auto) + gajim.connections[account].change_status(status, txt, auto, to = to) for gc_control in gajim.interface.msg_win_mgr.get_controls( message_control.TYPE_GC): @@ -2864,6 +2880,13 @@ else: change(None, account, status) + def on_send_custom_status(self, widget, account, jid, show): + '''send custom status''' + dlg = dialogs.ChangeStatusMessageDialog(show) + message = dlg.run() + if message is not None: # None if user pressed Cancel + self.send_status(account, show, message, to = jid) + def on_status_combobox_changed(self, widget): '''When we change our status via the combobox''' model = self.status_combobox.get_model()

1 0

[commit-gajim] r8087 - in trunk: data/glade src
by asterix＠gajim.org 19 Apr '07

19 Apr '07

Author: asterix Date: 2007-04-19 23:23:50 +0200 (Thu, 19 Apr 2007) New Revision: 8087 Modified: trunk/data/glade/chat_control_popup_menu.glade trunk/src/chat_control.py Log: remove ping menuitem and add /help command to chat_window. fixes #2947 Modified: trunk/data/glade/chat_control_popup_menu.glade =================================================================== --- trunk/data/glade/chat_control_popup_menu.glade 2007-04-19 20:54:42 UTC (rev 8086) +++ trunk/data/glade/chat_control_popup_menu.glade 2007-04-19 21:23:50 UTC (rev 8087) @@ -13,7 +13,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1366"> + <widget class="GtkImage" id="image1370"> <property name="visible">True</property> <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> @@ -42,7 +42,7 @@ <signal name="activate" handler="_on_send_file_menuitem_activate" last_modification_time="Tue, 03 Jan 2006 04:26:55 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1367"> + <widget class="GtkImage" id="image1371"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -83,7 +83,7 @@ <signal name="activate" handler="_on_add_to_roster_menuitem_activate" last_modification_time="Tue, 03 Jan 2006 04:26:37 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1368"> + <widget class="GtkImage" id="image1372"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -95,15 +95,6 @@ </child> </widget> </child> - - <child> - <widget class="GtkMenuItem" id="ping_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Ping</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_ping_menuitem_activate" last_modification_time="Mon, 16 Apr 2007 18:23:32 GMT"/> - </widget> - </child> </widget> </glade-interface> Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-04-19 20:54:42 UTC (rev 8086) +++ trunk/src/chat_control.py 2007-04-19 21:23:50 UTC (rev 8087) @@ -498,11 +498,6 @@ if message_array == ['']: message_array = [] - if command == 'ping' and not len(message_array): - gajim.connections[self.account].sendPing(self.contact) - self.clear(self.msg_textview) - return True - if command == 'clear' and not len(message_array): self.conv_textview.clear() # clear conversation self.clear(self.msg_textview) # clear message textview too @@ -866,6 +861,7 @@ '''A control for standard 1-1 chat''' TYPE_ID = message_control.TYPE_CHAT old_msg_kind = None # last kind of the printed message + CHAT_CMDS = ['clear', 'compact', 'help', 'ping'] def __init__(self, parent_win, contact, acct, resource = None): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, @@ -1144,6 +1140,49 @@ self.contact.get_shown_name() gtk.Tooltips().set_tip(self.xml.get_widget('gpg_eventbox'), tt) + def _process_command(self, message): + if message[0] != '/': + return False + + # Handle common commands + if ChatControlBase._process_command(self, message): + return True + + message = message[1:] + message_array = message.split(' ', 1) + command = message_array.pop(0).lower() + if message_array == ['']: + message_array = [] + + if command == 'help': + if len(message_array): + subcommand = message_array.pop(0) + self.get_command_help(subcommand) + else: + self.get_command_help(command) + self.clear(self.msg_textview) + return True + elif command == 'ping' and not len(message_array): + gajim.connections[self.account].sendPing(self.contact) + self.clear(self.msg_textview) + return True + return False + + def get_command_help(self, command): + if command == 'help': + self.print_conversation(_('Commands: %s') % ChatControl.CHAT_CMDS, + 'info') + elif command == 'clear': + self.print_conversation(_('Usage: /%s, clears the text window.'), + 'info') + elif command == 'compact': + self.print_conversation(_('Usage: /%s, hide the chat buttons.'), + 'info') + elif command == 'ping': + self.print_conversation(_(''), 'info') + else: + self.print_conversation(_('No help info for /%s') % command, 'info') + def send_message(self, message, keyID = '', chatstate = None): '''Send a message to contact''' if message in ('', None, '\n') or self._process_command(message): @@ -1393,7 +1432,6 @@ toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem') add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem') send_file_menuitem = xml.get_widget('send_file_menuitem') - ping_menuitem = xml.get_widget('ping_menuitem') compact_view_menuitem = xml.get_widget('compact_view_menuitem') information_menuitem = xml.get_widget('information_menuitem') @@ -1434,8 +1472,6 @@ id = history_menuitem.connect('activate', self._on_history_menuitem_activate) self.handlers[id] = history_menuitem - id = ping_menuitem.connect('activate', - self._on_ping_menuitem_activate) id = send_file_menuitem.connect('activate', self._on_send_file_menuitem_activate) self.handlers[id] = send_file_menuitem @@ -1830,9 +1866,6 @@ cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) self.bigger_avatar_window.window.set_cursor(cursor) - def _on_ping_menuitem_activate(self, widget): - gajim.connections[self.account].sendPing(self.contact) - def _on_send_file_menuitem_activate(self, widget): gajim.interface.instances['file_transfers'].show_file_send_request( self.account, self.contact)

1 0

[commit-gajim] r8086 - in trunk/src: . common
by asterix＠gajim.org 19 Apr '07

19 Apr '07

Author: asterix Date: 2007-04-19 22:54:42 +0200 (Thu, 19 Apr 2007) New Revision: 8086 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/gajim.py trunk/src/search_window.py Log: support JEP-0055 (search) for non-dataform services. TODO: improve GUI Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-04-19 20:11:54 UTC (rev 8085) +++ trunk/src/common/connection.py 2007-04-19 20:54:42 UTC (rev 8086) @@ -1349,13 +1349,34 @@ iq = common.xmpp.Iq(typ = 'get', to = jid, queryNS = \ common.xmpp.NS_SEARCH) self.connection.send(iq) - + def send_search_form(self, jid, form, is_form): + iq = common.xmpp.Iq(typ = 'set', to = jid, queryNS = \ + common.xmpp.NS_SEARCH) + item = iq.getTag('query') if is_form: - iq = common.xmpp.Iq(typ = 'set', to = jid, queryNS = \ - common.xmpp.NS_SEARCH) - item = iq.getTag('query') item.addChild(node = form) - self.connection.send(iq) + else: + for i in form.keys(): + item.setTagData(i,form[i]) + def _on_response(resp): + jid = jid = helpers.get_jid_from_iq(resp) + tag = resp.getTag('query', namespace = common.xmpp.NS_SEARCH) + if not tag: + self.dispatch('SEARCH_RESULT', (jid, None, False)) + return + df = tag.getTag('x', namespace = common.xmpp.NS_DATA) + if df: + self.dispatch('SEARCH_RESULT', (jid, df, True)) + return + df = [] + for item in tag.getTags('item'): + f = {} + for i in item.getPayload(): + f[i.getName()] = i.getData() + df.append(f) + self.dispatch('SEARCH_RESULT', (jid, df, False)) + self.connection.SendAndCallForResponse(iq, _on_response) + # END Connection Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-04-19 20:11:54 UTC (rev 8085) +++ trunk/src/common/connection_handlers.py 2007-04-19 20:54:42 UTC (rev 8086) @@ -1936,18 +1936,16 @@ jid = jid = helpers.get_jid_from_iq(iq_obj) tag = iq_obj.getTag('query', namespace = common.xmpp.NS_SEARCH) if not tag: - self.dispatch('SEARCH_RESULT', (jid, None, False)) + self.dispatch('SEARCH_FORM', (jid, None, False)) return df = tag.getTag('x', namespace = common.xmpp.NS_DATA) if df: - self.dispatch('SEARCH_RESULT', (jid, df, True)) + self.dispatch('SEARCH_FORM', (jid, df, True)) return df = {} for i in iq_obj.getQueryPayload(): - if not isinstance(i, common.xmpp.Node): - pass df[i.getName()] = i.getData() - self.dispatch('SEARCH_RESULT', (jid, df, False)) + self.dispatch('SEARCH_FORM', (jid, df, False)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-04-19 20:11:54 UTC (rev 8085) +++ trunk/src/gajim.py 2007-04-19 20:54:42 UTC (rev 8086) @@ -1671,11 +1671,18 @@ ctrl = self.msg_win_mgr.get_control(contact.jid, account) ctrl.print_conversation(_('Error.'), 'status') + def handle_event_search_form(self, account, data): + # ('SEARCH_FORM', account, (jid, dataform, is_dataform)) + if not self.instances[account]['search'].has_key(data[0]): + return + self.instances[account]['search'][data[0]].on_form_arrived(data[1], + data[2]) + def handle_event_search_result(self, account, data): # ('SEARCH_RESULT', account, (jid, dataform, is_dataform)) if not self.instances[account]['search'].has_key(data[0]): return - self.instances[account]['search'][data[0]].on_form_arrived(data[1], + self.instances[account]['search'][data[0]].on_result_arrived(data[1], data[2]) def read_sleepy(self): @@ -1993,6 +2000,7 @@ 'PING_SENT': self.handle_event_ping_sent, 'PING_REPLY': self.handle_event_ping_reply, 'PING_ERROR': self.handle_event_ping_error, + 'SEARCH_FORM': self.handle_event_search_form, 'SEARCH_RESULT': self.handle_event_search_result, } gajim.handlers = self.handlers Modified: trunk/src/search_window.py =================================================================== --- trunk/src/search_window.py 2007-04-19 20:11:54 UTC (rev 8085) +++ trunk/src/search_window.py 2007-04-19 20:54:42 UTC (rev 8086) @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -## search.py +## search_window.py ## ## Copyright (C) 2007 Yann Le Boulanger <asterix(a)lagaule.org> ## @@ -33,16 +33,10 @@ self.xml = gtkgui_helpers.get_glade('search_window.glade') self.window = self.xml.get_widget('search_window') for name in ('label', 'progressbar', 'search_vbox', 'search_button'): -# 'execute_button','close_button','stages_notebook', -# 'retrieving_commands_stage_vbox', -# 'command_list_stage_vbox','command_list_vbox', -# 'sending_form_stage_vbox','sending_form_progressbar', -# 'notes_label','no_commands_stage_vbox','error_stage_vbox', -# 'error_description_label'): self.__dict__[name] = self.xml.get_widget(name) self.data_form_widget = dataforms_widget.DataFormWidget() - self.search_vbox.pack_start(self.data_form_widget) + self.table = None # displaying the window self.xml.signal_autoconnect(self) @@ -51,6 +45,10 @@ self.pulse_id = gobject.timeout_add(80, self.pulse_callback) self.is_form = None + + # for non-dataform forms + self.entries = {} + self.info = {} def request_form(self): gajim.connections[self.account].request_search_fields(self.jid) @@ -76,10 +74,19 @@ self.data_form_widget.data_form.type = 'submit' gajim.connections[self.account].send_search_form(self.jid, self.data_form_widget.data_form, True) + self.search_vbox.remove(self.data_form_widget) + else: + for name in self.entries.keys(): + self.infos[name] = self.entries[name].get_text().decode('utf-8') + if self.infos.has_key('instructions'): + del self.infos['instructions'] + gajim.connections[self.account].send_search_form(self.jid, self.infos, + False) + self.search_vbox.remove(self.table) + self.progressbar.show() self.label.set_text(_('Waiting for results')) self.label.show() - self.data_form_widget.hide() self.pulse_id = gobject.timeout_add(80, self.pulse_callback) self.search_button.hide() @@ -91,7 +98,32 @@ if not is_form: self.is_form = False - print 'no form, not supported yet' + self.infos = form + nbrow = 0 + if self.infos.has_key('instructions'): + self.label.set_text(self.infos['instructions']) + self.label.show() + self.table = gtk.Table() + for name in self.infos.keys(): + if not name: + continue + if name == 'instructions': + continue + + nbrow = nbrow + 1 + self.table.resize(rows = nbrow, columns = 2) + label = gtk.Label(name.capitalize() + ':') + self.table.attach(label, 0, 1, nbrow - 1, nbrow, 0, 0, 0, 0) + entry = gtk.Entry() + entry.set_activates_default(True) + if self.infos[name]: + entry.set_text(self.infos[name]) + if name == 'password': + entry.set_visibility(False) + self.table.attach(entry, 1, 2, nbrow - 1, nbrow, 0, 0, 0, 0) + self.entries[name] = entry + self.table.show_all() + self.search_vbox.pack_start(self.table) return self.dataform = dataforms.ExtendForm(node = form) @@ -105,7 +137,59 @@ return self.is_form = True + self.search_vbox.pack_start(self.data_form_widget) self.data_form_widget.show() if self.data_form_widget.title: - self.window.set_title("%s - Search - Gajim" % \ + self.window.set_title('%s - Search - Gajim' % \ self.data_form_widget.title) + + def on_result_arrived(self, form, is_form): + if self.pulse_id: + gobject.source_remove(self.pulse_id) + self.progressbar.hide() + self.label.hide() + + if not is_form: + if not form: + self.label.set_text(_('No result')) + self.label.show() + return + # We suppose all items have the same fields + sw = gtk.ScrolledWindow() + sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + treeview = gtk.TreeView() + sw.add(treeview) + # Create model + fieldtypes = [str]*len(form[0]) + model = gtk.ListStore(*fieldtypes) + # Copy data to model + for item in form: + model.append(item.values()) + # Create columns + counter = 0 + for field in form[0].keys(): + treeview.append_column( + gtk.TreeViewColumn(field, gtk.CellRendererText(), + text = counter)) + counter += 1 + treeview.set_model(model) + sw.show_all() + self.search_vbox.pack_start(sw) + return + + self.dataform = dataforms.ExtendForm(node = form) + + self.data_form_widget.set_sensitive(True) + try: + self.data_form_widget.data_form = self.dataform + except dataforms.Error: + self.label.set_text(_('Error in received dataform')) + self.label.show() + return + + self.search_vbox.pack_start(self.data_form_widget) + self.data_form_widget.show() + if self.data_form_widget.title: + self.window.set_title('%s - Search - Gajim' % \ + self.data_form_widget.title) +

1 0

[commit-gajim] r8085 - www-website/locale/pt_BR/LC_MESSAGES
by asterix＠gajim.org 19 Apr '07

19 Apr '07

Author: asterix Date: 2007-04-19 22:11:54 +0200 (Thu, 19 Apr 2007) New Revision: 8085 Modified: www-website/locale/pt_BR/LC_MESSAGES/msg.po Log: [Davidson Rodrigues Paulo] updated website translation Modified: www-website/locale/pt_BR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pt_BR/LC_MESSAGES/msg.po 2007-04-19 19:55:50 UTC (rev 8084) +++ www-website/locale/pt_BR/LC_MESSAGES/msg.po 2007-04-19 20:11:54 UTC (rev 8085) @@ -1,20 +1,23 @@ +# translation of msg.po to Português Brasileiro # Portuguese translations for PACKAGE package. # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# asterix <asterix(a)localhost.localdomain>, 2006. # +# asterix <asterix(a)localhost.localdomain>, 2006. +# Gajim <gajim-devel(a)gajim.org>, 2007. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" -"PO-Revision-Date: 2006-08-23 19:09+0200\n" -"Last-Translator: YOU <me@there>\n" -"Language-Team: Portuguese <ldp-br(a)bazar.conectiva.com.br>\n" +"POT-Creation-Date: 2007-04-19 16:50-0300\n" +"PO-Revision-Date: 2007-04-19 17:07-0300\n" +"Last-Translator: Gajim <gajim-devel(a)gajim.org>\n" +"Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" #: Design.php:85 msgid "Home" @@ -46,7 +49,7 @@ #: Design.php:95 msgid "Slackware" -msgstr "" +msgstr "Slackware" #: Design.php:96 msgid "Ubuntu" @@ -78,7 +81,7 @@ #: Design.php:103 msgid "Mandriva" -msgstr "" +msgstr "Mandriva" #: Design.php:104 msgid "FreeBSD" @@ -121,9 +124,8 @@ msgstr "Estrutura" #: Design.php:133 -#, fuzzy msgid " Language:" -msgstr " Idioma: \n" +msgstr " Idioma:" #: Design.php:174 msgid "" @@ -230,8 +232,7 @@ #: dev.php:47 msgid " Bug reporting: in case you find a bug, do not hesitate to" -msgstr "" -" Reportando bugs: se você encontrar algum, não hesite em" +msgstr " Reportando bugs: se você encontrar algum, não hesite em" #: dev.php:47 msgid "report it" @@ -240,6 +241,8 @@ #: dev.php:50 msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" msgstr "" +" Doações: contate-me no Jabber " +"(asterix(a)jabber.lagaule.org)" #: dev.php:56 msgid " Authors" @@ -249,11 +252,11 @@ msgid " Project is composed of:" msgstr " O projeto é composto por:" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr " Gostariámos de agradecer também" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "essas pessoas" @@ -277,7 +280,7 @@ #: docs.php:19 msgid "page.\n" -msgstr "" +msgstr "página.\n" #: docs.php:21 downloads.php:147 msgid " Under GNU/Linux\n" @@ -369,7 +372,7 @@ #: docs.php:46 msgid "(Gajim works with python-2.4.x)" -msgstr "" +msgstr "(o Gajim funciona com o python-2.4.x)" #: docs.php:46 docs.php:49 msgid "and install it.\n" @@ -393,8 +396,7 @@ #: docs.php:55 msgid " At last, to get pywin32, download latest version " -msgstr "" -" Por fim, para obter o pywin32, baixe a última versão " +msgstr " Por fim, para obter o pywin32, baixe a última versão " #: docs.php:59 msgid " You can now" @@ -413,9 +415,8 @@ msgstr " Leia, por favor" #: docs.php:70 -#, fuzzy msgid " Structure\n" -msgstr "Estrutura" +msgstr " Estrutura\n" #: docs.php:72 msgid " You can see how Gajim is structured" @@ -475,12 +476,11 @@ #: downloads.php:31 downloads.php:108 msgid "Soon available here." -msgstr "" +msgstr "Em breve disponível aqui" #: downloads.php:40 msgid " If you use Ubuntu universe repository do" -msgstr "" -" Se você usa o Ubuntu com repositório universe, faça" +msgstr " Se você usa o Ubuntu com repositório universe, faça" #: downloads.php:48 msgid " You can install Gajim provided you have Fedora Extras repository by" @@ -517,9 +517,8 @@ msgstr "pydns rpm" #: downloads.php:70 -#, fuzzy msgid "python-sqlite2 rpm" -msgstr "python-sqlite rpm" +msgstr "pacote RPM do python-sqlite" #: downloads.php:74 msgid " PLD\n" @@ -605,11 +604,11 @@ #: downloads.php:133 msgid "For information on how to build Gajim," -msgstr "" +msgstr "Para mais informações sobre como compilar o Gajim," #: downloads.php:133 msgid "in English" -msgstr "" +msgstr "em inglês" #: downloads.php:135 msgid "" @@ -636,8 +635,7 @@ #: downloads.php:149 msgid " In order to download Gajim sources, here is what you have to do:\n" -msgstr "" -" Para baixar o código-font do Gajim, faça o seguinte:\n" +msgstr " Para baixar o código-font do Gajim, faça o seguinte:\n" #: downloads.php:150 msgid "" @@ -653,15 +651,15 @@ #: downloads.php:160 msgid " Install dependencies, and build Gajim. Please see the" -msgstr "" +msgstr " Instale as dependências e compile o Gajim. Por favor leia a" #: downloads.php:160 msgid "English" -msgstr "" +msgstr "Inglês" #: downloads.php:160 msgid "for details.\n" -msgstr "" +msgstr "para mais detalhes.\n" #: downloads.php:163 msgid " You can run Gajim by typing the following:\n" @@ -717,21 +715,19 @@ #: downloads.php:188 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" -msgstr "" +msgstr "(Versão 2.10.x ou superior, PyGTK versão < 2.10 está disponível" #: downloads.php:188 -#, fuzzy msgid "(Version 2.4 or higher, 2.5 is recommended)," -msgstr "(A versão 2.4.x é preferível)" +msgstr "(Versão 2.4 ou superior, 2.5 recomendada)," #: downloads.php:188 -#, fuzzy msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," msgstr "" -"(Versão 2.6.x ou superior) NOTA: O GTK+ Runtime do gimp-win.sh.net " -"NÃO vai funcionar (por causa da falta da libglade)," +"(Versão 2.6 ou superior, 2.10.x recomendada) " +"NOTA: o GTK+ Runtime do gimp-win.sf.net NÃO vai funcionar (falta a libglade)," #: downloads.php:188 msgid "GTK Runtime Environment" @@ -739,7 +735,7 @@ #: downloads.php:188 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" -msgstr "" +msgstr "PyGTK para Windows (PyGTK com pycairo e pygobject)" #: downloads.php:188 msgid "and at last" @@ -857,51 +853,47 @@ "British, Bulgarian, Chinese (simplified), Croatian, Czech, Dutch, English, " "Esperanto, French, German, Greek, Italian, Norwegian (Bokmål), Polish, " "Portugese, Russian, Serbian, Spanish, Slovak and Swedish" -msgstr "" +msgstr "O Gajim está diponível em 24 idiomas: alemão, basco, bielorusso, bretão, búlgaro, chinês (simplificado), croata, eslovaco, espanhol, esperanto, francês, grego, holandês, inglês, inglês britânico, italiano, norueguês, polonês, português, português do Brasil, russo, sérvio, sueco e tcheco" #: index.php:46 msgid "NEWS" msgstr "NOTÍCIAS" #: index.php:49 -#, fuzzy msgid "Gajim 0.11.1 is here!" -msgstr "O Gajim 0.10.1 está aqui!" +msgstr "O Gajim 0.11.1 está aqui!" #: index.php:50 msgid "Pre-release of Gajim 0.11.1" -msgstr "" +msgstr "Pré-lançamento do Gajim 0.11.1" #: index.php:51 -#, fuzzy msgid "Gajim 0.11 is here!" -msgstr "O Gajim 0.10.1 está aqui!" +msgstr "O Gajim 0.11 está aqui!" #: index.php:53 msgid "18 February 2007" -msgstr "" +msgstr "18 de Fevereiro de 2007" #: index.php:54 msgid "07 February 2007" -msgstr "" +msgstr "07 de Fevereiro de 2007" #: index.php:55 msgid "19 December 2006" -msgstr "" +msgstr "19 de Dezembro de 2006" #: index.php:57 -#, fuzzy msgid "Version 0.11.1 of Gajim has been released." -msgstr "A versão 0.10.1 do Gajim foi lançada." +msgstr "A versão 0.11.1 do Gajim é lançada" #: index.php:58 msgid "Version 0.11.1 will arrive soon." -msgstr "" +msgstr "A versão 0.11.1 chegará brevemente." #: index.php:59 -#, fuzzy msgid "Version 0.11 of Gajim has been released." -msgstr "A versão 0.10.1 do Gajim foi lançada." +msgstr "A versão 0.11 do Gajim é lançada." #: index.php:61 index.php:62 index.php:63 msgid "What's new since " @@ -909,228 +901,69 @@ #: index.php:66 index.php:78 msgid "Fix Idle and non-ascii languages under Windows" -msgstr "" +msgstr "Corrigidos os idiomas ociosos e não-ASCII no Windows" #: index.php:67 index.php:79 msgid "Fix International Domain Name usage" -msgstr "" +msgstr "Corrigo uso de nome de domínio internacional (Internacional Domain Name)" #: index.php:68 index.php:80 msgid "Fixed avatars cache problems in group chats" -msgstr "" +msgstr "Corrigido problema com cache do avatar em salas de conferência" #: index.php:69 index.php:81 msgid "Support of XEP-0202 (Entity Time)" -msgstr "" +msgstr "Suporte a XEP-0202 (horário de entidade)" #: index.php:70 index.php:82 msgid "Support of XEP-0199 (XMPP Ping)" -msgstr "" +msgstr "Suporte a XEP-0199 (ping XMPP)" #: index.php:71 msgid "New translation: Serbian" -msgstr "" +msgstr "Nova tradução: sérvio" #: index.php:72 msgid "Fix pubsub usage" -msgstr "" +msgstr "Corrigido uso de \"pubsub\"" #: index.php:73 index.php:83 index.php:95 msgid "Full ChangeLog" -msgstr "" +msgstr "Registro Completo das Alterações" #: index.php:74 index.php:84 index.php:96 msgid "Bugs/Annoyances closed" -msgstr "" +msgstr "Problemas resolvidos" #: index.php:88 msgid "Support for link-local messaging via Zeroconf using Avahi" -msgstr "" +msgstr "Suporte para troca de mensagens link-local via Zeroconf usando o Avahi" #: index.php:89 msgid "Support for Network Manager" -msgstr "" +msgstr "Suporte ao Network Manager" #: index.php:90 msgid "IPv6 support to connect to server" -msgstr "" +msgstr "Suporte a IPv6 para conectar ao servidor" #: index.php:91 msgid "XHTML Support" -msgstr "" +msgstr "Suporte a XHTML" #: index.php:92 msgid "Privacy Lists support" -msgstr "" +msgstr "Suporte a Listas de Privacidade" #: index.php:93 msgid "Ad-Hoc commands" -msgstr "" +msgstr "Comandos Ad-Hoc" #: index.php:94 msgid "GNOME Keyring support" -msgstr "" +msgstr "Suporte ao Gnome Keyring" #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "Aqui estão alguns screenshots do Gajim:" -#, fuzzy -#~ msgid " There is a Gajim installer for 0.11.0.7951 pre-release " -#~ msgstr " Há um instalador do Gajim " - -#, fuzzy -#~ msgid " The tarball version of 0.11.0.7951 pre-release is " -#~ msgstr "" -#~ " A versão do pacote de código-fonte do Gajim é" - -#~ msgid "One Messages Window ability (default to it) with tab reorder ability" -#~ msgstr "" -#~ "Janela de Mensagens Única (por padrão) suportando " -#~ "reorganização das abas" - -#~ msgid "Gajim no longer remains unresponsive" -#~ msgstr "O Gajim já não ficar mais sem resposta" - -#~ msgid "Gajim now uses less memory" -#~ msgstr "O Gajim agora usa menos memória" - -#~ msgid "File Transfer works better (now should work out of the box for all)" -#~ msgstr "A transferência de arquivos funciona melhor" - -#~ msgid "Meta Contacts ability (relationships between contacts)" -#~ msgstr "Suporte a meta-contatos (transações entre contatos)" - -#~ msgid "" -#~ "Support for legacy composing event (JEP-0022). Now 'Contact is composing " -#~ "a message' will always work" -#~ msgstr "" -#~ "Suporte para o evento legado compondo (JEP-0022). Agora 'O contato " -#~ "está escrevendo uma mensagem funcionará sempre" - -#~ msgid "Gajim now defaults to theme that uses GTK colors" -#~ msgstr "" -#~ "O Gajim agora usa, por padrão, um tema que usa as cores do GTK" - -#~ msgid "" -#~ "Roster Management Improvements (f.e. editablity of transport names, " -#~ "extended Drag and Drop Functionality)" -#~ msgstr "" -#~ "Melhorias no gerenciamentos de rosters (ex.: editabilidade dos nomes dos " -#~ "transportes, funcionalidades extendidas de arrastar e soltar" - -#~ msgid "History (chat logs) Manager (search globally, delete, etc)" -#~ msgstr "" -#~ "Gerenciador de histórico (logs das conversas). Busca global, " -#~ "apagar etc" - -#~ msgid "Animated Emoticons ability" -#~ msgstr "Suporte a emoticons animados" - -#~ msgid "Support for GTalk email notifications for GMail" -#~ msgstr "" -#~ "Suporte para notificações de email do Gmail para Google Talk" - -#~ msgid "Room administrators can modify room ban list" -#~ msgstr "" -#~ "Os administradores de sala podem modificar a lista de usuários " -#~ "banidos" - -#~ msgid "" -#~ "Gajim no longer optionally depends on pydns or dnspython. Requires " -#~ "dnsutils (or whatever package provides the nslookup binary)" -#~ msgstr "" -#~ "O Gajim não precisa mais de pydns ou dnspython, somente o dnsutils " -#~ "(ou qualquer outro pacote que provenha o binário nslookup)" - -#~ msgid "gajim-remote has extended functionality" -#~ msgstr "O utilitário gajim-remote ganhou funcionalidades extendidas" - -#~ msgid "Improved Preset Status Messages Experience" -#~ msgstr "" -#~ "Aprimoramento do sistema de mensagens de status pré-definidas" - -#~ msgid "Detection for CRUX as user's operating system" -#~ msgstr "" -#~ "Detecção do CRUX como sistema operacional do usuário" - -#~ msgid "New art included, appropriate sizes of icons used where available" -#~ msgstr "" -#~ "Novas artes incluídas, com tamanhos de ícones apropriados e " -#~ "usados quando disponíveis" - -#~ msgid "Translations under Windows now work okay" -#~ msgstr "As traduções agora funcionam sem problemas no Windows" - -#~ msgid "Tons of fixes" -#~ msgstr "Toneladas de correções" - -#~ msgid "for bugs and annoyances." -#~ msgstr "para bugs e observações." - -#, fuzzy -#~ msgid "Here" -#~ msgstr "aqui" - -#, fuzzy -#~ msgid "is the list of fixed bugs and annoyances." -#~ msgstr "para bugs e observações." - -#, fuzzy -#~ msgid " You can get the Slackware package of Gajim" -#~ msgstr " Você pode baixar o autopackage " - -#~ msgid " You can download the autopackage " -#~ msgstr " Você pode baixar o autopackage " - -#~ msgid "To use it: make it executable, run it and follow the instructions.\n" -#~ msgstr "" -#~ "Para usá-lo: dê permissão de execução " -#~ "ao arquivo, execute-o e siga as instruções.\n" - -#~ msgid "(Version 2.6.x or up)," -#~ msgstr "(Versão 2.6.x ou superior)," - -#~ msgid "PyGTK for Windows" -#~ msgstr "PyGTK para Windows" - -#, fuzzy -#~ msgid "" -#~ "Gajim is available in 16 languages: English, French, German, Russian, " -#~ "Spanish, Polish, Dutch, Portugese, Greek, Bulgarian, Czech, Basque, " -#~ "Norwegian (Bokmål), Slovak, Italian and Swedish" -#~ msgstr "" -#~ "O Gajim está disponível em 16 idiomas: Inglês, " -#~ "Francês, Almeão, Russo, Espanhol, Polonês, " -#~ "Irlandês, Português, Grego, Búlgaro, Tcheco, Basco, " -#~ "Norueguês, Eslovaco, Italiano e Sueco" - -#~ msgid "Gajim 0.10 is here!" -#~ msgstr "O Gajim 0.10 está aqui!" - -#~ msgid "06 June 2006" -#~ msgstr "06 de Junho de 2006" - -#~ msgid "01 May 2006" -#~ msgstr "1º de Maio de 2006" - -#~ msgid "Version 0.10 of Gajim has been released." -#~ msgstr "A versão 0.10 do Gajim foi lançada." - -#~ msgid "Freeze and lost contacts in roster (#1953)" -#~ msgstr "Contatos paralisados e perdidos no roster (#1953)" - -#~ msgid "Popup menus are correctly placed" -#~ msgstr "Os menus popup são posicionados corretamente" - -#~ msgid "High CPU usage on FreeBSD (#1963)" -#~ msgstr "Alto consumo de processador no FreeBSD (#1963)" - -#~ msgid "Update pl, cs, fr translations" -#~ msgstr "Atualização nas traduções pl, cs e fr" - -#~ msgid "Fix a blocking bug in windows installer (#1924)" -#~ msgstr "Corrigido um bug bloqueador no instalador do Windows (#1924)" - -#~ msgid "Fixes" -#~ msgstr "Correções"

1 0

[commit-gajim] r8084 - trunk/src
by asterix＠gajim.org 19 Apr '07

19 Apr '07

Author: asterix Date: 2007-04-19 21:55:50 +0200 (Thu, 19 Apr 2007) New Revision: 8084 Modified: trunk/src/gajim.py Log: really take nick from FN field Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-04-19 19:02:56 UTC (rev 8083) +++ trunk/src/gajim.py 2007-04-19 19:55:50 UTC (rev 8084) @@ -954,14 +954,10 @@ def handle_event_myvcard(self, account, array): nick = '' - if array.has_key('NICKNAME'): - nick = array['NICKNAME'] - if nick: - gajim.nicks[account] = nick - if not gajim.nicks[account] and array.has_key('FN'): - nick = array['FN'] - if nick: - gajim.nicks[account] = nick + if array.has_key('NICKNAME') and array['NICKNAME']: + gajim.nicks[account] = array['NICKNAME'] + elif array.has_key('FN') and array['FN']: + gajim.nicks[account] = array['FN'] if self.instances[account].has_key('profile'): win = self.instances[account]['profile'] win.set_values(array)

1 0

[commit-gajim] r8083 - trunk/src
by asterix＠gajim.org 19 Apr '07

19 Apr '07

Author: asterix Date: 2007-04-19 21:02:56 +0200 (Thu, 19 Apr 2007) New Revision: 8083 Modified: trunk/src/gajim.py Log: if no NICKNAME is present in our vcard, use FN fiield as our default nickname. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-04-19 18:36:07 UTC (rev 8082) +++ trunk/src/gajim.py 2007-04-19 19:02:56 UTC (rev 8083) @@ -958,6 +958,10 @@ nick = array['NICKNAME'] if nick: gajim.nicks[account] = nick + if not gajim.nicks[account] and array.has_key('FN'): + nick = array['FN'] + if nick: + gajim.nicks[account] = nick if self.instances[account].has_key('profile'): win = self.instances[account]['profile'] win.set_values(array)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2007