Changeset d685cc7b132dc9471218349ddee02b64b209a7c9

Timestamp:

06/27/08 21:46:39 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

b1ca4c933b03b9223f71cf8ab5a68a0e17c18515

Children:

e4e679ae7ba627bb42375a3343fa8182c2cf68c6

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-06-27T21:46:39Z+0200

Message:

Automatically subscribe to newly created documents.

2008-06-27 Armin Burgmeier <armin@…>

• inc/commands/browser-commands.hpp:
• src/commands/browser-commands.cpp: Make sure subscription progress is only shown for sessions that are synchronized, not for sync-ins.

• inc/core/preferences.hpp: Removed the non-const operator Type& since it allows changing the Properties content without notification. Also added get() in analogy to set().

• inc/operations/operation-open.hpp:
• src/operations/operation-open.cpp: Take a Preferences in the constructor, add a user to the session before synchronizing it to the server so that we can start editing the document before the synchronization is complete.

• inc/operations/operations.hpp:
• src/operations/operations.cpp:
• src/window.cpp: Pass the Preferences object to OperationOpen?.

• src/operations/operation-new.cpp: Automatically Subscribe to newly created documents.

Files:

• ChangeLog (modified) (1 diff)
• inc/commands/browser-commands.hpp (modified) (1 diff)
• inc/core/preferences.hpp (modified) (2 diffs)
• inc/operations/operation-open.hpp (modified) (2 diffs)
• inc/operations/operations.hpp (modified) (2 diffs)
• src/commands/browser-commands.cpp (modified) (5 diffs)
• src/operations/operation-new.cpp (modified) (1 diff)
• src/operations/operation-open.cpp (modified) (4 diffs)
• src/operations/operations.cpp (modified) (2 diffs)
• src/window.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-06-27  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/commands/browser-commands.hpp:
+        * src/commands/browser-commands.cpp: Make sure subscription progress
+        is only shown for sessions that are synchronized, not for sync-ins.
+
+        * inc/core/preferences.hpp: Removed the non-const operator Type& since
+        it allows changing the Properties content without notification. Also
+        added get() in analogy to set().
+
+        * inc/operations/operation-open.hpp:
+        * src/operations/operation-open.cpp: Take a Preferences in the
+        constructor, add a user to the session before synchronizing it to the
+        server so that we can start editing the document before the
+        synchronization is complete.
+
+        * inc/operations/operations.hpp:
+        * src/operations/operations.cpp:
+        * src/window.cpp: Pass the Preferences object to OperationOpen.
+
+        * src/operations/operation-new.cpp: Automatically Subscribe to newly
+        created documents.
+
 2008-06-27  Armin Burgmeier  <armin@0x539.de>
 

inc/commands/browser-commands.hpp

@@ -170 +170 @@
         struct SessionNode {
                 InfcSessionProxy* proxy;
+                InfSessionStatus status;
 
                 gulong failed_id;

inc/core/preferences.hpp

@@ -53 +53 @@
                 }
 
+                const Type& get() const
+                {
+                        return m_value;
+                }
+
                 operator const Type&() const
                 {
@@ -58 +63 @@
                 }
 
-                operator Type&()
+                /*operator Type&()
                 {
                         return m_value;
-                }
+                }*/
 
                 signal_changed_type signal_changed() const

inc/operations/operation-open.hpp

@@ -32 +32 @@
 {
 public:
-        OperationOpen(Operations& operations, InfcBrowser* browser,
-                      InfcBrowserIter* parent, const std::string& name,
-                      const std::string& uri,
+        OperationOpen(Operations& operations, const Preferences& preferences,
+                      InfcBrowser* browser, InfcBrowserIter* parent,
+                      const std::string& name, const std::string& uri,
                       const char* encoding /* NULL means auto-detect */);
 
@@ -81 +81 @@
         void error(const Glib::ustring& message);
 protected:
+        const Preferences& m_preferences;
         std::string m_name;
         InfcBrowser* m_browser;

inc/operations/operations.hpp

@@ -58 +58 @@
         };
 
-        Operations(DocumentInfoStorage& info_storage, StatusBar& status_bar);
+        Operations(DocumentInfoStorage& info_storage,
+                   Preferences& preferences, StatusBar& status_bar);
         ~Operations();
 
@@ -75 +76 @@
 
         DocumentInfoStorage& m_info_storage;
+        Preferences& m_preferences;
         StatusBar& m_status_bar;
 

src/commands/browser-commands.cpp

@@ -124 +124 @@
 
 Gobby::BrowserCommands::SessionNode::SessionNode(const SessionNode& node):
-        proxy(node.proxy)
+        proxy(node.proxy), status(node.status)
 {
         g_assert(proxy == NULL);
@@ -283 +283 @@
                 INF_TEXT_SESSION(session),
                 infc_browser_iter_get_name(browser, iter));
+        m_folder.switch_to_document(window);
 
         SessionNode& node = m_session_map[session];
         node.proxy = proxy;
+
+        /* We cache this for the synchronization-complete signal handler,
+         * since the session already changed to RUNNING before the signal
+         * handler is run: */
+        node.status = inf_session_get_status(session);
         g_object_ref(proxy);
 
@@ -350 +356 @@
         g_assert(iter != m_session_map.end());
 
-        DocWindow* window = m_folder.lookup_document(
-                INF_TEXT_SESSION(session));
-        g_assert(window != NULL);
-
-        set_error_text(
-                *window,
-                Glib::ustring::compose("Synchronization failed: %1",
-                                       error->message), SYNC_ERROR);
+        if(iter->second.status == INF_SESSION_SYNCHRONIZING)
+        {
+                DocWindow* window = m_folder.lookup_document(
+                        INF_TEXT_SESSION(session));
+                g_assert(window != NULL);
+
+                set_error_text(
+                        *window,
+                        Glib::ustring::compose("Synchronization failed: %1",
+                                               error->message), SYNC_ERROR);
+        }
 }
 
