Changeset 877d3231c6feab2ff51abd8a53b79bf1ea6c7ad6

Timestamp:

11/09/09 10:57:08 (4 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Armin Burgmeier <armin@arbur.net> / 2009-11-08T00:37:07Z+0100

Parents:

646a4f3c01880913367395f619aea3fe17d0cca5

Children:

f8809f6ead608ebf57654a28ca9e0bc748cb3ee6

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-11-09T10:57:08Z+0100

Message:

Added ChatSessionView? and a paned for the chat area

2009-11-08 Armin Burgmeier <armin@…>

• code/core/chatsessionview.hpp:
• code/core/chatsessionview.cpp: Added a SessionView?-deriving class to show a chat session.

• code/core/Makefile.am: Added the new files to the build.

• code/core/folder.hpp:
• code/core/folder.cpp: Added add_chat_session, renamed add_document to add_text_session.

• code/commands/browser-commands.cpp: Use add_text_session instead of add_document.

• code/window.hpp:
• code/window.cpp: Added a bottom pane for the chat.

Files:

• ChangeLog (modified) (1 diff)
• code/commands/browser-commands.cpp (modified) (1 diff)
• code/core/Makefile.am (modified) (2 diffs)
• code/core/chatsessionview.cpp (added)
• code/core/chatsessionview.hpp (added)
• code/core/folder.cpp (modified) (2 diffs)
• code/core/folder.hpp (modified) (3 diffs)
• code/window.cpp (modified) (4 diffs)
• code/window.hpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2009-11-08  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/chatsessionview.hpp:
+        * code/core/chatsessionview.cpp: Added a SessionView-deriving class to
+        show a chat session.
+
+        * code/core/Makefile.am: Added the new files to the build.
+
+        * code/core/folder.hpp:
+        * code/core/folder.cpp: Added add_chat_session, renamed add_document
+        to add_text_session.
+
+        * code/commands/browser-commands.cpp: Use add_text_session instead of
+        add_document.
+
+        * code/window.hpp:
+        * code/window.cpp: Added a bottom pane for the chat.
+
 2009-10-25  Armin Burgmeier  <armin@arbur.net>
 

code/commands/browser-commands.cpp

@@ -291 +291 @@
                      "remote-hostname", &hostname, NULL);
 
