ported nautilus-elementary UNDO-REDO (bzr rev 60)

author: Stefano Karapetsas <[email protected]> 2011-12-26 19:52:59 +0100
committer: Stefano Karapetsas <[email protected]> 2011-12-26 19:52:59 +0100
commit: cdd4cad2ce3930bf1d484ab12371a5d6a354ea00 (patch)
tree: 029f4f723976e1480812a984e81b8e961e14d39c /src
parent: 390b49cb93699309e1250143e744b2e61ac81cfe (diff)
download: caja-cdd4cad2ce3930bf1d484ab12371a5d6a354ea00.tar.bz2
caja-cdd4cad2ce3930bf1d484ab12371a5d6a354ea00.tar.xz
5 files changed, 184 insertions, 1 deletions
diff --git a/src/caja-shell-ui.xml b/src/caja-shell-ui.xml
index 0c27d173..ce9268a2 100644
--- a/src/caja-shell-ui.xml
+++ b/src/caja-shell-ui.xml
@@ -21,8 +21,10 @@
 <menuitem name="Close" action="Close"/>
 </menu>
 <menu action="Edit">
+ <placeholder name="Undostack Actions"/>
+ <separator/>
 <placeholder name="Clipboard Actions">
- </placeholder>
+ </placeholder>
 <separator/>
 <placeholder name="Copy Move to Placeholder"/>
 <separator/>
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index c11b2869..774bb7c9 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -273,6 +273,7 @@ action_stop_callback (GtkAction *action,
 caja_window_slot_stop_loading (slot);
 }
 
+#ifdef TEXT_CHANGE_UNDO
 static void
 action_undo_callback (GtkAction *action,
 gpointer user_data)
@@ -280,6 +281,7 @@ action_undo_callback (GtkAction *action,
 caja_undo_manager_undo
 (CAJA_WINDOW (user_data)->application->undo_manager);
 }
+#endif
 
 static void
 action_home_callback (GtkAction *action,
@@ -849,10 +851,12 @@ static const GtkActionEntry main_entries[] =
 NULL, N_("Edit Caja preferences"),
 G_CALLBACK (action_preferences_callback)
 },
+ #ifdef TEXT_CHANGE_UNDO
 /* name, stock id, label */ { "Undo", NULL, N_("_Undo"),
 "<control>Z", N_("Undo the last text change"),
 G_CALLBACK (action_undo_callback)
 },
+ #endif
 /* name, stock id, label */ { "Up", GTK_STOCK_GO_UP, N_("Open _Parent"),
 "<alt>Up", N_("Open the parent folder"),
 G_CALLBACK (action_up_callback)
diff --git a/src/file-manager/caja-directory-view-ui.xml b/src/file-manager/caja-directory-view-ui.xml
index 80b9e881..4e926fa0 100644
--- a/src/file-manager/caja-directory-view-ui.xml
+++ b/src/file-manager/caja-directory-view-ui.xml
@@ -58,6 +58,10 @@
 <menuitem name="Copy" action="Copy"/>
 <menuitem name="Paste" action="Paste"/>
 </placeholder>
+ <placeholder name="Undostack Actions">
+ <menuitem name="Undo" action="Undo"/>
+ <menuitem name="Redo" action="Redo"/>
+ </placeholder>
 <placeholder name="Select Items">
 <menuitem name="Select All" action="Select All"/>
 <menuitem name="Select Pattern" action="Select Pattern"/>
diff --git a/src/file-manager/fm-actions.h b/src/file-manager/fm-actions.h
index 077d82c1..17782322 100644
--- a/src/file-manager/fm-actions.h
+++ b/src/file-manager/fm-actions.h
@@ -105,6 +105,8 @@
 #define FM_ACTION_STRETCH "Stretch"
 #define FM_ACTION_UNSTRETCH "Unstretch"
 #define FM_ACTION_ZOOM_ITEMS "Zoom Items"
+#define FM_ACTION_UNDO "Undo"
+#define FM_ACTION_REDO "Redo"
 #define FM_ACTION_SORT_TRASH_TIME "Sort by Trash Time"
 
 #endif /* FM_ACTIONS_H */
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index a192aa58..a5504893 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -81,6 +81,7 @@
 #include <libcaja-private/caja-signaller.h>
 #include <libcaja-private/caja-autorun.h>
 #include <libcaja-private/caja-icon-names.h>
+#include <libcaja-private/caja-undostack-manager.h>
 
 /* Minimum starting update inverval */
 #define UPDATE_INTERVAL_MIN 100
@@ -256,6 +257,13 @@ struct FMDirectoryViewDetails
 gboolean allow_moves;
 
 GdkPoint context_menu_position;
+
+ gboolean undo_active;
+ gboolean redo_active;
+ gchar* undo_action_description;
+ gchar* undo_action_label;
+ gchar* redo_action_description;
+ gchar* redo_action_label;
 };
 
 typedef struct {
@@ -386,6 +394,22 @@ static inline void fm_directory_view_widget_to_file_operation_position (FMDirect
 static void fm_directory_view_widget_to_file_operation_position_xy (FMDirectoryView *view,
 int *x, int *y);
 
+/* undo-related actions */
+
+static void undo_redo_menu_update_callback (CajaUndoStackManager* manager, gpointer arg1, gpointer data);
+
+static void undo_update_menu (FMDirectoryView *view);
+
+static void finish_undoredo_callback (gpointer data);
+
+static void real_action_undo (FMDirectoryView *view);
+
+static void real_action_redo (FMDirectoryView *view);
+
+static void action_undo_callback (GtkAction *action, gpointer callback_data);
+
+static void action_redo_callback (GtkAction *action, gpointer callback_data);
+
 EEL_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
 
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, add_file)
@@ -2042,6 +2066,21 @@ fm_directory_view_init (FMDirectoryView *view)
 sort_directories_first_changed_callback, view);
 eel_preferences_add_callback (CAJA_PREFERENCES_LOCKDOWN_COMMAND_LINE,
 lockdown_disable_command_line_changed_callback, view);
