Changeset 08eae59d49170034303842da09846cc88a3216fe

Timestamp:

07/03/08 10:56:02 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

da3e3a0201b8e4eb8cc106101386ca2e7234c06e

Children:

77f22cf1f41f0254633ba54553333e8ab1d75823

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-07-03T10:56:02Z+0200

Message:

Added Cut/Copy/Paste functionality

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

• inc/commands/edit-commands.hpp:
• src/commands/edit-commands.cpp: Implemented Cut/Copy/Paste functionality.

• src/core/folder.cpp: Emit signal_document_changed when the last document is about to be removed before the document has actually been removed, so that signal handlers that still have a reference to the last document can still make use of it.

• src/core/header.cpp: Added a shortcut (<control><stift>L) for Save All, as in gedit.

Files:

• ChangeLog (modified) (1 diff)
• inc/commands/edit-commands.hpp (modified) (3 diffs)
• src/commands/edit-commands.cpp (modified) (11 diffs)
• src/core/folder.cpp (modified) (2 diffs)
• src/core/header.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-07-03  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/commands/edit-commands.hpp:
+        * src/commands/edit-commands.cpp: Implemented Cut/Copy/Paste
+        functionality.
+
+        * src/core/folder.cpp: Emit signal_document_changed when the last
+        document is about to be removed before the document has actually been
+        removed, so that signal handlers that still have a reference to the
+        last document can still make use of it.
+
+        * src/core/header.cpp: Added a shortcut (<control><stift>L) for Save
+        All, as in gedit.
+
 2008-07-02  Armin Burgmeier  <armin@0x539.de>
 

inc/commands/edit-commands.hpp

@@ -67 +67 @@
         }
 
+        static void on_mark_set_static(GtkTextBuffer* buffer,
+                                       GtkTextIter* iter,
+                                       GtkTextMark* mark,
+                                       gpointer user_data)
+        {
+                static_cast<EditCommands*>(user_data)->on_mark_set();
+        }
+
+        static void on_changed_static(GtkTextBuffer* buffer,
+                                      gpointer user_data)
+        {
+                static_cast<EditCommands*>(user_data)->on_changed();
+        }
+
         void on_sync_complete();
         void on_active_user_changed(InfTextUser* active_user);
+        void on_mark_set();
+        void on_changed();
+
         void on_can_undo_changed(InfAdoptedUser* user, bool can_undo);
         void on_can_redo_changed(InfAdoptedUser* user, bool can_redo);
@@ -74 +91 @@
         void on_undo();
         void on_redo();
+        void on_cut();
+        void on_copy();
+        void on_paste();
 
         DocWindow* m_current_document;
@@ -81 +101 @@
         gulong m_can_redo_changed_handler;
         gulong m_synchronization_complete_handler;
+        gulong m_mark_set_handler;
+        gulong m_changed_handler;
 
         Gtk::Window& m_parent;

src/commands/edit-commands.cpp

@@ -34 +34 @@
         m_header.action_edit_redo->signal_activate().connect(
                 sigc::mem_fun(*this, &EditCommands::on_redo));
+        m_header.action_edit_cut->signal_activate().connect(
+                sigc::mem_fun(*this, &EditCommands::on_cut));
+        m_header.action_edit_copy->signal_activate().connect(
+                sigc::mem_fun(*this, &EditCommands::on_copy));
+        m_header.action_edit_paste->signal_activate().connect(
+                sigc::mem_fun(*this, &EditCommands::on_paste));
         m_folder.signal_document_changed().connect(
                 sigc::mem_fun(*this, &EditCommands::on_document_changed));
@@ -55 +61 @@
                         inf_adopted_session_get_algorithm(
                                 INF_ADOPTED_SESSION(session));
+                GtkTextBuffer* buffer = GTK_TEXT_BUFFER(
+                        m_current_document->get_text_buffer());
 
                 if(m_synchronization_complete_handler != 0)
@@ -72 +80 @@
                 }
 
+                g_signal_handler_disconnect(G_OBJECT(buffer),
+                                            m_mark_set_handler);
+                g_signal_handler_disconnect(G_OBJECT(buffer),
+                                            m_changed_handler);
+
                 m_active_user_changed_connection.disconnect();
         }
@@ -81 +94 @@
                 InfTextSession* session = document->get_session();
                 InfTextUser* active_user = document->get_active_user();
+                GtkTextBuffer* buffer =
+                        GTK_TEXT_BUFFER(document->get_text_buffer());
 
                 m_active_user_changed_connection =
@@ -88 +103 @@
                                         &EditCommands::
                                                 on_active_user_changed));