-        TextSessionView& view = m_folder.add_document(
+        TextSessionView& view = m_folder.add_text_session(
                 INF_TEXT_SESSION(session),
                 infc_browser_iter_get_name(browser, iter),

code/core/Makefile.am

@@ -3 +3 @@
 libgobby_core_a_SOURCES = \
         browser.cpp \
+        chatsessionview.cpp \
         closableframe.cpp \
         documentinfostorage.cpp \
@@ -23 +24 @@
 noinst_HEADERS = \
         browser.hpp \
+        chatsessionview.hpp \
         closableframe.hpp \
         documentinfostorage.hpp \

code/core/folder.cpp

@@ -119 +119 @@
 
 Gobby::TextSessionView&
-Gobby::Folder::add_document(InfTextSession* session,
-                            const Glib::ustring& title,
-                            const Glib::ustring& path,
-                            const Glib::ustring& hostname,
-                            const std::string& info_storage_key)
+Gobby::Folder::add_text_session(InfTextSession* session,
+                                const Glib::ustring& title,
+                                const Glib::ustring& path,
+                                const Glib::ustring& hostname,
+                                const std::string& info_storage_key)
 {
         TextSessionView* view = Gtk::manage(
@@ -155 +155 @@
 }
 
+Gobby::ChatSessionView&
+Gobby::Folder::add_chat_session(InfChatSession* session,
+                                const Glib::ustring& title,
+                                const Glib::ustring& path,
+                                const Glib::ustring& hostname)
+{
+        ChatSessionView* view = Gtk::manage(
+                new ChatSessionView(session, title, path, hostname,
+                                    m_preferences));
+        view->show();
+        m_signal_document_added.emit(*view);
+
+        SessionUserView* userview = Gtk::manage(
+                new SessionUserView(
+                        *view,
+                        m_preferences.appearance.show_userlist,
+                        m_preferences.appearance.userlist_width));
+        userview->show();
+
+        // TODO chat: Use a ChatTabLabel
+        Gtk::Label* tablabel = Gtk::manage(new Gtk::Label(hostname));
+/*      tablabel->signal_close_request().connect(
+                sigc::bind(
+                        sigc::mem_fun(*this, &Folder::on_tab_close_request),
+                        sigc::ref(*view)));*/
+        tablabel->show();
+        append_page(*userview, *tablabel);
+
+        set_tab_reorderable(*userview, true);
+        return *view;
+}
+
 void Gobby::Folder::remove_document(SessionView& view)
 {

code/core/folder.hpp

@@ -21 +21 @@
 
 #include "core/textsessionview.hpp"
+#include "core/chatsessionview.hpp"
 #include "core/preferences.hpp"
 #include "util/defaultaccumulator.hpp"
@@ -35 +36 @@
 {
 public:
+        // TODO chat: This should be SignalSessionAdded/Removed/Changed
         typedef sigc::signal<void, SessionView&> SignalDocumentAdded;
         typedef sigc::signal<void, SessionView&> SignalDocumentRemoved;
@@ -43 +45 @@
                         SignalDocumentCloseRequest;
 
+        // TODO chat: Should not require langmgr
         Folder(Preferences& preferences,
                GtkSourceLanguageManager* lang_manager);
         ~Folder();
 
-        TextSessionView& add_document(InfTextSession* session,
-                                      const Glib::ustring& title,
-                                      const Glib::ustring& path,
-                                      const Glib::ustring& hostname,
-                                      const std::string& info_storage_key);
+        TextSessionView& add_text_session(InfTextSession* session,
+                                          const Glib::ustring& title,
+                                          const Glib::ustring& path,
+                                          const Glib::ustring& hostname,
+                                          const std::string& info_storage_key);
+        ChatSessionView& add_chat_session(InfChatSession* session,
+                                          const Glib::ustring& title,
+                                          const Glib::ustring& path,
+                                          const Glib::ustring& hostname);
         void remove_document(SessionView& view);
 

code/window.cpp

@@ -46 +46 @@
         m_header(m_preferences, m_lang_manager),
         m_browser(*this, Plugins::TEXT, m_statusbar, m_preferences),
-        m_folder(m_preferences, m_lang_manager),
-        m_statusbar(m_folder, m_preferences),
+        m_text_folder(m_preferences, m_lang_manager),
+        m_chat_folder(m_preferences, m_lang_manager),
+        m_statusbar(m_text_folder, m_preferences),
         m_info_storage(INF_GTK_BROWSER_MODEL(m_browser.get_store())),
         m_operations(m_info_storage, m_statusbar), 
-        m_commands_autosave(m_folder, m_operations, m_info_storage,
+        m_commands_autosave(m_text_folder, m_operations, m_info_storage,
                             m_preferences),
-        m_commands_browser(m_browser, m_folder, m_info_storage, m_statusbar,
-                           m_preferences),
+        m_commands_browser(m_browser, m_text_folder, m_info_storage,
+                           m_statusbar, m_preferences),
         m_commands_browser_context(*this, m_browser, m_file_chooser,
                                    m_operations, m_preferences),
-        m_commands_folder(m_folder),
-        m_commands_file(*this, m_header, m_browser, m_folder, m_statusbar,
-                        m_file_chooser, m_operations, m_info_storage,
+        m_commands_folder(m_text_folder),
+        // TODO: chat_folder commands
+        m_commands_file(*this, m_header, m_browser, m_text_folder,
+                        m_statusbar, m_file_chooser, m_operations,
+                        m_info_storage, m_preferences),
+        m_commands_edit(*this, m_header, m_text_folder, m_statusbar,
                         m_preferences),
-        m_commands_edit(*this, m_header, m_folder, m_statusbar,
-                        m_preferences),
-        m_commands_view(m_header, m_folder, m_preferences),
+        m_commands_view(m_header, m_text_folder, m_preferences),
         m_commands_help(*this, m_header, m_icon_mgr),
-        m_title_bar(*this, m_folder)
+        m_title_bar(*this, m_text_folder)
 {
 #ifdef WITH_UNIQUE
@@ -76 +78 @@
         m_header.show();
         m_browser.show();
-        m_folder.show();
+        m_text_folder.show();
+        m_chat_folder.show();
 
         // Build UI
@@ -90 +93 @@
         Gtk::Frame* frame_text = Gtk::manage(new Gtk::Frame);
         frame_text->set_shadow_type(Gtk::SHADOW_IN);
-        frame_text->add(m_folder);
+        frame_text->add(m_text_folder);
         frame_text->show();
 
+        // TODO: Use ClosableFrame here
+        Gtk::Frame* frame_chat = Gtk::manage(new Gtk::Frame);
+        frame_chat->set_shadow_type(Gtk::SHADOW_IN);
+        frame_chat->add(m_chat_folder);
+        frame_chat->show();
+
+        m_chat_paned.pack1(*frame_text, true, false);
+        m_chat_paned.pack2(*frame_chat, false, false);
+        m_chat_paned.show();
+
         m_paned.pack1(*frame_browser, false, false);
-        m_paned.pack2(*frame_text, true, false);
+        m_paned.pack2(m_chat_paned, true, false);
         m_paned.show();
 
@@ -185 +198 @@
 
         m_paned.set_position(m_paned.get_width() * 2 / 5);
+        m_chat_paned.set_position(m_chat_paned.get_height() * 7 / 10);
 }
 

code/window.hpp

@@ -73 +73 @@
         ~Window();
 
-        const Folder& get_folder() const { return m_folder; }
-        Folder& get_folder() { return m_folder; }
+        const Folder& get_text_folder() const { return m_text_folder; }
+        Folder& get_text_folder() { return m_text_folder; }
 
         void connect_to_host(const Glib::ustring& hostname)
@@ -133 +133 @@
         Gtk::VBox m_mainbox;
         Gtk::HPaned m_paned;
+        Gtk::VPaned m_chat_paned;
 
         Header m_header;
         Browser m_browser;
-        Folder m_folder;
+        Folder m_text_folder;
+        Folder m_chat_folder;
         StatusBar m_statusbar;