Ticket #1041: gajim-message-mode.4.patch

src/config.py

@@ -71 +71 @@
                 self.notebook = self.xml.get_widget('preferences_notebook')
                 self.treat_incoming_messages_combobox =\
                         self.xml.get_widget('treat_incoming_messages_combobox')
+                self.default_message_type_combobox =\
+                        self.xml.get_widget('default_message_type_combobox')
                 self.one_window_type_combobox =\
                         self.xml.get_widget('one_window_type_combobox')
                 self.iconset_combobox = self.xml.get_widget('iconset_combobox')
@@ -140 +142 @@
                 else:
                         self.treat_incoming_messages_combobox.set_active(0)
 
+                # Set default for send outgoing messages
+                choices = common.config.opt_default_message_type
+                type = gajim.config.get('default_message_type')
+                if type in choices:
+                        self.default_message_type_combobox.set_active(choices.index(type))
+                else:
+                        self.default_message_type_combobox.set_active(0)
+
                 # Set default for single window type
                 choices = common.config.opt_one_window_types
                 type = gajim.config.get('one_message_window')
@@ -574 +584 @@
                 config_type = common.config.opt_treat_incoming_messages[active]
                 gajim.config.set('treat_incoming_messages', config_type)
 
+        def on_default_message_type_combobox_changed(self, widget):
+                active = widget.get_active()
+                config_type = common.config.opt_default_message_type[active]
+                gajim.config.set('default_message_type', config_type)
+
         def on_one_window_type_combo_changed(self, widget):
                 active = widget.get_active()
                 config_type = common.config.opt_one_window_types[active]

src/roster_window.py

@@ -1969 +1969 @@
                         self.draw_account(account)
 
         def on_send_single_message_menuitem_activate(self, widget, account,
-        contact = None):
+        contact=None, resource=None):
                 if contact is None:
                         dialogs.SingleMessageWindow(account, action = 'send')
                 elif type(contact) == type([]):
                         dialogs.SingleMessageWindow(account, contact, 'send')
                 else:
                         jid = contact.jid
-                        if contact.jid == gajim.get_jid_from_account(account):
+                        if resource:
+                                jid += '/' + resource
+                        elif contact.jid == gajim.get_jid_from_account(account):
                                 jid += '/' + contact.resource
                         dialogs.SingleMessageWindow(account, jid, 'send')
 
@@ -4350 +4352 @@
                                         else:
                                                 child_iter = model.iter_next(child_iter)
                         session = None
+                        chat_messages_waiting = False
                         if first_ev:
                                 if first_ev.type_ in ('chat', 'normal'):
                                         session = first_ev.parameters[8]
@@ -4358 +4361 @@
                                         fjid += '/' + resource
                                 if self.open_event(account, fjid, first_ev):
                                         return
+                                elif first_ev.type_ == 'chat':
+                                        chat_messages_waiting = True
                         c = gajim.contacts.get_contact(account, jid, resource)
                         if not c or isinstance(c, list):
                                 c = gajim.contacts.get_contact_with_highest_priority(account, jid)
                         if jid == gajim.get_jid_from_account(account):
                                 resource = c.resource
-                        self.on_open_chat_window(widget, c, account, resource = resource, session = session)
+                        default_message_type = gajim.config.get('default_message_type')
+                        if default_message_type == 'normal' and not chat_messages_waiting:
+                                self.on_send_single_message_menuitem_activate(widget, account, c, resource = resource)
+                        else:
+                                self.on_open_chat_window(widget, c, account, resource = resource, session = session)
 
         def on_roster_treeview_row_activated(self, widget, path, col = 0):
                 '''When an iter is double clicked: open the first event window'''

src/dialogs.py

@@ -1832 +1832 @@
         # Keep a reference on windows so garbage collector don't restroy them
         instances = []
         def __init__(self, account, to='', action='', from_whom='', subject='',
-        message='', resource='', session=None, form_node=None):
+        message='', resource='', session=None, form_node=None, encrypted=None):
                 self.instances.append(self)
                 self.account = account
                 self.action = action
@@ -1844 +1844 @@
                 self.resource = resource
                 self.session = session
 
