[nautilus] application: add nautilus_application_set_accelerators()
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] application: add nautilus_application_set_accelerators()
- Date: Fri, 24 Jun 2016 17:59:39 +0000 (UTC)
commit 13938661a1114fc01b5282574012fb4ca219afc7
Author: Ernestas Kulik <ernestask src gnome org>
Date: Thu Jun 9 17:22:59 2016 +0300
application: add nautilus_application_set_accelerators()
nautilus_application_add_accelerator() only allows setting a single
accelerator, which in some cases is not enough. This commit adds a
wrapper for gtk_application_set_accels_for_action(), which takes an
array of accels.
https://bugzilla.gnome.org/show_bug.cgi?id=763948
src/nautilus-application.c | 8 ++++++++
src/nautilus-application.h | 4 ++++
src/nautilus-files-view.c | 8 +++-----
3 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index cf55c74..6076215 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -93,6 +93,14 @@ nautilus_application_add_accelerator (GApplication *app,
gtk_application_set_accels_for_action (GTK_APPLICATION (app), action_name, vaccels);
}
+void
+nautilus_application_set_accelerators (GApplication *app,
+ const gchar *action_name,
+ const gchar **accels)
+{
+ gtk_application_set_accels_for_action (GTK_APPLICATION (app), action_name, accels);
+}
+
GList *
nautilus_application_get_windows (NautilusApplication *self)
{
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 43fb3c8..2043e84 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -52,6 +52,10 @@ void nautilus_application_add_accelerator (GApplication *app,
const gchar *action_name,
const gchar *accel);
+void nautilus_application_set_accelerators (GApplication *app,
+ const gchar *action_name,
+ const gchar **accels);
+
GList * nautilus_application_get_windows (NautilusApplication *application);
void nautilus_application_open_location (NautilusApplication *application,
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index ed41d7c..712c4cf 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -8300,8 +8300,7 @@ nautilus_files_view_init (NautilusFilesView *view)
app = g_application_get_default ();
/* Toolbar menu */
- gtk_application_set_accels_for_action (GTK_APPLICATION (app),
- "view.zoom-in", zoom_in_accels);
+ nautilus_application_set_accelerators (app, "view.zoom-in", zoom_in_accels);
nautilus_application_add_accelerator (app, "view.zoom-out", "<control>minus");
nautilus_application_add_accelerator (app, "view.show-hidden-files", "<control>h");
/* Background menu */
@@ -8309,8 +8308,7 @@ nautilus_files_view_init (NautilusFilesView *view)
nautilus_application_add_accelerator (app, "view.paste", "<control>v");
nautilus_application_add_accelerator (app, "view.create-link", "<control>m");
/* Selection menu */
- gtk_application_set_accels_for_action (GTK_APPLICATION (app),
- "view.open-with-default-application", open_accels);
+ nautilus_application_set_accelerators (app, "view.open-with-default-application", open_accels);
nautilus_application_add_accelerator (app, "view.open-item-new-tab", "<shift><control>t");
nautilus_application_add_accelerator (app, "view.open-item-new-window", "<shift><control>w");
nautilus_application_add_accelerator (app, "view.move-to-trash", "Delete");
@@ -8321,7 +8319,7 @@ nautilus_files_view_init (NautilusFilesView *view)
* actions active */
nautilus_application_add_accelerator (app, "view.delete-permanently-menu-item", "Delete");
nautilus_application_add_accelerator (app, "view.permanent-delete-permanently-menu-item",
"<shift>Delete");
- gtk_application_set_accels_for_action (GTK_APPLICATION (app), "view.properties", open_properties);
+ nautilus_application_set_accelerators (app, "view.properties", open_properties);
nautilus_application_add_accelerator (app, "view.open-item-location", "<control><alt>o");
nautilus_application_add_accelerator (app, "view.rename", "F2");
nautilus_application_add_accelerator (app, "view.cut", "<control>x");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]