Changeset 8478 for branches/pep/src/chat_control.py

Timestamp:

08/09/07 17:39:18 (17 months ago)

Author:

asterix

Message:

merge diff from trunk to pep branch

Files:

• branches/pep/src/chat_control.py (modified) (39 diffs)

branches/pep/src/chat_control.py

@@ -5 +5 @@
 ## Copyright (C) 2006 Travis Shirk <travis@pobox.com>
 ## Copyright (C) 2006 Dimitur Kirov <dkirov@gmail.com>
+## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
+## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -130 +132 @@
                 self.handlers[id] = self.widget
 
+                # Create banner and connect signals
                 widget = self.xml.get_widget('banner_eventbox')
+                widget.set_property('height-request', gajim.config.get('chat_avatar_height'))
                 id = widget.connect('button-press-event',
                         self._on_banner_eventbox_button_press_event)
                 self.handlers[id] = widget
+                # Init DND
+                self.TARGET_TYPE_URI_LIST = 80
+                self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ),
+                                ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)]
+                id = self.widget.connect('drag_data_received',
+                        self._on_drag_data_received)
+                self.handlers[id] = self.widget
+                self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
+                        gtk.DEST_DEFAULT_HIGHLIGHT |
+                        gtk.DEST_DEFAULT_DROP,
+                        self.dnd_list, gtk.gdk.ACTION_COPY)
 
                 # Create textviews and connect signals
                 self.conv_textview = ConversationTextview(self.account)
+                # FIXME: DND on non editable TextView, find a better way
+                self.drag_entered = False
+                id = self.conv_textview.tv.connect('drag_data_received',
+                        self._on_drag_data_received)
+                self.handlers[id] = self.conv_textview.tv
+                id = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion)
+                self.handlers[id] = self.conv_textview.tv
+                id = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave)
+                self.handlers[id] = self.conv_textview.tv
+                self.conv_textview.tv.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
+                        gtk.DEST_DEFAULT_HIGHLIGHT |
+                        gtk.DEST_DEFAULT_DROP,
+                        self.dnd_list, gtk.gdk.ACTION_COPY)
 
                 self.conv_scrolledwindow = self.xml.get_widget(
@@ -150 +178 @@
                 self.scroll_to_end_id = None
                 self.was_at_the_end = True
+
                 # add MessageTextView to UI and connect signals
                 self.msg_scrolledwindow = self.xml.get_widget('message_scrolledwindow')
@@ -165 +194 @@
                         self.on_msg_textview_populate_popup)
                 self.handlers[id] = self.msg_textview
+                # Setup DND
+                id = self.msg_textview.connect('drag_data_received',
+                        self._on_drag_data_received)
+                self.handlers[id] = self.msg_textview
+                self.msg_textview.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
+                        gtk.DEST_DEFAULT_HIGHLIGHT,
+                        self.dnd_list, gtk.gdk.ACTION_COPY)
         
                 self.update_font()
@@ -482 +518 @@
                                 event_keymod)
 
+        def _on_drag_data_received(self, widget, context, x, y, selection,
+                target_type, timestamp):
+                pass  # Derived classes SHOULD implement this method
+
+        def _on_drag_leave(self, widget, context, time):
+                # FIXME: DND on non editable TextView, find a better way
+                self.drag_entered = False
+                self.conv_textview.tv.set_editable(False)
+
+        def _on_drag_motion(self, widget, context, x, y, time):
+                # FIXME: DND on non editable TextView, find a better way
+                if not self.drag_entered:
+                        # We drag new data over the TextView, make it editable to catch dnd
+                        self.drag_entered_conv = True
+                        self.conv_textview.tv.set_editable(True)
+
         def _process_command(self, message):
                 if not message or message[0] != '/':
@@ -497 +549 @@
                         return True
                 elif message == 'compact' and not len(message_array):
-                        self.chat_buttons_set_visible(not self.hide_chat_buttons_current)
+                        self.chat_buttons_set_visible(not self.hide_chat_buttons)
                         self.clear(self.msg_textview)
                         return True