+                if encrypted is None:
+                        jid = to # cannot use self.get_contact(), as self.to_entry does not exist yet
+                        contact = None
+                        if '@' in jid:
+                                if '/' in jid:
+                                        jid, resource = jid.split('/', 1)
+                                else:
+                                        resource = self.resource
+                                contact = gajim.contacts.get_contact(self.account, jid, resource)
+                        if contact: # only load if we have a valid contact
+                                encrypted = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled')
+                                if encrypted is None:
+                                        encrypted = False
+                self.encrypted = encrypted
+                self.next_count = 0
+
                 self.xml = gtkgui_helpers.get_glade('single_message_window.glade')
                 self.window = self.xml.get_widget('single_message_window')
                 self.count_chars_label = self.xml.get_widget('count_chars_label')
                 self.from_label = self.xml.get_widget('from_label')
                 self.from_entry = self.xml.get_widget('from_entry')
+                self.from_status_image = self.xml.get_widget('from_status_image')
+                self.from_name = self.xml.get_widget('from_name')
                 self.to_label = self.xml.get_widget('to_label')
                 self.to_entry = self.xml.get_widget('to_entry')
+                self.to_status_image = self.xml.get_widget('to_status_image')
+                self.to_name = self.xml.get_widget('to_name')
                 self.subject_entry = self.xml.get_widget('subject_entry')
                 self.message_scrolledwindow = self.xml.get_widget(
                         'message_scrolledwindow')
@@ -1876 +1896 @@
                                 parent_box.child_get_property(self.xml.get_widget('conversation_scrolledwindow'), 'position'))
                         self.action = 'form'
 
+                self.gpg_togglebutton = self.xml.get_widget('gpg_togglebutton')
+                self.gpg_togglebutton_separator = self.xml.get_widget('gpg_togglebutton_separator')
                 self.send_button = self.xml.get_widget('send_button')
+                self.quote_button = self.xml.get_widget('quote_button')
                 self.reply_button = self.xml.get_widget('reply_button')
+                self.next_button = self.xml.get_widget('next_button')
+                self.next_count_label = self.xml.get_widget('next_count_label')
                 self.send_and_close_button = self.xml.get_widget('send_and_close_button')
                 self.cancel_button = self.xml.get_widget('cancel_button')
                 self.close_button = self.xml.get_widget('close_button')
@@ -1902 +1927 @@
 
                 self.prepare_widgets_for(self.action)
 
+                gajim.events.event_added_subscribe(self.on_event_added)
+                gajim.events.event_removed_subscribe(self.on_event_removed)
+                if self.action == 'receive':
+                        self.update_next_count()
+
                 # set_text(None) raises TypeError exception
                 if self.subject is None:
                         self.subject = ''
@@ -1924 +1954 @@
 
                 if gajim.config.get('saveposition'):
                         # get window position and size from config
-                        gtkgui_helpers.move_window(self.window,
-                                gajim.config.get('single-msg-x-position'),
-                                gajim.config.get('single-msg-y-position'))
+                        # Makes absolutely no sense when dealing with multiple windows
+                        # (for example when hitting "reply" the orig window stays)
+                        #gtkgui_helpers.move_window(self.window,
+                        #       gajim.config.get('single-msg-x-position'),
+                        #       gajim.config.get('single-msg-y-position'))
                         gtkgui_helpers.resize_window(self.window,
                                 gajim.config.get('single-msg-width'),
                                 gajim.config.get('single-msg-height'))
@@ -1968 +2000 @@
                         self.send_and_close_button.show()
                         self.to_label.show()
                         self.to_entry.show()
+                        self.to_status_image.show()
+                        self.to_name.show()
                         self.reply_button.hide()
+                        self.quote_button.hide()
+                        self.next_button.hide()
                         self.from_label.hide()
                         self.from_entry.hide()
+                        self.from_status_image.hide()
+                        self.from_name.hide()
                         self.conversation_scrolledwindow.hide()
                         self.message_scrolledwindow.show()
+                        self.gpg_togglebutton.show()
+                        if type(self.to) == type([]):
+                                self.gpg_togglebutton.set_property('sensitive', False)
+                                self.gpg_togglebutton.set_active(False)
+                        else:
+                                self.gpg_togglebutton.set_property('sensitive', True)
+                                self.gpg_togglebutton.set_active(self.encrypted)
+                        self.gpg_togglebutton_separator.show()
 
                         if self.message: # we come from a reply?
                                 self.message_textview.grab_focus()
@@ -1983 +2029 @@
                         else: # we write a new message (not from reply)
                                 self.close_button.hide()
                                 if self.to: # do we already have jid?
-                                        self.subject_entry.grab_focus()
+                                        # Most of the time users skip the subject
+                                        #self.subject_entry.grab_focus()
+                                        self.message_textview.grab_focus()
+                                else:
+                                        self.to_entry.grab_focus()
+                        self.update_to_information()
 
                 elif action == 'receive': # prepare UI for Receiving
                         title = _('Received %s') % title
                         self.reply_button.show()
