Changeset da3e3a0201b8e4eb8cc106101386ca2e7234c06e

Timestamp:

07/02/08 22:54:27 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

93f6a42ac3ff9aae384c3628b155631b6f3c22ff

Children:

08eae59d49170034303842da09846cc88a3216fe

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-07-02T22:54:27Z+0200

Message:

Added Undo/Redo functionality

2008-07-02 Armin Burgmeier <armin@…>

• inc/core/docwindow.hpp:
• src/core/docwindow.cpp: Added the active_user_changed signal and the get_active_user() function.

• src/core/header.cpp: Added shortcuts for Undo and Redo.

• src/core/noteplugin.cpp: Disable GtkSourceView? Undo/Redo system by calling gtk_source_buffer_begin_non_undoable_action() without ever ending that non-undoable action.

• inc/commands/edit-commands.hpp:
• src/commands/edit-commands.cpp: New class handling the commands in the Edit submenu. For now Undo and Redo are implemented.

• inc/window.hpp:
• src/window.cpp: Instantiate EditCommands?.

• inc/commands/Makefile.am:
• src/commands/Makefile.am: Added new files to build.

Files:

• ChangeLog (modified) (1 diff)
• inc/commands/Makefile.am (modified) (1 diff)
• inc/commands/edit-commands.hpp (added)
• inc/core/docwindow.hpp (modified) (4 diffs)
• inc/window.hpp (modified) (5 diffs)
• src/commands/Makefile.am (modified) (1 diff)
• src/commands/edit-commands.cpp (added)
• src/core/docwindow.cpp (modified) (2 diffs)
• src/core/header.cpp (modified) (1 diff)
• src/core/noteplugin.cpp (modified) (1 diff)
• src/window.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-07-02  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/core/docwindow.hpp:
+        * src/core/docwindow.cpp: Added the active_user_changed signal and
+        the get_active_user() function.
+
+        * src/core/header.cpp: Added shortcuts for Undo and Redo.
+
+        * src/core/noteplugin.cpp: Disable GtkSourceView Undo/Redo system by
+        calling gtk_source_buffer_begin_non_undoable_action() without ever
+        ending that non-undoable action.
+
+        * inc/commands/edit-commands.hpp:
+        * src/commands/edit-commands.cpp: New class handling the commands in
+        the Edit submenu. For now Undo and Redo are implemented.
+
+        * inc/window.hpp:
+        * src/window.cpp: Instantiate EditCommands.
+
+        * inc/commands/Makefile.am:
+        * src/commands/Makefile.am: Added new files to build.
+
 2008-06-29  Armin Burgmeier  <armin@0x539.de>
 

inc/commands/Makefile.am

@@ -2 +2 @@
 noinst_HEADERS = \
         browser-commands.hpp \
+        edit-commands.hpp \
         file-commands.hpp

inc/core/docwindow.hpp

@@ -42 +42 @@
 public:
         typedef sigc::signal<void, GtkSourceLanguage*> SignalLanguageChanged;
+        typedef sigc::signal<void, InfTextUser*> SignalActiveUserChanged;
 
         DocWindow(InfTextSession* session, const Glib::ustring& title,
@@ -65 +66 @@
         void set_language(GtkSourceLanguage* language);
 
+        InfTextUser* get_active_user() const;
         void set_active_user(InfTextUser* user);
 
@@ -76 +78 @@
         {
                 return m_signal_language_changed;
+        }
+
+        SignalActiveUserChanged signal_active_user_changed() const
+        {
+                return m_signal_active_user_changed;
         }
 
@@ -106 +113 @@
 
         SignalLanguageChanged m_signal_language_changed;
+        SignalActiveUserChanged m_signal_active_user_changed;
 };
 

inc/window.hpp

@@ -25 +25 @@
 #include "commands/browser-commands.hpp"
 #include "commands/file-commands.hpp"
+#include "commands/edit-commands.hpp"
 #include "operations/operations.hpp"
 
-/*#include "dialogs/finddialog.hpp"
-#include "dialogs/gotodialog.hpp"
-#include "dialogs/preferencesdialog.hpp"*/
 #include "dialogs/initialdialog.hpp"
 
@@ -35 +33 @@
 #include "core/iconmanager.hpp"
 #include "core/header.hpp"
-#include "core/docwindow.hpp"
 #include "core/folder.hpp"
 #include "core/browser.hpp"
@@ -47 +44 @@
 #include <gtkmm/messagedialog.h>
 
-#include <queue>
 #include <memory>
 
@@ -94 +90 @@
         BrowserCommands m_commands_browser;
         FileCommands m_commands_file;
+        EditCommands m_commands_edit;
 
         // TODO: Can't we use this directly now that the session is
@@ -101 +98 @@
         // Dialogs
         std::auto_ptr<InitialDialog> m_initial_dlg;
-/*      std::auto_ptr<PreferencesDialog> m_preferences_dlg;
-        std::auto_ptr<FindDialog> m_finddialog;
-        std::auto_ptr<GotoDialog> m_gotodialog;*/
 };
 

src/commands/Makefile.am

@@ -3 +3 @@
 libgobby_commands_a_SOURCES = \
         browser-commands.cpp \
+        edit-commands.cpp \
         file-commands.cpp
 

src/core/docwindow.cpp

@@ -270 +270 @@
 }
 
+InfTextUser* Gobby::DocWindow::get_active_user() const
+{
+        InfTextGtkBuffer* buffer = INF_TEXT_GTK_BUFFER(
+                inf_session_get_buffer(INF_SESSION(m_session)));
+        return inf_text_gtk_buffer_get_active_user(buffer);
+}
+
 void Gobby::DocWindow::set_active_user(InfTextUser* user)
 {
@@ -288 +295 @@
         else
                 gtk_text_view_set_editable(GTK_TEXT_VIEW(m_view), FALSE);
+
+        m_signal_active_user_changed.emit(user);
 }
 

src/core/header.cpp

@@ -280 +280 @@
 
         group_edit->add(action_edit);
-        group_edit->add(action_edit_undo);
-        group_edit->add(action_edit_redo);
+        group_edit->add(action_edit_undo,
+                        Gtk::AccelKey("<control>Z",
+                                      "<Actions>/MenuEdit/EditUndo"));
+        group_edit->add(action_edit_redo,
+                        Gtk::AccelKey("<control><shift>Z",
+                                      "<Actions>/MenuEdit/EditRedo"));
         group_edit->add(action_edit_cut);
         group_edit->add(action_edit_copy);

src/core/noteplugin.cpp

@@ -36 +36 @@
         {
                 GtkSourceBuffer* textbuffer = gtk_source_buffer_new(NULL);
+                // We never end this non-undoable action since we have our
+                // own (collaborative) Undo implementanion, and we don't want
+                // GtkSourceView to get in our way:
+                gtk_source_buffer_begin_not_undoable_action(textbuffer);
+
                 InfUserTable* user_table = inf_user_table_new();
                 InfTextGtkBuffer* buffer =

src/window.cpp

@@ -36 +36 @@
                            m_preferences),
         m_commands_file(*this, m_header, m_browser, m_folder, m_operations,
-                        m_info_storage, m_preferences)
+                        m_info_storage, m_preferences),
+        m_commands_edit(*this, m_header, m_folder, m_preferences)
 {
         m_header.show();