Merge lp:~fincha/openshot/andy-1.2 into lp:openshot/1.4

[Andy Finch]

Includes the following fixes/changes:

#510755 - 'Replace Clip' option on the right click menu - replaces clip, but preserves current properties.
#510708 - Allow user to import new transitions (done via a gui)
#502861 - Dragging a clip on the Timeline shouldn't change the mute/visible properties (Couldn't actually prevent the change when dragging, but now you can't accidentally change them when right clicking or in razor mode).
#517068 - Add Frame snapshot. Keyboard shortcut 'f' extracts the current frame and adds to the project as an image.

Also added Bass & Treble audio effects - might replace these later with a proper equaliser, if I can get the ladspa audio effects working.

=== modified file 'openshot/classes/clip.py'
--- openshot/classes/clip.py	2010-07-06 03:23:04 +0000
+++ openshot/classes/clip.py	2010-07-12 22:08:40 +0000
@@ -1308,7 +1308,7 @@
 
 	def on_motion_notify_x (self, item, target, event):
 		"""this method allows the clip to be dragged and dropped on a track"""	  
-
+		
 		# get the new x,y coordinates from the mouse
 		new_x = float(event.x)
 		new_y = float(event.y)	
@@ -1804,6 +1804,7 @@
 			else:
 				# The clip has moved
 				type_of_event = _("Moved clip")
+<<<<<<< TREE
 				
 				# Animate the clip to it's new position
 				item.animate(distance_from_clip, drop_track.y_top - item.get_bounds().y1 + 2, 1.0, 0.0, False, 200, 4, goocanvas.ANIMATE_FREEZE)
@@ -1818,6 +1819,12 @@
 				self.parent.parent.project.set_project_modified(is_modified=True, refresh_xml=True, type = type_of_event)
 
 			
+=======
+			
+			self.parent.parent.project.set_project_modified(is_modified=True, refresh_xml=True, type = type_of_event)
+	
+						
+>>>>>>> MERGE-SOURCE
 		elif isResize:
 			
 			# remove clip from goocanvas
@@ -1885,6 +1892,7 @@
 		
 		
 	def on_visible_click (self, item, target, event):
+<<<<<<< TREE
 		
 		# get a reference to the language translate method
 		_ = self.parent.parent.project.translate
@@ -1917,9 +1925,43 @@
 		self.parent.parent.project.set_project_modified(is_modified=True, refresh_xml=True, type = _("Changed visibility of clip"))
 
 		return False
+=======
+		#don't do this if in razor mode
+		(isArrow, isRazor, isSnap, isResize) = self.parent.parent.project.form.get_toolbar_options()
+		if isArrow:
+			# get a reference to the 2 main canvas objects & theme
+			theme = self.parent.parent.project.theme
+			
+			# get the parent left group
+			parent_group = item.get_parent()
+			canvas = parent_group.get_canvas()
+			canvas.pointer_ungrab (item, event.time)
+			
+			if self.play_video == True:
+				# Load Hover Over
+				imgTrack_Visible = gtk.image_new_from_file("%s/openshot/themes/%s/not_visible_transparent.png" % (self.parent.parent.project.form.openshot_path, theme))
+				item.set_properties(pixbuf = imgTrack_Visible.get_pixbuf())
+	
+				# update play video variable
+				self.play_video = False
+				
+			else: 
+				# Load normal image
+				imgTrack_Visible = gtk.image_new_from_file("%s/openshot/themes/%s/visible_transparent.png" % (self.parent.parent.project.form.openshot_path, theme))
+				item.set_properties(pixbuf = imgTrack_Visible.get_pixbuf())
+	
+				# update play video variable
+				self.play_video = True
+	
+			# mark project as modified
+			self.parent.parent.project.set_project_modified(is_modified=True, refresh_xml=True, type = _("Changed visibility of clip"))
+	
+			return False
+>>>>>>> MERGE-SOURCE
 	
 	
 	def on_audio_click (self, item, target, event):
+<<<<<<< TREE
 		
 		# get a reference to the language translate method
 		_ = self.parent.parent.project.translate
