pitivi r1340 - in trunk: . pitivi pitivi/ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Fri Oct 17 11:48:17 2008
New Revision: 1340
URL: http://svn.gnome.org/viewvc/pitivi?rev=1340&view=rev

Log:
	* pitivi/pitivi.py:
	Only import pitivi.ui for Interactive subclass
	* pitivi/Makefile.am:
	* pitivi/ui/Makefile.am:
	* pitivi/ui/dnd.py:
	Move dnd module to pitivi.ui
	* pitivi/ui/sourcefactories.py:
	* pitivi/ui/timeline.py:
	* pitivi/ui/viewer.py:
	Adjust code for dnd move

Added:
   trunk/pitivi/ui/dnd.py
      - copied, changed from r1339, /trunk/pitivi/dnd.py
Removed:
   trunk/pitivi/dnd.py
Modified:
   trunk/ChangeLog
   trunk/pitivi/Makefile.am
   trunk/pitivi/pitivi.py
   trunk/pitivi/ui/Makefile.am
   trunk/pitivi/ui/sourcefactories.py
   trunk/pitivi/ui/timeline.py
   trunk/pitivi/ui/viewer.py

Modified: trunk/pitivi/Makefile.am
==============================================================================
--- trunk/pitivi/Makefile.am	(original)
+++ trunk/pitivi/Makefile.am	Fri Oct 17 11:48:17 2008
@@ -13,7 +13,6 @@
 	configure.py 	\
 	device.py	\
 	discoverer.py 	\
-	dnd.py 		\
 	effects.py	\
 	instance.py 	\
 	objectfactory.py \

Modified: trunk/pitivi/pitivi.py
==============================================================================
--- trunk/pitivi/pitivi.py	(original)
+++ trunk/pitivi/pitivi.py	Fri Oct 17 11:48:17 2008
@@ -28,7 +28,6 @@
 import check
 import instance
 import device
-from ui import mainwindow
 from pitivigstutils import patch_gst_python
 from playground import PlayGround
 from project import Project, file_is_project
@@ -224,9 +223,10 @@
                         *args, **kwargs)
         self.mainloop = mainloop
 
-        # we're starting a GUI for the time being
-        self._gui = mainwindow.PitiviMainWindow(self)
+        from ui.mainwindow import PitiviMainWindow
+        self._gui = PitiviMainWindow(self)
         self._gui.load()
+
         self._gui.show()
 
         if filepath:

Modified: trunk/pitivi/ui/Makefile.am
==============================================================================
--- trunk/pitivi/ui/Makefile.am	(original)
+++ trunk/pitivi/ui/Makefile.am	Fri Oct 17 11:48:17 2008
@@ -5,6 +5,7 @@
 	complexinterface.py	\
 	complexlayer.py		\
 	complextimeline.py	\
+	dnd.py			\
 	exportsettingswidget.py	\
 	filelisterrordialog.py	\
 	glade.py		\

Copied: trunk/pitivi/ui/dnd.py (from r1339, /trunk/pitivi/dnd.py)
==============================================================================

Modified: trunk/pitivi/ui/sourcefactories.py
==============================================================================
--- trunk/pitivi/ui/sourcefactories.py	(original)
+++ trunk/pitivi/ui/sourcefactories.py	Fri Oct 17 11:48:17 2008
@@ -33,11 +33,11 @@
 from urllib import unquote
 
 import pitivi.instance as instance
-import pitivi.dnd as dnd
 from pitivi.configure import get_pixmap_dir
 from pitivi.signalgroup import SignalGroup
 from pitivi.threads import Thread
 
+import dnd
 from filelisterrordialog import FileListErrorDialog
 
 from gettext import gettext as _

Modified: trunk/pitivi/ui/timeline.py
==============================================================================
--- trunk/pitivi/ui/timeline.py	(original)
+++ trunk/pitivi/ui/timeline.py	Fri Oct 17 11:48:17 2008
@@ -28,10 +28,10 @@
 import gst
 
 import pitivi.instance as instance
-import pitivi.dnd as dnd
 from pitivi.timeline.source import TimelineFileSource, TimelineBlankSource
 from pitivi.timeline.objects import MEDIA_TYPE_AUDIO, MEDIA_TYPE_VIDEO
 
+import dnd
 from complextimeline import ComplexTimelineWidget
 
 class TimelineWidget(gtk.VBox):

Modified: trunk/pitivi/ui/viewer.py
==============================================================================
--- trunk/pitivi/ui/viewer.py	(original)
+++ trunk/pitivi/ui/viewer.py	Fri Oct 17 11:48:17 2008
@@ -27,10 +27,10 @@
 import pitivi.plumber as plumber
 import pitivi.instance as instance
 from pitivi.bin import SmartTimelineBin
-import pitivi.dnd as dnd
 from pitivi.signalgroup import SignalGroup
 
 from pitivi.utils import time_to_string
+import dnd
 
 class PitiviViewer(gtk.VBox):
     """ Pitivi's viewer widget with controls """