Changeset a73b5e04f5607f8f2e71a141419a1e76be0747d9

Timestamp:

01/06/07 23:52:22 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

1be24ded71c2b8ec47770d9f242a47fb92b9bc62

Children:

f94f43663a2895417594b24a3aa3dcecf6d2e7ac

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:52:22Z+0000

Message:

[project @ Userlist using TreeView?; currently disfunctional!]

Original author: Armin Burgmeier <armin@…>
Date: 2005-11-07 20:34:58+00:00

Files:

• inc/userlist.hpp (modified) (3 diffs)
• src/userlist.cpp (modified) (6 diffs)
• src/window.cpp (modified) (1 diff)

inc/userlist.hpp

@@ -22 +22 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
+#include <gtkmm/treestore.h>
 #include <obby/user.hpp>
-#include <obby/local_document_info.hpp>
 #include <obby/local_buffer.hpp>
-#include "folder.hpp"
+#include "header.hpp"
 
 namespace Gobby
@@ -42 +41 @@
                 ~Columns();
 
-                Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > colour;
-                Gtk::TreeModelColumn<Glib::ustring> name;
-                Gtk::TreeModelColumn<bool> connected;
-                Gtk::TreeModelColumn<bool> subscribed;
+                Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > icon;
+                Gtk::TreeModelColumn<Glib::ustring> text;
+                // TODO: Column with pointer that holds reference to obby::user.
         };
 
-        UserList(Header& header, const Folder& folder);
+        UserList(Header& header);
         ~UserList();
 
@@ -63 +61 @@
         virtual void obby_document_remove(obby::local_document_info& document);
 protected:
-        /** Signal handlers
-         */
-        void on_folder_tab_switched(Document& document);
-        void on_user_subscribe(const obby::user& user,
-                               obby::local_document_info& info);
-        void on_user_unsubscribe(const obby::user& user,
-                                 obby::local_document_info& info);
-
-        /** Helper functions
-         */
-        Gtk::TreeModel::iterator find_user(const Glib::ustring& name) const;
-        void add_user(const obby::user& user);
-
         /** Reference to header.
          */
         Header& m_header;
 
-        /** Currently selected document.
-         */
-        obby::local_document_info* m_info;
-
         /** GUI components.
          */
-        Gtk::TreeView m_list_view;
-        Glib::RefPtr<Gtk::ListStore> m_list_data;
-        Columns m_list_cols;
+        Gtk::TreeView m_tree_view;
+        Glib::RefPtr<Gtk::TreeStore> m_tree_data;
+        Columns m_tree_cols;
 
-        Gtk::TreeViewColumn* m_view_col_colour;
-        Gtk::TreeViewColumn* m_view_col_name;
-        Gtk::TreeViewColumn* m_view_col_connected;
-        Gtk::TreeViewColumn* m_view_col_subscribed;
+        Gtk::TreeViewColumn m_view_col;
+
+        Gtk::TreeIter m_iter_online;
+        Gtk::TreeIter m_iter_offline;
 };
 
-#if 0
-/** UserList-derivated class that lists all users in the session.
- */
-class UserListSession : public UserList
-{
-public:
-        UserListSession(const Folder& folder);
-        ~UserListSession();
-
-protected:
-        virtual void obby_start(obby::local_buffer& buf);
-        virtual void obby_end();
-        virtual void obby_user_join(obby::user& user);
-        virtual void obby_user_part(obby::user& user);
-};
-
-/** UserList derivated class that lists all users who are subscribed to the
- * currently active document.
- */
-class UserListDocument : public UserList
-{
-public:
-        UserListDocument(const Folder& folder);
-        ~UserListDocument();
-
-protected:
-        /** Window delegates
-         */
-        virtual void obby_start(obby::local_buffer& buf);
-        virtual void obby_end();
-        virtual void obby_user_join(obby::user& user);
-        virtual void obby_user_part(obby::user& user);
-        virtual void obby_document_insert(obby::local_document_info& info);
-        virtual void obby_document_remove(obby::local_document_info& info);
-
-};
-#endif
-
-}
+} // namespace obby
 
 #endif // _GOBBY_USERLIST_HPP_