@@ -1952,6 +1994,39 @@
 		self.parent.parent.project.set_project_modified(is_modified=True, refresh_xml=True, type = _("Changed audio of clip"))
 
 		return False
+=======
+		#don't do this if in razor mode.
+		(isArrow, isRazor, isSnap, isResize) = self.parent.parent.project.form.get_toolbar_options()
+		if isArrow:
+			# get a reference to the 2 main canvas objects & theme
+			theme = self.parent.parent.project.theme
+		
+			# get the parent left group
+			parent_group = item.get_parent()
+			canvas = parent_group.get_canvas()
+			canvas.pointer_ungrab (item, event.time)
+		
+			if self.play_audio == True:
+				# Load Hover Over
+				imgTrack_Visible = gtk.image_new_from_file("%s/openshot/themes/%s/speaker_mute_transparent.png" % (self.parent.parent.project.form.openshot_path, theme))
+				item.set_properties(pixbuf = imgTrack_Visible.get_pixbuf())
+			
+				# update play video variable
+				self.play_audio = False
+			
+			else: 
+				# Load normal image
+				imgTrack_Visible = gtk.image_new_from_file("%s/openshot/themes/%s/speaker_transparent.png" % (self.parent.parent.project.form.openshot_path, theme))
+				item.set_properties(pixbuf = imgTrack_Visible.get_pixbuf())
+			
+				# update play video variable
+				self.play_audio = True
+
+				# mark project as modified
+				self.parent.parent.project.set_project_modified(is_modified=True, refresh_xml=True, type = _("Changed audio of clip"))
+
+				return False
+>>>>>>> MERGE-SOURCE
 	
 	def on_effect_click (self, item, target, event):
 		pass

=== modified file 'openshot/classes/project.py'
--- openshot/classes/project.py	2010-07-07 00:04:26 +0000
+++ openshot/classes/project.py	2010-07-12 22:08:40 +0000
@@ -55,6 +55,8 @@
 		self.USER_DIR = os.path.join(os.path.expanduser("~"), ".openshot")
 		self.THEMES_DIR = os.path.join(self.BASE_DIR, "openshot", "themes")
 		self.USER_PROFILES_DIR = os.path.join(self.USER_DIR, "user_profiles")
+		self.USER_TRANSITIONS_DIR = os.path.join(self.USER_DIR, "user_transitions")
+		
 
 		# only run the following code if we are really using 
 		# this project file... 
@@ -123,6 +125,7 @@
 		pidPath = os.path.join(path, "pid.lock")
 		pid=int(open(pidPath, 'r').read().strip())
 		
+<<<<<<< TREE
 		# list of folders that should not be deleted
 		safe_folders = ["blender", "queue", "user_profiles"]
 		
@@ -138,6 +141,23 @@
 						# remove folder
 						os.removedirs(os.path.join(path, child_path))
 		
+=======
+		# list of folders that should not be deleted
+		safe_folders = ["blender", "queue", "user_profiles", "user_transitions"]
+		
+		# loop through all folders in the USER_DIR
+		for child_path in os.listdir(path):
+			if os.path.isdir(os.path.join(path, child_path)):
+				if child_path not in safe_folders:
+					# clear all files / folders recursively in the thumbnail folder
+					if os.getpid() == pid:
+						# only clear this folder for the primary instance of OpenShot
+						self.remove_files(os.path.join(path, child_path))
+						
+						# remove folder
+						os.removedirs(os.path.join(path, child_path))
+		
+>>>>>>> MERGE-SOURCE
 		# thumbnail path
 		thumbnail_path = os.path.join(path, "thumbnail")
 		
@@ -193,6 +213,7 @@
 		state['DESKTOP'] = empty_project.DESKTOP
 		state['THEMES_DIR'] = empty_project.THEMES_DIR
 		state['USER_PROFILES_DIR'] = empty_project.USER_PROFILES_DIR
+		state['USER_TRANSITIONS_DIR'] = empty_project.USER_TRANSITIONS_DIR
 		state['refresh_xml'] = True
 		state['mlt_profile'] = None
 

