Changeset cc37110c28b330da46dc5136468afb1e18701df3

Timestamp:

01/30/11 01:53:44 (2 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

061584b90a59d08011ad2a0f88f1be2b160acf6a

Children:

1335dccb9e3311971ba63b63980147343be6b457

git-committer:

Armin Burgmeier <armin@arbur.net> / 2011-01-30T01:53:44Z+0100

Message:

Jump to a user's cursor when double-clicking it in the user list

2011-01-29 Armin Burgmeier <armin@…>

• code/core/textsessionuserview.hpp:
• code/core/textsessionuserview.cpp:
• code/core/Makefile.am: Add the InfTextSessionUserView? class which handles scrolling to a remote user's cursor when double-clicking it in the user list.

• code/core/userlist.hpp:
• code/core/userlist.cpp: Add the user_activated signal.

• code/core/folder.cpp: Create a TextSessionUserView? for text sessions.

Files:

• ChangeLog (modified) (1 diff)
• code/core/Makefile.am (modified) (2 diffs)
• code/core/folder.cpp (modified) (2 diffs)
• code/core/textsessionuserview.cpp (added)
• code/core/textsessionuserview.hpp (added)
• code/core/userlist.cpp (modified) (2 diffs)
• code/core/userlist.hpp (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2011-01-29  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/textsessionuserview.hpp:
+        * code/core/textsessionuserview.cpp:
+        * code/core/Makefile.am: Add the InfTextSessionUserView class which
+        handles scrolling to a remote user's cursor when double-clicking it in
+        the user list.
+
+        * code/core/userlist.hpp:
+        * code/core/userlist.cpp: Add the user_activated signal.
+
+        * code/core/folder.cpp: Create a TextSessionUserView for text
+        sessions.
+
 2011-01-29  Armin Burgmeier  <armin@arbur.net>
 

code/core/Makefile.am

@@ -19 +19 @@
         statusbar.cpp \
         tablabel.cpp \
+        textsessionuserview.cpp \
         textsessionview.cpp \
         textundogrouping.cpp \
@@ -43 +44 @@
         statusbar.hpp \
         tablabel.hpp \
+        textsessionuserview.hpp \
         textsessionview.hpp \
         textundogrouping.hpp \

code/core/folder.cpp

@@ -18 +18 @@
 
 #include "core/folder.hpp"
+#include "core/textsessionuserview.hpp"
 #include "core/sessionuserview.hpp"
 #include "core/chattablabel.hpp"
@@ -134 +135 @@
         m_signal_document_added.emit(*view);
 
-        SessionUserView* userview = Gtk::manage(
-                new SessionUserView(
+        TextSessionUserView* userview = Gtk::manage(
+                new TextSessionUserView(
                         *view, true,
                         m_preferences.appearance.show_document_userlist,

code/core/userlist.cpp

@@ -123 +123 @@
                 sigc::mem_fun(*this, &UserList::name_cell_data_func));
 
+        m_view.signal_row_activated().connect(
+                sigc::mem_fun(*this, &UserList::on_row_activated));
+
         column->set_spacing(6);
         m_view.append_column(*column);
@@ -333 +336 @@
 }
 
+void Gobby::UserList::on_row_activated(const Gtk::TreePath& path,
+                                       Gtk::TreeViewColumn* column)
+{
+        Gtk::TreePath parent_path;
+        if(m_filter_model)
+                parent_path = m_filter_model->convert_path_to_child_path(path);
+        else
+                parent_path = path;
+
+        const Gtk::TreeIter& iter = m_store->get_iter(path);
+        InfUser* user = (*iter)[m_columns.user];
+
+        if(inf_user_get_status(user) != INF_USER_UNAVAILABLE)
+                m_signal_user_activated.emit(user);
+}
+
 Gtk::TreeIter Gobby::UserList::find_user_iter(InfUser* user)
 {

code/core/userlist.hpp

@@ -33 +33 @@
         {
         public:
+                typedef sigc::signal<void, InfUser*> SignalUserActivated;
+
                 UserList(InfUserTable* table);
                 ~UserList();
@@ -38 +40 @@
                 void set_show_disconnected(bool show_disconnected);
 
+                SignalUserActivated signal_user_activated() const
+                {
+                        return m_signal_user_activated;
+                }
+                
         protected:
                 InfUserTable* m_table;
@@ -96 +103 @@
                 void on_notify_hue(InfTextUser* user);
 
+                //void on_select_func(const Gtk::TreeIter& iter);
+                void on_row_activated(const Gtk::TreePath& path,
+                                      Gtk::TreeViewColumn* column);
+
                 Gtk::TreeIter find_user_iter(InfUser* user);
 
@@ -104 +115 @@
 
                 gulong m_add_user_handle;
+
+                SignalUserActivated m_signal_user_activated;
         };
 }