src/userlist.cpp

@@ -24 +24 @@
         /** Creates a pixbuf representing a user's colour.
          */
-        Glib::RefPtr<Gdk::Pixbuf> create_coloured_pixbuf(int red, int green,
-                                                         int blue)
+        Glib::RefPtr<Gdk::Pixbuf>
+        create_coloured_pixbuf(const obby::colour& colour)
         {
                 Glib::RefPtr<Gdk::Pixbuf> pixbuf =
                         Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, false, 8, 16,
                                 16);
-                pixbuf->fill( (red << 24) | (green << 16) | (blue << 8) );
+                pixbuf->fill( (colour.get_red() << 24) | (colour.get_green() << 16) | (colour.get_blue() << 8) );
 
                 // Border around the color
@@ -56 +56 @@
 Gobby::UserList::Columns::Columns()
 {
-        add(colour);
-        add(name);
-        add(connected);
-        add(subscribed);
+        add(icon);
+        add(text);
 }
 
@@ -66 +64 @@
 }
 
-Gobby::UserList::UserList(Header& header, const Folder& folder):
-        m_header(header), m_info(NULL)
+Gobby::UserList::UserList(Header& header):
+        m_header(header)
 {
-        m_list_data = Gtk::ListStore::create(m_list_cols);
-        m_list_view.set_model(m_list_data);
+        m_tree_data = Gtk::TreeStore::create(m_tree_cols);
 
-        m_list_view.append_column(_("Colour"), m_list_cols.colour);
-        m_list_view.append_column(_("Name"), m_list_cols.name);
-        m_list_view.append_column(_("Connected"), m_list_cols.connected);
-        m_list_view.append_column(_("Subscribed"), m_list_cols.subscribed);
+        m_view_col.pack_start(m_tree_cols.icon, false);
+        m_view_col.pack_start(m_tree_cols.text, false);
+        m_view_col.set_spacing(5);
 
-        // Store TreeViewColumns
-        m_view_col_colour = m_list_view.get_column(0);
-        m_view_col_name = m_list_view.get_column(1);
-        m_view_col_connected = m_list_view.get_column(2);
-        m_view_col_subscribed = m_list_view.get_column(3);
+        m_tree_view.set_model(m_tree_data);
+        m_tree_view.append_column(m_view_col);
 
-        // Let the user sort by these columns
-        m_view_col_name->set_sort_column(m_list_cols.name);
-        m_view_col_connected->set_sort_column(m_list_cols.connected);
-        m_view_col_subscribed->set_sort_column(m_list_cols.subscribed);
+        m_iter_online = m_tree_data->append();
+        m_iter_offline = m_tree_data->append();
 
-        // Let the user reorder the columns
-        for(int i = 0; i < 4; ++ i)
-                m_list_view.get_column(i)->set_reorderable(true);
+        (*m_iter_online)[m_tree_cols.text] = _("Online");
+        (*m_iter_offline)[m_tree_cols.text] = _("Offline");
 
-        // No users can be selected
-        m_list_view.get_selection()->set_mode(Gtk::SELECTION_NONE);
+        m_view_col.set_sort_column(m_tree_cols.text);
 
-        // Hide subscription column until a document has been inserted
-        m_view_col_subscribed->set_visible(false);
+        m_tree_view.get_selection()->set_mode(Gtk::SELECTION_NONE);
+        m_tree_view.set_headers_visible(false);
 
         set_shadow_type(Gtk::SHADOW_IN);
@@ -102 +91 @@
         set_sensitive(false);
 
-        add(m_list_view);
-
-        // Connect tab_switched_event from folder to change subscribed flag
-        // according to current document.
-        folder.tab_switched_event().connect(
-                sigc::mem_fun(*this, &UserList::on_folder_tab_switched) );
-
-        // UserList crashes with GTK+ 2.8.x if it gets too small and no entry
-        set_size_request(200, 0);
+        add(m_tree_view);
 }
 
@@ -119 +100 @@
 void Gobby::UserList::obby_start(obby::local_buffer& buf)
 {
-        // Enable list
         set_sensitive(true);
 }
