[pitivi] elements: Reuse the cursor objects
- From: Mathieu Duponchelle <mathieudu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] elements: Reuse the cursor objects
- Date: Tue, 4 Feb 2014 21:52:12 +0000 (UTC)
commit b18c6f2067c923a804a66d8b0ea9a118a09c7339
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Tue Jan 7 21:23:53 2014 +0100
elements: Reuse the cursor objects
Also use LEFT_PTR which is the normal mouse pointer instead of ARROW.
pitivi/timeline/elements.py | 21 +++++++++++++--------
pitivi/utils/timeline.py | 2 --
2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index ba53eee..807534c 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -50,6 +50,11 @@ GHOST_CLIP_COLOR = Clutter.Color.new(255, 255, 255, 50)
BORDER_NORMAL_COLOR = create_cogl_color(100, 100, 100, 255)
BORDER_SELECTED_COLOR = create_cogl_color(200, 200, 10, 255)
+NORMAL_CURSOR = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)
+DRAG_CURSOR = Gdk.Cursor.new(Gdk.CursorType.HAND1)
+DRAG_LEFT_HANDLEBAR_CURSOR = Gdk.Cursor.new(Gdk.CursorType.LEFT_SIDE)
+DRAG_RIGHT_HANDLEBAR_CURSOR = Gdk.Cursor.new(Gdk.CursorType.RIGHT_SIDE)
+
def get_preview_for_object(bElement, timeline):
# FIXME: special preview for transitions, titles
@@ -255,9 +260,9 @@ class TrimHandle(Clutter.Texture):
self.set_from_file(os.path.join(configure.get_pixmap_dir(), "trimbar-focused.png"))
if self.isLeft:
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_SIDE))
+
self.timelineElement.timeline._container.embed.get_window().set_cursor(DRAG_LEFT_HANDLEBAR_CURSOR)
else:
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.RIGHT_SIDE))
+
self.timelineElement.timeline._container.embed.get_window().set_cursor(DRAG_RIGHT_HANDLEBAR_CURSOR)
def _leaveEventCb(self, actor, event):
self.timelineElement.set_reactive(True)
@@ -270,7 +275,7 @@ class TrimHandle(Clutter.Texture):
for elem in children:
elem.set_reactive(True)
self.set_from_file(os.path.join(configure.get_pixmap_dir(), "trimbar-normal.png"))
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.ARROW))
+ self.timelineElement.timeline._container.embed.get_window().set_cursor(NORMAL_CURSOR)
def _elementEnterEventCb(self, actor, event):
self.show()
@@ -321,7 +326,7 @@ class TrimHandle(Clutter.Texture):
elem.set_reactive(True)
self.set_from_file(os.path.join(configure.get_pixmap_dir(), "trimbar-normal.png"))
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.ARROW))
+ self.timelineElement.timeline._container.embed.get_window().set_cursor(NORMAL_CURSOR)
def clipTrimCb(self, unused_TrimStartContext, tl_obj, position):
# While a clip is being trimmed, ask the viewer to preview it
@@ -768,7 +773,7 @@ class Line(Clutter.Actor):
def _ungrab(self):
self.timelineElement.set_reactive(True)
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.ARROW))
+ self.timelineElement.timeline._container.embed.get_window().set_cursor(NORMAL_CURSOR)
def _clickedCb(self, actor, event):
if self.gotDragged:
@@ -783,7 +788,7 @@ class Line(Clutter.Actor):
def _enterEventCb(self, actor, event):
self.timelineElement.set_reactive(False)
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND1))
+ self.timelineElement.timeline._container.embed.get_window().set_cursor(DRAG_CURSOR)
def _leaveEventCb(self, actor, event):
self._ungrab()
@@ -883,7 +888,7 @@ class Keyframe(Clutter.Actor):
def _unselect(self):
self.timelineElement.set_reactive(True)
self.set_background_color(KEYFRAME_NORMAL_COLOR)
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.ARROW))
+ self.timelineElement.timeline._container.embed.get_window().set_cursor(NORMAL_CURSOR)
def remove(self):
# Can't remove edge keyframes !
@@ -913,7 +918,7 @@ class Keyframe(Clutter.Actor):
def _enterEventCb(self, actor, event):
self.timelineElement.set_reactive(False)
self.set_background_color(KEYFRAME_SELECTED_COLOR)
-
self.timelineElement.timeline._container.embed.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND1))
+ self.timelineElement.timeline._container.embed.get_window().set_cursor(DRAG_CURSOR)
def _leaveEventCb(self, actor, event):
self._unselect()
diff --git a/pitivi/utils/timeline.py b/pitivi/utils/timeline.py
index 915a016..a6150c3 100644
--- a/pitivi/utils/timeline.py
+++ b/pitivi/utils/timeline.py
@@ -300,8 +300,6 @@ class EditingContext(Signallable):
#-------------------------- Interfaces ----------------------------------------#
-ARROW = Gdk.Cursor.new(Gdk.CursorType.ARROW)
-
class Zoomable(object):
"""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]