Changeset 56383089e5ae1d12c04e5c0b67699e31eae062e0

Timestamp:

01/06/07 23:40:57 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

9c8b8080dc4d007fd27de778666221b86fe62b54

Children:

21d9a4d072dc4144bb9ee6e07f436fd8fa290adb

git-committer:

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

Message:

[project @ Close icons in tab labels [ref #32]]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-20 13:55:50+00:00

Files:

• inc/folder.hpp (modified) (5 diffs)
• inc/window.hpp (modified) (5 diffs)
• src/folder.cpp (modified) (6 diffs)
• src/window.cpp (modified) (11 diffs)

inc/folder.hpp

@@ -21 +21 @@
 
 #include <sigc++/signal.h>
+#include <gtkmm/box.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+#include <gtkmm/button.h>
 #include <gtkmm/notebook.h>
 #include <obby/user.hpp>
@@ -43 +47 @@
 {
 public:
+        class TabLabel : public Gtk::HBox
+        {
+        public:
+                typedef Glib::SignalProxy0<void> close_signal_type;
+
+                TabLabel(const Glib::ustring& label);
+                ~TabLabel();
+
+                close_signal_type close_event();
+        protected:
+                Gtk::Image m_image;
+                Gtk::Label m_label;
+                Gtk::Button m_button;
+                Gtk::HBox m_box;
+        };
+
+        typedef sigc::signal<void, Document&> signal_document_close_type;
         typedef sigc::signal<void, Document&> signal_document_cursor_moved_type;
         typedef sigc::signal<void, Document&>
@@ -70 +91 @@
         void obby_document_remove(obby::local_document_info& document);
 
+        signal_document_close_type document_close_event() const;
         signal_document_cursor_moved_type document_cursor_moved_event() const;
         signal_document_content_changed_type
@@ -80 +102 @@
 
 protected:
+        // Overrides
+        virtual void on_switch_page(GtkNotebookPage* page, guint page_num);
+
         // Signal handlers
-        virtual void on_switch_page(GtkNotebookPage* page, guint page_num);
+        void on_document_close(Document& document);
 
         void on_document_cursor_moved(Document& document);
@@ -89 +114 @@
 #endif
 
+        signal_document_close_type m_signal_document_close;
         signal_document_cursor_moved_type m_signal_document_cursor_moved;
         signal_document_content_changed_type m_signal_document_content_changed;

inc/window.hpp

@@ -27 +27 @@
 #include "config.hpp"
 #include "header.hpp"
+#include "docwindow.hpp"
 #include "folder.hpp"
 #include "userlist.hpp"
@@ -53 +54 @@
         void obby_end();
 
-        // UI handler
+        // Header UI handler
         void on_session_create();
         void on_session_join();
@@ -73 +74 @@
 #endif
 
+        // Folder UI handler
+        void on_folder_document_close(Document& document);
         void on_folder_tab_switched(Document& document);
 
@@ -92 +95 @@
 
         // Helper functions
+        void close_document(DocWindow& doc);
         void display_error(const Glib::ustring& message);
 
@@ -120 +124 @@
 #endif
         sigc::connection m_timer_conn;
-        bool m_running; // m_running is set if the obby connection has been
-                        // established successfully.
 };
 

src/folder.cpp

@@ -17 +17 @@
  */
 
+#include <gtkmm/box.h>
+#include <gtkmm/stock.h>
+
 #include "document.hpp"
 #include "docwindow.hpp"
 #include "folder.hpp"
 
+Gobby::Folder::TabLabel::TabLabel(const Glib::ustring& label)
+ : m_image(Gtk::Stock::CLOSE, Gtk::ICON_SIZE_MENU), m_label(label)
+{
+        // Lookup icon size
+        int width, height;
+        Gtk::IconSize::lookup(Gtk::ICON_SIZE_MENU, width, height);
+
+        // Resize button to image's size
+        m_button.set_size_request(width + 4, height);
+        m_button.add(m_image);
+        m_button.set_relief(Gtk::RELIEF_NONE);
+
+        // Add box
+        set_spacing(5);
+        pack_start(m_label, Gtk::PACK_SHRINK);
+        pack_start(m_button, Gtk::PACK_SHRINK);
+        show_all();
+}
+
+Gobby::Folder::TabLabel::~TabLabel()
+{
+}
+
 Gobby::Folder::Folder()
  : Gtk::Notebook(), m_running(false)
@@ -33 +59 @@
         // Delete documents
         for(int i = 0; i < get_n_pages(); ++ i)
+        {
+                delete get_tab_label(*get_nth_page(i) );
                 delete get_nth_page(i);
+        }
+}
+
+Gobby::Folder::TabLabel::close_signal_type
+Gobby::Folder::TabLabel::close_event() 
+{
+        return m_button.signal_clicked();
 }
 
@@ -125 +160 @@
 #endif
 
+        // Create label for the tab
+        TabLabel* label = new TabLabel(document.get_title() );
+
+        // Connect close event
+        label->close_event().connect(
+                sigc::bind(
+                        sigc::mem_fun(*this, &Folder::on_document_close),
+                        sigc::ref(new_doc)
+                )
+        );
+
         // Append document's title as new page to the notebook
-        append_page(*new_wnd, document.get_title() );
+        append_page(*new_wnd, *label);
 
         // Show child
@@ -143 +189 @@
                 if(&obdoc == &document)
                 {
-                        // Delete it.
-                        remove_page(i);
+                        // Remove page
+                        remove_page(*doc);
+
+                        // Delete tab label assigned to the document
+                        delete get_tab_label(*doc);
+
+                        // Delete document itself
                         delete doc;
+
                         break;
                 }
@@ -152 +204 @@
 
 // Signals
+Gobby::Folder::signal_document_close_type
+Gobby::Folder::document_close_event() const
+{
+        return m_signal_document_close;
+}
+
 Gobby::Folder::signal_document_cursor_moved_type
 Gobby::Folder::document_cursor_moved_event() const
@@ -176 +234 @@
 {
         return m_signal_tab_switched;
+}
+
+void Gobby::Folder::on_document_close(Document& document)
+{
+        m_signal_document_close.emit(document);
 }
 

src/window.cpp

@@ -48 +48 @@
    m_zeroconf(NULL),
 #endif
-   m_running(false), m_header(m_folder), m_statusbar(m_folder)
-{
-        // Connect UI signals
+   m_header(m_folder), m_statusbar(m_folder)
+{
+        // Header
         m_header.session_create_event().connect(
                 sigc::mem_fun(*this, &Window::on_session_create) );
@@ -84 +84 @@
                 sigc::mem_fun(*this, &Window::on_quit) );
 
+        // Folder
+        m_folder.document_close_event().connect(
+                sigc::mem_fun(*this, &Window::on_folder_document_close) );
         m_folder.tab_switched_event().connect(
                 sigc::mem_fun(*this, &Window::on_folder_tab_switched) );
@@ -319 +322 @@
 }
 
+void Gobby::Window::on_folder_document_close(Document& document)
+{
+        for(int i = 0; i < m_folder.get_n_pages(); ++ i)
+        {
+                Gtk::Widget* doc = m_folder.get_nth_page(i);
+                if(&static_cast<DocWindow*>(doc)->get_document() == &document)
+                {
+                        close_document(*static_cast<DocWindow*>(doc));
+                        break;
+                }
+        }
+}
+
 void Gobby::Window::on_folder_tab_switched(Document& document)
 {
@@ -371 +387 @@
 void Gobby::Window::on_document_save()
 {
+        // Get page
         Widget* page = m_folder.get_nth_page(m_folder.get_current_page() );
         DocWindow& doc = *static_cast<DocWindow*>(page);
 
+        // Show dialog
         Gtk::FileChooserDialog dlg(*this, _("Save current document"),
                         Gtk::FILE_CHOOSER_ACTION_SAVE);
@@ -382 +400 @@
         if(dlg.run() == Gtk::RESPONSE_OK)
         {
+                // Build ofstream
                 std::ofstream stream(dlg.get_filename().c_str() );
 
                 if(stream)
                 {
+                        // Save content into file
                         stream << doc.get_document().get_content() << std::endl;
                         doc.get_document().set_path(dlg.get_filename() );
@@ -392 +412 @@
                 else
                 {
+                        // File could not be opened
                         obby::format_string str("Could not open file "
                                                 "%0 for writing");
@@ -402 +423 @@
 void Gobby::Window::on_document_close()
 {
-        if(m_buffer.get() != NULL)
-        {
-                // Get current page
-                Widget* page = m_folder.get_nth_page(
-                        m_folder.get_current_page()
-                );
-
-                // Send remove document request
-                m_buffer->remove_document(
-                        static_cast<DocWindow*>(
-                                page
-                        )->get_document().get_document()
-                );
-        }
-        else
-        {
-                // Buffer does not exist: Maybe the connection has been lost
-                // or something: Just remove the document from the folder.
-                Gtk::Widget* doc_wnd = m_folder.get_nth_page(
-                        m_folder.get_current_page()
-                );
-
-                m_folder.remove_page(m_folder.get_current_page() );
-                delete doc_wnd;
-
-                // If there are no more documents disable
-                // save and close buttons in header
-                if(!m_folder.get_n_pages() )
-                        m_header.disable_document_actions();
-        }
+        Widget* page = m_folder.get_nth_page(m_folder.get_current_page() );
+        close_document(*static_cast<DocWindow*>(page) );
 }
 
@@ -447 +440 @@
         if(dlg.run() == Gtk::RESPONSE_OK)
         {
-                dynamic_cast<obby::client_buffer*>(m_buffer.get() )->set_password(
-                        dlg.get_text() );
+                dynamic_cast<obby::client_buffer*>(
+                        m_buffer.get() )->set_password(dlg.get_text() );
         }
 }
@@ -504 +497 @@
 }
 
-/*
-void Gobby::Window::on_obby_login_failed(obby::login::error error)
-{
-        display_error(obby::login::errstring(error) );
-        on_session_join();
-}
-
-bool Gobby::Window::on_obby_global_password(std::string& password)
-{
-        // Prompt for password
-        EntryDialog dlg(
-                *this,
-                _("Password required"),
-                _("Enter session password")
-        );
-
-        // Disable view of typed characters (password input)
-        dlg.get_entry().set_visibility(false);
-        if(dlg.run() == Gtk::RESPONSE_OK)
-        {
-                // Use given text as password
-                password = dlg.get_text();
-                return true;
-        }
-        else
-        {
-                // Close connection otherwise
-                on_session_quit();
-                return false;
-        }
-}
-
-bool Gobby::Window::on_obby_user_password(std::string& password)
-{
-        obby::format_string str(_("Enter user password for user %0") );
-        str << m_buffer->get_name();
-
-        // Prompt for password
-        EntryDialog dlg(
-                *this,
-                _("Password required"),
-                str.str()
-        );
-
-        // Disable view of typed characters (password input)
-        dlg.get_entry().set_visibility(false);
-        if(dlg.run() == Gtk::RESPONSE_OK)
-        {
-                // Use given text as password
-                password = dlg.get_text();
-                return true;
-        }
-        else
-        {
-                // Close connection otherwise
-                on_session_quit();
-                return false;
-        }
-}*/
-
 void Gobby::Window::on_obby_close()
 {
@@ -569 +502 @@
         on_session_quit();
 }
-
-/*void Gobby::Window::on_obby_sync()
-{
-        // Send documents to components
-        obby::buffer::document_iterator iter = m_buffer->document_begin();
-        for(; iter != m_buffer->document_end(); ++ iter)
-                on_obby_document_insert(*iter);
-
-        // Set last page as active one because it is currently shown anyway.
-        if(m_buffer->document_count() > 0)
-                m_folder.set_current_page(m_buffer->document_count() - 1);
-}*/
 
 void Gobby::Window::on_obby_chat(obby::user& user, const Glib::ustring& message)
@@ -647 +568 @@
 }
 
+void Gobby::Window::close_document(DocWindow& document)
+{
+        if(m_buffer.get() != NULL)
+        {
+                // Send remove document request
+                m_buffer->remove_document(
+                        document.get_document().get_document()
+                );
+        }
+        else
+        {
+                // Buffer does not exist: Maybe the connection has been lost
+                // or something: Just remove the document from the folder.
+                m_folder.remove_page(document);
+                delete m_folder.get_tab_label(document);
+                delete &document;
+
+                // If there are no more documents, disable
+                // save and close buttons in header
+                if(!m_folder.get_n_pages() )
+                        m_header.disable_document_actions();
+        }
+}
+