Changeset 9960

Timestamp:

07/19/08 19:36:21 (7 weeks ago)

Author:

steve-e

Message:

Improved groupchat minimization:

• partly rewrote join_room because it was hard to read
• Correctly handle invites from anonymous rooms. Fixes #4057
• Use HIG dialog for invitation requests
• Fix bug where minimized groupchats where hidden after a reconnect
• Removed some duplicated code

Location:

trunk

Files:

• data/glade/invitation_received_dialog.glade (deleted)
• src/dialogs.py (modified) (2 diffs)
• src/gajim.py (modified) (5 diffs)
• src/groupchat_control.py (modified) (1 diff)
• src/roster_window.py (modified) (10 diffs)

trunk/src/dialogs.py

@@ -2215 +2215 @@
 
         def set_cursor_to_end(self):
-                        end_iter = self.message_tv_buffer.get_end_iter()
-                        self.message_tv_buffer.place_cursor(end_iter)
+                end_iter = self.message_tv_buffer.get_end_iter()
+                self.message_tv_buffer.place_cursor(end_iter)
 
         def save_pos(self):
@@ -2921 +2921 @@
                 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')
-
+
+                pritext = _('''You are invited to a groupchat''')
                 #Don't translate $Contact
                 if is_continued:
-                        pritext = _('$Contact has invited you to join a discussion')
-                else:
-                        pritext = _('$Contact has invited you to group chat %(room_jid)s')\
+                        sectext = _('$Contact has invited you to join a discussion')
+                else:
+                        sectext = _('$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)
-                else:
-                        contact_text = contact_jid
-                pritext = pritext.replace('$Contact', contact_text)
-
-                label_text = '<big><b>%s</b></big>' % pritext
+                contact_text = contact and contact.name or contact_jid
+                sectext = sectext.replace('$Contact', contact_text)
 
                 if comment: # only if not None and not ''
                         comment = gobject.markup_escape_text(comment)
-                        sectext = _('Comment: %s') % comment
-                        label_text += '\n\n%s' % sectext
-
-                xml.get_widget('label').set_markup(label_text)
-
-                xml.get_widget('deny_button').connect('clicked',
-                        self.on_deny_button_clicked)
-                xml.get_widget('accept_button').connect('clicked',
-                        self.on_accept_button_clicked)
-                self.dialog.show_all()
-
-        def on_deny_button_clicked(self, widget):
-                self.dialog.destroy()
-
-        def on_accept_button_clicked(self, widget):
-                self.dialog.destroy()
-                try:
-                        if self.is_continued:
-                                gajim.interface.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
+                        comment = _('Comment: %s') % comment
+                        sectext += '\n\n%s' % comment
+                sectext += '\n\n' + _('Do you want to accept the invitation?')
+                
+                dialog = YesNoDialog(pritext, sectext)
+                if dialog.get_response() == gtk.RESPONSE_YES:
+                        try:
+                                if self.is_continued:
+                                        gajim.interface.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
 
 class ProgressDialog:

trunk/src/gajim.py

@@ -2129 +2129 @@
                 if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'):
                         w = self.msg_win_mgr.get_window(jid, account)
-                        if self.minimized_controls[account].has_key(jid):
-                                if not w:
-                                        ctrl = self.minimized_controls[account][jid]
-                                        w = self.msg_win_mgr.create_window(ctrl.contact, \
-                                                ctrl.account, ctrl.type_id)
+                        if jid in self.minimized_controls[account]:
                                 self.roster.on_groupchat_maximized(None, jid, account)
 
@@ -2474 +2470 @@
 
         def join_gc_room(self, account, room_jid, nick, password, minimize=False,
-                is_continued=False):
+        is_continued=False):
                 '''joins the room immediately'''
                 if not nick:
                         nick = gajim.nicks[account]
+
                 if self.msg_win_mgr.has_window(room_jid, account) and \
-                                gajim.gc_connected[account][room_jid]:
+                gajim.gc_connected[account][room_jid]:
                         gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
                         win = gc_ctrl.parent_win
@@ -2485 +2482 @@
                         dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid)
                         return