=== modified file 'openshot/classes/thumbnail.py'
--- openshot/classes/thumbnail.py	2010-02-27 19:51:35 +0000
+++ openshot/classes/thumbnail.py	2010-07-12 22:08:40 +0000
@@ -180,8 +180,10 @@
 		 self.profile = None
 		 self.f = None
 		 
-	def get_thumb_at_frame(self, filename, frame=1):
-		
+	def get_thumb_at_frame(self, filename, frame=1, new_name=""):
+		'''by passing a value in new_name, this will extract a 
+		   full size frame (based on the project profile).'''
+		   
 		self.file_name = filename
 		
 		project_path = self.project.folder
@@ -189,14 +191,15 @@
 		(dirName, fileName) = os.path.split(myPath)
 		(fileBaseName, fileExtension)=os.path.splitext(fileName)
 		fileExtension = fileExtension.replace(".", "")
-	
+		
 		mlt.Factory.init()
 		
-		# just get 1 thumbnail frame
-		self.thumbnail_path = project_path + "/thumbnail/" + fileBaseName + "_" + fileExtension + "_%d.png"
-					
+				
 		# set the profile
-		self.profile = mlt.Profile("quarter_ntsc")
+		if new_name == "":
+			self.profile = mlt.Profile("quarter_ntsc")
+		else:
+			self.profile = profiles.mlt_profiles(self.project).get_profile(self.project.project_type)
 		
 		# Create the producer
 		self.p = mlt.Producer( self.profile, '%s' % self.file_name )
@@ -205,6 +208,15 @@
 		if self.p.is_valid() == False:
 			return None
 		
+		
+		if new_name == "":
+			# just get 1 thumbnail frame
+			self.thumbnail_path = project_path + "/thumbnail/" + fileBaseName + "_" + fileExtension + "_%d.png"
+		else:
+			#for snapshots, use the new file name
+			#don't use the thumbnail path for the new file
+			self.thumbnail_path = project_path + "/" + new_name
+		
 		# create the consumer
 		self.c = mlt.Consumer(self.profile, "avformat", self.thumbnail_path)
 	

=== added file 'openshot/effects/bass.xml'
--- openshot/effects/bass.xml	1970-01-01 00:00:00 +0000
+++ openshot/effects/bass.xml	2010-07-12 22:08:40 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE openshot-effect>
+<effect>
+	<title translatable="True">Bass</title>
+	<description translatable="True">Sox Bass control</description>
+	<icon>audio.png</icon>
+	<category>Audio</category>
+	<service>sox:bass</service>
+
+	<param name="frequency" type="spinner" title="Frequency" description="">
+		<min>1</min>
+		<max>5000</max>
+		<default>100</default>
+	</param>
+	
+	<param name="gain" type="spinner" title="Gain" description="">
+		<min>-20</min>
+		<max>20</max>
+		<default>10</default>
+	</param>
+	
+		
+</effect>

=== added file 'openshot/effects/treble.xml'
--- openshot/effects/treble.xml	1970-01-01 00:00:00 +0000
+++ openshot/effects/treble.xml	2010-07-12 22:08:40 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE openshot-effect>
+<effect>
+	<title translatable="True">Treble</title>
+	<description translatable="True">Sox Treble control</description>
+	<icon>audio.png</icon>
+	<category>Audio</category>
+	<service>sox:treble</service>
+
+	<param name="frequency" type="spinner" title="Frequency" description="">
+		<min>3000</min>
+		<max>22000</max>
+		<default>5000</default>
+	</param>
+	
+	<param name="gain" type="spinner" title="Gain" description="">
+		<min>-20</min>
+		<max>20</max>
+		<default>8</default>
+	</param>
+		
+</effect>

=== modified file 'openshot/windows/AddFiles.py'
--- openshot/windows/AddFiles.py	2010-04-03 18:52:42 +0000
+++ openshot/windows/AddFiles.py	2010-07-12 22:08:40 +0000
@@ -34,13 +34,10 @@
 		# Add language support
 		_ = Language_Init.Translator(project).lang.gettext
 