@@ -503 +555 @@
 
         def send_message(self, message, keyID = '', type = 'chat', chatstate = None,
-        msg_id = None, composing_jep = None, resource = None):
+        msg_id = None, composing_xep = None, resource = None,
+        process_command = True):
                 '''Send the given message to the active tab. Doesn't return None if error
                 '''
@@ -509 +562 @@
                         return 1
 
-
-                if not self._process_command(message):
+                if not process_command or not self._process_command(message):
                         ret = MessageControl.send_message(self, message, keyID, type = type,
                                 chatstate = chatstate, msg_id = msg_id,
-                                composing_jep = composing_jep, resource = resource,
+                                composing_xep = composing_xep, resource = resource,
                                 user_nick = self.user_nick)
                         if ret:
@@ -570 +622 @@
                         not self.parent_win.is_active() or not end)) or \
                         (gc_message and \
-                        gajim.interface.minimized_controls.has_key(self.account) and \
                         jid in gajim.interface.minimized_controls[self.account])) and \
                         kind in ('incoming', 'incoming_queue'):
@@ -668 +719 @@
                                 history_window.HistoryWindow(jid, self.account)
 
-        def _on_compact_view_menuitem_activate(self, widget):
-                isactive = widget.get_active()
-                self.chat_buttons_set_visible(isactive)
-
-        def _on_minimize_menuitem_activate(self, widget):
+        def on_minimize_menuitem_toggled(self, widget):
                 '''When a grouchat is minimized, unparent the tab, put it in roster etc'''
-                win = gajim.interface.msg_win_mgr.get_window(self.contact.jid, self.account)
-                ctrl = win.get_control(self.contact.jid, self.account)
-
-                ctrl_page = win.notebook.page_num(ctrl.widget)
-                control = win.notebook.get_nth_page(ctrl_page)
-
-                win.notebook.remove_page(ctrl_page)
-                control.unparent()
-                ctrl.parent_win = None
-
-                if not gajim.interface.minimized_controls.has_key(self.account):
-                        gajim.interface.minimized_controls[self.account] = {}
-                gajim.interface.minimized_controls[self.account][self.contact.jid] = ctrl
-
-                del win._controls[self.account][self.contact.jid]
-
-                win.check_tabs()
-                gajim.interface.roster.add_groupchat_to_roster(self.account,
-                        self.contact.jid, status = self.subject)
+                old_value = False
+                minimized_gc = gajim.config.get_per('accounts', self.account,
+                        'minimized_gc').split()
+                if self.contact.jid in minimized_gc:
+                        old_value = True
+                minimize = widget.get_active()
+                if minimize and not self.contact.jid in minimized_gc:
+                        minimized_gc.append(self.contact.jid)
+                if not minimize and self.contact.jid in minimized_gc:
+                        minimized_gc.remove(self.contact.jid)
+                if old_value != minimize:
+                        gajim.config.set_per('accounts', self.account, 'minimized_gc',
+                                ' '.join(minimized_gc))
 
         def set_control_active(self, state):
@@ -826 +867 @@
                         groupchat_control = gajim.interface.msg_win_mgr.get_control(
                                 room_jid, self.account)
-                        if not groupchat_control and \
-                        gajim.interface.minimized_controls.has_key(self.account) and \
-                        room_jid in gajim.interface.minimized_controls[self.account]:
+                        if room_jid in gajim.interface.minimized_controls[self.account]:
                                 groupchat_control = \
                                         gajim.interface.minimized_controls[self.account][room_jid]
+                        contact = \
+                                gajim.contacts.get_contact_with_highest_priority(self.account, \
+                                room_jid)
+                        if contact:
+                                gajim.interface.roster.draw_contact(room_jid, self.account)
                         groupchat_control.draw_contact(nick)
                         mw = gajim.interface.msg_win_mgr.get_window(room_jid, self.account)
@@ -904 +948 @@
         TYPE_ID = message_control.TYPE_CHAT
         old_msg_kind = None # last kind of the printed message