+
+ /* Update undo actions stuff and connect signals from the undostack manager */
+ view->details->undo_active = FALSE;
+ view->details->redo_active = FALSE;
+ view->details->undo_action_description = NULL;
+ view->details->undo_action_label = NULL;
+ view->details->redo_action_description = NULL;
+ view->details->redo_action_label = NULL;
+
+ CajaUndoStackManager* manager = caja_undostack_manager_instance ();
+
+ g_signal_connect_object (G_OBJECT(manager), "request-menu-update",
+ G_CALLBACK(undo_redo_menu_update_callback), view, 0);
+
+ caja_undostack_manager_request_menu_update (caja_undostack_manager_instance());
 }
 
 static void
@@ -2770,6 +2809,10 @@ copy_move_done_callback (GHashTable *debuting_files, gpointer data)
 (GClosureNotify) debuting_files_data_free,
 G_CONNECT_AFTER);
 }
+
+ /* Schedule menu update for undo items */
+ schedule_update_menus (directory_view);
+ 
 }
 
 copy_move_done_data_free (copy_move_done_data);
@@ -3227,6 +3270,20 @@ schedule_changes (FMDirectoryView *view)
 }
 
 static void
+action_undo_callback (GtkAction *action,
+ gpointer callback_data)
+{
+ real_action_undo (FM_DIRECTORY_VIEW (callback_data));
+}
+
+static void
+action_redo_callback (GtkAction *action,
+ gpointer callback_data)
+{
+ real_action_redo (FM_DIRECTORY_VIEW (callback_data));
+}
+
+static void
 files_added_callback (CajaDirectory *directory,
 GList *files,
 gpointer callback_data)
@@ -6218,6 +6275,32 @@ action_paste_files_into_callback (GtkAction *action,
 }
 
 static void