@@ -366 +375 @@
         g_assert(iter != m_session_map.end());
 
-        join_user(iter->second.proxy);
+        if(iter->second.status == INF_SESSION_SYNCHRONIZING)
+        {
+                iter->second.status = INF_SESSION_RUNNING;
+                join_user(iter->second.proxy);
+        }
 }
 
@@ -376 +389 @@
         g_assert(iter != m_session_map.end());
 
-        DocWindow* window = m_folder.lookup_document(
-                INF_TEXT_SESSION(session));
-
-        g_assert(window != NULL);
-        window->set_info(
-                Glib::ustring::compose(
-                        _("Synchronization in progress
 %1%%"),
-                        static_cast<unsigned int>(percentage * 100)));
+        if(iter->second.status == INF_SESSION_SYNCHRONIZING)
+        {
+                DocWindow* window = m_folder.lookup_document(
+                        INF_TEXT_SESSION(session));
+
+                g_assert(window != NULL);
+                window->set_info(
+                        Glib::ustring::compose(
+                                _("Synchronization in progress
 %1%%"),
+                                static_cast<unsigned int>(percentage * 100)));
+        }
 }
 

src/operations/operation-new.cpp

@@ -30 +30 @@
         // TODO: Use TRUE here as soon as BrowserCommands handles it
         m_request = infc_browser_add_note(browser, parent, name.c_str(),
-                                          Plugins::TEXT, FALSE);
+                                          Plugins::TEXT, TRUE);
         // Note infc_browser_add_note does not return a
         // new reference.

src/operations/operation-open.cpp

@@ -51 +51 @@
 
 Gobby::OperationOpen::OperationOpen(Operations& operations,
+                                    const Preferences& preferences,
                                     InfcBrowser* browser,
                                     InfcBrowserIter* parent,
@@ -56 +57 @@
                                     const std::string& uri,
                                     const char* encoding):
-        Operation(operations), m_name(name), m_browser(browser),
-        m_parent(*parent), m_encoding_auto_detect_index(-1),
+        Operation(operations), m_preferences(preferences), m_name(name),
+        m_browser(browser), m_parent(*parent),
+        m_encoding_auto_detect_index(-1),
         m_eol_style(DocumentInfoStorage::EOL_CR), m_request(NULL),
         m_finished_id(0), m_failed_id(0), m_raw_pos(0)
@@ -346 +348 @@
 void Gobby::OperationOpen::read_finish()
 {
+        GtkTextIter insert_iter;
+        GtkTextMark* insert = gtk_text_buffer_get_insert(m_content);
+        gtk_text_buffer_get_iter_at_mark(m_content, &insert_iter, insert);
+
+        InfUser* user = INF_USER(g_object_new(
+                INF_TEXT_TYPE_USER,
+                "id", 1,
+                "flags", INF_USER_LOCAL,
+                "name", m_preferences.user.name.get().c_str(),
+                "status", INF_USER_AVAILABLE,
+                "hue", m_preferences.user.hue.get(),
+                "caret-position", gtk_text_iter_get_offset(&insert_iter),
+                static_cast<void*>(NULL)));
+
         InfUserTable* user_table = inf_user_table_new();
+        inf_user_table_add_user(user_table, user);
+        g_object_unref(user);
+
         InfTextGtkBuffer* text_gtk_buffer =
                 inf_text_gtk_buffer_new(m_content, user_table);
@@ -365 +384 @@
 
         g_object_unref(io);
-        // TODO: Use TRUE here as soon as BrowserCommands handles it
         m_request = infc_browser_add_note_with_content(
                 m_browser, &m_parent, m_name.c_str(), Plugins::TEXT,
-                INF_SESSION(session), FALSE);
+                INF_SESSION(session), TRUE);
         g_object_unref(session);
 

src/operations/operations.cpp

@@ -27 +27 @@
 
 Gobby::Operations::Operations(DocumentInfoStorage& info_storage,
+                              Preferences& preferences,
                               StatusBar& status_bar):
-        m_info_storage(info_storage), m_status_bar(status_bar)
+        m_info_storage(info_storage), m_preferences(preferences),
+        m_status_bar(status_bar)
 {
 }
@@ -54 +56 @@
                                         const char* encoding)
 {
-        m_operations.insert(new OperationOpen(*this, browser, parent, name,
-                                              from_uri, encoding));
+        m_operations.insert(
+                new OperationOpen(*this, m_preferences, browser, parent, name,
+                                  from_uri, encoding));
 }
 

src/window.cpp

@@ -32 +32 @@
         m_browser(*this, Plugins::TEXT, m_statusbar, m_preferences),
         m_info_storage(INF_GTK_BROWSER_MODEL(m_browser.get_store())),
-        m_operations(m_info_storage, m_statusbar), 
+        m_operations(m_info_storage, m_preferences, m_statusbar), 
         m_commands_browser(m_browser, m_folder, m_statusbar, m_preferences),
         m_commands_file(*this, m_header, m_browser, m_folder, m_operations)