-        CHAT_CMDS = ['clear', 'compact', 'help', 'ping']
+        CHAT_CMDS = ['clear', 'compact', 'help', 'me', 'ping', 'say']
         
         def __init__(self, parent_win, contact, acct, resource = None):
@@ -916 +960 @@
                 self.handlers[id] = widget
 
-                hide_chat_buttons_always = gajim.config.get(
-                        'always_hide_chat_buttons')
-                self.chat_buttons_set_visible(hide_chat_buttons_always)
+                compact_view = gajim.config.get('compact_view')
+                self.chat_buttons_set_visible(compact_view)
                 self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
                         gajim.config.get('hide_chat_banner'))
-                # Initialize drag-n-drop
-                self.TARGET_TYPE_URI_LIST = 80
-                self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ) ]
-                id = self.widget.connect('drag_data_received',
-                        self._on_drag_data_received)
-                self.handlers[id] = self.widget
-                self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
-                        gtk.DEST_DEFAULT_HIGHLIGHT |
-                        gtk.DEST_DEFAULT_DROP,
-                        self.dnd_list, gtk.gdk.ACTION_COPY)
 
                 # keep timeout id and window obj for possible big avatar
@@ -1086 +1119 @@
 
                 banner_name_label = self.xml.get_widget('banner_name_label')
+                banner_eventbox = self.xml.get_widget('banner_eventbox')
+                
                 name = contact.get_shown_name()
                 if self.resource:
@@ -1112 +1147 @@
                 status = contact.status
                 if status is not None:
+                        self.status_tooltip.set_tip(banner_eventbox, status)
+                        self.status_tooltip.enable()
                         banner_name_label.set_ellipsize(pango.ELLIPSIZE_END)
-                        status = helpers.reduce_chars_newlines(status, max_lines = 2)
+                        status = helpers.reduce_chars_newlines(status, max_lines = 1)
                 status_escaped = gobject.markup_escape_text(status)
 
@@ -1122 +1159 @@
                         if contact.show == 'offline':
                                 chatstate = ''
-                        elif contact.composing_jep == 'JEP-0085':
+                        elif contact.composing_xep == 'XEP-0085':
                                 if st == 'all' or cs == 'composing':
                                         chatstate = helpers.get_uf_chatstate(cs)
                                 else:
                                         chatstate = ''
-                        elif contact.composing_jep == 'JEP-0022':
+                        elif contact.composing_xep == 'XEP-0022':
                                 if cs in ('composing', 'paused'):
                                         # only print composing, paused
@@ -1146 +1183 @@
                         label_text += '\n<span %s>%s</span>' %\
                                 (font_attrs_small, status_escaped)
-                        banner_eventbox = self.xml.get_widget('banner_eventbox')
-                        self.status_tooltip.set_tip(banner_eventbox, status)
-                        self.status_tooltip.enable()
                 else:
                         self.status_tooltip.disable()
@@ -1197 +1231 @@
                         message_array = []
 
+                if command == 'me':
+                        return False # This is not really a command
+
                 if command == 'help':
                         if len(message_array):
@@ -1205 +1242 @@
                         self.clear(self.msg_textview)
                         return True
-                elif command == 'ping' and not len(message_array):
-                        gajim.connections[self.account].sendPing(self.contact)
+                elif command == 'ping':
+                        if not len(message_array):
+                                gajim.connections[self.account].sendPing(self.contact)
+                        else:
+                                self.get_command_help(command)
                         self.clear(self.msg_textview)
+                        return True
+                elif command == 'say':
+                        return False
+                else:
+                        self.print_conversation(_('No such command: /%s (if you want to send '
+                                'this, prefix it with /say)') % command, 'info')
                         return True
                 return False
@@ -1216 +1262 @@
                                 'info')
                 elif command == 'clear':
-                        self.print_conversation(_('Usage: /%s, clears the text window.'),
-                                'info')
+                        self.print_conversation(_('Usage: /%s, clears the text window.') % \
+                                command, 'info')
                 elif command == 'compact':