+
+                m_mark_set_handler = g_signal_connect_after(
+                        G_OBJECT(buffer), "mark-set",
+                        G_CALLBACK(&on_mark_set_static), this);
+                // The selection might change without mark-set being emitted
+                // when the document changes, for example when all
+                // currently selected text is deleted.
+                m_changed_handler = g_signal_connect_after(
+                        G_OBJECT(buffer), "changed",
+                        G_CALLBACK(&on_changed_static), this);
 
                 if(inf_session_get_status(INF_SESSION(session)) ==
@@ -116 +141 @@
                 // Set initial sensitivity for active user:
                 on_active_user_changed(active_user);
+                // Set initial sensitivity for cut/copy/paste:
+                on_mark_set();
         }
         else
@@ -121 +148 @@
                 m_header.action_edit_undo->set_sensitive(false);
                 m_header.action_edit_redo->set_sensitive(false);
+                m_header.action_edit_cut->set_sensitive(false);
+                m_header.action_edit_copy->set_sensitive(false);
+                m_header.action_edit_paste->set_sensitive(false);
         }
 }
@@ -152 +182 @@
 {
         g_assert(m_current_document != NULL);
-        InfTextSession* session = m_current_document->get_session();
-        InfAdoptedAlgorithm* algorithm = inf_adopted_session_get_algorithm(
-                INF_ADOPTED_SESSION(session));
 
         if(active_user != NULL)
         {
+                InfTextSession* session = m_current_document->get_session();
+                InfAdoptedAlgorithm* algorithm =
+                        inf_adopted_session_get_algorithm(
+                                INF_ADOPTED_SESSION(session));
+                GtkTextBuffer* buffer = GTK_TEXT_BUFFER(
+                        m_current_document->get_text_buffer());
+
                 m_header.action_edit_undo->set_sensitive(
                         inf_adopted_algorithm_can_undo(
@@ -164 +198 @@
                         inf_adopted_algorithm_can_redo(
                                 algorithm, INF_ADOPTED_USER(active_user)));
+
+                m_header.action_edit_cut->set_sensitive(
+                        gtk_text_buffer_get_has_selection(buffer));
+                m_header.action_edit_paste->set_sensitive(true);
         }
         else
@@ -169 +207 @@
                 m_header.action_edit_undo->set_sensitive(false);
                 m_header.action_edit_redo->set_sensitive(false);
-        }
+                m_header.action_edit_cut->set_sensitive(false);
+                m_header.action_edit_paste->set_sensitive(false);
+        }
+}
+
+void Gobby::EditCommands::on_mark_set()
+{
+        g_assert(m_current_document != NULL);
+        GtkTextBuffer* buffer =
+                GTK_TEXT_BUFFER(m_current_document->get_text_buffer());
+
+        m_header.action_edit_copy->set_sensitive(
+                gtk_text_buffer_get_has_selection(buffer));
+
+        if(m_current_document->get_active_user() != NULL)
+        {
+                m_header.action_edit_cut->set_sensitive(
+                        gtk_text_buffer_get_has_selection(buffer));
+        }
+}
+
+void Gobby::EditCommands::on_changed()
+{
+        on_mark_set();
 }
 
@@ -207 +268 @@
         );
 }
+
+void Gobby::EditCommands::on_cut()
+{
+        g_assert(m_current_document != NULL);
+        g_assert(m_current_document->get_active_user() != NULL);
+
+        gtk_text_buffer_cut_clipboard(
+                GTK_TEXT_BUFFER(m_current_document->get_text_buffer()),
+                gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+                TRUE);
+}
+
+void Gobby::EditCommands::on_copy()
+{
+        g_assert(m_current_document != NULL);
+
+        gtk_text_buffer_copy_clipboard(
+                GTK_TEXT_BUFFER(m_current_document->get_text_buffer()),
+                gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
+}
+
+void Gobby::EditCommands::on_paste()
+{
+        g_assert(m_current_document != NULL);
+        g_assert(m_current_document->get_active_user() != NULL);
+
+        gtk_text_buffer_paste_clipboard(
+                GTK_TEXT_BUFFER(m_current_document->get_text_buffer()),
+                gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+                NULL, TRUE);
+}

src/core/folder.cpp

@@ -132 +132 @@
                                                                 gpointer data)
                 {
-                        printf("Notify subscr group\n");
                         static_cast<TabLabel*>(data)->update_icon();
                 }
@@ -228 +227 @@
 {
         m_signal_document_removed.emit(window);
+
+        // TODO: We should actually remove the page here, but destroy the
+        // DocWindow after having emitted signal_document_changed.
+        if(get_n_pages() == 1)
+                m_signal_document_changed.emit(NULL);
+
         inf_session_close(INF_SESSION(window.get_session()));
         remove_page(window);
-
-        if(get_n_pages() == 0)
-                m_signal_document_changed.emit(NULL);
 }
 

src/core/header.cpp

@@ -276 +276 @@
                         Gtk::AccelKey("<control><shift>S",
                                       "<Actions>/MenuFile/FileSaveAs"));
-        group_file->add(action_file_save_all);
+        group_file->add(action_file_save_all,
+                        Gtk::AccelKey("<control><shift>L",
+                                      "<Actions>/MenuFile/FileSaveAll"));
         group_file->add(action_file_quit);