+real_action_undo (FMDirectoryView *view)
+{
+ CajaUndoStackManager *manager = caja_undostack_manager_instance ();
+
+ /* Disable menus because they are in an untrustworthy status */
+ view->details->undo_active = FALSE;
+ view->details->redo_active = FALSE;
+ fm_directory_view_update_menus (view);
+
+ caja_undostack_manager_undo (manager, GTK_WIDGET (view), finish_undoredo_callback);
+}
+
+static void
+real_action_redo (FMDirectoryView *view)
+{
+ CajaUndoStackManager *manager = caja_undostack_manager_instance ();
+
+ /* Disable menus because they are in an untrustworthy status */
+ view->details->undo_active = FALSE;
+ view->details->redo_active = FALSE;
+ fm_directory_view_update_menus (view);
+
+ caja_undostack_manager_redo (manager, GTK_WIDGET (view), finish_undoredo_callback);
+}
+
+static void
 real_action_rename (FMDirectoryView *view,
 gboolean select_all)
 {
@@ -7260,6 +7343,15 @@ static const GtkActionEntry directory_view_entries[] = {
 /* label, accelerator */ N_("_Restore"), NULL,
 NULL,
 G_CALLBACK (action_restore_from_trash_callback) },
+ /* name, stock id */ { FM_ACTION_UNDO, GTK_STOCK_UNDO,
+ /* label, accelerator */ N_("_Undo"), "<control>Z",
+ /* tooltip */ N_("Undo the last action"),
+ G_CALLBACK (action_undo_callback) },
+ /* name, stock id */ { FM_ACTION_REDO, GTK_STOCK_REDO,
+ /* label, accelerator */ N_("_Redo"), "<control>Y",
+ /* tooltip */ N_("Redo the last undone action"),
+ G_CALLBACK (action_redo_callback) },
+ 
 /*
 * multiview-TODO: decide whether "Reset to Defaults" should
 * be window-wide, and not just view-wide.
@@ -8925,6 +9017,8 @@ real_update_menus (FMDirectoryView *view)
 
 real_update_menus_volumes (view, selection, selection_count);
 
+ undo_update_menu (view);
+
 caja_file_list_free (selection);
 
 if (view->details->scripts_invalid) {
@@ -9514,6 +9608,14 @@ metadata_for_files_in_directory_ready_callback (CajaDirectory *directory,
 finish_loading_if_all_metadata_loaded (view);
 }
 
+static void
+finish_undoredo_callback (gpointer data)
+{
+ FMDirectoryView *view;
+
+ view = FM_DIRECTORY_VIEW (data);
+}
+
 char **
 fm_directory_view_get_emblem_names_to_exclude (FMDirectoryView *view)
 {
@@ -10934,3 +11036,72 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 klass->trash = real_trash;
 klass->delete = real_delete;
 }
+
+static void
+undo_redo_menu_update_callback (CajaUndoStackManager* manager, gpointer arg, gpointer data)
+{
+ FMDirectoryView *view;
+ view = FM_DIRECTORY_VIEW (data);
+
+ CajaUndoStackMenuData* menudata = (CajaUndoStackMenuData*) arg;
+
+ g_free(view->details->undo_action_label);
+ g_free(view->details->undo_action_description);
+ g_free(view->details->redo_action_label);
+ g_free(view->details->redo_action_description);
+
+ view->details->undo_active = menudata->undo_label ? TRUE : FALSE;
+ view->details->redo_active = menudata->redo_label ? TRUE : FALSE;
+
+ view->details->undo_action_label = g_strdup (menudata->undo_label);
+ view->details->undo_action_description = g_strdup (menudata->undo_description);
+ view->details->redo_action_label = g_strdup (menudata->redo_label);
+ view->details->redo_action_description = g_strdup (menudata->redo_description);
+
+ schedule_update_menus (view);
+}
+
+static void
+undo_update_menu (FMDirectoryView *view)
+{
+ GtkAction *action;
+ gboolean available = FALSE;
+ gchar* label;
+ gchar* tooltip;
+
+ /* Update undo entry */
+ action = gtk_action_group_get_action (view->details->dir_action_group,
+ FM_ACTION_UNDO);
+ available = view->details->undo_active;
+ if (available) {
+ label = view->details->undo_action_label;
+ tooltip = view->details->undo_action_description;
+ } else {
+ /* Reset to default info */
+ label = _("Undo");
+ tooltip = _("Undo the last action");
+ }
+ g_object_set (action,
+ "label", label,
+ "tooltip", tooltip,
+ NULL);
+ gtk_action_set_sensitive (action, available);
+
+ /* Update redo entry */
+ action = gtk_action_group_get_action (view->details->dir_action_group,
+ FM_ACTION_REDO);
+ available = view->details->redo_active;
+ if (available) {
+ label = view->details->redo_action_label;
+ tooltip = view->details->redo_action_description;
+ } else {
+ /* Reset to default info */
+ label = _("Redo");
+ tooltip = _("Redo the last undone action");
+ }
+ g_object_set (action,
+ "label", label,
+ "tooltip", tooltip,
+ NULL);
+ gtk_action_set_sensitive (action, available);
+}
author	Stefano Karapetsas <[email protected]>	2011-12-26 19:52:59 +0100
committer	Stefano Karapetsas <[email protected]>	2011-12-26 19:52:59 +0100
commit	cdd4cad2ce3930bf1d484ab12371a5d6a354ea00 (patch)
tree	029f4f723976e1480812a984e81b8e961e14d39c /src
parent	390b49cb93699309e1250143e744b2e61ac81cfe (diff)
download	caja-cdd4cad2ce3930bf1d484ab12371a5d6a354ea00.tar.bz2 caja-cdd4cad2ce3930bf1d484ab12371a5d6a354ea00.tar.xz