Changeset 9a8cd27d463ae24ca3b212a3d0be3bef9bea422a

Timestamp:

12/31/08 18:23:22 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

215618cb3db4556e21f4040ae192e01f100fde03

Children:

c66abc31de85dace6d89600a4638b1993978f0e4

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-12-31T18:23:22Z+0100

Message:

Added begin-save-operation signal

2008-12-31 Armin Burgmeier <armin@…>

• code/operations/operations.hpp:
• code/operations/operations.cpp: Added a begin_save_operation signal, and added a boolean parameter to base operation's finished signal which indicates whether the operation was performed successfully or not. Removed the remove() function, and added finish() and fail() instead.

• code/operations/operation-open.hpp: Derive from sigc::trackable.

• code/operations/operation-save.hpp:
• code/operations/operation-save.cpp: Added get_document(), get_start_time() and derive from sigc::trackable, adapt to finish() and fail().

• code/operations/operation-new.cpp:
• code/operations/operation-open.cpp:
• code/operations/operation-delete.cpp: Adapt to finish() and fail().

Files:

• ChangeLog (modified) (1 diff)
• code/operations/operation-delete.cpp (modified) (1 diff)
• code/operations/operation-new.cpp (modified) (1 diff)
• code/operations/operation-open.cpp (modified) (2 diffs)
• code/operations/operation-open.hpp (modified) (1 diff)
• code/operations/operation-save.cpp (modified) (3 diffs)
• code/operations/operation-save.hpp (modified) (3 diffs)
• code/operations/operations.cpp (modified) (6 diffs)
• code/operations/operations.hpp (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2008-12-31  Armin Burgmeier  <armin@arbur.net>
+
+        * code/operations/operations.hpp:
+        * code/operations/operations.cpp: Added a begin_save_operation signal,
+        and added a boolean parameter to base operation's finished signal
+        which indicates whether the operation was performed successfully or
+        not. Removed the remove() function, and added finish() and fail()
+        instead.
+
+        * code/operations/operation-open.hpp: Derive from sigc::trackable.
+
+        * code/operations/operation-save.hpp:
+        * code/operations/operation-save.cpp: Added get_document(),
+        get_start_time() and derive from sigc::trackable, adapt to finish()
+        and fail().
+
+        * code/operations/operation-new.cpp:
+        * code/operations/operation-open.cpp:
+        * code/operations/operation-delete.cpp: Adapt to finish() and fail().
+
 2008-12-30  Armin Burgmeier  <armin@arbur.net>
 

code/operations/operation-delete.cpp

@@ -60 +60 @@
                         m_name, error->message), 5);
 
-        remove();
+        fail();
 }
 
 void Gobby::OperationDelete::on_request_finished(InfcBrowserIter* iter)
 {
-        remove();
+        finish();
 }

code/operations/operation-new.cpp

@@ -77 +77 @@
                         m_name, error->message), 5);
 
-        remove();
+        fail();
 }
 
 void Gobby::OperationNew::on_request_finished(InfcBrowserIter* iter)
 {
-        remove();
+        finish();
 }

code/operations/operation-open.cpp

@@ -437 +437 @@
         get_info_storage().set_info(m_browser, iter, info);
 
-        remove();
+        finish();
 }
 
@@ -447 +447 @@
                                          m_file->get_uri(), message), 5);
 
-        remove();
-}
+        fail();
+}

code/operations/operation-open.hpp

@@ -29 +29 @@
 {
 
-class OperationOpen: public Operations::Operation
+class OperationOpen: public Operations::Operation, public sigc::trackable
 {
 public:

code/operations/operation-save.cpp

@@ -29 +29 @@
                                     const std::string& encoding,
                                     DocumentInfoStorage::EolStyle eol_style):
-        Operation(operations), m_document(&document), m_current_line_index(0),
+        Operation(operations), m_document(&document),
+        m_start_time(std::time(NULL)), m_current_line_index(0),
         m_iconv(encoding.c_str(), "UTF-8"), m_encoding(encoding),
         m_eol_style(eol_style),
@@ -158 +159 @@
                 }
 
-                remove();
+                finish();
         }
         else
@@ -283 +284 @@
                                          m_file->get_uri(), message), 5);
 
-        remove();
-}
+        fail();
+}

code/operations/operation-save.hpp

@@ -26 +26 @@
 #include <giomm/outputstream.h>
 
+#include <ctime>
+
 namespace Gobby
 {
 
-class OperationSave: public Operations::Operation
+class OperationSave: public Operations::Operation, public sigc::trackable
 {
 public:
@@ -38 +40 @@
 
         virtual ~OperationSave();
+
+        // Note these can return NULL in case the document has been removed
+        // in the meanwhile.
+        DocWindow* get_document() { return m_document; }
+        const DocWindow* get_document() const { return m_document; }
+
+        std::time_t get_start_time() const { return m_start_time; }
 
 protected:
@@ -49 +58 @@
 protected:
         DocWindow* m_document;
+        std::time_t m_start_time;
 
         typedef std::pair<gchar*, std::size_t> Line;

code/operations/operations.cpp

@@ -44 +44 @@
 }
 
-Gobby::Operations::Operation*
+Gobby::OperationNew*
 Gobby::Operations::create_directory(InfcBrowser* browser,
                                     InfcBrowserIter* parent,
@@ -56 +56 @@
 }
 
-Gobby::Operations::Operation*
+Gobby::OperationNew*
 Gobby::Operations::create_document(InfcBrowser* browser,
                                    InfcBrowserIter* parent,
@@ -68 +68 @@
 }
 
-Gobby::Operations::Operation*
+Gobby::OperationOpen*
 Gobby::Operations::create_document(InfcBrowser* browser,
                                    InfcBrowserIter* parent,
@@ -84 +84 @@
 }
 
-Gobby::Operations::Operation*
+Gobby::OperationSave*
 Gobby::Operations::save_document(DocWindow& document,
                                  Folder& folder,
@@ -91 +91 @@
                                  DocumentInfoStorage::EolStyle eol_style)
 {
+        OperationSave* prev_op = get_save_operation_for_document(document);
+
+        // Cancel previous save operation:
+        if(prev_op != NULL)
+                fail_operation(prev_op);
+
         OperationSave* op = new OperationSave(*this, document, folder, uri,
                                               encoding, eol_style);
 
         m_operations.insert(op);
+        m_signal_begin_save_operation.emit(op);
         return op;
 }
 
-Gobby::Operations::Operation*
+Gobby::OperationDelete*
 Gobby::Operations::delete_node(InfcBrowser* browser,
                                InfcBrowserIter* iter)
@@ -107 +114 @@
 }
 
