Commits August 2007

commits@gajim.org

7 participants
239 discussions

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

21 Aug '07

Author: asterix Date: 2007-08-22 01:13:03 +0200 (Wed, 22 Aug 2007) New Revision: 8535 Added: trunk/data/glade/chat_to_muc_window.glade Modified: trunk/data/glade/chat_control_popup_menu.glade trunk/src/chat_control.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/xmpp/protocol.py trunk/src/dialogs.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: [roidelapluie, elghinn, msieurhappy, xbright and me] chat to muc convertion. see #2095 and #1408. TODO: DND Modified: trunk/data/glade/chat_control_popup_menu.glade =================================================================== --- trunk/data/glade/chat_control_popup_menu.glade 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/data/glade/chat_control_popup_menu.glade 2007-08-21 23:13:03 UTC (rev 8535) @@ -1,90 +1,76 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkMenu" id="chat_control_popup_menu"> - - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Click to see past conversations with this contact</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1370"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</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="information_menuitem"> - <property name="visible">True</property> - <property name="label">gtk-info</property> - <property name="use_stock">True</property> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Send _File</property> - <property name="use_underline">True</property> - <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="image1371"> - <property name="visible">True</property> - <property name="stock">gtk-file</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="GtkCheckMenuItem" id="toggle_gpg_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> - <property name="use_underline">True</property> - <property name="active">False</property> - <signal name="activate" handler="_on_toggle_gpg_menuitem_activate" last_modification_time="Tue, 03 Jan 2006 04:26:46 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add to Roster</property> - <property name="use_underline">True</property> - <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="image1372"> - <property name="visible">True</property> - <property name="stock">gtk-add</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> -</widget> - + <widget class="GtkMenu" id="chat_control_popup_menu"> + <child> + <widget class="GtkImageMenuItem" id="history_menuitem"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Click to see past conversations with this contact</property> + <property name="label" translatable="yes">_History</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1370"> + <property name="visible">True</property> + <property name="stock">gtk-justify-fill</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="information_menuitem"> + <property name="visible">True</property> + <property name="label">gtk-info</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Send _File</property> + <property name="use_underline">True</property> + <signal name="activate" handler="_on_send_file_menuitem_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="image1371"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> + <property name="use_underline">True</property> + <signal name="activate" handler="_on_toggle_gpg_menuitem_activate"/> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Add to Roster</property> + <property name="use_underline">True</property> + <signal name="activate" handler="_on_add_to_roster_menuitem_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="image1372"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="convert_to_groupchat"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Invite _Friends</property> + <property name="use_underline">True</property> + </widget> + </child> + </widget> </glade-interface> Added: trunk/data/glade/chat_to_muc_window.glade =================================================================== --- trunk/data/glade/chat_to_muc_window.glade (rev 0) +++ trunk/data/glade/chat_to_muc_window.glade 2007-08-21 23:13:03 UTC (rev 8535) @@ -0,0 +1,275 @@ +<?xml version="1.0" standalone="no"?>  +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="chat_to_muc_window"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Invite Friends !</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">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + + <child> + <widget class="GtkVBox" id="general_vbox"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="server_select_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">You are going to begin a Multi-User Chat. +First please select a MUC server.</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</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">4</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBoxEntry" id="server_list_comboboxentry"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHSeparator" id="server_and_guests_hseparator"> + <property name="visible">True</property> + </widget> + <packing> + <property name="padding">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="info_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Select the friends you want to invite.</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</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">4</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="guests_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="guests_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + <signal name="drag_data_received" handler="on_guests_treeview_drag_data_received" last_modification_time="Mon, 16 Jul 2007 13:49:16 GMT"/> + <signal name="drag_end" handler="on_guests_treeview_drag_end" last_modification_time="Mon, 16 Jul 2007 14:02:56 GMT"/> + <signal name="drag_data_get" handler="on_guests_treeview_drag_data_get" last_modification_time="Mon, 16 Jul 2007 14:04:27 GMT"/> + </widget> + </child> + </widget> + <packing> + <property name="padding">4</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="invite_cancel_hbox"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="empty_label"> + <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="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">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sun, 15 Jul 2007 08:42:47 GMT"/> + </widget> + <packing> + <property name="padding">3</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="invite_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_invite_button_clicked" last_modification_time="Sun, 15 Jul 2007 08:42:41 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">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="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">In_vite</property> + <property name="use_underline">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> + <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> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">3</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/chat_control.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -1536,6 +1536,7 @@ add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem') send_file_menuitem = xml.get_widget('send_file_menuitem') information_menuitem = xml.get_widget('information_menuitem') + convert_to_gc_menuitem = xml.get_widget('convert_to_groupchat') contact = self.parent_win.get_active_contact() jid = contact.jid @@ -1550,7 +1551,7 @@ is_sensitive = gpg_btn.get_property('sensitive') toggle_gpg_menuitem.set_active(isactive) toggle_gpg_menuitem.set_property('sensitive', is_sensitive) - + # If we don't have resource, we can't do file transfer # in transports, contact holds our info we need to disable it too if self.TYPE_ID == message_control.TYPE_PM and self.gc_contact.jid and \ @@ -1560,7 +1561,14 @@ send_file_menuitem.set_sensitive(True) else: send_file_menuitem.set_sensitive(False) - + + # compact_view_menuitem + compact_view_menuitem.set_active(self.hide_chat_buttons_current) + + # check if it's possible to convert to groupchat + if gajim.get_transport_name_from_jid(jid): + convert_to_gc_menuitem.set_sensitive(False) + # add_to_roster_menuitem if _('Not in Roster') in contact.groups: add_to_roster_menuitem.show() @@ -1568,8 +1576,7 @@ else: add_to_roster_menuitem.hide() add_to_roster_menuitem.set_no_show_all(True) - - + # connect signals id = history_menuitem.connect('activate', self._on_history_menuitem_activate) @@ -1586,6 +1593,9 @@ id = information_menuitem.connect('activate', self._on_contact_information_menuitem_activate) self.handlers[id] = information_menuitem + id = convert_to_gc_menuitem.connect('activate', + self._on_convert_to_gc_menuitem_activate) + self.handlers[id] = convert_to_gc_menuitem menu.connect('selection-done', lambda w:w.destroy()) return menu @@ -1999,7 +2009,12 @@ # this is reverse logic, as we are on 'activate' (before change happens) tb = self.xml.get_widget('gpg_togglebutton') tb.set_active(not tb.get_active()) + + def _on_convert_to_gc_menuitem_activate(self, widget): + '''user want to invite some friends to chat''' + dialogs.TransformChatToMUC(self.account, [self.contact.jid]) + def got_connected(self): ChatControlBase.got_connected(self) # Refreshing contact Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/common/connection.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -1201,6 +1201,21 @@ p = self.add_sha(p, ptype != 'unavailable') self.connection.send(p) + def check_unique_room_id_support(self, server, instance): + if not self.connection: + return + iq = common.xmpp.Iq(typ = 'get', to = server) + iq.setAttr('id', 'unique1') + iq.addChild('unique', namespace=common.xmpp.NS_MUC_UNIQUE) + def _on_response(resp): + if not common.xmpp.isResultNode(resp): + self.dispatch('UNIQUE_ROOM_ID_UNSUPPORTED', (server, instance)) + return + print resp.getTag('unique').getData() + self.dispatch('UNIQUE_ROOM_ID_SUPPORTED', (server, instance, + resp.getTag('unique').getData())) + self.connection.SendAndCallForResponse(iq, _on_response) + def join_gc(self, nick, room_jid, password): # FIXME: This room JID needs to be normalized; see #1364 if not self.connection: @@ -1387,11 +1402,13 @@ else: _on_unregister_account_connect(self.connection) - def send_invite(self, room, to, reason=''): + def send_invite(self, room, to, reason='', continue_tag=False): '''sends invitation''' message=common.xmpp.Message(to = room) c = message.addChild(name = 'x', namespace = common.xmpp.NS_MUC_USER) c = c.addChild(name = 'invite', attrs={'to' : to}) + if continue_tag: + c.addChild(name = 'continue') if reason != '': c.setTagData('reason', reason) self.connection.send(message) Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/common/connection_handlers.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -1483,7 +1483,11 @@ for xtag in xtags: if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite: room_jid = xtag.getAttr('jid') - self.dispatch('GC_INVITATION', (room_jid, frm, '', None)) + is_continued = False + if xtag.getTag('continue'): + is_continued = True + self.dispatch('GC_INVITATION', (room_jid, frm, '', None, + is_continued)) return # chatstates - look for chatstate tags in a message if not delayed if not delayed: @@ -1574,7 +1578,11 @@ reason = item.getTagData('reason') item = invite.getTag('password') password = invite.getTagData('password') - self.dispatch('GC_INVITATION',(frm, jid_from, reason, password)) + is_continued = False + if invite.getTag('invite').getTag('continue'): + is_continued = True + self.dispatch('GC_INVITATION',(frm, jid_from, reason, password, + is_continued)) return if self.name not in no_log_for and jid not in no_log_for and msgtxt: try: Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/common/xmpp/protocol.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -62,6 +62,7 @@ NS_MUC_USER =NS_MUC+'#user' NS_MUC_ADMIN =NS_MUC+'#admin' NS_MUC_OWNER =NS_MUC+'#owner' +NS_MUC_UNIQUE =NS_MUC+'#unique' NS_NICK ='http://jabber.org/protocol/nick' # XEP-0172 NS_OFFLINE ='http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 NS_PHYSLOC ='http://jabber.org/protocol/physloc' # XEP-0112 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/dialogs.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -29,6 +29,8 @@ import conversation_textview import message_control +from random import randrange + try: import gtkspell HAS_GTK_SPELL = True @@ -401,7 +403,7 @@ def on_change_status_message_dialog_key_press_event(self, widget, event): self.countdown_enabled = False if event.keyval == gtk.keysyms.Return or \ - event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER + event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER if (event.state & gtk.gdk.CONTROL_MASK): self.window.response(gtk.RESPONSE_OK) # Stop the event @@ -1532,7 +1534,7 @@ keys.sort() for jid in keys: contact = self.completion_dict[jid] - img = gajim.interface.roster.jabber_state_images['16'][contact.show] + img = gajim.interface.roster.jabber_state_images['16'][contact.show] liststore.append((img.get_pixbuf(), jid)) self.ok_handler = self.new_chat_response @@ -2577,17 +2579,21 @@ class InvitationReceivedDialog: def __init__(self, account, room_jid, contact_jid, password = None, - comment = None): + comment = None, is_continued = False): self.room_jid = room_jid self.account = account self.password = password + self.is_continued = is_continued xml = gtkgui_helpers.get_glade('invitation_received_dialog.glade') self.dialog = xml.get_widget('invitation_received_dialog') #Don't translate $Contact - pritext = _('$Contact has invited you to group chat %(room_jid)s')\ - % {'room_jid': room_jid} + if is_continued: + pritext = _('$Contact has invited you to join a discussion') + else: + pritext = _('$Contact has invited you to group chat %(room_jid)s')\ + % {'room_jid': room_jid} contact = gajim.contacts.get_first_contact_from_jid(account, contact_jid) if contact and contact.name: contact_text = '%s (%s)' % (contact.name, contact_jid) @@ -2615,8 +2621,11 @@ def on_accept_button_clicked(self, widget): self.dialog.destroy() try: - JoinGroupchatWindow(self.account, self.room_jid, - password=self.password) + if self.is_continued: + gajim.interface.roster.join_gc_room(self.account, self.room_jid, + gajim.nicks[self.account], None, is_continued=True) + else: + JoinGroupchatWindow(self.account, self.room_jid) except GajimGeneralException: pass @@ -3283,3 +3292,135 @@ def on_close_window(self, widget): self.window.destroy() + +class TransformChatToMUC: + def __init__(self, account, jids): + '''This window is used to trasform a one-to-one chat to a MUC. + We do 2 things: first select the server and then make a guests list.''' + + self.account = account + self.auto_jids = jids + + self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade') + self.window = self.xml.get_widget('chat_to_muc_window') + self.window.connect('key_press_event', self._on_keypress_event) + + for widget_to_add in ('invite_button', 'cancel_button', + 'server_list_comboboxentry', 'guests_treeview', + 'server_and_guests_hseparator', 'server_select_label'): + self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) + self.window.connect('key_press_event', self._on_keypress_event) + + # set a list of servers which support it + self.servers_support = {} + + # set comboboxentry + renderer_servers = gtk.CellRendererText() + + server_list = [] + self.servers = gtk.ListStore(str) + self.server_list_comboboxentry.set_model(self.servers) + + self.server_list_comboboxentry.set_text_column(0) + + # get the muc server of our server + if 'jabber' in gajim.connections[account].muc_jid: + server_list.append(gajim.connections[account].muc_jid['jabber']) + # add servers or recently joined groupchats + recently_groupchat = gajim.config.get('recently_groupchat').split() + for g in recently_groupchat: + server = gajim.get_server_from_jid(g) + if server not in server_list: + server_list.append(gajim.get_server_from_jid(g)) + # add a default server + if not server_list: + server_list.append('conference.jabber.org') + + for s in server_list: + self.servers.append([s]) + + self.server_list_comboboxentry.set_active(0) + + # set treeview + # name, jid + self.store = gtk.ListStore(str, str) + self.guests_treeview.set_model(self.store) + + renderer1 = gtk.CellRendererText() + column = gtk.TreeViewColumn('Name', renderer1, text=0) + self.guests_treeview.append_column(column) + + self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) + + # set jabber id and pseudos + for jid in gajim.contacts.get_jid_list(self.account): + contact = \ + gajim.contacts.get_contact_with_highest_priority(self.account, jid) + if contact.jid not in self.auto_jids: + if contact.show not in ('offline', 'error'): + name = contact.name + if name == '': + name = jid.split('@')[0] + self.store.append([name, jid]) + + # show all but... + self.window.show_all() + + # ...hide this + self.server_selection_visible = True + self.toggle_server_selection_visible() + + self.xml.signal_autoconnect(self) + + def toggle_server_selection_visible(self): + if self.server_selection_visible: + self.server_selection_visible = False + self.server_and_guests_hseparator.hide() + self.server_list_comboboxentry.hide() + self.server_select_label.hide() + else: + self.server_selection_visible = True + self.server_and_guests_hseparator.show() + self.server_list_comboboxentry.show() + self.server_select_label.show() + + def _on_keypress_event(self, widget, event): + if (event.state & gtk.gdk.MOD1_MASK) and (event.keyval == gtk.keysyms.c \ + or event.keyval == gtk.keysyms.C): + self.toggle_server_selection_visible() + return True + + def on_invite_button_clicked(self, widget): + server = self.server_list_comboboxentry.get_active_text() + if server == '': + return + room_id = gajim.nicks[self.account] + str(randrange(9999999)) +# if self.servers_support.has_key(server): +# self.unique_room_id_supported(server, self.servers_support[server]) +# return +# gajim.connections[self.account].check_unique_room_id_support(server, self) + +# def unique_room_id_supported(self, server, room_id): +# if not self.servers_support.has_key(server): +# self.servers_support[server] = room_id + guest_list = [] + guests = self.guests_treeview.get_selection().get_selected_rows() + for guest in guests[1]: + iter = self.store.get_iter(guest) + guest_list.append(self.store[iter][1].decode('utf-8')) + for guest in self.auto_jids: + guest_list.append(guest) + room_jid = room_id + '@' + server + gajim.automatic_rooms[self.account][room_jid] = {} + gajim.automatic_rooms[self.account][room_jid]['invities'] = guest_list + gajim.automatic_rooms[self.account][room_jid]['continue_tag'] = True + gajim.interface.roster.join_gc_room(self.account, room_jid, + gajim.nicks[self.account], None, is_continued=True) + self.window.destroy() + + def on_cancel_button_clicked(self, widget): + self.window.destroy() + + def unique_room_id_error(self, server): + self.unique_room_id_supported(server, + gajim.nicks[self.account] + str(randrange(9999999))) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/gajim.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -1210,9 +1210,14 @@ # use default configuration gajim.connections[account].send_gc_config(room_jid, array[1]) # invite contacts + # check if it is necessary to add <continue /> + continue_tag = False + if gajim.automatic_rooms[account][room_jid].has_key('continue_tag'): + continue_tag = True if gajim.automatic_rooms[account][room_jid].has_key('invities'): for jid in gajim.automatic_rooms[account][room_jid]['invities']: - gajim.connections[account].send_invite(room_jid, jid) + gajim.connections[account].send_invite(room_jid, jid, + continue_tag=continue_tag) del gajim.automatic_rooms[account][room_jid] elif not self.instances[account]['gc_config'].has_key(room_jid): self.instances[account]['gc_config'][room_jid] = \ @@ -1289,16 +1294,16 @@ dlg.input_entry.set_visibility(False) def handle_event_gc_invitation(self, account, array): - #('GC_INVITATION', (room_jid, jid_from, reason, password)) + #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued)) jid = gajim.get_jid_without_resource(array[1]) room_jid = array[0] if helpers.allow_popup_window(account) or not self.systray_enabled: dialogs.InvitationReceivedDialog(account, room_jid, jid, array[3], - array[2]) + array[2], is_continued=array[4]) return self.add_event(account, jid, 'gc-invitation', (room_jid, array[2], - array[3])) + array[3], array[4])) if helpers.allow_showing_notification(account): path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', @@ -1867,6 +1872,17 @@ _('You are already connected to this account with the same resource. Please type a new one'), input_str = gajim.connections[account].server_resource, is_modal = False, ok_handler = on_ok) + def handle_event_unique_room_id_supported(self, account, data): + '''Receive confirmation that unique_room_id are supported''' + # ('UNIQUE_ROOM_ID_SUPPORTED', server, instance, room_id) + instance = data[1] + instance.unique_room_id_supported(data[0], data[2]) + + def handle_event_unique_room_id_unsupported(self, account, data): + # ('UNIQUE_ROOM_ID_UNSUPPORTED', server, instance) + instance = data[1] + instance.unique_room_id_error(data[0]) + def read_sleepy(self): '''Check idle status and change that status if needed''' if not self.sleeper.poll(): @@ -2195,6 +2211,9 @@ 'SEARCH_FORM': self.handle_event_search_form, 'SEARCH_RESULT': self.handle_event_search_result, 'RESOURCE_CONFLICT': self.handle_event_resource_conflict, + 'UNIQUE_ROOM_ID_UNSUPPORTED': \ + self.handle_event_unique_room_id_unsupported, + 'UNIQUE_ROOM_ID_SUPPORTED': self.handle_event_unique_room_id_supported, } gajim.handlers = self.handlers @@ -2287,7 +2306,7 @@ event = gajim.events.get_first_event(account, jid, type_) data = event.parameters dialogs.InvitationReceivedDialog(account, data[0], jid, data[2], - data[1]) + data[1], data[3]) gajim.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) if w: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/groupchat_control.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -153,10 +153,12 @@ 'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick', 'part', 'names', 'say', 'topic'] - def __init__(self, parent_win, contact, acct): + def __init__(self, parent_win, contact, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, 'muc_child_vbox', contact, acct); + self.is_continued=is_continued + widget = self.xml.get_widget('muc_window_actions_button') id = widget.connect('clicked', self.on_actions_button_clicked) self.handlers[id] = widget @@ -478,7 +480,19 @@ ''' self.name_label.set_ellipsize(pango.ELLIPSIZE_END) font_attrs, font_attrs_small = self.get_font_attrs() - text = '%s' % (font_attrs, self.room_jid) + if self.is_continued: + nicks = [] + for nick in gajim.contacts.get_nick_list(self.account, self.room_jid): + if nick != self.nick: + nicks.append(nick) + if nicks != []: + title = ', ' + title = 'Conversation with ' + title.join(nicks) + else: + title = 'Continued conversation' + text = '%s' % (font_attrs, title) + else: + text = '%s' % (font_attrs, self.room_jid) if self.subject: subject = helpers.reduce_chars_newlines(self.subject, max_lines = 2) subject = gobject.markup_escape_text(subject) @@ -1135,6 +1149,8 @@ if nick == self.nick: # we became online self.got_connected() self.list_treeview.expand_row((model.get_path(role_iter)), False) + if self.is_continued: + self.draw_banner_text() return iter def get_role_iter(self, role): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-21 22:58:19 UTC (rev 8534) +++ trunk/src/roster_window.py 2007-08-21 23:13:03 UTC (rev 8535) @@ -751,7 +751,8 @@ for iter in iters: model[iter][C_SECPIXBUF] = scaled_pixbuf - def join_gc_room(self, account, room_jid, nick, password, minimize = False): + def join_gc_room(self, account, room_jid, nick, password, minimize=False, + is_continued=False): '''joins the room immediatelly''' if gajim.interface.msg_win_mgr.has_window(room_jid, account) and \ gajim.gc_connected[account][room_jid]: @@ -780,7 +781,7 @@ return if not minimized_control_exists and \ not gajim.interface.msg_win_mgr.has_window(room_jid, account): - self.new_room(room_jid, nick, account) + self.new_room(room_jid, nick, account, is_continued=is_continued) if not minimized_control_exists: gc_win = gajim.interface.msg_win_mgr.get_window(room_jid, account) gc_win.set_active_tab(room_jid, account) @@ -3804,14 +3805,15 @@ mc = mw.get_control(fjid, account) mc.user_nick = gajim.nicks[account] - def new_room(self, room_jid, nick, account): + def new_room(self, room_jid, nick, account, is_continued=False): # Get target window, create a control, and associate it with the window contact = gajim.contacts.create_contact(jid = room_jid, name = nick) mw = gajim.interface.msg_win_mgr.get_window(contact.jid, account) if not mw: mw = gajim.interface.msg_win_mgr.create_window(contact, account, - GroupchatControl.TYPE_ID) - gc_control = GroupchatControl(mw, contact, account) + GroupchatControl.TYPE_ID) + gc_control = GroupchatControl(mw, contact, account, + is_continued=is_continued) mw.new_tab(gc_control) def on_message(self, jid, msg, tim, account, encrypted = False,