@@ -125 +105 @@
 void Gobby::UserList::obby_end()
 {
-        // Clear list
-        m_info = NULL;
-        m_list_data->clear();
-        // Hide subscription column
-        m_view_col_subscribed->set_visible(false);
-        // Disable list item
         set_sensitive(false);
+        // TODO: Remove all users in the list
 }
 
 void Gobby::UserList::obby_user_join(const obby::user& user)
 {
-        // Is there already such a user?
-        Gtk::TreeModel::iterator iter = find_user(user.get_name() );
-        if(iter == m_list_data->children().end() )
-        {
-                // No, so add the user to the list
-                add_user(user);
-        }
-        else
-        {
-                // Update connected flag
-                (*iter)[m_list_cols.connected] =
-                        user.get_flags() & obby::user::flags::CONNECTED;
-        }
+        // TODO: Check connected flag, add user to correct column, remove from
+        // other, if necessary
 }
 
 void Gobby::UserList::obby_user_part(const obby::user& user)
 {
-        // User is not anymore connceted
-        Gtk::TreeModel::iterator iter = find_user(user.get_name() );
-        (*iter)[m_list_cols.connected] = false;
+        // TODO: Remove user from online column, add to offline
 }
 
 void Gobby::UserList::obby_user_colour(const obby::user& user)
 {
-        // Get user with this name
-        Gtk::TreeModel::iterator iter = find_user(user.get_name() );
-        // Get new colour
-        unsigned int red = user.get_colour().get_red();
-        unsigned int green = user.get_colour().get_green();
-        unsigned int blue = user.get_colour().get_blue();
-        // Update it
-        (*iter)[m_list_cols.colour] = create_coloured_pixbuf(red, green, blue);
+        // Change user colour of given user
 }
 
 void Gobby::UserList::obby_document_insert(obby::local_document_info& info)
 {
-        // Get notification when a user subscribed to this document
-        info.subscribe_event().connect(sigc::bind(
-                sigc::mem_fun(*this, &UserList::on_user_subscribe),
-                        sigc::ref(info)) );
-
-        // Get notification when a user unsubscribed
-        info.unsubscribe_event().connect(sigc::bind(
-                sigc::mem_fun(*this, &UserList::on_user_unsubscribe),
-                        sigc::ref(info)) );
-        
-        // There is at least one document: Show subscription column
-        m_view_col_subscribed->set_visible(true);
+        // TODO: Add to (un)subscribe event, add corresponding documents as
+        // child of user into list.
 }
 
 void Gobby::UserList::obby_document_remove(obby::local_document_info& document)
 {
-        // Is this the last document to be removed?
-        if(document.get_buffer().document_count() == 1)
-                // Hide subscription column then
-                m_view_col_subscribed->set_visible(false);
 }
