[pitivi/ges: 168/287] utils: Move receiver to utils



commit da5cf61ef483e10e725e7c9d78555d1b591dc48e
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Mon Jan 9 16:11:38 2012 -0300

    utils: Move receiver to utils

 pitivi/Makefile.am             |    1 -
 pitivi/ui/controller.py        |    2 +-
 pitivi/ui/curve.py             |    2 +-
 pitivi/ui/preview.py           |    2 +-
 pitivi/ui/previewer.py         |    1 -
 pitivi/ui/timelinecanvas.py    |    2 +-
 pitivi/ui/timelinecontrols.py  |    1 -
 pitivi/ui/track.py             |    2 +-
 pitivi/ui/trackobject.py       |    2 +-
 pitivi/utils/Makefile.am       |    1 +
 pitivi/{ => utils}/receiver.py |    0
 11 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index 38b72a5..5ea5592 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -15,7 +15,6 @@ pitivi_PYTHON = \
 	instance.py 	\
 	project.py 	\
 	projectmanager.py 	\
-	receiver.py	\
 	settings.py 	\
 	sourcelist.py 	\
 	thumbnailcache.py
diff --git a/pitivi/ui/controller.py b/pitivi/ui/controller.py
index e28a09d..d1a611b 100644
--- a/pitivi/ui/controller.py
+++ b/pitivi/ui/controller.py
@@ -23,7 +23,7 @@ import gtk.gdk
 
 from pitivi.ui.point import Point
 from pitivi.utils.loggable import Loggable
-from pitivi.receiver import receiver, handler
+from pitivi.utils.receiver import receiver, handler
 
 # Controllers are reusable and implement specific behaviors. Currently this
 # Includes only click, and drag. Multiple controllers could be attached to a
diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
index c5543b1..3499c1a 100644
--- a/pitivi/ui/curve.py
+++ b/pitivi/ui/curve.py
@@ -26,7 +26,7 @@ import goocanvas
 import gobject
 import gtk
 
-from pitivi.receiver import receiver, handler
+from pitivi.utils.receiver import receiver, handler
 from pitivi.ui.zoominterface import Zoomable
 import pitivi.ui.previewer as previewer
 from pitivi.ui.view import View
diff --git a/pitivi/ui/preview.py b/pitivi/ui/preview.py
index c9fc636..605b613 100644
--- a/pitivi/ui/preview.py
+++ b/pitivi/ui/preview.py
@@ -27,7 +27,7 @@ The actual drawing is done by the pitivi.previewer.Previewer class.  """
 import goocanvas
 import gobject
 
-from pitivi.receiver import receiver, handler
+from pitivi.utils.receiver import receiver, handler
 from pitivi.ui.zoominterface import Zoomable
 import pitivi.ui.previewer as previewer
 
diff --git a/pitivi/ui/previewer.py b/pitivi/ui/previewer.py
index e2d6716..43fa8ec 100644
--- a/pitivi/ui/previewer.py
+++ b/pitivi/ui/previewer.py
@@ -36,7 +36,6 @@ from pitivi.ui.zoominterface import Zoomable
 from pitivi.utils.loggable import Loggable
 from pitivi.thumbnailcache import ThumbnailCache
 from pitivi.ui.prefs import PreferencesDialog
-from pitivi.receiver import receiver, handler
 
 GlobalSettings.addConfigSection("thumbnailing")
 GlobalSettings.addConfigOption("thumbnailSpacingHint",
diff --git a/pitivi/ui/timelinecanvas.py b/pitivi/ui/timelinecanvas.py
index 6cccd5e..9bef484 100644
--- a/pitivi/ui/timelinecanvas.py
+++ b/pitivi/ui/timelinecanvas.py
@@ -24,7 +24,7 @@ import goocanvas
 from gettext import gettext as _
 
 from pitivi.utils.loggable import Loggable
-from pitivi.receiver import receiver, handler
+from pitivi.utils.receiver import receiver, handler
 from pitivi.ui.track import Track
 from pitivi.ui.trackobject import TrackObject
 from pitivi.ui.point import Point
diff --git a/pitivi/ui/timelinecontrols.py b/pitivi/ui/timelinecontrols.py
index eeb3e85..93f4d1f 100644
--- a/pitivi/ui/timelinecontrols.py
+++ b/pitivi/ui/timelinecontrols.py
@@ -1,5 +1,4 @@
 import gtk
-from pitivi.receiver import receiver, handler
 from gettext import gettext as _
 from pitivi.utils.ui import LAYER_HEIGHT_EXPANDED, LAYER_SPACING
 from pitivi.utils.loggable import Loggable
diff --git a/pitivi/ui/track.py b/pitivi/ui/track.py
index 956ac1c..12f9a6f 100644
--- a/pitivi/ui/track.py
+++ b/pitivi/ui/track.py
@@ -26,7 +26,7 @@ import gobject
 
 from pitivi.utils.loggable import Loggable
 from pitivi.ui.zoominterface import Zoomable
-from pitivi.receiver import receiver, handler
+from pitivi.utils.receiver import receiver, handler
 from pitivi.ui.trackobject import TrackObject
 from pitivi.utils.ui import LAYER_HEIGHT_EXPANDED,\
         LAYER_HEIGHT_COLLAPSED, LAYER_SPACING
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index 485453a..416c320 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -16,7 +16,7 @@ from pitivi.utils.ui import LAYER_SPACING, unpack_cairo_pattern, \
 from pitivi.ui.point import Point
 from pitivi.utils.loggable import Loggable
 from pitivi.settings import GlobalSettings
-from pitivi.receiver import receiver, handler
+from pitivi.utils.receiver import receiver, handler
 from pitivi.ui.prefs import PreferencesDialog
 from pitivi.utils.signal import Signallable
 from pitivi.utils.timeline import SELECT, SELECT_ADD, UNSELECT, \
diff --git a/pitivi/utils/Makefile.am b/pitivi/utils/Makefile.am
index 1122c57..a207b65 100644
--- a/pitivi/utils/Makefile.am
+++ b/pitivi/utils/Makefile.am
@@ -12,6 +12,7 @@ utils_PYTHON = 	\
 	ui.py           \
 	system.py       \
 	threads.py      \
+	receiver.py     \
 	misc.py
 
 clean-local:
diff --git a/pitivi/receiver.py b/pitivi/utils/receiver.py
similarity index 100%
rename from pitivi/receiver.py
rename to pitivi/utils/receiver.py



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]