+                        self.quote_button.show()
+                        self.next_button.show()
                         self.from_label.show()
                         self.from_entry.show()
+                        self.from_status_image.show()
+                        self.from_name.show()
                         self.send_button.hide()
                         self.send_and_close_button.hide()
                         self.to_label.hide()
                         self.to_entry.hide()
+                        self.to_status_image.hide()
+                        self.to_name.hide()
                         self.conversation_scrolledwindow.show()
                         self.message_scrolledwindow.hide()
+                        self.gpg_togglebutton.show()
+                        self.gpg_togglebutton.set_active(self.encrypted)
+                        self.gpg_togglebutton_separator.show()
 
                         if self.message:
                                 self.conversation_textview.print_real_text(self.message)
@@ -2008 +2068 @@
                         self.reply_button.grab_focus()
                         self.cancel_button.hide()
                         self.close_button.show()
+                        self.update_from_information()
+                        
                 elif action == 'form': # prepare UI for Receiving
                         title = _('Form %s') % title 
                         self.send_button.show() 
                         self.send_and_close_button.show() 
                         self.to_label.show() 
                         self.to_entry.show() 
+                        self.to_status_image.show()
+                        self.to_name.show()
                         self.reply_button.hide() 
                         self.from_label.hide() 
                         self.from_entry.hide() 
+                        self.from_status_image.hide()
+                        self.from_name.hide()
                         self.conversation_scrolledwindow.hide() 
                         self.message_scrolledwindow.hide() 
+                        self.gpg_togglebutton.hide()
+                        self.gpg_togglebutton_separator.hide()
+                        self.update_to_information()
 
                 self.window.set_title(title)
 