-                        self.print_conversation(_('Usage: /%s, hide the chat buttons.'),
-                                'info')
+                        self.print_conversation(_('Usage: /%s, hide the chat buttons.') % \
+                                command, 'info')
+                elif command == 'me':
+                        self.print_conversation(_('Usage: /%s <action>, sends action to the '
+                                'current group chat. Use third person. (e.g. /%s explodes.)') % \
+                                (command, command), 'info')
                 elif command == 'ping':
-                        self.print_conversation(_(''), 'info')
+                        self.print_conversation(_('Usage: /%s, sends a ping to the contact') %\
+                                command, 'info')
+                elif command == 'say':
+                        self.print_conversation(_('Usage: /%s, send the message to the contact') %\
+                                command, 'info')
                 else:
                         self.print_conversation(_('No help info for /%s') % command, 'info')
@@ -1230 +1284 @@
                 if message in ('', None, '\n') or self._process_command(message):
                         return
+
+                # Do we need to process command for the message ?
+                process_command = True
+                if message.startswith('/say'):
+                        message = message[5:]
+                        process_command = False
 
                 # refresh timers
@@ -1245 +1305 @@
                 chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \
                         'disabled'
-                composing_jep = contact.composing_jep
+                composing_xep = contact.composing_xep
                 chatstate_to_send = None
                 if chatstates_on and contact is not None:
-                        if composing_jep is None:
+                        if composing_xep is None:
                                 # no info about peer
                                 # send active to discover chat state capabilities
@@ -1257 +1317 @@
                                 if contact.our_chatstate:
                                         # We already asked for xep 85, don't ask it twice
-                                        composing_jep = 'asked_once'
+                                        composing_xep = 'asked_once'
 
                                 chatstate_to_send = 'active'
@@ -1263 +1323 @@
                         # if peer supports jep85 and we are not 'ask', send 'active'
                         # NOTE: first active and 'ask' is set in gajim.py
-                        elif composing_jep is not False:
+                        elif composing_xep is not False:
                                 #send active chatstate on every message (as JEP says)
                                 chatstate_to_send = 'active'
@@ -1273 +1333 @@
                                 
                 if not ChatControlBase.send_message(self, message, keyID, type = 'chat',
-                chatstate = chatstate_to_send, composing_jep = composing_jep):
+                chatstate = chatstate_to_send, composing_xep = composing_xep,
+                process_command = process_command):
                         self.print_conversation(message, self.contact.jid,
                                 encrypted = encrypted)
@@ -1442 +1503 @@
                 num_unread = len(gajim.events.get_events(self.account, jid,
                         ['printed_' + self.type_id, self.type_id]))
-                # Set tab image (always 16x16); unread messages show the 'message' image
+                # Set tab image (always 16x16); unread messages show the 'event' image
                 tab_img = None
                 
                 if num_unread and gajim.config.get('show_unread_tab_icon'):
                         img_16 = gajim.interface.roster.get_appropriate_state_images(
-                                self.contact.jid, icon_name = 'message')
-                        tab_img = img_16['message']
+                                self.contact.jid, icon_name = 'event')
+                        tab_img = img_16['event']
                 else:
                         contact = gajim.contacts.get_contact_with_highest_priority(
@@ -1475 +1536 @@
                 add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
                 send_file_menuitem = xml.get_widget('send_file_menuitem')
-                compact_view_menuitem = xml.get_widget('compact_view_menuitem')
                 information_menuitem = xml.get_widget('information_menuitem')
                 
@@ -1494 +1554 @@
                 # 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 contact.resource and contact.jid.find('@') != -1:
+                if self.TYPE_ID == message_control.TYPE_PM and self.gc_contact.jid and \
+                self.gc_contact.resource:
                         send_file_menuitem.set_sensitive(True)
+                elif contact.resource and contact.jid.find('@') != -1:
+                        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)
                 
                 # add_to_roster_menuitem
@@ -1518 +1578 @@
                         self._on_send_file_menuitem_activate)
                 self.handlers[id] = send_file_menuitem 