1 0

[commit-gajim] r8534 - in trunk: data/glade src
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-22 00:58:19 +0200 (Wed, 22 Aug 2007) New Revision: 8534 Modified: trunk/data/glade/zeroconf_contact_context_menu.glade trunk/src/roster_window.py Log: Rework zeroconf menu. Modified: trunk/data/glade/zeroconf_contact_context_menu.glade =================================================================== --- trunk/data/glade/zeroconf_contact_context_menu.glade 2007-08-21 21:24:52 UTC (rev 8533) +++ trunk/data/glade/zeroconf_contact_context_menu.glade 2007-08-21 22:58:19 UTC (rev 8534) @@ -9,7 +9,7 @@ <property name="label" translatable="yes">Start _Chat</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1534"> + <widget class="GtkImage" id="image1701"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -18,78 +18,107 @@ </widget> </child> <child> - <widget class="GtkImageMenuItem" id="rename_menuitem"> - <property name="label" translatable="yes">_Rename</property> + <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Send _File</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1535"> + <widget class="GtkImage" id="image1706"> <property name="visible">True</property> - <property name="stock">gtk-refresh</property> + <property name="stock">gtk-save</property> <property name="icon_size">1</property> </widget> </child> </widget> </child> <child> - <widget class="GtkMenuItem" id="edit_groups_menuitem"> - <property name="label" translatable="yes">Edit _Groups</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> <widget class="GtkSeparatorMenuItem" id="above_send_file_separator"> <property name="visible">True</property> </widget> </child> <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <widget class="GtkImageMenuItem" id="manage_contact"> <property name="visible">True</property> - <property name="label" translatable="yes">Send _File</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">_Manage Contact</property> <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1536"> + <child> + <widget class="GtkMenu" id="menu2"> <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkImageMenuItem" id="rename_menuitem"> + <property name="label" translatable="yes">_Rename</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1705"> + <property name="visible">True</property> + <property name="stock">gtk-refresh</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="edit_groups_menuitem"> + <property name="label" translatable="yes">Edit _Groups</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image21"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-edit</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="assign_openpgp_key_menuitem"> + <property name="label" translatable="yes">Assign Open_PGP Key</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/> + <child internal-child="image"> + <widget class="GtkImage" id="image1707"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="add_special_notification_menuitem"> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">Add Special _Notification</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1708"> + <property name="visible">True</property> + <property name="stock">gtk-info</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> </widget> </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="assign_openpgp_key_menuitem"> - <property name="label" translatable="yes">Assign Open_PGP Key</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image1537"> + <widget class="GtkImage" id="menu-item-image19"> <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-properties</property> <property name="icon_size">1</property> </widget> </child> </widget> </child> <child> - <widget class="GtkImageMenuItem" id="add_special_notification_menuitem"> + <widget class="GtkSeparatorMenuItem" id="separator6"> <property name="visible">True</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Add Special _Notification</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1538"> - <property name="visible">True</property> - <property name="stock">gtk-info</property> - <property name="icon_size">1</property> - </widget> - </child> </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="above_information_separator"> - <property name="visible">True</property> - </widget> - </child> - <child> <widget class="GtkImageMenuItem" id="information_menuitem"> <property name="label">gtk-info</property> <property name="use_underline">True</property> @@ -101,7 +130,7 @@ <property name="label" translatable="yes">_History</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1539"> + <widget class="GtkImage" id="image1718"> <property name="visible">True</property> <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-21 21:24:52 UTC (rev 8533) +++ trunk/src/roster_window.py 2007-08-21 22:58:19 UTC (rev 8534) @@ -1984,7 +1984,6 @@ above_information_separator = xml.get_widget( 'above_information_separator') - # skip a separator information_menuitem = xml.get_widget('information_menuitem') history_menuitem = xml.get_widget('history_menuitem') @@ -2014,7 +2013,7 @@ if contact.resource: send_file_menuitem.connect('activate', self.on_send_file_menuitem_activate, account, contact) - else: # if we do not have resource we cannot send file + else: # if we do no have resource we cannot do much send_file_menuitem.set_sensitive(False) rename_menuitem.connect('activate', self.on_rename, iter, tree_path) @@ -2675,6 +2674,11 @@ status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) menu.append(send_custom_status_menuitem) + + # there is no singlemessage and custom status for zeroconf + if gajim.config.get_per('accounts', account, 'is_zeroconf'): + send_custom_status_menuitem.set_sensitive(False) + send_group_message_item.set_sensitive(False) if not group in helpers.special_groups: item = gtk.SeparatorMenuItem() # separator