-
-void Gobby::UserList::on_folder_tab_switched(Document& document)
-{
-        // No document open
-        if(!m_view_col_subscribed->get_visible() ) return;
-        // Update current info
-        obby::local_document_info* info = &document.get_document();
-        // Same document
-        if(info == m_info) return;
-        m_info = info;
-        // Clear current data
-        m_list_data->clear();
-        // Get user table
-        const obby::user_table& table =
-                info->get_buffer().get_user_table();
-        // Add all users in user table
-        for(obby::user_table::iterator iter =
-                table.begin(obby::user::flags::NONE, obby::user::flags::NONE);
-            iter !=
-                table.end(obby::user::flags::NONE, obby::user::flags::NONE);
-            ++ iter)
-        {
-                add_user(*iter);
-        }
-}
-
-void Gobby::UserList::on_user_subscribe(const obby::user& user,
-                                        obby::local_document_info& info)
-{
-        // Not current doc
-        if(&info != m_info) return;
-        // Find user
-        Gtk::TreeModel::iterator iter = find_user(user.get_name() );
-        // Update subscribed flag
-        (*iter)[m_list_cols.subscribed] = true;
-}
-
-void Gobby::UserList::on_user_unsubscribe(const obby::user& user,
-                                          obby::local_document_info& info)
-{
-        // Not current doc
-        if(&info != m_info) return;
-        // Find user
-        Gtk::TreeModel::iterator iter = find_user(user.get_name() );
-        // Update subscribed flag
-        (*iter)[m_list_cols.subscribed] = false;
-}
-
-Gtk::TreeModel::iterator
-Gobby::UserList::find_user(const Glib::ustring& name) const
-{
-        Gtk::TreeModel::iterator iter = m_list_data->children().begin();
-        for(iter; iter != m_list_data->children().end(); ++ iter)
-                if( (*iter)[m_list_cols.name] == name)
-                        return iter;
-        return m_list_data->children().end();
-}
-
-void Gobby::UserList::add_user(const obby::user& user)
-{
-        Gtk::TreeModel::Row row = *(m_list_data->append() );
-
-        unsigned int red = user.get_colour().get_red();
-        unsigned int green = user.get_colour().get_green();
-        unsigned int blue = user.get_colour().get_blue();
-
-        row[m_list_cols.name] = user.get_name();
-        row[m_list_cols.colour] = create_coloured_pixbuf(red, green, blue);
-        row[m_list_cols.connected] =
-                user.get_flags() & obby::user::flags::CONNECTED;
-
-        if(m_info != NULL)
-                row[m_list_cols.subscribed] = m_info->is_subscribed(user);
-}
-
-#if 0
-Gobby::UserListSession::UserListSession(const Folder& folder)
- : UserList(folder)
-{
-        set_sensitive(false);
-}
-
-Gobby::UserListSession::~UserListSession()
-{
-}
-
-void Gobby::UserListSession::obby_start(obby::local_buffer& buf)
-{
-}
-
-void Gobby::UserListSession::obby_end()
-{
-}
-
-void Gobby::UserListSession::obby_user_join(obby::user& user)
-{
-        Gtk::TreeModel::Row row = *(m_list_data->append() );
-
-        unsigned int red = user.get_red();
-        unsigned int green = user.get_green();
-        unsigned int blue = user.get_blue();
-
-        row[m_list_cols.name] = user.get_name();
-        row[m_list_cols.connected] = true;
-        row[m_list_cols.color] = create_coloured_pixbuf(red, green, blue);
-}
-
-void Gobby::UserListSession::obby_user_part(obby::user& user)
-{
-        Gtk::TreeModel::iterator iter = m_list_data->children().begin();
-        (*iter)[m_list_cols.connected] = false;
-}
-
-Gobby::UserListDocument::UserListDocument(const Folder& folder)
- : UserList(folder), m_info(NULL)
-{
-
-        // Show subscribed users, not connected ones
-        m_list_view.get_column(1)->set_title("Subscribed");
-        set_sensitive(false);
-}
-
-Gobby::UserListDocument::~UserListDocument()
-{
-}
-
-void Gobby::UserListDocument::obby_start(obby::local_buffer& buf)
-{
-}
-
-void Gobby::UserListDocument::obby_end()
-{
-        m_info = NULL;
-        m_list_data->clear();
-        m_list_view.get_column(2)->set_visible(false);
-        set_sensitive(false);
-}
-
-void Gobby::UserListDocument::obby_user_join(obby::user& user)
-{
-        // Are there open documents? So add the user.
-        if(m_info)
-                add_user(user);
-        {
-        }
-}
-
-void Gobby::UserListDocument::obby_user_part(obby::user& user)
-{
-}
-
-void Gobby::UserListDocument::obby_document_insert(
-        obby::local_document_info& info
-)
-{
-
-        // There is at least one document: Enable widget
-        set_sensitive(true);
-}
-
-void Gobby::UserListDocument::obby_document_remove(
-        obby::local_document_info& info
-)
-{
-        // Is this the last document that gets removed?
-        if(info.get_buffer().document_count() == 1)
-        {
-                m_info = NULL;
-                // Hide subcription column
-                m_list_view.get_column(2)->set_visible(false);
-        }
-}
-#endif

src/window.cpp

@@ -57 +57 @@
    m_header(),
    m_folder(m_header, m_preferences),
-   m_userlist(m_header, m_folder),
+   m_userlist(m_header),
    m_statusbar(m_header, m_folder)
 {