From f632510d2a8b96e25f529c9f408fa1bef9693557 Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch
Date: Wed, 12 Jan 2022 10:58:06 +0100
Subject: Put reloading the image as its own action
---
fiv.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
(limited to 'fiv.c')
diff --git a/fiv.c b/fiv.c
index d188b25..69d6cb8 100644
--- a/fiv.c
+++ b/fiv.c
@@ -84,6 +84,7 @@ static struct key_group help_keys_browser[] = {
{"General", help_keys_general},
{"View", (struct key[]) {
{"F9", "Toggle navigation sidebar"},
+ {"F5 r r", "Refresh"},
{"h h", "Toggle hiding unsupported files"},
{}
}},
@@ -94,7 +95,7 @@ static struct key_group help_keys_browser[] = {
{"Right", "Go forward in history"},
{"Up", "Go to parent directory"},
{"Home", "Go home"},
- {"F5 r r", "Refresh"},
+ {"Return", "Open selected item"},
{}
}},
{}
@@ -104,6 +105,7 @@ static struct key_group help_keys_view[] = {
{"General", help_keys_general},
{"View", (struct key[]) {
{"F8", "Toggle toolbar"},
+ {"F5 r r", "Reload"},
{}
}},
{"Navigation", (struct key[]) {
@@ -1044,10 +1046,6 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_o:
on_open();
return TRUE;
- case GDK_KEY_r:
- // TODO(p): Reload the image instead, if it's currently visible.
- load_directory(NULL);
- return TRUE;
case GDK_KEY_q:
case GDK_KEY_w:
gtk_widget_destroy(g.window);
@@ -1087,16 +1085,9 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_q:
gtk_widget_destroy(g.window);
return TRUE;
-
case GDK_KEY_o:
on_open();
return TRUE;
- case GDK_KEY_F5:
- case GDK_KEY_r:
- // TODO(p): See the comment for C-r above.
- load_directory(NULL);
- return TRUE;
-
case GDK_KEY_F1:
show_help_shortcuts();
return TRUE;
@@ -1104,7 +1095,6 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
gtk_widget_set_visible(g.browser_sidebar,
!gtk_widget_is_visible(g.browser_sidebar));
return TRUE;
-
case GDK_KEY_F11:
case GDK_KEY_f:
toggle_fullscreen();
@@ -1152,6 +1142,13 @@ on_key_press_browser_paned(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
{
// TODO(p): Consider replicating more GtkFileChooserWidget bindings.
switch (event->state & gtk_accelerator_get_default_mod_mask()) {
+ case GDK_CONTROL_MASK:
+ switch (event->keyval) {
+ case GDK_KEY_r:
+ load_directory(NULL);
+ return TRUE;
+ }
+ break;
case GDK_MOD1_MASK:
switch (event->keyval) {
case GDK_KEY_Up: {
@@ -1175,6 +1172,10 @@ on_key_press_browser_paned(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_h:
gtk_button_clicked(GTK_BUTTON(g.funnel));
return TRUE;
+ case GDK_KEY_F5:
+ case GDK_KEY_r:
+ load_directory(NULL);
+ return TRUE;
}
}
return FALSE;
--
cgit v1.2.3-54-g00ecf