pitivi r1332 - in trunk: . pitivi/ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Thu Oct 16 14:21:10 2008
New Revision: 1332
URL: http://svn.gnome.org/viewvc/pitivi?rev=1332&view=rev

Log:
	* pitivi/ui/complextimeline.py:
	* pitivi/ui/filelisterrordialog.py:
	* pitivi/ui/glade.py:
	* pitivi/ui/mainwindow.py:
	* pitivi/ui/slider.py:
	* pitivi/ui/timeline.py:
	* pitivi/ui/viewer.py:
	Fix imports in pitivi/ui

Modified:
   trunk/ChangeLog
   trunk/pitivi/ui/complextimeline.py
   trunk/pitivi/ui/filelisterrordialog.py
   trunk/pitivi/ui/glade.py
   trunk/pitivi/ui/mainwindow.py
   trunk/pitivi/ui/slider.py
   trunk/pitivi/ui/timeline.py
   trunk/pitivi/ui/viewer.py

Modified: trunk/pitivi/ui/complextimeline.py
==============================================================================
--- trunk/pitivi/ui/complextimeline.py	(original)
+++ trunk/pitivi/ui/complextimeline.py	Thu Oct 16 14:21:10 2008
@@ -25,7 +25,6 @@
 
 import gtk
 import gst
-import cairo
 import pitivi.instance as instance
 
 from pitivi.bin import SmartTimelineBin
@@ -37,8 +36,8 @@
 from util import *
 import os.path
 from urllib import unquote
-from pitivi.timeline.objects import MEDIA_TYPE_AUDIO, MEDIA_TYPE_VIDEO
-from pitivi.utils import closest_item, argmax
+from pitivi.timeline.objects import MEDIA_TYPE_VIDEO
+from pitivi.utils import closest_item
 from gettext import gettext as _
 
 
@@ -201,7 +200,7 @@
         element.connect("start-duration-changed", self.start_duration_cb, w)
         self.widgets[element] = w
         self.elements[w] = element
-        element.set_data("widget", w)
+        #element.set_data("widget", w)
         self.start_duration_cb(element, element.start, element.duration, w)
         self.add_child(w)
         make_selectable(self.canvas, w.bg)

Modified: trunk/pitivi/ui/filelisterrordialog.py
==============================================================================
--- trunk/pitivi/ui/filelisterrordialog.py	(original)
+++ trunk/pitivi/ui/filelisterrordialog.py	Thu Oct 16 14:21:10 2008
@@ -23,7 +23,6 @@
 Dialog box listing files which had errors, and the reasons.
 """
 
-import gobject
 import gtk
 import gst
 import pango

Modified: trunk/pitivi/ui/glade.py
==============================================================================
--- trunk/pitivi/ui/glade.py	(original)
+++ trunk/pitivi/ui/glade.py	Thu Oct 16 14:21:10 2008
@@ -29,8 +29,7 @@
 import sys
 
 import gtk
-import gtk.glade
-import gobject
+from gtk.glade import XML, set_custom_handler
 
 # proc := module1.module2.moduleN.proc1().maybe_another_proc()
 #  -> eval proc1().maybe_another_proc() in module1.module2.moduleN
@@ -63,7 +62,7 @@
     w.set_name(name)
     w.show()
     return w
-gtk.glade.set_custom_handler(flumotion_glade_custom_handler)
+set_custom_handler(flumotion_glade_custom_handler)
 
 
 class GladeWidget(gtk.VBox):
@@ -88,10 +87,10 @@
             assert self.glade_file
             filepath = os.path.join(self.glade_dir, self.glade_file)
             if self.glade_typedict:
-                wtree = gtk.glade.XML(filepath, typedict=self.glade_typedict, domain='pitivi')
+                wtree = XML(filepath, typedict=self.glade_typedict, domain='pitivi')
             else:
                 # pygtk 2.4 doesn't like typedict={} ?
-                wtree = gtk.glade.XML(filepath, domain='pitivi')
+                wtree = XML(filepath, domain='pitivi')
         except RuntimeError, e:
             raise RuntimeError('Failed to load file %s from directory %s: %s'
                                % (self.glade_file, self.glade_dir, e))
@@ -145,10 +144,10 @@
             assert self.glade_file
             filepath = os.path.join(self.glade_dir, self.glade_file)
             if self.glade_typedict:
-                wtree = gtk.glade.XML(filepath, typedict=self.glade_typedict, domain='pitivi')
+                wtree = XML(filepath, typedict=self.glade_typedict, domain='pitivi')
             else:
                 # pygtk 2.4 doesn't like typedict={} ?
-                wtree = gtk.glade.XML(filepath, domain='pitivi')
+                wtree = XML(filepath, domain='pitivi')
         except RuntimeError, e:
             raise RuntimeError('Failed to load file %s from directory %s: %s'
                                % (self.glade_file, self.glade_dir, e))

Modified: trunk/pitivi/ui/mainwindow.py
==============================================================================
--- trunk/pitivi/ui/mainwindow.py	(original)
+++ trunk/pitivi/ui/mainwindow.py	Thu Oct 16 14:21:10 2008
@@ -36,7 +36,6 @@
 else:
     have_gconf=True
 
-import pitivi.instance as instance
 import pitivi.configure as configure
 from pitivi.projectsaver import ProjectSaver
 

Modified: trunk/pitivi/ui/slider.py
==============================================================================
--- trunk/pitivi/ui/slider.py	(original)
+++ trunk/pitivi/ui/slider.py	Thu Oct 16 14:21:10 2008
@@ -22,7 +22,6 @@
 import gtk
 import gst
 import pitivi.instance as instance
-from pitivi.timeline.source import TimelineFileSource
 
 class PipelineSliderEndpoints(gtk.DrawingArea):
     """ Helper class which displays start and stop points within the upper and

Modified: trunk/pitivi/ui/timeline.py
==============================================================================
--- trunk/pitivi/ui/timeline.py	(original)
+++ trunk/pitivi/ui/timeline.py	Thu Oct 16 14:21:10 2008
@@ -25,11 +25,7 @@
 """
 
 import gtk
-import gobject
 import gst
-import pango
-
-from gettext import gettext as _
 
 import pitivi.instance as instance
 import pitivi.dnd as dnd

Modified: trunk/pitivi/ui/viewer.py
==============================================================================
--- trunk/pitivi/ui/viewer.py	(original)
+++ trunk/pitivi/ui/viewer.py	Thu Oct 16 14:21:10 2008
@@ -20,12 +20,9 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import os.path
 import gobject
 import gtk
 import gst
-import gst.interfaces
-from glade import GladeWindow
 
 import pitivi.plumber as plumber
 import pitivi.instance as instance
@@ -33,7 +30,6 @@
 import pitivi.dnd as dnd
 from pitivi.signalgroup import SignalGroup
 
-from gettext import gettext as _
 from pitivi.utils import time_to_string
 
 class PitiviViewer(gtk.VBox):