Changeset f5456c54572e967281cbc0c449855854cd046885

Timestamp:

01/06/07 23:36:19 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

e608789f1c38925d706e1b53f791db7997b99c22

Children:

810831841edb9a9fea83b0eba21d712ec4d2ae2a

git-committer:

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

Message:

[project @ Show revision and sync state in statusbar [fixes #13]]

Original author: Armin Burgmeier <armin@…>
Date: 2005-06-01 18:25:31+00:00

Files:

• TODO (modified) (3 diffs)
• inc/document.hpp (modified) (6 diffs)
• inc/folder.hpp (modified) (2 diffs)
• inc/statusbar.hpp (modified) (3 diffs)
• inc/window.hpp (modified) (3 diffs)
• src/document.cpp (modified) (10 diffs)
• src/folder.cpp (modified) (4 diffs)
• src/statusbar.cpp (modified) (6 diffs)
• src/window.cpp (modified) (3 diffs)

TODO

@@ -4 +4 @@
 Serious:
  * Opening large documents is _really_ slow on win32's timer implementation
- * On connection loss: give a chance to save everything
- * Chat messages could be faked by using newline characters (split them into
-   multiple single line messages)
 
 Important:
@@ -15 +12 @@
 Normal:
  * Menu to switch the syntax colouring scheme.
- * Initialise size of paned widgets
  * Prompt before overwriting existing files when explicitly choosing path
  * Chat command infrastructure (/me, /ignore)
@@ -30 +26 @@
  * Default to save files to the location they were loaded from
    (or save the directory of the last save)
-

inc/document.hpp

@@ -38 +38 @@
 {
 public:
-        typedef sigc::signal<void> signal_update_type;
+        typedef sigc::signal<void> signal_cursor_moved_type;
+        typedef sigc::signal<void> signal_changed_type;
 
         Document(obby::document& doc, const Folder& folder);
@@ -54 +55 @@
         unsigned int get_unsynced_changes_count() const;
 
+        /** Returns the current document revision.
+         */
+        unsigned int get_revision() const;
+
         /** Returns the currently selected Gtk::SourceLanguage.
          */
@@ -67 +72 @@
         Glib::ustring get_content();
 
-        /** Signal which will be emitted if the document gets updated in a way
-         * that is interesting for the status bar.
+        /** Signal which will be emitted if the document gets changed by a
+         * network event.
          */
-        signal_update_type update_event() const;
+        signal_changed_type changed_event() const;
+
+        /** Signal which will be emitted if the cursor's position changed.
+         */
+        signal_cursor_moved_type cursor_moved_event() const;
 
         /** Calls from the folder.
@@ -82 +91 @@
         void on_obby_insert(const obby::insert_record& record);
         void on_obby_delete(const obby::delete_record& record);
+        void on_obby_change();
 
         /** TextBuffer signal handlers.
@@ -97 +107 @@
                             const Gtk::TextBuffer::iterator& end);
 
-        /** Cursor position changed signal hanlder.
+        /** Signal handler for the mark_set event to detect cursor movements.
          */
-        void on_cursor_changed(const Gtk::TextBuffer::iterator& location,
-                               const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
+        void on_mark_set(const Gtk::TextBuffer::iterator& location,
+                         const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
 
         /** Marks the given part of the text as written by <em>user</em>.
@@ -125 +135 @@
         bool m_editing;
         
-        signal_update_type m_signal_update;
+        signal_cursor_moved_type m_signal_cursor_moved;
+        signal_changed_type m_signal_changed;
 private:
         /** Handler for update_user_colour(): It removes the given tag in

inc/folder.hpp

@@ -42 +42 @@
 {
 public:
-        typedef sigc::signal<void, Document&> signal_document_update_type;
+        typedef sigc::signal<void, Document&> signal_document_cursor_moved_type;
+        typedef sigc::signal<void, Document&> signal_document_changed_type;
+        typedef sigc::signal<void, Document&> signal_tab_switched_type;
 
         Folder();
@@ -62 +64 @@
         void obby_document_remove(obby::document& document);
 
-        signal_document_update_type document_update_event() const;
+        signal_document_cursor_moved_type document_cursor_moved_event() const;
+        signal_document_changed_type document_changed_event() const;
+        signal_tab_switched_type tab_switched_event() const;
 
 protected:
         // Signal handlers
         virtual void on_switch_page(GtkNotebookPage* page, guint page_num);
-        virtual void on_document_update(Document& document);
 
-        signal_document_update_type m_signal_document_update;
+        void on_document_cursor_moved(Document& document);
+        void on_document_changed(Document& document);
+
+        signal_document_cursor_moved_type m_signal_document_cursor_moved;
+        signal_document_changed_type m_signal_document_changed;
+        signal_tab_switched_type m_signal_tab_switched;
 
         /** Signals whether the obby session is running.

inc/statusbar.hpp

@@ -26 +26 @@
 #include <obby/document.hpp>
 #include "document.hpp"
+#include "folder.hpp"
 
 namespace Gobby
@@ -33 +34 @@
 {
 public:
-        StatusBar();
+        StatusBar(const Folder& folder);
         virtual ~StatusBar();
 
-        void update(Document& document);
+#ifdef WITH_GTKSOURCEVIEW
+        void update_language(Document& document);
+#endif
+        void update_sync(Document& document);
+        void update_revision(Document& document);
+        void update_cursor(Document& document);
+
+        void update_all(Document& document);
 
         // Calls from the window
@@ -50 +58 @@
         Gtk::Label m_language;
         Gtk::Label m_sync;
+        Gtk::Label m_revision;
         Gtk::Label m_position;
 };

inc/window.hpp

@@ -58 +58 @@
 
         void on_chat(const Glib::ustring& message);
-        void on_document_update(Document& document);
 
         // Obby signal handlers
@@ -82 +81 @@
         Gtk::VBox m_mainbox;
         Header m_header;
-        StatusBar m_statusbar;
 
         Gtk::VPaned m_mainpaned;
@@ -94 +92 @@
         UserList m_userlist;
         Chat m_chat;
+        StatusBar m_statusbar;
 
         // obby

src/document.cpp

@@ -93 +93 @@
                 sigc::mem_fun(*this, &Document::on_erase_after), true);
         buf->signal_mark_set().connect(
-                sigc::mem_fun(*this, &Document::on_cursor_changed) );
+                sigc::mem_fun(*this, &Document::on_mark_set) );
 
         // Obby signal handlers
@@ -100 +100 @@
         doc.delete_event().before().connect(
                 sigc::mem_fun(*this, &Document::on_obby_delete) );
+        doc.change_event().after().connect(
+                sigc::mem_fun(*this, &Document::on_obby_change) );
 
         // Set initial text
@@ -164 +166 @@
 }
 
-Gobby::Document::signal_update_type Gobby::Document::update_event() const
+Gobby::Document::signal_cursor_moved_type
+Gobby::Document::cursor_moved_event() const
+{
+        return m_signal_cursor_moved;
+}
+
+Gobby::Document::signal_changed_type Gobby::Document::changed_event() const
+{
+        return m_signal_changed;
+}
+
+/*Gobby::Document::signal_update_type Gobby::Document::update_event() const
 {
         return m_signal_update;
 }
-        
+*/
 void Gobby::Document::get_cursor_position(unsigned int& row,
                                           unsigned int& col)
 {
         // Get insert mark
-        // TODO: buffer provides a method that returns the insert mark
-        // directly.
         Glib::RefPtr<Gtk::TextBuffer::Mark> mark =
-                m_view.get_buffer()->get_mark("insert");
+                m_view.get_buffer()->get_insert();
 
         // Get corresponding iterator
@@ -199 +210 @@
         // Return amount reported by document otherwise
         return doc->unsynced_count();
+}
+
+unsigned int Gobby::Document::get_revision() const
+{
+        // Get revision from obby document
+        return m_doc.get_revision();
 }
 
@@ -242 +259 @@
 }
 
+void Gobby::Document::on_obby_insert(const obby::insert_record& record)
+{
+        if(m_editing) return;
+        m_editing = true;
+
+        // Get textbuffer
+        Glib::RefPtr<Gtk::TextBuffer> buffer = m_view.get_buffer();
+
+        // Translate position to row/column
+        unsigned int row, col;
+        m_doc.position_to_coord(record.get_position(), row, col);
+
+        // Find obby::user that inserted the text
+        obby::user* user = m_doc.get_buffer().find_user(record.get_from() );
+        assert(user != NULL);
+
+        // Insert text
+        Gtk::TextBuffer::iterator end = buffer->insert(
+                buffer->get_iter_at_line_index(row, col),
+                record.get_text()
+        );
+
+        // Colourize new text
+        Gtk::TextBuffer::iterator begin = end;
+        begin.backward_chars(record.get_text().length() );
+        update_user_colour(begin, end, *user);
+
+        m_view.queue_draw();
+        m_editing = false;
+}
+
+void Gobby::Document::on_obby_delete(const obby::delete_record& record)
+{
+        if(m_editing) return;
+        m_editing = true;
+
+        Glib::RefPtr<Gtk::TextBuffer> buffer = m_view.get_buffer();
+
+        unsigned int brow, bcol, erow, ecol;
+        m_doc.position_to_coord(record.get_begin(), brow, bcol);
+        m_doc.position_to_coord(record.get_end(), erow, ecol);
+
+        buffer->erase(
+                buffer->get_iter_at_line_index(brow, bcol),
+                buffer->get_iter_at_line_index(erow, ecol)
+        );
+        m_editing = false;
+}
+
+void Gobby::Document::on_obby_change()
+{
+        // Document changed
+        m_signal_changed.emit();
+}
+
 void Gobby::Document::on_insert_before(const Gtk::TextBuffer::iterator& begin,
                                        const Glib::ustring& text,
@@ -248 +320 @@
         if(m_editing) return;
         m_editing = true;
-        
+
         m_doc.insert(
                 m_doc.coord_to_position(
@@ -280 +352 @@
 }
 
-void Gobby::Document::on_obby_insert(const obby::insert_record& record)
-{
-        if(m_editing) return;
-        m_editing = true;
-
-        // Get textbuffer
-        Glib::RefPtr<Gtk::TextBuffer> buffer = m_view.get_buffer();
-
-        // Translate position to row/column
-        unsigned int row, col;
-        m_doc.position_to_coord(record.get_position(), row, col);
-
-        // Find obby::user that inserted the text
-        obby::user* user = m_doc.get_buffer().find_user(record.get_from() );
-        assert(user != NULL);
-
-        // Insert text
-        Gtk::TextBuffer::iterator end = buffer->insert(
-                buffer->get_iter_at_line_index(row, col),
-                record.get_text()
-        );
-
-        // Colourize new text
-        Gtk::TextBuffer::iterator begin = end;
-        begin.backward_chars(record.get_text().length() );
-        update_user_colour(begin, end, *user);
-
-        m_view.queue_draw();
-        m_editing = false;
-}
-
-void Gobby::Document::on_obby_delete(const obby::delete_record& record)
-{
-        if(m_editing) return;
-        m_editing = true;
-
-        Glib::RefPtr<Gtk::TextBuffer> buffer = m_view.get_buffer();
-
-        unsigned int brow, bcol, erow, ecol;
-        m_doc.position_to_coord(record.get_begin(), brow, bcol);
-        m_doc.position_to_coord(record.get_end(), erow, ecol);
-
-        buffer->erase(
-                buffer->get_iter_at_line_index(brow, bcol),
-                buffer->get_iter_at_line_index(erow, ecol)
-        );
-        m_editing = false;
-}
-
 void Gobby::Document::on_insert_after(const Gtk::TextBuffer::iterator& end,
                                       const Glib::ustring& text,
@@ -336 +359 @@
         if(!m_editing)
         {
-                // TODO: Find a better solution to access the local user object.
-                /*obby::client_document* client_doc =
-                        dynamic_cast<obby::client_document*>(&m_doc);
-                obby::host_document* host_doc =
-                        dynamic_cast<obby::host_document*>(&m_doc);
-
-                const obby::user* user = NULL;
-                if(client_doc != NULL)
-                        user = &client_doc->get_buffer().get_self();
-                if(host_doc != NULL)
-                        user = &host_doc->get_buffer().get_self();*/
-//              const obby::user& user = reinterpret_cast<const obby::local_buffer&>(m_doc.get_buffer() ).get_self();
-                // dynamic_cast suckt
+                // Find the user that has written this text
                 const obby::user& user =
                         dynamic_cast<const obby::local_buffer&>(
@@ -362 +373 @@
         }
 
-        // Document changed: Update statusbar
-        m_signal_update.emit();
+        // Cursor position has changed
+        m_signal_cursor_moved.emit();
 }
 
@@ -369 +380 @@
                                      const Gtk::TextBuffer::iterator& end)
 {
-        // Document changed: Update statusbar
-        m_signal_update.emit();
-}
-
-void Gobby::Document::on_cursor_changed(
+        // Cursor position may have changed
+        m_signal_cursor_moved.emit();
+}
+
+void Gobby::Document::on_mark_set(
         const Gtk::TextBuffer::iterator& location,
         const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark
 )
 {
-        // Insert mark changed position: Update status bar
-        // TODO: Build separate cursor changed signal?
-        if(mark->get_name() == "insert")
-                m_signal_update.emit();
+        // Insert mark changed position: Cursor position change
+        if(mark == m_view.get_buffer()->get_insert() )//->get_name() == "insert")
+                m_signal_cursor_moved.emit();
 }
 

src/folder.cpp

@@ -94 +94 @@
         // Watch update signal to emit document_updated signal if a document
         // has been updated.
-        new_doc->update_event().connect(
+        new_doc->cursor_moved_event().connect(
                 sigc::bind(
-                        sigc::mem_fun(*this, &Folder::on_document_update),
+                        sigc::mem_fun(*this, &Folder::on_document_cursor_moved),
+                        sigc::ref(*new_doc)
+                )
+        );
+
+        new_doc->changed_event().connect(
+                sigc::bind(
+                        sigc::mem_fun(*this, &Folder::on_document_changed),
                         sigc::ref(*new_doc)
                 )
@@ -124 +131 @@
 }
 
-Gobby::Folder::signal_document_update_type
-Gobby::Folder::document_update_event() const
+// Signals
+Gobby::Folder::signal_document_cursor_moved_type
+Gobby::Folder::document_cursor_moved_event() const
 {
-        return m_signal_document_update;
+        return m_signal_document_cursor_moved;
+}
+
+Gobby::Folder::signal_document_changed_type
+Gobby::Folder::document_changed_event() const
+{
+        return m_signal_document_changed;
+}
+
+Gobby::Folder::signal_tab_switched_type
+Gobby::Folder::tab_switched_event() const
+{
+        return m_signal_tab_switched;
 }
 
@@ -143 +163 @@
         {
                 // Another document has been selected: Update statusbar
-                m_signal_document_update.emit(
-                        *static_cast<Document*>(get_nth_page(page_num))
+                m_signal_tab_switched.emit(
+                        *static_cast<Document*>(get_nth_page(page_num) )
                 );
         }
@@ -151 +171 @@
 }
 
-void Gobby::Folder::on_document_update(Document& document)
+void Gobby::Folder::on_document_cursor_moved(Document& document)
 {
         // Update in the currently visible document? Update statusbar.
         if(get_current_page() == page_num(document) )
-                m_signal_document_update.emit(document);
+                m_signal_document_cursor_moved.emit(document);
 }
 
+void Gobby::Folder::on_document_changed(Document& document)
+{
+        // Update in the currently visible document? Update statusbar.
+        if(get_current_page() == page_num(document) )
+                m_signal_document_changed.emit(document);
+}
+

src/statusbar.cpp

@@ -18 +18 @@
 
 #include <sstream>
+#include <obby/buffer.hpp>
 #include "common.hpp"
 #include "statusbar.hpp"
 
-Gobby::StatusBar::StatusBar()
+Gobby::StatusBar::StatusBar(const Folder& folder)
  : Frame(), 
    m_language("", Gtk::ALIGN_LEFT),
    m_sync("", Gtk::ALIGN_LEFT),
+   m_revision("", Gtk::ALIGN_LEFT),
    m_position("", Gtk::ALIGN_LEFT)
 {
         m_box.pack_start(m_language);
         m_box.pack_start(m_sync);
+        m_box.pack_start(m_revision);
         m_box.pack_start(m_position);
         m_box.set_homogeneous(true);
@@ -34 +37 @@
         add(m_box);
         set_shadow_type(Gtk::SHADOW_OUT);
+
+        folder.document_cursor_moved_event().connect(
+                sigc::mem_fun(*this, &StatusBar::update_cursor) );
+        folder.document_changed_event().connect(
+                sigc::mem_fun(*this, &StatusBar::update_all) );
+        folder.tab_switched_event().connect(
+                sigc::mem_fun(*this, &StatusBar::update_all) );
 }
 
@@ -40 +50 @@
 }
 
-void Gobby::StatusBar::update(Document& document)
+#ifdef WITH_GTKSOURCEVIEW
+void Gobby::StatusBar::update_language(Document& document)
 {
-        // Unsynced changes
-        unsigned int unsynced_count = document.get_unsynced_changes_count();
-        
-/*      std::stringstream sync_str;
-        if(!unsynced_count)
-                sync_str << _("In sync");
-        else
-                sync_str << unsynced_count << _(" unsynced change(s)");*/
-        
-        // Position
-        unsigned int row, col;
-        document.get_cursor_position(row, col);
-        ++ row; ++ col;
-
-        std::stringstream pos_str;
-        pos_str << _("Line: ") << row << _(" Column: ") << col;
-
-#ifdef WITH_GTKSOURCEVIEW
         // Selected language
         if(document.get_language() )
@@ -68 +61 @@
         else
                 m_language.set_text(_("No language selected") );
+}
 #endif
-//      m_sync.set_text(sync_str.str() );
+
+void Gobby::StatusBar::update_sync(Document& document)
+{
+        unsigned int unsynced_count = document.get_unsynced_changes_count();
+        if(unsynced_count)
+        {
+                std::stringstream sync_str;
+                sync_str << unsynced_count << _(" unsynced change(s)");
+                m_sync.set_text(sync_str.str() );
+        }
+        else
+        {
+                m_sync.set_text(_("In sync") );
+        }
+}
+
+void Gobby::StatusBar::update_revision(Document& document)
+{
+        std::stringstream rev_str;
+        rev_str << _("Revision: ") << document.get_revision();
+        m_revision.set_text(rev_str.str() );
+}
+
+void Gobby::StatusBar::update_cursor(Document& document)
+{
+        unsigned int row, col;
+        document.get_cursor_position(row, col);
+        ++ row; ++ col;
+
+        std::stringstream pos_str;
+        pos_str << _("Line: ") << row << _(" Column: ") << col;
         m_position.set_text(pos_str.str() );
+}
+
+void Gobby::StatusBar::update_all(Document& document)
+{
+#ifdef WITH_GTKSOURCEVIEW
+        update_language(document);
+#endif
+        update_sync(document);
+        update_revision(document);
+        update_cursor(document);
 }
 
@@ -80 +114 @@
 {
         m_language.set_text("");
+        m_sync.set_text("");
+        m_revision.set_text("");
         m_position.set_text("");
-        m_sync.set_text("");
 }
 
@@ -98 +133 @@
 void Gobby::StatusBar::obby_document_remove(obby::document& document)
 {
+        // Last document that is closed?
+        if(document.get_buffer().document_count() == 1)
+        {
+                // Clear statusbar
+                obby_end();
+        }
 }
 

src/window.cpp

@@ -43 +43 @@
  : Gtk::Window(Gtk::WINDOW_TOPLEVEL), 
    m_config(Glib::get_home_dir() + "/.gobby/config.xml"), m_buffer(NULL),
-   m_running(false)
+   m_running(false), m_statusbar(m_folder)
 {
         m_header.session_create_event().connect(
@@ -70 +70 @@
         m_chat.chat_event().connect(
                 sigc::mem_fun(*this, &Window::on_chat) );
-        m_folder.document_update_event().connect(
-                sigc::mem_fun(*this, &Window::on_document_update) );
 
         m_frame_chat.set_shadow_type(Gtk::SHADOW_IN);
@@ -403 +401 @@
 }
 
-void Gobby::Window::on_document_update(Document& document)
+/*void Gobby::Window::on_document_update(Document& document)
 {
         // Update statusbar
         m_statusbar.update(document);
-}
+}*/
 
 void Gobby::Window::on_obby_login_failed(const std::string& reason)