From 935506b120170af249d63b11311fd44163838a12 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Fri, 26 Jan 2024 15:45:59 +0100 Subject: Make the Delete key move files to trash in browser --- fiv-browser.c | 10 +++++++++- fiv-context-menu.c | 30 ++++++++++++++++++------------ fiv-context-menu.h | 3 ++- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/fiv-browser.c b/fiv-browser.c index cfff7e2..2e7024a 100644 --- a/fiv-browser.c +++ b/fiv-browser.c @@ -1,7 +1,7 @@ // // fiv-browser.c: filesystem browsing widget // -// Copyright (c) 2021 - 2023, Přemysl Eric Janouch +// Copyright (c) 2021 - 2024, Přemysl Eric Janouch // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted. @@ -1562,6 +1562,14 @@ fiv_browser_key_press_event(GtkWidget *widget, GdkEventKey *event) switch ((event->state & gtk_accelerator_get_default_mod_mask())) { case 0: switch (event->keyval) { + case GDK_KEY_Delete: + if (self->selected) { + GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(widget)); + GFile *file = g_file_new_for_uri(self->selected->e->uri); + fiv_context_menu_remove(window, file); + g_object_unref(file); + } + return GDK_EVENT_STOP; case GDK_KEY_Return: if (self->selected) return open_entry(widget, self->selected, FALSE); diff --git a/fiv-context-menu.c b/fiv-context-menu.c index 28f578d..16460b6 100644 --- a/fiv-context-menu.c +++ b/fiv-context-menu.c @@ -1,7 +1,7 @@ // // fiv-context-menu.c: popup menu // -// Copyright (c) 2021 - 2022, Přemysl Eric Janouch +// Copyright (c) 2021 - 2024, Přemysl Eric Janouch // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted. @@ -328,17 +328,13 @@ open_context_unref(gpointer data, G_GNUC_UNUSED GClosure *closure) } static void -open_context_show_error_dialog(OpenContext *self, GError *error) +show_error_dialog(GtkWindow *parent, GError *error) { - GtkWindow *window = g_weak_ref_get(&self->window); - GtkWidget *dialog = - gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, + gtk_message_dialog_new(GTK_WINDOW(parent), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); - - g_clear_object(&window); g_error_free(error); } @@ -357,7 +353,9 @@ open_context_launch(GtkWidget *widget, OpenContext *self) (void) g_app_info_set_as_last_used_for_type( self->app_info, self->content_type, NULL); } else { - open_context_show_error_dialog(self, error); + GtkWindow *window = g_weak_ref_get(&self->window); + show_error_dialog(window, error); + g_clear_object(&window); } g_list_free(files); g_object_unref(context); @@ -437,14 +435,22 @@ on_info_activate(G_GNUC_UNUSED GtkMenuItem *item, gpointer user_data) g_free(uri); } +void +fiv_context_menu_remove(GtkWindow *parent, GFile *file) +{ + // TODO(p): Use g_file_trash_async(), for which we need a task manager. + GError *error = NULL; + if (!g_file_trash(file, NULL, &error)) + show_error_dialog(parent, error); +} + static void on_trash_activate(G_GNUC_UNUSED GtkMenuItem *item, gpointer user_data) { - // TODO(p): Use g_file_trash_async(), for which we need a task manager. OpenContext *ctx = user_data; - GError *error = NULL; - if (!g_file_trash(ctx->file, NULL, &error)) - open_context_show_error_dialog(ctx, error); + GtkWindow *window = g_weak_ref_get(&ctx->window); + fiv_context_menu_remove(window, ctx->file); + g_clear_object(&window); } static gboolean diff --git a/fiv-context-menu.h b/fiv-context-menu.h index 8da58c1..34374aa 100644 --- a/fiv-context-menu.h +++ b/fiv-context-menu.h @@ -1,7 +1,7 @@ // // fiv-context-menu.h: popup menu // -// Copyright (c) 2022, Přemysl Eric Janouch +// Copyright (c) 2022 - 2024, Přemysl Eric Janouch // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted. @@ -18,4 +18,5 @@ #include void fiv_context_menu_information(GtkWindow *parent, const char *uri); +void fiv_context_menu_remove(GtkWindow *parent, GFile *file); GtkMenu *fiv_context_menu_new(GtkWidget *widget, GFile *file); -- cgit v1.2.3-70-g09d2