-                id = compact_view_menuitem.connect('activate', 
-                        self._on_compact_view_menuitem_activate)
-                self.handlers[id] = compact_view_menuitem 
                 id = add_to_roster_menuitem.connect('activate', 
                         self._on_add_to_roster_menuitem_activate)
@@ -1566 +1623 @@
                         return
 
-                if contact.composing_jep is False: # jid cannot do jep85 nor jep22
+                if contact.composing_xep is False: # jid cannot do xep85 nor xep22
                         return
 
@@ -1574 +1631 @@
                         return
 
-                if contact.composing_jep is None:
+                if contact.composing_xep is None:
                         # we don't know anything about jid, so return
                         # NOTE:
@@ -1588 +1645 @@
                 # in JEP22, when we already sent stop composing
                 # notification on paused, don't resend it
-                if contact.composing_jep == 'JEP-0022' and \
+                if contact.composing_xep == 'XEP-0022' and \
                 contact.our_chatstate in ('paused', 'active', 'inactive') and \
                 state is not 'composing': # not composing == in (active, inactive, gone)
@@ -1610 +1667 @@
 
                 MessageControl.send_message(self, None, chatstate = state,
-                        msg_id = contact.msg_id, composing_jep = contact.composing_jep)
+                        msg_id = contact.msg_id, composing_xep = contact.composing_xep)
                 contact.our_chatstate = state
                 if contact.our_chatstate == 'active':
@@ -1639 +1696 @@
                 self.conv_textview.del_handlers()
                 self.msg_textview.destroy()
-                
 
         def allow_shutdown(self, method):
@@ -1646 +1702 @@
                         # 2 seconds
                         dialog = dialogs.ConfirmationDialog(
-                                #%s is being replaced in the code with JID
+                                # %s is being replaced in the code with JID
                                 _('You just received a new message from "%s"') % self.contact.jid,
                                 _('If you close this tab and you have history disabled, '\
                                 'this message will be lost.'))
                         if dialog.get_response() != gtk.RESPONSE_OK:
-                                return False #stop the propagation of the event
-                return True
+                                return 'no' # stop the propagation of the event
+                return 'yes'
 
         def handle_incoming_chatstate(self):
@@ -1711 +1767 @@
         def _on_drag_data_received(self, widget, context, x, y, selection,
                 target_type, timestamp):
-                # If not resource, we can't send file
-                if not self.contact.resource:
+                # If no resource is known, we can't send a file
+                if self.TYPE_ID == message_control.TYPE_PM:
+                        c = self.gc_contact
+                else:
+                        c = self.contact
+                if not c.resource:
                         return
                 if target_type == self.TARGET_TYPE_URI_LIST:
+                        if not selection.data:
+                                return
                         uri = selection.data.strip()
                         uri_splitted = uri.split() # we may have more than one file dropped
@@ -1721 +1783 @@
                                 if os.path.isfile(path): # is it file?
                                         ft = gajim.interface.instances['file_transfers']
-                                        ft.send_file(self.account, self.contact, path)
+                                        ft.send_file(self.account, c, path)
 
         def _on_message_tv_buffer_changed(self, textbuffer):
@@ -1834 +1896 @@
                         if (not show_transports and gajim.jid_is_transport(jid)) or \
                         (not show_offline and typ == 'chat' and \
-                        len(gajim.contacts.get_contact(self.account, jid)) < 2):
+                        len(gajim.contacts.get_contacts(self.account, jid)) < 2):
                                 gajim.interface.roster.really_remove_contact(self.contact,
                                         self.account)
@@ -1920 +1982 @@
 
         def _on_send_file_menuitem_activate(self, widget):
+                if self.TYPE_ID == message_control.TYPE_PM:
+                        c = self.gc_contact
+                else:
+                        c = self.contact
                 gajim.interface.instances['file_transfers'].show_file_send_request( 
-                        self.account, self.contact)
+                        self.account, c)
 
         def _on_add_to_roster_menuitem_activate(self, widget):