Changeset 6fbb20faf0c9263df082e566d81d646880948636

Timestamp:

10/14/08 00:26:39 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

1bd84c9d6dcc0de860310abca412cc2d271f2d41

Children:

09f550a23adf2adfddfdcf3bbc12cff6c1b1d669

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-10-14T00:26:39Z+0200

Message:

Show modification status in tab

2008-10-13 Armin Burgmeier <armin@…>

• code/commands/browser-commands.hpp:
• code/commands/browser-commands.cpp:
• code/operations/operation-open.cpp:
• code/operations/operation-save.cpp: Set the modified flag upon opening or saving a document correctly.

• code/core/tablabel.hpp:
• code/core/tablabel.cpp: Show the modify flag in the tab.

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (1 diff)
• code/commands/browser-commands.cpp (modified) (5 diffs)
• code/commands/browser-commands.hpp (modified) (3 diffs)
• code/core/tablabel.cpp (modified) (4 diffs)
• code/core/tablabel.hpp (modified) (1 diff)
• code/operations/operation-open.cpp (modified) (1 diff)
• code/operations/operation-save.cpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2008-10-13  Armin Burgmeier  <armin@arbur.net>
+
+        * code/commands/browser-commands.hpp:
+        * code/commands/browser-commands.cpp:
+        * code/operations/operation-open.cpp:
+        * code/operations/operation-save.cpp: Set the modified flag upon
+        opening or saving a document correctly.
+
+        * code/core/tablabel.hpp:
+        * code/core/tablabel.cpp: Show the modify flag in the tab.
+
 2008-10-12  Armin Burgmeier  <armin@arbur.net>
 

TODO

@@ -1 @@
-Critical bugs:
- - Gobby crashes when a document that is currently open gets deleted from the
-   server
-
 Some features that would be nice for a final Gobby 0.5 release. We could
 perhaps do pre-releases with some of these missing before:

code/commands/browser-commands.cpp

@@ -17 +17 @@
  */
 
+// TODO: Split this file into multiple smaller files,
+// perhaps browser-commands.cpp (basically on_activate)
+// synchronization-commands.cpp (basically on_subscribe_session)
+// user-join-commands.cpp (basically join_user)
+
 #include "commands/browser-commands.hpp"
 #include "util/i18n.hpp"
@@ -139 +144 @@
                 g_signal_handler_disconnect(proxy, notify_connection_id);
                 g_signal_handler_disconnect(session, failed_id);
-                g_signal_handler_disconnect(session, complete_id);
+                g_signal_handler_disconnect(session, complete_before_id);
+                g_signal_handler_disconnect(session, complete_after_id);
                 g_signal_handler_disconnect(session, progress_id);
                 g_signal_handler_disconnect(session, close_id);
@@ -317 +323 @@
         // AdoptedAlgorithm the default handler created to perform
         // the user join.
-        node.complete_id = g_signal_connect_after(
+        node.complete_before_id = g_signal_connect(
                 session, "synchronization-complete",
-                G_CALLBACK(on_synchronization_complete_static), this);
+                G_CALLBACK(on_synchronization_complete_before_static), this);
+        node.complete_after_id = g_signal_connect_after(
+                session, "synchronization-complete",
+                G_CALLBACK(on_synchronization_complete_after_static), this);
         node.progress_id = g_signal_connect(
                 session, "synchronization-progress",
@@ -326 +335 @@
                 session, "close", G_CALLBACK(on_close_static), this);
 
-        // TODO: Connect to notify::status of subscription connection
-
         if(inf_session_get_status(session) == INF_SESSION_SYNCHRONIZING)
         {
@@ -383 +390 @@
                         Glib::ustring::compose("Synchronization failed: %1",
                                                error->message), SYNC_ERROR);
-        }
-}
-
-void Gobby::BrowserCommands::on_synchronization_complete(InfSession* session,
-                                                         InfXmlConnection* c)
+
+                // The document will be of no use anyway, so consider it not
+                // being modified.
+                gtk_text_buffer_set_modified(
+                        GTK_TEXT_BUFFER(window->get_text_buffer()), FALSE);
+        }
+}
+
+void Gobby::BrowserCommands::
+        on_synchronization_complete_before(InfSession* session,
+                                           InfXmlConnection* connection)
+{
+        SessionMap::iterator iter = m_session_map.find(session);
+        g_assert(iter != m_session_map.end());
+
+        if(iter->second.status == INF_SESSION_SYNCHRONIZING)
+        {
+                // Unset modified flag after synchronization.
+                DocWindow* window = m_folder.lookup_document(
+                        INF_TEXT_SESSION(session));
+                g_assert(window != NULL);
+
+                gtk_text_buffer_set_modified(
+                        GTK_TEXT_BUFFER(window->get_text_buffer()), FALSE);
+
+                // TODO: Actually we should always set the modified flag,
+                // except the document is either empty, or known in the
+                // document info storage and the version on disk is the same
+                // as the one we got synchronized. We could store a hash and
+                // modification time in the documentinfo storage for this.
+                // We should do this is another source file, such as
+                // synchronization-commands.cpp.
+        }
+}
+
+void Gobby::BrowserCommands::
+        on_synchronization_complete_after(InfSession* session,
+                                          InfXmlConnection* connection)
 {
         SessionMap::iterator iter = m_session_map.find(session);

code/commands/browser-commands.hpp

@@ -86 +86 @@
         }
 
