gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-06-30 23:46:35 +00:00
Code Issues Projects Releases Wiki Activity

window-slot: Don't add accels to application

Browse Source 
We've been using GtkApplication, through a NautilusApplication method,
to set accelerators (i.e., global shortctus which trigger regardless
of where the focus is on the application window).

This will not work if NautilusWindowSlot is added to a window which
is nor a GtkApplicationWindow instance, as will be the case for the
upcoming FileChooser window.

Let's instead add them to a shortcut controller in the slow, but with
a "managed" scope which allows it to trigger even if the focus is not
on the slot.

Part of: https://gitlab.gnome.org/GNOME/nautilus/-/work_items/3411
This commit is contained in:
António Fernandes 2024-05-05 22:52:51 +01:00
parent 3f17995dbc
commit 9dbe8569c3
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/nautilus-window-slot.c
View File

@ -80,6 +80,7 @@ struct _NautilusWindowSlot
/* Slot actions */
GActionGroup *slot_action_group;
GtkShortcutController *shortcuts;
/* Current location. */
GFile *location;
@ -1129,16 +1130,6 @@ recursive_search_preferences_changed (GSettings *settings,
static void
nautilus_window_slot_init (NautilusWindowSlot *self)
{
GApplication *app;
const gchar *search_visible_accels[] =
{
"<control>f",
"Search",
NULL
};
app = g_application_get_default ();
g_signal_connect_object (nautilus_preferences,
"changed::recursive-search",
G_CALLBACK (recursive_search_preferences_changed),
@ -1153,20 +1144,34 @@ nautilus_window_slot_init (NautilusWindowSlot *self)
"slot",
G_ACTION_GROUP (self->slot_action_group));
#define ACCELS(...) ((const char *[]) { __VA_ARGS__, NULL })
self->shortcuts = GTK_SHORTCUT_CONTROLLER (gtk_shortcut_controller_new ());
nautilus_application_set_accelerator (app,
"slot.files-view-mode(uint32 " G_STRINGIFY (NAUTILUS_VIEW_LIST_ID) ")",
"<control>1");
nautilus_application_set_accelerator (app,
"slot.files-view-mode(uint32 " G_STRINGIFY (NAUTILUS_VIEW_GRID_ID) ")",
"<control>2");
nautilus_application_set_accelerators (app, "slot.focus-search", search_visible_accels);
nautilus_application_set_accelerator (app, "slot.search-global", "<control><shift>f");
nautilus_application_set_accelerators (app, "slot.reload", ACCELS ("F5", "<ctrl>r", "Refresh", "Reload"));
nautilus_application_set_accelerator (app, "slot.stop", "Stop");
gtk_shortcut_controller_set_scope (self->shortcuts, GTK_SHORTCUT_SCOPE_MANAGED);
gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (self->shortcuts));
#undef ACCELS
g_autoptr (GtkShortcutAction) view_mode_action = gtk_named_action_new ("slot.files-view-mode");
GtkShortcut *shortcut;
shortcut = gtk_shortcut_new_with_arguments (gtk_shortcut_trigger_parse_string ("<control>1"),
g_object_ref (view_mode_action),
"u", NAUTILUS_VIEW_LIST_ID);
gtk_shortcut_controller_add_shortcut (self->shortcuts, shortcut);
shortcut = gtk_shortcut_new_with_arguments (gtk_shortcut_trigger_parse_string ("<control>2"),
g_object_ref (view_mode_action),
"u", NAUTILUS_VIEW_GRID_ID);
gtk_shortcut_controller_add_shortcut (self->shortcuts, shortcut);
#define ADD_SHORTCUT_FOR_ACTION(controller, action, trigger) \
(gtk_shortcut_controller_add_shortcut ((controller), \
gtk_shortcut_new (gtk_shortcut_trigger_parse_string ((trigger)), \
gtk_named_action_new ((action)))))
ADD_SHORTCUT_FOR_ACTION (self->shortcuts, "slot.focus-search", "<control>f|Search");
ADD_SHORTCUT_FOR_ACTION (self->shortcuts, "slot.search-global", "<control><shift>f");
ADD_SHORTCUT_FOR_ACTION (self->shortcuts, "slot.reload", "F5|<ctrl>r|Refresh|Reload");
ADD_SHORTCUT_FOR_ACTION (self->shortcuts, "slot.stop", "Stop");
#undef ADD_SHORTCUT_FOR_ACTION
self->fd_holder = nautilus_fd_holder_new ();
self->view_mode_before_network = NAUTILUS_VIEW_INVALID_ID;

2
src/resources/gtk/help-overlay.ui
View File

@ -30,7 +30,7 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes" context="shortcut window">Search Everywhere</property>
<property name="action-name">slot.search-global</property>
<property name="accelerator">&lt;Primary&gt;&lt;Shift&gt;F</property>
</object>
</child>
<child>