+		self.frmAddFiles.set_title("OpenShot")
 		self.frmAddFiles.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
 		self.frmAddFiles.set_select_multiple(True)
-		#if the video folder exists, default to this
-		#video_dir = os.path.join(os.path.expanduser("~"), "Video")
-		#if video_dir:
-		#	self.frmAddFiles.set_current_folder(video_dir)
-
+		
 		self.form = form
 		self.project = project
 		
@@ -81,6 +78,57 @@
 		#call the open project method when a file is double clicked
 		self.on_btnAdd_clicked(widget, *args)
 		
+class frmReplaceFiles(SimpleGtkBuilderApp):
+
+	def __init__(self, path="AddFiles.ui", root="frmAddFiles", domain="OpenShot", form=None, project=None,clip=None, **kwargs):
+		SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
+		
+		# Add language support
+		_ = Language_Init.Translator(project).lang.gettext
+
+		self.frmAddFiles.set_title("OpenShot")
+		self.frmAddFiles.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
+		self.frmAddFiles.set_select_multiple(False)
+		
+		self.form = form
+		self.project = project
+		self.clip = clip		
+		
+		self.frmAddFiles.show_all()
+		
+	def on_btnCancel_clicked(self, widget, *args):
+		self.frmAddFiles.destroy()
+		
+	def on_btnAdd_clicked(self, widget, *args):
+		replace_clip_with = self.frmAddFiles.get_filename()
+		try:
+			#does the new file already exist in the project?
+			file_object = self.project.project_folder.FindFile(replace_clip_with)
+			if not file_object:
+				#add the file to the project
+				self.project.project_folder.AddFile(replace_clip_with)
+			
+			#this method does the actual replacement and modifies the project	
+			self.form.replace_clip(self.clip,replace_clip_with)
+			
+		except:
+			messagebox.show(_("Error"), _("There was an error importing the selected files"))
+
+		#set the last used folder
+		preferences.Settings.app_state["import_folder"] = self.frmAddFiles.get_current_folder()
+		
+			
+		self.frmAddFiles.destroy()
+		
+			
+		
+	def on_frmAddFiles_file_activated(self, widget, *args):
+		#call the open project method when a file is double clicked
+		self.on_btnAdd_clicked(widget, *args)
+		
+	def get_replace_clip_with(self):
+		return self.replace_clip_with
+		
 		
 			
 def main():

=== modified file 'openshot/windows/FileProperties.py'
--- openshot/windows/FileProperties.py	2010-07-04 19:40:34 +0000
+++ openshot/windows/FileProperties.py	2010-07-12 22:08:40 +0000
@@ -39,8 +39,21 @@
 		
 		#set the thumbnail - use the preview thumbnail
 		#for video & image files
+<<<<<<< TREE
 		pixbuf = file.get_thumbnail(112, 83)
 		self.imgPreview.set_from_pixbuf(pixbuf)
+=======
+		if file.file_type != "audio":
+			if file.thumb_location != "":
+				pixbuf = gtk.gdk.pixbuf_new_from_file(file.thumb_location)
+				pixbuf = pixbuf.scale_simple(112,83,gtk.gdk.INTERP_BILINEAR)
+				self.imgPreview.set_from_pixbuf(pixbuf)
+		else:
+			#use the generic OpenShot audio thumbnail
+			pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(self.project.IMAGE_DIR, "AudioThumbnail.png"))
+			pixbuf = pixbuf.scale_simple(112,83,gtk.gdk.INTERP_BILINEAR)
+			self.imgPreview.set_from_pixbuf(pixbuf)
+>>>>>>> MERGE-SOURCE
 		
 		#set the file type	
 		self.lblMimeType.set_label(file.file_type)