-        static void on_synchronization_complete_static(InfSession* session,
-                                                       InfXmlConnection* conn,
-                                                       gpointer user_data)
-        {
-                static_cast<BrowserCommands*>(user_data)->
-                        on_synchronization_complete(session, conn);
+        static void
+        on_synchronization_complete_before_static(InfSession* session,
+                                                  InfXmlConnection* conn,
+                                                  gpointer user_data)
+        {
+                static_cast<BrowserCommands*>(user_data)->
+                        on_synchronization_complete_before(session, conn);
+        }
+
+        static void
+        on_synchronization_complete_after_static(InfSession* session,
+                                                 InfXmlConnection* conn,
+                                                 gpointer user_data)
+        {
+                static_cast<BrowserCommands*>(user_data)->
+                        on_synchronization_complete_after(session, conn);
         }
 
@@ -147 +157 @@
                                        InfXmlConnection* connection,
                                        const GError* error);
-        void on_synchronization_complete(InfSession* session,
-                                         InfXmlConnection* connection);
+        void on_synchronization_complete_before(InfSession* session,
+                                                InfXmlConnection* connection);
+        void on_synchronization_complete_after(InfSession* session,
+                                               InfXmlConnection* connection);
         void on_synchronization_progress(InfSession* session,
                                          InfXmlConnection* connection,
@@ -186 +198 @@
                 gulong notify_connection_id;
                 gulong failed_id;
-                gulong complete_id;
+                gulong complete_before_id;
+                gulong complete_after_id;
                 gulong progress_id;
                 gulong close_id;

code/core/tablabel.cpp

@@ -25 +25 @@
         Gtk::HBox(false, 6),
         m_folder(folder), m_document(document),
-        m_title(document.get_title(), Gtk::ALIGN_LEFT),
         m_changed(false)
 {
-        update_icon();
+        m_title.set_alignment(Gtk::ALIGN_LEFT);
+
+        update_icon();
+        update_color();
+        update_modified();
 
         m_icon.show();
@@ -82 +85 @@
         update_icon();
         update_color();
+        update_modified();
 }
 
@@ -92 +96 @@
 void Gobby::TabLabel::on_modified_changed()
 {
+        update_modified();
 }
 
@@ -184 +189 @@
         }
 }
+
+void Gobby::TabLabel::update_modified()
+{
+        InfSession* session = INF_SESSION(m_document.get_session());
+        bool modified = gtk_text_buffer_get_modified(
+                GTK_TEXT_BUFFER(m_document.get_text_buffer()));
+
+        if(inf_session_get_status(session) == INF_SESSION_SYNCHRONIZING)
+                modified = false;
+
+        if(modified)
+                m_title.set_text("*" + m_document.get_title());
+        else
+                m_title.set_text(m_document.get_title());
+}

code/core/tablabel.hpp

@@ -91 +91 @@
         void update_icon();
         void update_color();
+        void update_modified();
 
         Folder& m_folder;

code/operations/operation-open.cpp

@@ -348 +348 @@
 void Gobby::OperationOpen::read_finish()
 {
+        gtk_text_buffer_set_modified(m_content, FALSE);
+
         GtkTextIter insert_iter;
         GtkTextMark* insert = gtk_text_buffer_get_insert(m_content);

code/operations/operation-save.cpp

@@ -83 +83 @@
         get_status_bar().remove_message(m_message_handle);
 
-        // Reset file explicitenly before closing stream so that, on failure,
+        // Reset file explicitely before closing stream so that, on failure,
         // existing files are not overriden with the temporary files we
         // actually wrote to, at least for local files.
@@ -141 +141 @@
                 if(m_document != NULL)
                 {
+                        // TODO: Don't unset modified flag if the document has
+                        // changed in the meanwhile.
                         gtk_text_buffer_set_modified(
                                 GTK_TEXT_BUFFER(