-                minimized_control_exists = False
-                if room_jid in gajim.interface.minimized_controls[account]:
-                        minimized_control_exists = True
+
                 invisible_show = gajim.SHOW_LIST.index('invisible')
                 if gajim.connections[account].connected == invisible_show:
@@ -2493 +2488 @@
                                 _('You cannot join a group chat while you are invisible'))
                         return
-                if minimize and not minimized_control_exists and \
+
+                minimized_control_exists = False
+                if room_jid in gajim.interface.minimized_controls[account]:
+                        minimized_control_exists = True
+
+                if not minimized_control_exists and \
                 not self.msg_win_mgr.has_window(room_jid, account):
-                        contact = gajim.contacts.create_contact(jid=room_jid, name=nick)
-                        gc_control = GroupchatControl(None, contact, account)
-                        self.minimized_controls[account][room_jid] = gc_control
-                        gajim.connections[account].join_gc(nick, room_jid, password)
-                        if password:
-                                gajim.gc_passwords[room_jid] = password
+                        # Join new groupchat
+                        if minimize:
+                                contact = gajim.contacts.create_contact(jid=room_jid, name=nick)
+                                gc_control = GroupchatControl(None, contact, account)
+                                gajim.interface.minimized_controls[account][room_jid] = gc_control
+                                self.roster.add_groupchat(room_jid, account)
+                        else:
+                                self.new_room(room_jid, nick, account, is_continued=is_continued)
+                elif not minimized_control_exists:
+                        # We are already in that groupchat
+                        gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
+                        gc_control.parent_win.set_active_tab(gc_control)        
+                else:
+                        # We are already in this groupchat and it is minimized
                         self.roster.add_groupchat(room_jid, account)
-                        return
-                if not minimized_control_exists and \
-                        not self.msg_win_mgr.has_window(room_jid, account):
-                        self.new_room(room_jid, nick, account, is_continued=is_continued)
-                if not minimized_control_exists:
-                        gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
-                        gc_control.parent_win.set_active_tab(gc_control)
+
+                # Connect
                 gajim.connections[account].join_gc(nick, room_jid, password)
                 if password:
                         gajim.gc_passwords[room_jid] = password
-                contact = gajim.contacts.get_contact_with_highest_priority(account, \
-                        room_jid)
-                if contact or minimized_control_exists:
-                        self.roster.add_groupchat(room_jid, account)
 
         def new_room(self, room_jid, nick, account, is_continued=False):
@@ -2822 +2821 @@
                                 # Only join non-opened groupchats. Opened one are already
                                 # auto-joined on re-connection
-                                if not gajim.gc_connected[account].has_key(jid):
+                                if not jid in gajim.gc_connected[account]:
                                         # we are not already connected
                                         minimize = bm['minimize'] in ('1', 'true')
                                         gajim.interface.join_gc_room(account, jid, bm['nick'],
                                         bm['password'], minimize = minimize)
