Changeset 3033edac03b725f01854e3161ac09682e771a063

Timestamp:

01/06/07 23:35:59 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

930225ef1e1c135c0f5076cf955ef263ab5be48e

Children:

f9e7e83d1603744ec991482a6817091f55697ba2

git-committer:

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

Message:

[project @ Allow the user to save documents after connection loss [fixes #1]]

Original author: Armin Burgmeier <armin@…>
Date: 2005-05-29 11:40:30+00:00

Files:

• inc/document.hpp (modified) (1 diff)
• inc/header.hpp (modified) (1 diff)
• src/document.cpp (modified) (1 diff)
• src/folder.cpp (modified) (2 diffs)
• src/header.cpp (modified) (2 diffs)
• src/window.cpp (modified) (3 diffs)

inc/document.hpp

@@ -59 +59 @@
         Glib::RefPtr<Gtk::SourceLanguage> get_language() const;
 #endif
+
+        /** Returns the document content. Equivalent to
+         * get_document().get_whole_buffer(), but it may be used even if the
+         * obby buffer does not exist anymore (in which case get_document()
+         * returns an invalid reference!)
+         */
+        Glib::ustring get_content();
 
         /** Signal which will be emitted if the document gets updated in a way

inc/header.hpp

@@ -62 +62 @@
         Glib::RefPtr<const Gtk::AccelGroup> get_accel_group() const;
 
+        // Disables close and save buttons. The windows calls this after
+        // all remaining documents have been closed after a connection loss.
+        void disable_close_save();
+
         signal_session_create_type session_create_event() const;
         signal_session_join_type session_join_event() const;

src/document.cpp

@@ -205 +205 @@
 #endif
 
+Glib::ustring Gobby::Document::get_content()
+{
+        return m_view.get_buffer()->get_text();
+}
+
 void Gobby::Document::obby_user_join(obby::user& user)
 {

src/folder.cpp

@@ -63 +63 @@
 void Gobby::Folder::obby_end()
 {
-        // TODO: Just remove the editable-attribute to allow the user to still
-        // save the documents.
-        set_sensitive(false);
+        // Insensitive just the text editor to allow to scroll and tab between
+        // the documents
+        for(unsigned int i = 0; i < get_n_pages(); ++ i)
+                static_cast<Document*>(
+                        get_nth_page(i)
+                )->get_child()->set_sensitive(false);
+
         m_running = false;
 }
@@ -109 +113 @@
         for(int i = 0; i < get_n_pages(); ++ i)
         {
-                Widget* doc = get_nth_page(i);
+                Gtk::Widget* doc = get_nth_page(i);
                 if(&static_cast<Document*>(doc)->get_document() == &document)
                 {

src/header.cpp

@@ -249 +249 @@
 }
 
+void Gobby::Header::disable_close_save()
+{
+        m_group_app->get_action("SaveDocument")->set_sensitive(false);
+        m_group_app->get_action("CloseDocument")->set_sensitive(false);
+}
+
 Gobby::Header::signal_session_create_type
 Gobby::Header::session_create_event() const
@@ -330 +336 @@
         m_group_app->get_action("CreateDocument")->set_sensitive(false);
         m_group_app->get_action("OpenDocument")->set_sensitive(false);
-        m_group_app->get_action("SaveDocument")->set_sensitive(false);
-        m_group_app->get_action("CloseDocument")->set_sensitive(false);
+
+        // Leave SaveDocument and CloseDocument as they were to allow the user
+        // to save documents.
 }
 

src/window.cpp

@@ -313 +313 @@
 {
         Widget* page = m_folder.get_nth_page(m_folder.get_current_page() );
-        obby::document& doc = static_cast<Document*>(page)->get_document();
+        Document& doc = *static_cast<Document*>(page);
 
         Gtk::FileChooserDialog dlg(*this, _("Save current document"),
                         Gtk::FILE_CHOOSER_ACTION_SAVE);
-        dlg.set_current_name(doc.get_title() );
+        dlg.set_current_name(m_folder.get_tab_label_text(doc) );
         dlg.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         dlg.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
@@ -324 +324 @@
         {
                 std::ofstream stream(dlg.get_filename().c_str() );
-                stream << doc.get_whole_buffer() << std::endl;
+
+                if(stream)
+                {
+                        stream << doc.get_content() << std::endl;
+                }
+                else
+                {
+                        display_error(
+                                "Could not open file " +
+                                dlg.get_filename() +
+                                " for writing"
+                        );
+                }
         }
 }
@@ -330 +342 @@
 void Gobby::Window::on_document_close()
 {
-        Widget* page = m_folder.get_nth_page(m_folder.get_current_page() );
-        m_buffer->remove_document(
-                static_cast<Document*>(page)->get_document() );
+        if(m_buffer)
+        {
+                // 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<Document*>(page)->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 = m_folder.get_nth_page(
+                        m_folder.get_current_page()
+                );
+
+                m_folder.remove_page(m_folder.get_current_page() );
+                delete doc;
+
+                // If there are no more documents disable
+                // save and close buttons in header
+                if(!m_folder.get_n_pages() )
+                        m_header.disable_close_save();
+        }
 }