p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: p:e6341e59bbc248b84a33aef263c90d6eb97e9302
Branches Tags
p:master
p:v1.0.0
..
compare: p:086dd66aa9c3cc333304579330b6e773e9c5071f
Branches Tags
p:master
p:v1.0.0

No commits in common. "e6341e59bbc248b84a33aef263c90d6eb97e9302" and "086dd66aa9c3cc333304579330b6e773e9c5071f" have entirely different histories.
e6341e59bb ... 086dd66aa9

3 changed files with 1 additions and 14 deletions
Show Stats Expand all files Collapse all files

10
fiv-browser.c
View File

@ -1430,16 +1430,6 @@ fiv_browser_key_press_event(GtkWidget *widget, GdkEventKey *event)
return GDK_EVENT_STOP; return GDK_EVENT_STOP;
} }
break; break;
case GDK_MOD1_MASK:
switch (event->keyval) {
case GDK_KEY_Return:
if (self->selected) {
GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(widget));
fiv_context_menu_information(window, self->selected->uri);
}
return GDK_EVENT_STOP;
}
break;
case GDK_CONTROL_MASK: case GDK_CONTROL_MASK:
case GDK_CONTROL_MASK | GDK_SHIFT_MASK: case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
switch (event->keyval) { switch (event->keyval) {

4
fiv-context-menu.c
View File

@ -103,7 +103,6 @@ info_make_bar(const char *message)
GtkWidget *info = gtk_info_bar_new(); GtkWidget *info = gtk_info_bar_new();
gtk_info_bar_set_message_type(GTK_INFO_BAR(info), GTK_MESSAGE_WARNING); gtk_info_bar_set_message_type(GTK_INFO_BAR(info), GTK_MESSAGE_WARNING);
GtkWidget *info_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(info)); GtkWidget *info_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(info));
// When the label is made selectable, Escape doesn't work when it has focus.
gtk_container_add(GTK_CONTAINER(info_area), gtk_label_new(message)); gtk_container_add(GTK_CONTAINER(info_area), gtk_label_new(message));
return info; return info;
} }
@ -174,7 +173,6 @@ on_info_finished(GObject *source_object, GAsyncResult *res, gpointer user_data)
g_free(out); g_free(out);
g_free(err); g_free(err);
gtk_widget_show_all(dialog); gtk_widget_show_all(dialog);
gtk_widget_grab_focus(scroller);
} }
static void static void
@ -487,7 +485,7 @@ fiv_context_menu_new(GtkWidget *widget, GFile *file)
gtk_menu_shell_append( gtk_menu_shell_append(
GTK_MENU_SHELL(menu), gtk_separator_menu_item_new()); GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
item = gtk_menu_item_new_with_mnemonic("_Information..."); item = gtk_menu_item_new_with_label("Information...");
g_signal_connect_data(item, "activate", G_CALLBACK(on_info_activate), g_signal_connect_data(item, "activate", G_CALLBACK(on_info_activate),
g_rc_box_acquire(ctx), open_context_unref, 0); g_rc_box_acquire(ctx), open_context_unref, 0);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);

1
fiv.c
View File

@ -111,7 +111,6 @@ static struct key_group help_keys_browser[] = {
{"<Alt>Up", "Go to parent directory"}, {"<Alt>Up", "Go to parent directory"},
{"<Alt>Home", "Go home"}, {"<Alt>Home", "Go home"},
{"Return", "Open selected item"}, {"Return", "Open selected item"},
{"<Alt>Return", "Show file information"},
{} {}
}}, }},
{"View", (struct key[]) { {"View", (struct key[]) {