+        def on_to_entry_changed(self, widget):
+                self.update_to_information()
+
+        def update_to_information(self):
+                jid, resource, contact = self.get_jid_resource_and_contact()
+                if contact:
+                        if contact.keyID:
+                                self.gpg_togglebutton.set_property('sensitive', True)
+                        else:
+                                self.gpg_togglebutton.set_property('sensitive', False)
+                        self.to_status_image.show()
+                        roster = gajim.interface.roster
+                        show = contact.show
+                        img = roster.get_appropriate_state_images(jid, icon_name=show)
+                        status_image = img[show]
+                        if status_image.get_storage_type() == gtk.IMAGE_ANIMATION:
+                                self.to_status_image.set_from_animation(status_image.get_animation())
+                        else:
+                                pix = status_image.get_pixbuf()
+                                if pix is not None:
+                                        self.to_status_image.set_from_pixbuf(pix)
+                        self.to_name.show()
+                        self.to_name.set_text(contact.get_shown_name())
+                else:
+                        self.to_status_image.hide()
+                        self.to_name.hide()
+
+        def update_from_information(self):
+                jid = self.from_whom
+                contact = None
+                if '@' in jid:
+                        if '/' in jid:
+                                jid, resource = jid.split('/', 1)
+                        else:
+                                resource = self.resource
+                        contact = gajim.contacts.get_contact(self.account, jid, resource)
+                if contact:
+                        self.from_status_image.show()
+                        roster = gajim.interface.roster
+                        show = contact.show
+                        img = roster.get_appropriate_state_images(jid, icon_name=show)
+                        status_image = img[show]
+                        if status_image.get_storage_type() == gtk.IMAGE_ANIMATION:
+                                self.from_status_image.set_from_animation(status_image.get_animation())
+                        else:
+                                pix = status_image.get_pixbuf()
+                                if pix is not None:
+                                        self.from_status_image.set_from_pixbuf(pix)
+                        self.from_name.show()
+                        self.from_name.set_text(contact.get_shown_name())
+                else:
+                        self.from_status_image.hide()
+                        self.from_name.hide()
+
+        def on_actions_button_clicked(self, widget):
+                '''popup action menu'''
+                menu = self.prepare_context_menu()
+                menu.show_all()
+                gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.window.window)
+
+        def get_jid_and_resource(self):
+                if self.action == 'receive':
+                        jid = self.from_whom
+                elif self.action == 'send':
+                        jid = self.to_entry.get_text()
+                else:
+                        jid = self.to
+                if '/' in jid:
+                        jid, resource = jid.split('/', 1)
+                else:
+                        resource = self.resource
+                return jid, resource
+
+        def get_contact(self):
+                jid, resource = self.get_jid_and_resource()
+                if '@' in jid:
+                        return gajim.contacts.get_contact(self.account, jid, self.resource)
+                else:
+                        return None
+
+        def get_jid_resource_and_contact(self):
+                jid, resource = self.get_jid_and_resource()
+                if '@' in jid:
+                        return jid, resource, gajim.contacts.get_contact(self.account, jid, self.resource)
+                else:
+                        return jid, resource, None
+
+        def prepare_context_menu(self):
+                '''sets compact view menuitem active state
+                sets active and sensitivity state for toggle_gpg_menuitem
+                sets sensitivity for history_menuitem (False for transports)
+                and file_transfer_menuitem
+                and hide()/show() for add_to_roster_menuitem
+                '''
+                xml = gtkgui_helpers.get_glade('chat_control_popup_menu.glade')
+                menu = xml.get_widget('chat_control_popup_menu')
+
+                history_menuitem = xml.get_widget('history_menuitem')
+                toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem')
+                toggle_e2e_menuitem = xml.get_widget('toggle_e2e_menuitem')
+                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')
+                muc_icon = gajim.interface.roster.load_icon('muc_active')
+                if muc_icon:
+                        convert_to_gc_menuitem.set_image(muc_icon) 
+
+                jid, resource, contact = self.get_jid_resource_and_contact()
+
+                # check if gpg capabitlies or else make gpg toggle insensitive
+                gpg_btn = self.gpg_togglebutton
+                isactive = gpg_btn.get_active()
+                is_sensitive = gpg_btn.get_property('sensitive')
+                toggle_gpg_menuitem.set_active(isactive)
+                toggle_gpg_menuitem.set_property('sensitive', is_sensitive)
+
+                # TODO: support this, if possible
+                toggle_e2e_menuitem.set_sensitive(False)
+
+                # 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 jid and resource:
+                        send_file_menuitem.set_sensitive(True)
+                elif contact and contact.resource and contact.jid.find('@') != -1:
+                        send_file_menuitem.set_sensitive(True)
+                else:
+                        send_file_menuitem.set_sensitive(False)
+
+                # check if it's possible to convert to groupchat
+                if gajim.get_transport_name_from_jid(jid) or \
+                gajim.connections[self.account].is_zeroconf:
+                        convert_to_gc_menuitem.set_sensitive(False)
+
+                # add_to_roster_menuitem
+                if contact and _('Not in Roster') in contact.groups:
+                        add_to_roster_menuitem.show()
+                        add_to_roster_menuitem.set_no_show_all(False)
+                else:
+                        add_to_roster_menuitem.hide()
+                        add_to_roster_menuitem.set_no_show_all(True)
+
+                # connect signals
+                history_menuitem.connect('activate', 
+                        self.on_history_menuitem_activate)
+                send_file_menuitem.connect('activate', 
+                        self.on_send_file_menuitem_activate)
+                add_to_roster_menuitem.connect('activate', 
+                        self.on_add_to_roster_menuitem_activate)
+                toggle_gpg_menuitem.connect('activate', 
+                        self.on_toggle_gpg_menuitem_activate)
+                #toggle_e2e_menuitem.connect('activate', 
+                #       self.on_toggle_e2e_menuitem_activate)
+                information_menuitem.connect('activate', 
+                        self.on_contact_information_menuitem_activate)
+                convert_to_gc_menuitem.connect('activate',
+                        self.on_convert_to_gc_menuitem_activate)
+                menu.connect('selection-done', self.destroy_menu)
+                return menu
+
+        def destroy_menu(self, menu):
+                # destroy menu
+                menu.destroy()
+
+        def on_history_menuitem_activate(self, widget):
+                '''When history menuitem is pressed: call history window'''
+                import history_window
+                jid, resource = self.get_jid_and_resource()
+
+                if gajim.interface.instances.has_key('logs'):
+                        gajim.interface.instances['logs'].window.present()
+                        gajim.interface.instances['logs'].open_history(jid, self.account)
+                else:
+                        gajim.interface.instances['logs'] = \
+                                history_window.HistoryWindow(jid, self.account)
+
+        def on_send_file_menuitem_activate(self, widget):
+                contact = self.get_contact()
+                if contact:
+                        gajim.interface.instances['file_transfers'].show_file_send_request( 
+                                self.account, contact)
+
+        def on_add_to_roster_menuitem_activate(self, widget):
+                jid, resource = self.get_jid_and_resource()
+                AddNewContactWindow(self.account, jid)
+
+        def on_toggle_gpg_menuitem_activate(self, widget):
+                if self.gpg_togglebutton.get_active():
+                        self.gpg_togglebutton.set_active(False)
+                else:
+                        self.gpg_togglebutton.set_active(True)
+                self.gpg_togglebutton.toggled()
+
+        def on_gpg_togglebutton_toggled(self, widget):
+                self.encrypted = self.gpg_togglebutton.get_active()
+                contact = self.get_contact()
+                if contact: # only save if we have a valid contact
+                        gajim.config.set_per('contacts', contact.jid, 'gpg_enabled',
+                                self.encrypted)
+
+        def on_contact_information_menuitem_activate(self, widget):
+                contact = self.get_contact()
+                if contact:
+                        gajim.interface.roster.on_info(widget, contact, self.account)
+
+        def on_convert_to_gc_menuitem_activate(self, widget):
+                '''user want to invite some friends to chat'''
+                jid, resource = self.get_jid_and_resource()
+                TransformChatToMUC(self.account, [jid])
+
+        def on_single_message_window_destroy(self, widget):
+                gajim.events.event_added_unsubscribe(self.on_event_added)
+                gajim.events.event_removed_unsubscribe(self.on_event_removed)
+
+        def update_next_count(self):
+                # gajim.get_jid_without_resource(self.from_jid)?
+                self.next_count = len(gajim.events.get_events(self.account, \
+                        self.from_whom, types=('normal',)))
+                self.next_count_label.set_label("(%d)" % self.next_count)
+                if self.next_count == 0:
+                        self.next_button.set_property('sensitive', False)
+                else:
+                        self.next_button.set_property('sensitive', True)
+
+        def on_event_added(self, event):
+                if event.type_ == 'normal':
+                        self.update_next_count()
+
+        def on_event_removed(self, event_list):
+                for event in event_list:
+                        if event.type_ == 'normal':
+                                self.update_next_count()
+                                return
+
+        def on_next_button_clicked(self, widget):
+                if self.next_count == 0:
+                        return
+                next_event = gajim.events.get_first_event(self.account, self.from_whom, 'normal')
+                #if not next_event:
+                #       next_event = gajim.events.get_first_event(self.account, self.from_whom, 'chat')
+                if not next_event:
+                        return
+                # parameters:
+                # message, subject, kind, time, encrypted, resource,
+                # msg_id
+                self.action = 'receive'
+                self.subject = next_event.parameters[1]
+                self.message = next_event.parameters[0]
+                self.resource = next_event.parameters[5]
+                self.session = next_event.parameters[8]
+                form_node = next_event.parameters[9]
+                
+                parent_box = self.xml.get_widget('conversation_scrolledwindow').get_parent()
+                if form_node:
+                        dataform = dataforms.ExtendForm(node = form_node)
+                        self.form_widget = dataforms_widget.DataFormWidget(dataform)
+                        self.form_widget.show_all()
+                        parent_box.add(self.form_widget)
+                        parent_box.child_set_property(self.form_widget, 'position',
+                                parent_box.child_get_property(self.xml.get_widget('conversation_scrolledwindow'), 'position'))
+                        self.action = 'form'
+                elif self.form_widget:
+                        self.form_widget.hide()
+                        parent_box.remove(self.form_widget)
+                        self.form_widget = None
+
+                self.conversation_textview.clear()
+                self.prepare_widgets_for(self.action)
+
+                # set_text(None) raises TypeError exception
+                if self.subject is None:
+                        self.subject = ''
+                self.subject_entry.set_text(self.subject)
+
+                gajim.interface.remove_first_event(self.account, self.from_whom, next_event.type_)
+                self.update_next_count()
+
         def on_cancel_button_clicked(self, widget):
                 self.save_pos()
                 self.window.destroy()
@@ -2066 +2412 @@
                                 form_node = self.form_widget.data_form
                         else:
                                 form_node = None
-                        # FIXME: allow GPG message some day
+                        keyID = None
+                        if self.encrypted:
+                                contact = self.get_contact()
+                                keyID = contact.keyID
                         gajim.connections[self.account].send_message(to_whom_jid, message,
-                                keyID=None, type='normal', subject=subject, session=session,
+                                keyID=keyID, type='normal', subject=subject, session=session,
                                 form_node=form_node)
 
                 self.subject_entry.set_text('') # we sent ok, clear the subject
@@ -2076 +2425 @@
 
       &nbs