[gnome-builder] shortcuts: track changes to shortcut engine in libdazzle
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] shortcuts: track changes to shortcut engine in libdazzle
- Date: Wed, 19 Jul 2017 11:22:10 +0000 (UTC)
commit 4b6a6381208166cc6e7dba0d15c22403f0cd1ba3
Author: Christian Hergert <chergert redhat com>
Date: Tue Jul 18 18:13:21 2017 -0700
shortcuts: track changes to shortcut engine in libdazzle
libide/editor/ide-editor-perspective-shortcuts.c | 4 ++++
libide/editor/ide-editor-view-shortcuts.c | 9 +++++++++
libide/layout/ide-layout-stack-shortcuts.c | 5 +++++
libide/sourceview/ide-source-view-shortcuts.c | 4 +++-
plugins/command-bar/gb-command-bar.c | 7 +++++--
5 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/libide/editor/ide-editor-perspective-shortcuts.c
b/libide/editor/ide-editor-perspective-shortcuts.c
index 8f0e319..f588af5 100644
--- a/libide/editor/ide-editor-perspective-shortcuts.c
+++ b/libide/editor/ide-editor-perspective-shortcuts.c
@@ -65,21 +65,25 @@ _ide_editor_perspective_init_shortcuts (IdeEditorPerspective *self)
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor.new-file"),
I_("<Primary>n"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor.new-file"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor.open-file"),
I_("<Primary>o"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor.open-file"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor.navigation-panel"),
I_("F9"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("dockbin.left-visible"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor.utilities-panel"),
I_("<Control>F9"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("dockbin.bottom-visible"));
dzl_shortcut_manager_add_shortcut_entries (NULL,
diff --git a/libide/editor/ide-editor-view-shortcuts.c b/libide/editor/ide-editor-view-shortcuts.c
index 53c4d7d..e2907da 100644
--- a/libide/editor/ide-editor-view-shortcuts.c
+++ b/libide/editor/ide-editor-view-shortcuts.c
@@ -93,46 +93,55 @@ _ide_editor_view_init_shortcuts (IdeEditorView *self)
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.find"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.find"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.find-and-replace"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.find-and-replace"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.next-match"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.move-next-search-result"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.prev-match"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.move-prevous-search-result"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.next-error"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.move-next-error"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.prev-error"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.move-prevous-error"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.clear-highlight"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.clear-highlight"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.save"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.save"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.editor-view.save-as"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("editor-view.save-as"));
dzl_shortcut_manager_add_shortcut_entries (NULL,
diff --git a/libide/layout/ide-layout-stack-shortcuts.c b/libide/layout/ide-layout-stack-shortcuts.c
index 46cb770..7d84be6 100644
--- a/libide/layout/ide-layout-stack-shortcuts.c
+++ b/libide/layout/ide-layout-stack-shortcuts.c
@@ -74,27 +74,32 @@ _ide_layout_stack_init_shortcuts (IdeLayoutStack *self)
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.layoutstack.move-right"),
I_("<Primary><Alt>Page_Down"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("layoutstack.move-right"));
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.layoutstack.move-left"),
I_("<Primary><Alt>Page_Up"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("layoutstack.move-left"));
dzl_shortcut_controller_add_command_signal (controller,
I_("org.gnome.builder.layoutstack.next-document"),
I_("<Primary><Shift>Page_Down"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("change-current-page"),
1, G_TYPE_INT, 1);
dzl_shortcut_controller_add_command_signal (controller,
I_("org.gnome.builder.layoutstack.previous-document"),
I_("<Primary><Shift>Page_Up"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("change-current-page"),
1, G_TYPE_INT, -1);
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.layoutstack.close-view"),
I_("<Primary>w"),
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("layoutstack.close-view"));
}
diff --git a/libide/sourceview/ide-source-view-shortcuts.c b/libide/sourceview/ide-source-view-shortcuts.c
index 0299969..89df463 100644
--- a/libide/sourceview/ide-source-view-shortcuts.c
+++ b/libide/sourceview/ide-source-view-shortcuts.c
@@ -38,7 +38,9 @@ _ide_source_view_init_shortcuts (IdeSourceView *self)
dzl_shortcut_controller_add_command_signal (controller,
"org.gnome.builder.sourceview.reset",
- "Escape", "reset", 0);
+ "Escape",
+ DZL_SHORTCUT_PHASE_BUBBLE,
+ "reset", 0);
dzl_shortcut_manager_add_shortcut_entries (NULL,
source_view_shortcuts,
diff --git a/plugins/command-bar/gb-command-bar.c b/plugins/command-bar/gb-command-bar.c
index 420274d..153e27b 100644
--- a/plugins/command-bar/gb-command-bar.c
+++ b/plugins/command-bar/gb-command-bar.c
@@ -711,7 +711,7 @@ gb_command_bar_class_finalize (GbCommandBarClass *klass)
static const DzlShortcutEntry shortcuts[] = {
{ "org.gnome.builder.show-command-bar",
- "<Control>Return",
+ "<Primary>Return",
N_("Editor"),
N_("General"),
N_("Command Bar") },
@@ -739,9 +739,12 @@ gb_command_bar_init (GbCommandBar *self)
dzl_shortcut_controller_add_command_action (controller,
I_("org.gnome.builder.show-command-bar"),
NULL,
+ DZL_SHORTCUT_PHASE_BUBBLE,
I_("win.show-command-bar"));
- dzl_shortcut_manager_add_shortcut_entries (NULL, shortcuts, G_N_ELEMENTS (shortcuts),
+ dzl_shortcut_manager_add_shortcut_entries (NULL,
+ shortcuts,
+ G_N_ELEMENTS (shortcuts),
GETTEXT_PACKAGE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