=== added file 'openshot/windows/ImportTransitions.py'
--- openshot/windows/ImportTransitions.py	1970-01-01 00:00:00 +0000
+++ openshot/windows/ImportTransitions.py	2010-07-12 22:08:40 +0000
@@ -0,0 +1,138 @@
+#	OpenShot Video Editor is a program that creates, modifies, and edits video files.
+#   Copyright (C) 2009  Jonathan Thomas
+#
+#	This file is part of OpenShot Video Editor (http://launchpad.net/openshot/).
+#
+#	OpenShot Video Editor is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 3 of the License, or
+#	(at your option) any later version.
+#
+#	OpenShot Video Editor is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with OpenShot Video Editor.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import gtk
+import shutil
+from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
+from classes import project, messagebox
+from PIL import Image
+
+# init the foreign language
+from language import Language_Init
+
+
+class frmImportTransitions(SimpleGtkBuilderApp):
+
+	def __init__(self, path="ImportTransitions.ui", root="frmImportTransitions", domain="OpenShot", form=None, project=None, **kwargs):
+		SimpleGtkBuilderApp.__init__(self, os.path.join(project.UI_DIR, path), root, domain, **kwargs)
+
+		# Add language support
+		_ = Language_Init.Translator(project).lang.gettext
+		
+		self.project = project
+		
+		filter = gtk.FileFilter()
+		filter.set_name("PNG or PGM files")
+		filter.add_pattern("*.png")
+		filter.add_pattern("*.pgm")
+		
+		self.fileTransition.add_filter(filter)
+		self.fileIcon.add_filter(filter)
+		
+		self.transition_file = ""
+		self.icon_file = ""
+		
+		self.frmImportTransitions.show_all()
+		
+	def on_btnCancel_clicked(self, widget, *args):
+		
+		self.frmImportTransitions.destroy()
+		
+		
+		
+	def on_fileTransition_file_set(self, widget, *args):
+		
+		self.transition_file = self.fileTransition.get_filename()
+		
+		if self.icon_file:
+			if self.check_filename_ok():
+				self.btnOK.set_sensitive(True)
+			else:
+				messagebox.show("Openshot", _("The Transition and Icon file names must be the same."))
+			
+			
+		
+	def on_fileIcon_file_set(self, widget, *args):
+		
+		self.icon_file = self.fileIcon.get_filename()
+		
+		if self.transition_file:
+			if self.check_filename_ok():
+				self.btnOK.set_sensitive(True)
+			else:
+				messagebox.show("Openshot", _("The Transition and Icon file names must be the same."))
+			
+			
+	def on_btnOK_clicked(self, widget, *args):
+		#check if a transition with this name exists
+		if self.check_icon_size():
+			(dirName, filename) = os.path.split(self.transition_file)
+			if os.path.exists(os.path.join(self.project.USER_TRANSITIONS_DIR,filename)):
+				messagebox.show("Openshot", _("A Transition with the filename %s already exists. Do you want to replace it?" % filename), gtk.BUTTONS_YES_NO, self.import_transition())
+			else:
+				#just import the transition
+				self.import_transition()
+		else:
+			messagebox.show("Openshot", _("The icon file must have a size of 80x62. The Transition will not be imported."))
+	
+	def check_icon_size(self):
+		#check the icon is 80x62
+		try:
+			im = Image.open(self.icon_file)
+		except IOError:
+			print "failed to identify", self.icon_file
+		else:
+			w, h = im.size
+			if w != 80 or h != 62:
+				return False
+			else:
+				return True
+			
+	def check_filename_ok(self):
+		#check both filenames match
+		(dirName, self.iconfilename) = os.path.split(self.icon_file)
+		(iconBaseName, fileExtension)=os.path.splitext(self.iconfilename)
+		
+		(dirName, self.transfilename) = os.path.split(self.transition_file)
+		(transBaseName, fileExtension)=os.path.splitext(self.transfilename)
+		if iconBaseName == transBaseName:
+			return True
+		else:
+			return False
+	
+			
+	def import_transition(self):
+		if not os.path.exists(self.project.USER_TRANSITIONS_DIR):
+			os.makedirs(self.project.USER_TRANSITIONS_DIR)
+			os.makedirs(os.path.join(self.project.USER_TRANSITIONS_DIR, "icons"))
+		try:
+			shutil.copyfile(self.transition_file, os.path.join(self.project.USER_TRANSITIONS_DIR, self.transfilename))
+			shutil.copyfile(self.icon_file, os.path.join(self.project.USER_TRANSITIONS_DIR, "icons", self.iconfilename))
+			messagebox.show("Openshot", _("Transition Imported successfully! Restart Openshot for the changes to take effect."))
+			self.frmImportTransitions.destroy()
+		except:
+			messagebox.show("Openshot Error!", _("There was an error importing the Transition!"))
+		
+		
+def main():
+	import_transitions = frmImportTransitions()
+	import_transitions.run()
+
+if __name__ == "__main__":
+	main()
\ No newline at end of file

