pitivi r1313 - in trunk: . pitivi/ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Sat Oct 11 11:12:26 2008
New Revision: 1313
URL: http://svn.gnome.org/viewvc/pitivi?rev=1313&view=rev

Log:
2008-10-11  Edward Hervey <edward hervey collabora co uk>

	* pitivi/ui/actions.xml:
	* pitivi/ui/mainwindow.py:
	* pitivi/ui/timeline.py:
	* pitivi/ui/Makefile.am:
	Remove usage of simple timeline.
	* pitivi/ui/complexsource.py:
	* pitivi/ui/layerwidgets.py:
	* pitivi/ui/tracklayer.py:
	Also remove files no longer used.

Removed:
   trunk/pitivi/ui/complexsource.py
   trunk/pitivi/ui/layerwidgets.py
   trunk/pitivi/ui/tracklayer.py
Modified:
   trunk/ChangeLog
   trunk/pitivi/ui/Makefile.am
   trunk/pitivi/ui/actions.xml
   trunk/pitivi/ui/mainwindow.py
   trunk/pitivi/ui/timeline.py

Modified: trunk/pitivi/ui/Makefile.am
==============================================================================
--- trunk/pitivi/ui/Makefile.am	(original)
+++ trunk/pitivi/ui/Makefile.am	Sat Oct 11 11:12:26 2008
@@ -4,14 +4,12 @@
 	__init__.py		\
 	complexinterface.py	\
 	complexlayer.py		\
-	complexsource.py	\
 	complextimeline.py	\
 	exportsettingswidget.py	\
 	filelisterrordialog.py	\
 	glade.py		\
 	gstwidget.py		\
 	infolayer.py		\
-	layerwidgets.py		\
 	mainwindow.py		\
 	netstream_managerdialog.py \
 	pluginmanagerdialog.py	\
@@ -23,7 +21,6 @@
 	sourcefactories.py	\
 	timeline.py		\
 	timelineobjects.py	\
-	tracklayer.py		\
 	util.py			\
 	viewer.py		\
 	webcam_managerdialog.py

Modified: trunk/pitivi/ui/actions.xml
==============================================================================
--- trunk/pitivi/ui/actions.xml	(original)
+++ trunk/pitivi/ui/actions.xml	Sat Oct 11 11:12:26 2008
@@ -22,7 +22,6 @@
     </menu>
     <menu action="View">
       <menuitem action="FullScreen" />
-      <menuitem action="AdvancedView" />
     </menu>
     <menu action="Help">
       <menuitem action="About" />
@@ -39,7 +38,6 @@
     <toolitem action="RenderProject" />
     <separator />
     <toolitem action="FullScreen" />
-    <toolitem action="AdvancedView" />
   </toolbar>
   <toolbar name="TimelineToolBar">
   </toolbar>

Modified: trunk/pitivi/ui/mainwindow.py
==============================================================================
--- trunk/pitivi/ui/mainwindow.py	(original)
+++ trunk/pitivi/ui/mainwindow.py	Sat Oct 11 11:12:26 2008
@@ -150,15 +150,10 @@
     def _createStockIcons(self):
         """ Creates the pitivi-only stock icons """
         gtk.stock_add([
-                ('pitivi-advanced-mode', 'Advanced Mode', 0, 0, 'pitivi'),
                 ('pitivi-render', 'Render', 0, 0, 'pitivi')
                 ])
         factory = gtk.IconFactory()
         pixbuf = gtk.gdk.pixbuf_new_from_file(
-            configure.get_pixmap_dir() + "/pitivi-advanced-24.png")
-        iconset = gtk.IconSet(pixbuf)
-        factory.add('pitivi-advanced-mode', iconset)
-        pixbuf = gtk.gdk.pixbuf_new_from_file(
             configure.get_pixmap_dir() + "/pitivi-render-24.png")
         iconset = gtk.IconSet(pixbuf)
         factory.add('pitivi-render', iconset)
@@ -207,8 +202,6 @@
         ]
 
         self.toggleactions = [
-            ("AdvancedView", 'pitivi-advanced-mode', _("Advanced vie_w"),
-             None, _("Switch to advanced view"), self._advancedViewCb, True),
             ("FullScreen", gtk.STOCK_FULLSCREEN, None, None,
              _("View the main window on the whole screen"), self._fullScreenCb)
         ]
@@ -224,9 +217,6 @@
                 self.render_button = action
             elif action.get_name() == "ImportfromCam":
                 self.webcam_button = action
-            elif action.get_name() == "AdvancedView":
-                if not instance.PiTiVi.settings.advancedModeEnabled:
-                    action.set_sensitive(False)
             elif action.get_name() == "Screencast":
                 # FIXME : re-enable this action once istanbul integration is complete
                 # and upstream istanbul has applied packages for proper interaction.
@@ -234,7 +224,7 @@
             elif action.get_name() in [
                 "ProjectSettings", "Quit", "File", "Edit", "Help",
                 "About", "View", "FullScreen", "ImportSources",
-                "ImportSourcesFolder", "AdvancedView", "PluginManager","ImportfromCam","NetstreamCapture"]:
+                "ImportSourcesFolder", "PluginManager","ImportfromCam","NetstreamCapture"]:
                 action.set_sensitive(True)
             elif action.get_name() in ["SaveProject", "SaveProjectAs",
                     "NewProject", "OpenProject"]:
@@ -411,12 +401,6 @@
     def _fullScreenCb(self, unused_action):
         self.toggleFullScreen()
 
-    def _advancedViewCb(self, action):
-        if action.get_active():
-            self.timeline.showComplexView()
-        else:
-            self.timeline.showSimpleView()
-
     def _aboutResponseCb(self, dialog, unused_response):
         dialog.destroy()
 

Modified: trunk/pitivi/ui/timeline.py
==============================================================================
--- trunk/pitivi/ui/timeline.py	(original)
+++ trunk/pitivi/ui/timeline.py	Sat Oct 11 11:12:26 2008
@@ -36,7 +36,6 @@
 from pitivi.timeline.source import TimelineFileSource, TimelineBlankSource
 from pitivi.timeline.objects import MEDIA_TYPE_AUDIO, MEDIA_TYPE_VIDEO
 
-from timelineobjects import SimpleTimelineWidget
 from complextimeline import ComplexTimelineWidget
 
 class TimelineWidget(gtk.VBox):
@@ -57,22 +56,10 @@
 
     def _createUi(self):
         """ draw the GUI """
-        self.simpleview = SimpleTimelineWidget()
         self.complexview = ComplexTimelineWidget()
 
-    def showSimpleView(self):
-        """ Show the simple timeline """
-        if self.complexview in self.get_children():
-            self.remove(self.complexview)
-            self.complexview.hide()
-        self.pack_start(self.simpleview, expand=True)
-        self.simpleview.show_all()
-
     def showComplexView(self):
         """ Show the advanced timeline """
-        if self.simpleview in self.get_children():
-            self.remove(self.simpleview)
-            self.simpleview.hide()
         self.pack_start(self.complexview, expand=True)
         self.complexview.show_all()