Ticket #2072: gajim-singleclick.patch

src/roster_window.py

@@ -2883 +2883 @@
                 elif event.button == 1: # Left click
                         model = self.tree.get_model()
                         type_ = model[path][C_TYPE]
-                        if type_ == 'group' and x < 27:
-                                # first cell in 1st column (the arrow SINGLE clicked)
-                                if (self.tree.row_expanded(path)):
-                                        self.tree.collapse_row(path)
-                                else:
-                                        self.tree.expand_row(path, False)
-
-                        elif type_ == 'contact' and x < 27:
-                                account = model[path][C_ACCOUNT].decode('utf-8')
-                                jid = model[path][C_JID].decode('utf-8')
-                                # first cell in 1st column (the arrow SINGLE clicked)
-                                iters = self.get_contact_iter(jid, account)
-                                for iter in iters:
-                                        path = model.get_path(iter)
+                        if gajim.config.get('singleclick'):
+                                self.open_chatwindow(widget, path)
+                        else:
+                                if type_ == 'group' and x < 27:
+                                        # first cell in 1st column (the arrow SINGLE clicked)
                                         if (self.tree.row_expanded(path)):
                                                 self.tree.collapse_row(path)
                                         else:
                                                 self.tree.expand_row(path, False)
+        
+                                elif type_ == 'contact' and x < 27:
+                                        account = model[path][C_ACCOUNT].decode('utf-8')
+                                        jid = model[path][C_JID].decode('utf-8')
+                                        # first cell in 1st column (the arrow SINGLE clicked)
+                                        iters = self.get_contact_iter(jid, account)
+                                        for iter in iters:
+                                                path = model.get_path(iter)
+                                                if (self.tree.row_expanded(path)):
+                                                        self.tree.collapse_row(path)
+                                                else:
+                                                        self.tree.expand_row(path, False)
 
         def on_req_usub(self, widget, list_):
                 '''Remove a contact. list_ is a list of (contact, account) tuples'''
@@ -3785 +3788 @@
 
                 win.window.present()
 
-        def on_roster_treeview_row_activated(self, widget, path, col = 0):
-                '''When an iter is double clicked: open the first event window'''
+        def open_chatwindow(self, widget, path):
+                '''open a chatwindow'''
                 model = self.tree.get_model()
                 account = model[path][C_ACCOUNT].decode('utf-8')
                 type_ = model[path][C_TYPE]
@@ -3830 +3833 @@
                                 resource = c.resource
                         self.on_open_chat_window(widget, c, account, resource = resource)
 
+        def on_roster_treeview_row_activated(self, widget, path, col = 0):
+                '''When an iter is double clicked: open the first event window'''
+                if not gajim.config.get('singleclick'):
+                        self.open_chatwindow(widget, path)
+
         def on_roster_treeview_row_expanded(self, widget, iter, path):
                 '''When a row is expanded change the icon of the arrow'''
                 model = self.tree.get_model()

src/groupchat_control.py

@@ -1757 +1757 @@
                 win.set_active_tab(nick_jid, self.account)
                 win.window.present()
 
-        def on_list_treeview_row_activated(self, widget, path, col = 0):
-                '''When an iter is double clicked: open the chat window'''
+        def open_chatwindow(self, widget, path):
+                '''open a chat window'''
                 model = widget.get_model()
                 if len(path) == 1: # It's a group
                         if (widget.row_expanded(path)):
@@ -1768 +1768 @@
                 else: # We want to send a private message
                         nick = model[path][C_NICK].decode('utf-8')
                         self._start_private_message(nick)
+                        
+        def on_list_treeview_row_activated(self, widget, path, col = 0):
+                '''When an iter is double clicked: open the chat window'''
+                if not gajim.config.get('singleclick'):
+                        self.open_chatwindow(widget, path)
 
         def on_list_treeview_button_press_event(self, widget, event):
                 '''popup user's group's or agent menu'''
@@ -1808 +1813 @@
                                 widget.get_selection().unselect_all()
                                 return
 
-                        model = widget.get_model()
-                        iter = model.get_iter(path)
-                        nick = model[iter][C_NICK].decode('utf-8')
-                        if not nick in gajim.contacts.get_nick_list(self.account,
-                        self.room_jid):
-                                #it's a group
-                                col = widget.get_column(0)
-                                avatar_cell = col.get_cell_renderers()[0]
-                                (pos, avatar_size) = col.cell_get_position(avatar_cell)
-                                status_cell = col.get_cell_renderers()[1]
-                                (pos, status_size) = col.cell_get_position(status_cell)
-                                if x > avatar_size and x < avatar_size + status_size:
-                                        if (widget.row_expanded(path)):
-                                                widget.collapse_row(path)
-                                        else:
-                                                widget.expand_row(path, False)
-                        elif event.state & gtk.gdk.SHIFT_MASK:
-                                self.append_nick_in_msg_textview(self.msg_textview, nick)
-                                self.msg_textview.grab_focus()
+                        if gajim.config.get('singleclick'):
+                                self.open_chatwindow(widget, path)                      
                                 return True
+                        else:
+                                model = widget.get_model()
+                                iter = model.get_iter(path)
+                                nick = model[iter][C_NICK].decode('utf-8')
+                                if not nick in gajim.contacts.get_nick_list(self.account,
+                                self.room_jid):
+                                        #it's a group
+                                        col = widget.get_column(0)
+                                        avatar_cell = col.get_cell_renderers()[0]
+                                        (pos, avatar_size) = col.cell_get_position(avatar_cell)
+                                        status_cell = col.get_cell_renderers()[1]
+                                        (pos, status_size) = col.cell_get_position(status_cell)
+                                        if x > avatar_size and x < avatar_size + status_size:
+                                                if (widget.row_expanded(path)):
+                                                        widget.collapse_row(path)
+                                                else:
+                                                        widget.expand_row(path, False)
+                                elif event.state & gtk.gdk.SHIFT_MASK:
+                                        self.append_nick_in_msg_textview(self.msg_textview, nick)
+                                        self.msg_textview.grab_focus()
+                                        return True
 
         def append_nick_in_msg_textview(self, widget, nick):
                 message_buffer = self.msg_textview.get_buffer()

src/common/config.py

@@ -226 +226 @@
                 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')],
                 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')],
                 'use_latex': [opt_bool, False, _('If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window.')],
+                'singleclick':[opt_bool, False, _('If True, Gajim will open Windows on singleclick instead of a doubleclick')],
         }
 
         __options_per_key = {