=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2010-07-07 06:25:46 +0000
+++ openshot/windows/MainGTK.py	2010-07-12 22:08:40 +0000
@@ -31,7 +31,7 @@
 from classes import files, lock, messagebox, open_project, project, timeline, tree, video, inputbox, av_formats, clip
 from windows import About, FileProperties, NewProject, OpenProject, preferences, Profiles
 from windows.SimpleGtkBuilderApp import SimpleGtkBuilderApp
-from windows import AddFiles, ClipProperties, ExportVideo, ImportImageSeq, Titles, TransitionProperties, TreeFiles, TreeTransitions, TreeEffects, TreeHistory, BlenderGenerator, AddToTimeline
+from windows import AddFiles, ClipProperties, ExportVideo, ImportImageSeq, Titles, TransitionProperties, TreeFiles, TreeTransitions, TreeEffects, TreeHistory, BlenderGenerator, AddToTimeline, ImportTransitions
 
 # init the foreign language
 from language import Language_Init
@@ -519,8 +519,10 @@
 		# Strip 'file://' from the beginning
 		file_to_open = uri[7:]
 		
+		
 		# Open the project file
 		self.open_project(file_to_open)
+		
 
 		
 	def open_project(self, file_to_open):
@@ -541,6 +543,7 @@
 		# Update the main form
 		self.refresh()
 		
+				
 
 	def new(self):
 		print "A new %s has been created" % self.__class__.__name__
@@ -1156,6 +1159,9 @@
 		
 		# show import file dialog
 		ImportImageSeq.frmImportImageSequence(form=self, project=self.project)
+		
+	def on_mnuImportTransitions_activate(self, widget, *args):
+		ImportTransitions.frmImportTransitions(form=self, project=self.project)
 
 
 	def on_mnuSaveProject_activate(self, widget, *args):
@@ -1705,22 +1711,28 @@
 					self.on_tlbNext_clicked(widget, event)
 					
 			elif keyname == "s":
-				#go to the end of the clip
+				#save the project
 				if (event.state == gtk.gdk.CONTROL_MASK) or (event.state == gtk.gdk.CONTROL_MASK | gtk.gdk.MOD2_MASK):
 					# call the save button
 					self.on_tlbSave_clicked(widget)
 					
 			elif keyname == "y":
-				#go to the end of the clip
+				#redo
 				if (event.state == gtk.gdk.CONTROL_MASK) or (event.state == gtk.gdk.CONTROL_MASK | gtk.gdk.MOD2_MASK):
 					# Undo last action
 					self.redo_last()
 					
 			elif keyname == "z":
-				#go to the end of the clip
+				#undo
 				if (event.state == gtk.gdk.CONTROL_MASK) or (event.state == gtk.gdk.CONTROL_MASK | gtk.gdk.MOD2_MASK):
 					# Undo last action
 					self.undo_last()
+					
+			elif keyname == "f":
+				#snapshot
+				self.get_frame_snapshot()
+				
+
 			
 		
 	def toggle_mode(self):
@@ -1757,6 +1769,48 @@
 					canvas_item = clip.get_canvas_child(root_right, clip.unique_id)
 					# divide clip
 					clip.divide_clip(x, canvas_item)