-void Gobby::Operations::remove_operation(Operation* operation)
+Gobby::OperationSave*
+Gobby::Operations::get_save_operation_for_document(DocWindow& document)
+{
+        for(OperationSet::iterator iter = m_operations.begin();
+            iter != m_operations.end(); ++ iter)
+        {
+                Operation* op = *iter;
+                OperationSave* save_op = dynamic_cast<OperationSave*>(op);
+                if(save_op != NULL)
+                {
+                        if(save_op->get_document() == &document)
+                                return save_op;
+                }
+        }
+
+        return NULL;
+}
+
+void Gobby::Operations::finish_operation(Operation* operation)
 {
         m_operations.erase(operation);
+        operation->signal_finished().emit(true);
         delete operation;
 }
+
+void Gobby::Operations::fail_operation(Operation* operation)
+{
+        m_operations.erase(operation);
+        operation->signal_finished().emit(false);
+        delete operation;
+}

code/operations/operations.hpp

@@ -33 +33 @@
 {
 
+class OperationNew;
+class OperationOpen;
+class OperationSave;
+class OperationDelete;
+
 class Operations: public sigc::trackable
 {
@@ -39 +44 @@
         {
         public:
-                typedef sigc::signal<void> SignalFinished;
+                typedef sigc::signal<void, bool> SignalFinished;
 
                 Operation(Operations& operations):
@@ -55 +60 @@
                 }
 
-                void remove()
-                {
-                        m_signal_finished.emit();
-                        m_operations.remove_operation(this);
-                }
-
                 SignalFinished signal_finished() const
                 {
                         return m_signal_finished;
                 }
+
+        protected:
+                void fail()
+                {
+                        m_operations.fail_operation(this);
+                }
+
+                void finish()
+                {
+                        m_operations.finish_operation(this);
+                }
+
         private:
                 SignalFinished m_signal_finished;
@@ -70 +81 @@
         };
 
+        typedef sigc::signal<void, OperationSave*> SignalBeginSaveOperation;
+
         Operations(DocumentInfoStorage& info_storage, StatusBar& status_bar);
         ~Operations();
 
-        Operation* create_directory(InfcBrowser* browser,
-                                    InfcBrowserIter* parent,
-                                    const Glib::ustring& name);
+        OperationNew* create_directory(InfcBrowser* browser,
+                                       InfcBrowserIter* parent,
+                                       const Glib::ustring& name);
 
-        Operation* create_document(InfcBrowser* browser,
-                                   InfcBrowserIter* parent,
-                                   const Glib::ustring& name);
+        OperationNew* create_document(InfcBrowser* browser,
+                                      InfcBrowserIter* parent,
+                                      const Glib::ustring& name);
 
-        Operation* create_document(InfcBrowser* browser,
-                                   InfcBrowserIter* parent,
-                                   const Glib::ustring& name,
-                                   const Preferences& preferences,
-                                   const Glib::ustring& from_uri,
-                                   const char* encoding);
+        OperationOpen* create_document(InfcBrowser* browser,
+                                       InfcBrowserIter* parent,
+                                       const Glib::ustring& name,
+                                       const Preferences& preferences,
+                                       const Glib::ustring& from_uri,
+                                       const char* encoding);
 
-        Operation* save_document(DocWindow& document,
-                                 Folder& folder,
-                                 const std::string& uri,
-                                 const std::string& encoding,
-                                 DocumentInfoStorage::EolStyle eol_style);
+        OperationSave* save_document(DocWindow& document,
+                                     Folder& folder,
+                                     const std::string& uri,
+                                     const std::string& encoding,
+                                     DocumentInfoStorage::EolStyle eol_style);
 
-        Operation* delete_node(InfcBrowser* browser,
-                               InfcBrowserIter* iter);
+        OperationDelete* delete_node(InfcBrowser* browser,
+                                     InfcBrowserIter* iter);
+
+        OperationSave* get_save_operation_for_document(DocWindow& window);
+
+        SignalBeginSaveOperation signal_begin_save_operation() const
+        {
+                return m_signal_begin_save_operation;
+        }
 
 protected:
-        void remove_operation(Operation* operation);
+        void fail_operation(Operation* operation);
+        void finish_operation(Operation* operation);
 
         DocumentInfoStorage& m_info_storage;
@@ -105 +126 @@
         typedef std::set<Operation*> OperationSet;
         OperationSet m_operations;
+
+        SignalBeginSaveOperation m_signal_begin_save_operation;
 };