[pitivi] timeline: Move zoom & play actions to the navigation group
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] timeline: Move zoom & play actions to the navigation group
- Date: Mon, 11 Jul 2016 11:11:21 +0000 (UTC)
commit ac4c1bdcbf529420127f9cfb5005f0268944b3bb
Author: Jakub Brindza <jakub brindza gmail com>
Date: Mon Jul 11 10:09:26 2016 +0100
timeline: Move zoom & play actions to the navigation group
Differential Revision: https://phabricator.freedesktop.org/D1165
pitivi/timeline/timeline.py | 53 ++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index ec62e70..a046e67 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -1400,26 +1400,6 @@ class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
self.toolbar.insert_action_group("timeline", group)
ShortcutsWindow.register_group("timeline", _("Timeline"))
- self.zoom_in_action = Gio.SimpleAction.new("zoom-in", None)
- self.zoom_in_action.connect("activate", self._zoomInCb)
- group.add_action(self.zoom_in_action)
- self.app.set_accels_for_action("timeline.zoom-in", ["<Control>plus",
- "<Control>equal"])
- ShortcutsWindow.add_action("timeline.zoom-in", _("Zoom in"))
-
- self.zoom_out_action = Gio.SimpleAction.new("zoom-out", None)
- self.zoom_out_action.connect("activate", self._zoomOutCb)
- group.add_action(self.zoom_out_action)
- self.app.set_accels_for_action("timeline.zoom-out", ["<Control>minus"])
- ShortcutsWindow.add_action("timeline.zoom-out", _("Zoom out"))
-
- self.zoom_fit_action = Gio.SimpleAction.new("zoom-fit", None)
- self.zoom_fit_action.connect("activate", self._zoomFitCb)
- group.add_action(self.zoom_fit_action)
- self.app.set_accels_for_action("timeline.zoom-fit", ["<Control>0"])
- ShortcutsWindow.add_action("timeline.zoom-fit",
- _("Adjust zoom to fit the project to the window"))
-
# Clips actions.
self.delete_action = Gio.SimpleAction.new("delete-selected-clips", None)
self.delete_action.connect("activate", self._deleteSelected)
@@ -1465,12 +1445,6 @@ class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
group.add_action(self.gapless_action)
# Playhead actions.
- self.play_action = Gio.SimpleAction.new("play", None)
- self.play_action.connect("activate", self._playPauseCb)
- group.add_action(self.play_action)
- self.app.set_accels_for_action("timeline.play", ["space"])
- ShortcutsWindow.add_action("timeline.play", _("Play"))
-
self.split_action = Gio.SimpleAction.new("split-clips", None)
self.split_action.connect("activate", self._splitCb)
group.add_action(self.split_action)
@@ -1492,6 +1466,33 @@ class TimelineContainer(Gtk.Grid, Zoomable, Loggable):
self.toolbar.insert_action_group("navigation", navigation_group)
ShortcutsWindow.register_group("navigation", _("Timeline Navigation"))
+ self.zoom_in_action = Gio.SimpleAction.new("zoom-in", None)
+ self.zoom_in_action.connect("activate", self._zoomInCb)
+ navigation_group.add_action(self.zoom_in_action)
+ self.app.set_accels_for_action("navigation.zoom-in",
+ ["<Control>plus", "<Control>equal"])
+ ShortcutsWindow.add_action("navigation.zoom-in", _("Zoom in"))
+
+ self.zoom_out_action = Gio.SimpleAction.new("zoom-out", None)
+ self.zoom_out_action.connect("activate", self._zoomOutCb)
+ navigation_group.add_action(self.zoom_out_action)
+ self.app.set_accels_for_action("navigation.zoom-out",
+ ["<Control>minus"])
+ ShortcutsWindow.add_action("navigation.zoom-out", _("Zoom out"))
+
+ self.zoom_fit_action = Gio.SimpleAction.new("zoom-fit", None)
+ self.zoom_fit_action.connect("activate", self._zoomFitCb)
+ navigation_group.add_action(self.zoom_fit_action)
+ self.app.set_accels_for_action("navigation.zoom-fit", ["<Control>0"])
+ ShortcutsWindow.add_action("navigation.zoom-fit",
+ _("Adjust zoom to fit the project to the window"))
+
+ self.play_action = Gio.SimpleAction.new("play", None)
+ self.play_action.connect("activate", self._playPauseCb)
+ navigation_group.add_action(self.play_action)
+ self.app.set_accels_for_action("navigation.play", ["space"])
+ ShortcutsWindow.add_action("navigation.play", _("Play"))
+
self.backward_one_frame_action = Gio.SimpleAction.new("backward_one_frame", None)
self.backward_one_frame_action.connect("activate", self._seek_backward_one_frame_cb)
navigation_group.add_action(self.backward_one_frame_action)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]