+					
+	
+	def get_frame_snapshot(self):
+		'''Extracts a frame from each (non-audio) clip at the current
+		   playhead position'''
+		# Get playhead position
+		current_position = self.project.sequences[0].play_head_position
+		# get frames per second
+		fps = self.project.fps()
+		# Loop through all tracks
+		for track in self.project.sequences[0].tracks:
+			# Loop through all clips on this track
+			for clip in track.clips:
+				# is playhead overlapping this clip
+				if current_position > clip.position_on_track and current_position < (clip.position_on_track + clip.length()):
+					#only extract frames from non-audio files
+					if clip.file_object.file_type != "audio":
+						clip_position = (current_position + clip.start_time) - clip.position_on_track
+						frame_position = round(clip_position * fps)
+						#when extracting a frame, it gets added to the 
+						#project as a new file.
+						#Here we get the name of the existing clip, and
+						#modify it to make it unique.
+						filepath = clip.file_object.project.folder
+						(fileBaseName, fileExtension)=os.path.splitext(clip.name)
+						#add a number to the end of the filename.
+						#get the next available number for the file
+						blnFind = True 
+						intNum = 0
+						while blnFind == True:
+							intNum += 1
+							blnFind = os.path.exists(os.path.join(filepath, fileBaseName + str(intNum) + ".png"))
+			
+						#this will be the new name of the snapshot image file
+						new_name = fileBaseName +  str(intNum) + ".png"
+						#extract the frame
+						self.project.thumbnailer.get_thumb_at_frame(clip.file_object.name, int(frame_position), new_name)
+						#add the file to the project in the project folder
+						self.project.project_folder.AddFile(self.project.folder + "/" + new_name)
+						#refresh the tree
+						self.refresh()
+					
 
 
 	def get_toolbar_options(self):
@@ -3085,6 +3139,23 @@
 		if is_title:
 			self.form.refresh()
 		
+	
+	def on_mnuReplaceClip_activate (self, event, *args):
+		# show import file dialog to select replacement file
+		AddFiles.frmReplaceFiles(form=self, project=self.project, clip=self.selected_clip)
+		
+		
+	def replace_clip(self, selected_clip, new_clip):
+		#this replaces the selected clip with a new clip
+		(filepath, filename) = os.path.split(new_clip)
+		file = self.project.project_folder.FindFile(filename)
+		if file:
+			selected_clip.file_object = file
+			selected_clip.name = filename
+			#force a refresh of the xml
+			self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Replaced Clip"))
+			self.project.Render()
+			self.form.refresh()
 		
 	def on_mnuSliceandShuffle_activate(self, event, *args):
 		""" Cut a clip into many small pieces and shuffle them """

=== modified file 'openshot/windows/TreeTransitions.py'
--- openshot/windows/TreeTransitions.py	2010-05-31 21:31:32 +0000
+++ openshot/windows/TreeTransitions.py	2010-07-12 22:08:40 +0000
@@ -18,7 +18,7 @@
 
 import os
 import gtk, gobject, pango
-from classes import project
+from classes import project, messagebox
 
 # init the foreign language
 from language import Language_Init
@@ -90,6 +90,33 @@
 			self.store.set_value(item, 1, _(trans_name))
 			self.store.set_value(item, 2, os.path.join(self.project.TRANSITIONS_DIR, file_name))
 			
+		#get any user created transitions
+		if os.path.exists(self.project.USER_TRANSITIONS_DIR):
+			user_list = os.listdir(self.project.USER_TRANSITIONS_DIR)
+			try:
+				for fname in sorted(user_list):
+					(dirName, file_name) = os.path.split(fname)
+					(fileBaseName, fileExtension)=os.path.splitext(file_name)
+					file_path = os.path.join(self.project.USER_TRANSITIONS_DIR, "icons", fileBaseName + ".png")
+				
+					if fileBaseName == "icons":
+						# ignore the 'icons' folder
+						continue
+				
+					# get the pixbuf
+					pbThumb = gtk.gdk.pixbuf_new_from_file(file_path)
+	
+					# get name of transition
+					trans_name = fileBaseName.replace("_", " ").capitalize()
+	
+					# add transition to tree
+					item = self.store.append(None)
+					self.store.set_value(item, 0, pbThumb)
+					self.store.set_value(item, 1, _(trans_name))
+					self.store.set_value(item, 2, os.path.join(self.project.USER_TRANSITIONS_DIR, file_name))
+			except:
+				messagebox.show("Openshot Error!", _("There was an error loading user created transitions."))
+			
 		
 		# connect signals
 		self.treeview.connect_after('drag_begin', self.on_treeTransition_drag_begin)