1 0

[commit-gajim] r8533 - trunk/src
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-21 23:24:52 +0200 (Tue, 21 Aug 2007) New Revision: 8533 Modified: trunk/src/roster_window.py Log: Only show customstatus icon for contacts and reset on statuschange. Fixes #3381. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-21 18:18:48 UTC (rev 8532) +++ trunk/src/roster_window.py 2007-08-21 21:24:52 UTC (rev 8533) @@ -1335,6 +1335,11 @@ ctrl.print_conversation(_('%s is now %s') % (name, uf_show), 'status') + # unset custom status + if gajim.interface.status_sent_to_users.has_key(account) and \ + contact.jid in gajim.interface.status_sent_to_users[account]: + del gajim.interface.status_sent_to_users[account][contact.jid] + if not contact.groups: self.draw_group(_('General'), account) else: @@ -2652,10 +2657,6 @@ if group in gajim.connections[account].blocked_groups: send_custom_status_menuitem.set_image(self.load_icon('offline')) send_custom_status_menuitem.set_sensitive(False) - elif gajim.interface.status_sent_to_groups.has_key(account) and \ - group in gajim.interface.status_sent_to_groups[account]: - send_custom_status_menuitem.set_image(self.load_icon( - gajim.interface.status_sent_to_groups[account][group])) else: icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU)