+                                elif jid in self.minimized_controls[account]:
+                                        # more or less a hack:
+                                        # On disconnect the minimized gc contact instances 
+                                        # were set to offline. Reconnect them to show up in the roster.
+                                        self.roster.add_groupchat(jid, account)
 
         def add_gc_bookmark(self, account, name, jid, autojoin, minimize, password,

trunk/src/groupchat_control.py

@@ -1625 +1625 @@
                 ctrl.parent_win = None
 
-                gajim.interface.minimized_controls[self.account][self.contact.jid] = \
-                        ctrl
-
-                del win._controls[self.account][self.contact.jid]
-
                 gajim.interface.roster.add_groupchat(self.contact.jid, self.account,
                         status = self.subject)
+
+                del win._controls[self.account][self.contact.jid]
 
         def shutdown(self, status='offline'):

trunk/src/roster_window.py

@@ -706 +706 @@
                                 self._remove_entity(contact, account)
 
-
                         if backend:
                                 # Remove contact before redrawing, otherwise the old
@@ -731 +730 @@
                 '''
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
+                # Do not show gc if we are disconnected and minimize it
+                if gajim.account_is_connected(account):
+                        show = 'online'
+                else: 
+                        show = 'offline'
+                        status = ''
+
                 if contact is None:
-                        # Do not show gc if we are disconnected and minimize it
-                        if gajim.account_is_connected(account):
-                                show = 'online'
-                        else: 
-                                show = 'offline'
-                                status = ''
+                        # New groupchat
                         contact = gajim.contacts.create_contact(jid=jid, name=jid,
                                 groups=[_('Groupchats')], show=show, status=status, sub='none')
                         gajim.contacts.add_contact(account, contact)
+                        gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account)
+                        if gc_control:
+                                # there is a window that we can minimize
+                                gajim.interface.minimized_controls[account][jid] = gc_control
                         self.add_contact(jid, account)
                 else:
-                        contact.show = 'online'
+                        contact.show = show
+                        contact.status = status
                         self.draw_completely_and_show_if_needed(jid, account)
+
                 return contact
 
@@ -752 +759 @@
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
                 if contact.is_groupchat():
+                        if jid in gajim.interface.minimized_controls[account]:
+                                gajim.interface.minimized_controls[account][jid]
                         self.remove_contact(jid, account, force=True, backend=True)
                         return True
@@ -962 +971 @@
 
                 # gets number of unread gc marked messages
-                if jid in gajim.interface.minimized_controls[account]:
+                if jid in gajim.interface.minimized_controls[account] and \
+                gajim.interface.minimized_controls[account][jid]:
                         nb_unread = len(gajim.events.get_events(account, jid,
                                 ['printed_marked_gc_msg']))
@@ -1582 +1592 @@
                 return False
 
-        def auto_join_bookmarks(self, account):
-                '''autojoin bookmarks that have 'auto join' on for this account'''
-                for bm in gajim.connections[account].bookmarks:
-                        if bm['autojoin'] in ('1', 'true'):
-                                jid = bm['jid']
-                                if not gajim.gc_connected[account].has_key(jid) or\
-                                        not gajim.gc_connected[account][jid]:
-                                        # we are not already connected
-                                        minimize = bm['minimize'] in ('1', 'true')
-                                        gajim.interface.join_gc_room(account, jid, bm['nick'],
-                                        bm['password'], minimize = minimize)
-
         def on_event_removed(self, event_list):
                 '''Remove contacts on last events removed.
@@ -2652 +2650 @@
         def on_disconnect(self, widget, jid, account):
                 '''When disconnect menuitem is activated: disconect from room'''
-                ctrl = gajim.interface.minimized_controls[account][jid]
-                del gajim.interface.minimized_controls[account][jid]
-                ctrl.shutdown()
+                if jid in gajim.interface.minimized_controls[account]:
+                        ctrl = gajim.interface.minimized_controls[account][jid]
+                        ctrl.shutdown()
                 self.remove_groupchat(jid, account)
 
@@ -2723 +2721 @@
         def on_groupchat_maximized(self, widget, jid, account):
                 '''When a groupchat is maximised'''
+                if not jid in gajim.interface.minimized_controls[account]:
+                        return
                 ctrl = gajim.interface.minimized_controls[account][jid]
                 mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid,
@@ -2732 +2732 @@
                 mw.new_tab(ctrl)
                 mw.set_active_tab(ctrl)
-                del gajim.interface.minimized_controls[account][jid]
-
+                
                 self.remove_groupchat(jid, account)
 
@@ -3241 +3240 @@
                 jid = model[path][C_JID].decode('utf-8')
                 resource = None
-                contact = None
+                contact = gajim.contacts.get_first_contact_from_jid(account, jid)
                 titer = model.get_iter(path)
                 if type_ in ('group', 'account'):
@@ -3248 +3247 @@
                         else:
                                 self.tree.expand_row(path, False)
-                elif jid in gajim.interface.minimized_controls[account]:
-                        self.on_groupchat_maximized(None, jid, account)
+                elif contact.is_groupchat():
+                        first_ev = gajim.events.get_first_event(account, jid)
+                        if first_ev and self.open_event(account, jid, first_ev):
+                                # We are invited to a GC
+                                # open event cares about connecting to it
+                                self.remove_groupchat(jid, account)
+                        else:
+                                self.on_groupchat_maximized(None, jid, account)
                 else:
                         first_ev = gajim.events.get_first_event(account, jid)