=== modified file 'openshot/windows/preferences.py'
--- openshot/windows/preferences.py	2010-07-06 03:23:04 +0000
+++ openshot/windows/preferences.py	2010-07-12 22:08:40 +0000
@@ -80,6 +80,7 @@
 		#populate the themes
 		for dir in os.listdir(self.project.THEMES_DIR):
 			self.cmbThemes.append_text(dir)
+		
 			
 		# populate project file type combo
 		for file_type in ["binary", "ascii"]:
@@ -190,7 +191,8 @@
 	def load_theme_image(self, theme_name):
 		#loads the preview image for the selected theme.
 		themes_folder = os.path.join(self.project.THEMES_DIR, theme_name)
-		self.imgTheme.set_from_file(os.path.join(themes_folder, "play.png"))
+		if os.path.exists(os.path.join(themes_folder, "play.png")):
+		        self.imgTheme.set_from_file(os.path.join(themes_folder, "play.png"))
 		
 		
 	def on_icvCategories_selection_changed(self, icon_view, model=None):

=== added file 'openshot/windows/ui/ImportTransitions.ui'
--- openshot/windows/ui/ImportTransitions.ui	1970-01-01 00:00:00 +0000
+++ openshot/windows/ui/ImportTransitions.ui	2010-07-12 22:08:40 +0000
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="frmImportTransitions">
+    <property name="width_request">400</property>
+    <property name="height_request">180</property>
+    <property name="title" translatable="yes">Import Transitions</property>
+    <property name="window_position">center</property>
+    <property name="icon">icons/openshot.png</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">The Transition file and Icon file must have the same file name, 
+and the Icon should be 80x62.</property>
+          </object>
+          <packing>
+            <property name="padding">6</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="xpad">10</property>
+                <property name="label" translatable="yes">Select Transition:</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="xpad">12</property>
+                <property name="label" translatable="yes">Select Icon:</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserButton" id="fileTransition">
+                <property name="visible">True</property>
+                <property name="create_folders">False</property>
+                <signal name="file_set" handler="on_fileTransition_file_set"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="x_padding">12</property>
+                <property name="y_padding">12</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserButton" id="fileIcon">
+                <property name="visible">True</property>
+                <property name="create_folders">False</property>
+                <signal name="file_set" handler="on_fileIcon_file_set"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_padding">12</property>
+                <property name="y_padding">12</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="btnCancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_btnCancel_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnOK">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_btnOK_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="fill">False</property>
+            <property name="padding">1</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== modified file 'openshot/windows/ui/Main.ui'
--- openshot/windows/ui/Main.ui	2010-07-04 20:03:37 +0000
+++ openshot/windows/ui/Main.ui	2010-07-12 22:08:40 +0000
@@ -77,6 +77,15 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="mnuImportTransitions">
+                        <property name="label" translatable="yes">Import New Transition...</property>
+                        <property name="visible">True</property>
+                        <property name="use_stock">False</property>
+                        <property name="accel_group">accelgroup1</property>
+                        <signal name="activate" handler="on_mnuImportTransitions_activate"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
                         <property name="visible">True</property>
                       </object>

=== modified file 'openshot/windows/ui/Main_clip_properties.ui'
--- openshot/windows/ui/Main_clip_properties.ui	2010-05-03 05:51:49 +0000
+++ openshot/windows/ui/Main_clip_properties.ui	2010-07-12 22:08:40 +0000
@@ -69,6 +69,15 @@
       </object>
     </child>
     <child>
+      <object class="GtkImageMenuItem" id="mnuReplaceClip">
+        <property name="label" translatable="yes">Replace Clip</property>
+        <property name="visible">True</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_mnuReplaceClip_activate"/>
+      </object>
+    </child>
+    <child>
       <object class="GtkImageMenuItem" id="mnuRemoveClip">
         <property name="label" translatable="yes">Remove Clip</property>
         <property name="visible">True</property>
@@ -94,4 +103,8 @@
     </child>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
 </interface>