1 0

[commit-gajim] r8532 - branches/jingle/src/common
by liori＠gajim.org 21 Aug '07

21 Aug '07

Author: liori Date: 2007-08-21 20:18:48 +0200 (Tue, 21 Aug 2007) New Revision: 8532 Modified: branches/jingle/src/common/jingle.py Log: Jingle: lots of debug prints cut Modified: branches/jingle/src/common/jingle.py =================================================================== --- branches/jingle/src/common/jingle.py 2007-08-21 13:39:53 UTC (rev 8531) +++ branches/jingle/src/common/jingle.py 2007-08-21 18:18:48 UTC (rev 8532) @@ -21,8 +21,6 @@ import farsight sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_LOCAL) -import meta - class JingleStates(object): ''' States in which jingle session may exist. ''' ended=0 @@ -35,7 +33,6 @@ class JingleSession(object): ''' This represents one jingle session. ''' - __metaclass__=meta.VerboseClassType def __init__(self, con, weinitiate, jid, sid=None): ''' con -- connection object, weinitiate -- boolean, are we the initiator? @@ -75,9 +72,6 @@ } # for making streams using farsight - import gc - gc.disable() - print self.weinitiate, "#farsight_session_factory_make" self.p2psession = farsight.farsight_session_factory_make('rtp') self.p2psession.connect('error', self.on_p2psession_error) @@ -190,8 +184,7 @@ cn = self.contents[(creator, name)] cn.stanzaCB(stanza, content, error, action) - def on_p2psession_error(self, *anything): - print self.weinitiate, "Farsight session error!" + def on_p2psession_error(self, *anything): pass ''' Methods that make/send proper pieces of XML. They check if the session is in appropriate state. ''' @@ -268,103 +261,6 @@ '''Callbacks''' def sessionTerminateCB(self, stanza): pass -class Codec(object): - ''' This class keeps description of a single codec. ''' - def __init__(self, name, id=None, **params): - ''' Create new codec description. ''' - self.name = name - self.id = id - self.attrs = {'name': self.name, 'id': self.id, 'channels': 1} - for key in ('channels', 'clockrate', 'maxptime', 'ptime'): - if key in params: - self.attrs[key]=params[key] - del params[key] - self.params = params - - def __eq__(a, b): - ''' Compare two codec descriptions. ''' - # TODO: check out what should be tested... - if a.name!=b.name: return False - # ... - return True - - def toXML(self): - return xmpp.Node('payload-type', - attrs=self.attrs, - payload=(xmpp.Node('parameter', {'name': k, 'value': v}) for k,v in self.params)) - -class JingleAudioSession(object): -# __metaclass__=meta.VerboseClassType - def __init__(self, content, fromNode): - self.content = content - - self.initiator_codecs=[] - self.responder_codecs=[] - - if fromNode: - # read all codecs peer understand - for payload in fromNode.iterTags('payload-type'): - attrs = fromNode.getAttrs().copy() - for param in fromNode.iterTags('parameter'): - attrs[param['name']]=param['value'] - self.initiator_codecs.append(Codec(**attrs)) - - def sessionInitiateCB(self, stanza, ourcontent): - pass - - ''' "Negotiation" of codecs... simply presenting what *we* can do, nothing more... ''' - def getOurCodecs(self, other=None): - ''' Get a list of codecs we support. Try to get them in the same - order as the codecs of our peer. If other!=None, raise - a NoCommonCodec error if no codecs both sides support (None means - we are initiating the connection and we don't know the other - peer's codecs.) ''' - # for now we "understand" only one codec -- speex with clockrate 16000 - # so we have an easy job to do... (codecs sorted in order of preference) - supported_codecs=[ - Codec('speex', clockrate='16000'), - ] - - if other is not None: - other_l = other - else: - other_l = [] - our_l = supported_codecs[:] - out = [] - ids = range(128) - for codec in other_l: - if codec in our_l: - out.append(codec) - our_l.remove(codec) - try: ids.remove(codec.id) - except ValueError: pass # when id is not a dynamic one - - if other is not None and len(out)==0: - raise NoCommonCodec - - for codec in our_l: - if not codec.id or codec.id not in ids: - codec.id = ids.pop() - out.append(codec) - - return out - - ''' Methods for making proper pieces of XML. ''' - def __codecsList(self, codecs): - ''' Prepares a description element with codecs given as a parameter. ''' - return xmpp.Node(xmpp.NS_JINGLE_AUDIO+' description', - payload=(codec.toXML() for codec in codecs)) - - def toXML(self): - if not self.initiator_codecs: - # we are the initiator, so just send our codecs - self.initiator_codecs = self.getOurCodecs() - return self.__codecsList(self.initiator_codecs) - else: - # we are the responder, we SHOULD adjust our codec list - self.responder_codecs = self.getOurCodecs(self.initiator_codecs) - return self.__codecsList(self.responder_codecs) - class JingleContent(object): ''' An abstraction of content in Jingle sessions. ''' def __init__(self, session, node=None): @@ -378,7 +274,6 @@ class JingleVoiP(JingleContent): ''' Jingle VoiP sessions consist of audio content transported over an ICE UDP protocol. ''' -# __metaclass__=meta.VerboseClassType def __init__(self, session, node=None): JingleContent.__init__(self, session, node) self.got_codecs = False @@ -422,7 +317,6 @@ codecs.append(c) if len(codecs)==0: return - print self.session.weinitiate, "#farsight_stream_set_remote_codecs" self.p2pstream.set_remote_codecs(codecs) self.got_codecs=True @@ -431,7 +325,7 @@ candidates = [] for candidate in content.getTag('transport').iterTags('candidate'): cand={ - 'candidate_id': candidate['cid'], + 'candidate_id': self.session.connection.connection.getAnID(), 'component': int(candidate['component']), 'ip': candidate['ip'], 'port': int(candidate['port']), @@ -451,7 +345,6 @@ cand['password']=candidate['pwd'] candidates.append(cand) - print self.session.weinitiate, "#add_remote_candidate" self.p2pstream.add_remote_candidate(candidates) def toXML(self): @@ -470,7 +363,6 @@ payload=payload) def setupStream(self): - print self.session.weinitiate, "#farsight_session_create_stream" self.p2pstream = self.session.p2psession.create_stream( farsight.MEDIA_TYPE_AUDIO, farsight.STREAM_DIRECTION_BOTH) self.p2pstream.set_property('transmitter', 'libjingle') @@ -483,10 +375,8 @@ self.p2pstream.set_remote_codecs(self.p2pstream.get_local_codecs()) - print self.session.weinitiate, "#farsight_stream_prepare_transports" self.p2pstream.prepare_transports() - print self.session.weinitiate, "#farsight_stream_set_active_codec" self.p2pstream.set_active_codec(8) #??? sink = gst.element_factory_make('alsasink') @@ -499,46 +389,29 @@ #src.set_property('latency-time', 20000) src.set_property('is-live', True) - print self.session.weinitiate, "#farsight_stream_set_sink" self.p2pstream.set_sink(sink) - print self.session.weinitiate, "#farsight_stream_set_source" self.p2pstream.set_source(src) def on_p2pstream_error(self, *whatever): pass - def on_p2pstream_new_active_candidate_pair(self, stream, native, remote): - print self.session.weinitiate, "##new_active_candidate_pair" - #print "New native candidate pair: %s, %s" % (native, remote) - def on_p2pstream_codec_changed(self, stream, codecid): - print self.session.weinitiate, "##codec_changed" - #print "Codec changed: %d" % codecid + def on_p2pstream_new_active_candidate_pair(self, stream, native, remote): pass + def on_p2pstream_codec_changed(self, stream, codecid): pass def on_p2pstream_native_candidates_prepared(self, *whatever): - print self.session.weinitiate, "##native_candidates_prepared" - #print "Native candidates prepared: %r" % whatever for candidate in self.p2pstream.get_native_candidate_list(): self.send_candidate(candidate) def on_p2pstream_state_changed(self, stream, state, dir): - print self.session.weinitiate, "##state_changed" - #print "State: %d, Dir: %d" % (state, dir) if state==farsight.STREAM_STATE_CONNECTED: - print self.session.weinitiate, "#farsight_stream_signal_native_candidates_prepared" stream.signal_native_candidates_prepared() - print self.session.weinitiate, "#farsight_stream_start" stream.start() def on_p2pstream_new_native_candidate(self, p2pstream, candidate_id): - print self.session.weinitiate, "##new_native_candidate" - print self.session.weinitiate, "#get_native_candidate" candidates = p2pstream.get_native_candidate(candidate_id) - print self.session.weinitiate, "#!", repr(candidates) for candidate in candidates: self.send_candidate(candidate) def send_candidate(self, candidate): attrs={ - 'cid': candidate['candidate_id'], 'component': candidate['component'], 'foundation': '1', # hack 'generation': '0', - 'type': candidate['type'], 'ip': candidate['ip'], 'network': '0', 'port': candidate['port'], @@ -557,7 +430,6 @@ self.session.sendTransportInfo(c) def iterCodecs(self): - print self.session.weinitiate, "#farsight_stream_get_local_codecs" codecs=self.p2pstream.get_local_codecs() for codec in codecs: a = {'name': codec['encoding_name'],

1 0

[commit-gajim] r8531 - trunk/data/glade
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-21 15:39:53 +0200 (Tue, 21 Aug 2007) New Revision: 8531 Modified: trunk/data/glade/gc_occupants_menu.glade trunk/data/glade/roster_contact_context_menu.glade Log: Some minor menu work. Part 2 Modified: trunk/data/glade/gc_occupants_menu.glade =================================================================== --- trunk/data/glade/gc_occupants_menu.glade 2007-08-21 12:55:29 UTC (rev 8530) +++ trunk/data/glade/gc_occupants_menu.glade 2007-08-21 13:39:53 UTC (rev 8531) @@ -18,6 +18,20 @@ </widget> </child> <child> + <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Send _File</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image4"> + <property name="stock">gtk-save</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> <widget class="GtkMenuItem" id="group_chat_actions_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">Occupant Actions</property> @@ -88,20 +102,6 @@ </widget> </child> <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Send _File</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image4"> - <property name="stock">gtk-save</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> <widget class="GtkSeparatorMenuItem" id="separator6"> <property name="visible">True</property> </widget> Modified: trunk/data/glade/roster_contact_context_menu.glade =================================================================== --- trunk/data/glade/roster_contact_context_menu.glade 2007-08-21 12:55:29 UTC (rev 8530) +++ trunk/data/glade/roster_contact_context_menu.glade 2007-08-21 13:39:53 UTC (rev 8531) @@ -39,7 +39,7 @@ <child internal-child="image"> <widget class="GtkImage" id="image1706"> <property name="visible">True</property> - <property name="stock">gtk-floppy</property> + <property name="stock">gtk-save</property> <property name="icon_size">1</property> </widget> </child> @@ -268,26 +268,26 @@ </widget> </child> <child> - <widget class="GtkImageMenuItem" id="remove_from_roster_menuitem"> - <property name="label" translatable="yes">_Remove</property> + <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> + <property name="label" translatable="yes">_Add to Roster</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1717"> + <widget class="GtkImage" id="image1716"> <property name="visible">True</property> - <property name="stock">gtk-remove</property> + <property name="stock">gtk-add</property> <property name="icon_size">1</property> </widget> </child> </widget> </child> <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="label" translatable="yes">_Add to Roster</property> + <widget class="GtkImageMenuItem" id="remove_from_roster_menuitem"> + <property name="label" translatable="yes">_Remove</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1716"> + <widget class="GtkImage" id="image1717"> <property name="visible">True</property> - <property name="stock">gtk-add</property> + <property name="stock">gtk-remove</property> <property name="icon_size">1</property> </widget> </child>

1 0

[commit-gajim] r8530 - trunk/data
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-21 14:55:29 +0200 (Tue, 21 Aug 2007) New Revision: 8530 Modified: trunk/data/Makefile.am Log: [GustavoCarneiro] Install root certs correctly Modified: trunk/data/Makefile.am =================================================================== --- trunk/data/Makefile.am 2007-08-21 12:51:36 UTC (rev 8529) +++ trunk/data/Makefile.am 2007-08-21 12:55:29 UTC (rev 8530) @@ -12,7 +12,7 @@ sounds_DATA = $(srcdir)/sounds/*.wav otherdir = $(pkgdatadir)/data/other -other_DATA = other/servers.xml +other_DATA = other/servers.xml other/cacerts.pem man_MANS = gajim.1 gajim-remote.1

1 0

[commit-gajim] r8529 - in trunk: data/glade src
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-21 14:51:36 +0200 (Tue, 21 Aug 2007) New Revision: 8529 Modified: trunk/data/glade/zeroconf_context_menu.glade trunk/src/roster_window.py Log: Some menu work: Set unusable menuitems insensitive instead of hiding them. Enhance transport roster menu. Fixes #3383 Modified: trunk/data/glade/zeroconf_context_menu.glade =================================================================== --- trunk/data/glade/zeroconf_context_menu.glade 2007-08-21 09:23:34 UTC (rev 8528) +++ trunk/data/glade/zeroconf_context_menu.glade 2007-08-21 12:51:36 UTC (rev 8529) @@ -1,49 +1,41 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkMenu" id="zeroconf_context_menu"> - - <child> - <widget class="GtkImageMenuItem" id="status_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Status</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1258"> - <property name="visible">True</property> - <property name="stock">gtk-network</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="zeroconf_properties_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Modify Account...</property> - <property name="use_underline">True</property> - - <child internal-child="image"> - <widget class="GtkImage" id="image1259"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</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> -</widget> - + <widget class="GtkMenu" id="zeroconf_context_menu"> + <child> + <widget class="GtkImageMenuItem" id="status_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Status</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1258"> + <property name="visible">True</property> + <property name="stock">gtk-network</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="zeroconf_properties_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Modify Account...</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1259"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + </widget> </glade-interface> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-21 09:23:34 UTC (rev 8528) +++ trunk/src/roster_window.py 2007-08-21 12:51:36 UTC (rev 8529) @@ -1952,7 +1952,8 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if not contact: return - + + # Zeroconf Account if gajim.config.get_per('accounts', account, 'is_zeroconf'): xml = gtkgui_helpers.get_glade('zeroconf_contact_context_menu.glade') zeroconf_contact_context_menu = xml.get_widget( @@ -1961,8 +1962,6 @@ start_chat_menuitem = xml.get_widget('start_chat_menuitem') rename_menuitem = xml.get_widget('rename_menuitem') edit_groups_menuitem = xml.get_widget('edit_groups_menuitem') - # separator has with send file, assign_openpgp_key_menuitem, etc.. - above_send_file_separator = xml.get_widget('above_send_file_separator') send_file_menuitem = xml.get_widget('send_file_menuitem') assign_openpgp_key_menuitem = xml.get_widget( 'assign_openpgp_key_menuitem') @@ -2011,8 +2010,7 @@ send_file_menuitem.connect('activate', self.on_send_file_menuitem_activate, account, contact) else: # if we do not have resource we cannot send file - send_file_menuitem.hide() - send_file_menuitem.set_no_show_all(True) + send_file_menuitem.set_sensitive(False) rename_menuitem.connect('activate', self.on_rename, iter, tree_path) if contact.show in ('offline', 'error'): @@ -2036,13 +2034,9 @@ self.on_assign_pgp_key, contact, account) else: # contact is in group 'Not in Roster' - edit_groups_menuitem.hide() + edit_groups_menuitem.set_sensitive(False) edit_groups_menuitem.set_no_show_all(True) - # hide first of the two consecutive separators - above_send_file_separator.hide() - above_send_file_separator.set_no_show_all(True) - assign_openpgp_key_menuitem.hide() - assign_openpgp_key_menuitem.set_no_show_all(True) + assign_openpgp_key_menuitem.set_sensitive(False) # Remove many items when it's self contact row if our_jid: @@ -2083,8 +2077,6 @@ unblock_menuitem = xml.get_widget('unblock_menuitem') rename_menuitem = xml.get_widget('rename_menuitem') edit_groups_menuitem = xml.get_widget('edit_groups_menuitem') - # separator has with send file, assign_openpgp_key_menuitem, etc.. - above_send_file_separator = xml.get_widget('above_send_file_separator') send_file_menuitem = xml.get_widget('send_file_menuitem') assign_openpgp_key_menuitem = xml.get_widget( 'assign_openpgp_key_menuitem') @@ -2115,8 +2107,9 @@ jid in gajim.interface.status_sent_to_users[account]: send_custom_status_menuitem.set_image( self.load_icon(gajim.interface.status_sent_to_users[account][jid])) - else: - send_custom_status_menuitem.set_image(None) + else: + icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU) + send_custom_status_menuitem.set_image(icon) if not our_jid: # add a special img for rename menuitem @@ -2130,8 +2123,7 @@ if muc_icon: invite_menuitem.set_image(muc_icon) - above_subscription_separator = xml.get_widget( - 'above_subscription_separator') + # Subscription submenu subscription_menuitem = xml.get_widget('subscription_menuitem') send_auth_menuitem, ask_auth_menuitem, revoke_auth_menuitem =\ subscription_menuitem.get_submenu().get_children() @@ -2139,7 +2131,6 @@ remove_from_roster_menuitem = xml.get_widget( 'remove_from_roster_menuitem') - # skip a separator information_menuitem = xml.get_widget('information_menuitem') history_menuitem = xml.get_widget('history_menuitem') @@ -2154,7 +2145,7 @@ contact_transport = gajim.get_transport_name_from_jid(contact.jid) t = contact_transport or 'jabber' # transform None in 'jabber' if not gajim.connections[account].muc_jid.has_key(t): - invite_to_new_room_menuitem.set_sensitive(False) + invite_menuitem.set_sensitive(False) invite_to_submenu.append(invite_to_new_room_menuitem) rooms = [] # a list of (room_jid, account) tuple for gc_control in gajim.interface.msg_win_mgr.get_controls( @@ -2234,8 +2225,7 @@ execute_command_menuitem.connect('activate', self.on_execute_command, contact, account, contact.resource) else: - execute_command_menuitem.hide() - execute_command_menuitem.set_no_show_all(True) + execute_command_menuitem.set_sensitive(False) our_jid_other_resource = None if our_jid: @@ -2257,8 +2247,7 @@ send_file_menuitem.connect('activate', self.on_send_file_menuitem_activate, account, contact) else: # if we do not have resource we cannot send file - send_file_menuitem.hide() - send_file_menuitem.set_no_show_all(True) + send_file_menuitem.set_sensitive(False) send_single_message_menuitem.connect('activate', self.on_send_single_message_menuitem_activate, account, contact) @@ -2273,8 +2262,6 @@ if _('Not in Roster') not in contact.groups: # contact is in normal group - edit_groups_menuitem.set_no_show_all(False) - assign_openpgp_key_menuitem.set_no_show_all(False) add_to_roster_menuitem.hide() add_to_roster_menuitem.set_no_show_all(True) edit_groups_menuitem.connect('activate', self.on_edit_groups, [( @@ -2304,33 +2291,27 @@ else: # contact is in group 'Not in Roster' add_to_roster_menuitem.set_no_show_all(False) - edit_groups_menuitem.hide() - edit_groups_menuitem.set_no_show_all(True) - # hide first of the two consecutive separators - above_send_file_separator.hide() - above_send_file_separator.set_no_show_all(True) - assign_openpgp_key_menuitem.hide() - assign_openpgp_key_menuitem.set_no_show_all(True) - subscription_menuitem.hide() - subscription_menuitem.set_no_show_all(True) + edit_groups_menuitem.set_sensitive(False) + assign_openpgp_key_menuitem.set_sensitive(False) + subscription_menuitem.set_sensitive(False) add_to_roster_menuitem.connect('activate', self.on_add_to_roster, contact, account) set_custom_avatar_menuitem.connect('activate', self.on_set_custom_avatar_activate, contact, account) - # Remove many items when it's self contact row + # Hide items when it's self contact row if our_jid: menuitem = xml.get_widget('manage_contact') - menuitem.set_no_show_all(True) - menuitem.hide() + menuitem.set_sensitive(False) # Unsensitive many items when account is offline if gajim.connections[account].connected < 2: for widget in [start_chat_menuitem, send_single_message_menuitem, rename_menuitem, edit_groups_menuitem, send_file_menuitem, subscription_menuitem, add_to_roster_menuitem, - remove_from_roster_menuitem, execute_command_menuitem]: + remove_from_roster_menuitem, execute_command_menuitem, + send_custom_status_menuitem]: widget.set_sensitive(False) if gajim.connections[account] and gajim.connections[account].\ @@ -2558,7 +2539,17 @@ maximize_menuitem.connect('activate', self.on_groupchat_maximized, \ jid, account) menu.append(maximize_menuitem) - + + disconnect_menuitem = gtk.ImageMenuItem(_('_Disconnect')) + disconnect_icon = gtk.image_new_from_stock(gtk.STOCK_DISCONNECT, \ + gtk.ICON_SIZE_MENU) + disconnect_menuitem.set_image(disconnect_icon) + disconnect_menuitem .connect('activate', self.on_disconnect, jid, account) + menu.append(disconnect_menuitem) + + item = gtk.SeparatorMenuItem() # separator + menu.append(item) + history_menuitem = gtk.ImageMenuItem(_('_History')) history_icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL, \ gtk.ICON_SIZE_MENU) @@ -2567,16 +2558,6 @@ contact, account) menu.append(history_menuitem) - item = gtk.SeparatorMenuItem() # separator - menu.append(item) - - disconnect_menuitem = gtk.ImageMenuItem(_('_Disconnect')) - disconnect_icon = gtk.image_new_from_stock(gtk.STOCK_DISCONNECT, \ - gtk.ICON_SIZE_MENU) - disconnect_menuitem.set_image(disconnect_icon) - disconnect_menuitem .connect('activate', self.on_disconnect, jid, account) - menu.append(disconnect_menuitem) - event_button = gtkgui_helpers.get_possible_button_event(event) menu.attach_to_widget(self.tree, None) @@ -2676,7 +2657,9 @@ send_custom_status_menuitem.set_image(self.load_icon( gajim.interface.status_sent_to_groups[account][group])) else: - send_custom_status_menuitem.set_image(None) + icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, + 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') @@ -2692,7 +2675,7 @@ status_menuitems.append(status_menuitem) menu.append(send_custom_status_menuitem) - if not group in helpers.special_groups + (_('General'),): + if not group in helpers.special_groups: item = gtk.SeparatorMenuItem() # separator menu.append(item) @@ -2739,9 +2722,16 @@ menu.append(remove_item) remove_item.connect('activate', self.on_remove_group_item_activated, group, account) + # unsensitive if account is not connected if gajim.connections[account].connected < 2: rename_item.set_sensitive(False) + + # General group cannot be changed + if group == _('General'): + rename_item.set_sensitive(False) + block_menuitem.set_sensitive(False) + remove_item.set_sensitive(False) event_button = gtkgui_helpers.get_possible_button_event(event) @@ -2780,7 +2770,44 @@ item = gtk.SeparatorMenuItem() # separator menu.append(item) + + # Send single message + item = gtk.ImageMenuItem(_('Send Single Message')) + icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) + item.set_image(icon) + item.connect('activate', + self.on_send_single_message_menuitem_activate, account, contact) + menu.append(item) + # Send Custom Status + send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) + # add a special img for this menuitem + if gajim.interface.status_sent_to_users.has_key(account) and \ + jid in gajim.interface.status_sent_to_users[account]: + send_custom_status_menuitem.set_image(self.load_icon( + gajim.interface.status_sent_to_users[account][jid])) + else: + icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, + 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(helpers.get_iconset_path(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, + [(contact, account)], s) + icon = state_images[s] + status_menuitem.set_image(icon) + status_menuitems.append(status_menuitem) + menu.append(send_custom_status_menuitem) + + item = gtk.SeparatorMenuItem() # separator + menu.append(item) + # Execute Command item = gtk.ImageMenuItem(_('Execute Command...')) icon = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU)

1 0

[commit-gajim] r8528 - trunk/src/common
by asterix＠gajim.org 21 Aug '07

21 Aug '07

Author: asterix Date: 2007-08-21 11:23:34 +0200 (Tue, 21 Aug 2007) New Revision: 8528 Modified: trunk/src/common/contacts.py Log: Fix TB when getting score of a not (yet) in the roster contact. fixes #3382 and #3335 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-08-21 00:43:58 UTC (rev 8527) +++ trunk/src/common/contacts.py 2007-08-21 09:23:34 UTC (rev 8528) @@ -431,9 +431,12 @@ for data_ in family: if data_.has_key('order') and data_['order'] > max_order: max_order = data_['order'] + score = (max_order - order)*10000 + contact = self.get_contact_with_highest_priority(account, jid) - score = (max_order - order)*10000 - + if not contact: + return score + if common.gajim.get_transport_name_from_jid(jid) is None and \ contact.show not in ('error', 'offline'): score += 10

1 0

[commit-gajim] r8527 - in trunk: data/glade src
by steve-e＠gajim.org 21 Aug '07

21 Aug '07

Author: steve-e Date: 2007-08-21 02:43:58 +0200 (Tue, 21 Aug 2007) New Revision: 8527 Modified: trunk/data/glade/account_context_menu.glade trunk/src/roster_window.py Log: Rework account_menu. Modified: trunk/data/glade/account_context_menu.glade =================================================================== --- trunk/data/glade/account_context_menu.glade 2007-08-20 23:26:10 UTC (rev 8526) +++ trunk/data/glade/account_context_menu.glade 2007-08-21 00:43:58 UTC (rev 8527) @@ -18,15 +18,25 @@ </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="seperator"> + <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </widget> </child> <child> - <widget class="GtkMenuItem" id="open_gmail_inbox_menuitem"> + <widget class="GtkImageMenuItem" id="start_chat_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">_Open Gmail Inbox</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">_Start Chat</property> <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image7"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-jump-to</property> + <property name="icon_size">1</property> + </widget> + </child> </widget> </child> <child> @@ -44,9 +54,28 @@ </widget> </child> <child> + <widget class="GtkSeparatorMenuItem" id="seperator"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="add_contact_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Add Contact</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1238"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> <widget class="GtkImageMenuItem" id="service_discovery_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">_Discover Services</property> + <property name="label" translatable="yes">_Discover Services</property> <property name="use_underline">True</property> <child internal-child="image"> <widget class="GtkImage" id="image1239"> @@ -72,22 +101,15 @@ </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="seperator"> + <widget class="GtkMenuItem" id="open_gmail_inbox_menuitem"> <property name="visible">True</property> + <property name="label" translatable="yes">_Open Gmail Inbox</property> + <property name="use_underline">True</property> </widget> </child> <child> - <widget class="GtkImageMenuItem" id="add_contact_menuitem"> + <widget class="GtkSeparatorMenuItem" id="seperator"> <property name="visible">True</property> - <property name="label" translatable="yes">_Add Contact</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1238"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </widget> - </child> </widget> </child> <child> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-20 23:26:10 UTC (rev 8526) +++ trunk/src/roster_window.py 2007-08-21 00:43:58 UTC (rev 8527) @@ -2733,7 +2733,7 @@ block_menuitem.set_sensitive(False) # Remove group - remove_item = gtk.ImageMenuItem(_('_Remove from Roster')) + remove_item = gtk.ImageMenuItem(_('_Remove')) icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) remove_item.set_image(icon) menu.append(remove_item) @@ -2889,6 +2889,7 @@ account_context_menu = xml.get_widget('account_context_menu') status_menuitem = xml.get_widget('status_menuitem') + start_chat_menuitem = xml.get_widget('start_chat_menuitem') join_group_chat_menuitem = xml.get_widget('join_group_chat_menuitem') muc_icon = self.load_icon('muc_active') if muc_icon: @@ -2951,6 +2952,9 @@ contact = gajim.contacts.create_contact(jid = hostname) # Fake contact execute_command_menuitem.connect('activate', self.on_execute_command, contact, account) + + start_chat_menuitem.connect('activate', + self.on_new_chat_menuitem_activate, account) gc_sub_menu = gtk.Menu() # gc is always a submenu join_group_chat_menuitem.set_submenu(gc_sub_menu) @@ -2960,7 +2964,8 @@ if gajim.connections[account].connected < 2: for widget in [add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, - execute_command_menuitem]: + execute_command_menuitem, + start_chat_menuitem]: widget.set_sensitive(False) else: xml = gtkgui_helpers.get_glade('zeroconf_context_menu.glade')

1 0

[commit-gajim] r8526 - trunk/data/glade
by steve-e＠gajim.org 20 Aug '07

20 Aug '07

Author: steve-e Date: 2007-08-21 01:26:10 +0200 (Tue, 21 Aug 2007) New Revision: 8526 Modified: trunk/data/glade/roster_contact_context_menu.glade Log: Fix glade annoyance. Modified: trunk/data/glade/roster_contact_context_menu.glade =================================================================== --- trunk/data/glade/roster_contact_context_menu.glade 2007-08-20 23:20:34 UTC (rev 8525) +++ trunk/data/glade/roster_contact_context_menu.glade 2007-08-20 23:26:10 UTC (rev 8526) @@ -136,7 +136,7 @@ <child internal-child="image"> <widget class="GtkImage" id="image1707"> <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> + <property name="stock">gtk-dialog-authentication</property> <property name="icon_size">1</property> </widget> </child> @@ -160,7 +160,6 @@ </child> <child> <widget class="GtkImageMenuItem" id="add_special_notification_menuitem"> - <property name="visible">True</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Add Special _Notification</property> <property name="use_underline">True</property>

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2007