Merge lp:~nagos/openshot/nagos into lp:openshot/1.4

[Vladimir Yakovlev]

[Vladimir Yakovlev (nagos)]

New feature to remove empty spaces in project. Space removed from all tracks without destroying transitions and relative position of clips.
Now it in project menu.

Plus proper clips compare thru __cmp__ without compare_clip. All sort/min/max work simply like sort([clip1,clip2])

Snap of razor. If you click in 10 pixels away from playhead, clip will be divided in playhead position. Snap button enable/disable this feature.

BUG:518504 Tabs in preferences can't be switched in localised version.

Enable/disable audio/video buttons now can be clicked only with arrow cursor. Without it clit divided in two with disabled audio.

Minor localisation strings.

[lp:~nagos/openshot/nagos]

209. By Vladimir Yakovlev on 2010-03-02

Bug with overlaying clips

210. By Vladimir Yakovlev on 2010-04-06

Last changes from main branch

Unmerged revisions

210. By Vladimir Yakovlev on 2010-04-06

Last changes from main branch

209. By Vladimir Yakovlev on 2010-03-02

Bug with overlaying clips

208. By Vladimir Yakovlev on 2010-02-28

New feature to remove empty spaces in project. Space removed from all tracks without destroying transitions and relative position of clips.
Now it in project menu.

Plus proper clips compare thry __cmp__ without compare_clip. All sort/min/max work simply like sort([clip1,clip2])

207. By Vladimir Yakovlev on 2010-02-26

Snap razor position only if Snap kep enabled

206. By Vladimir Yakovlev on 2010-02-25

Enable/Disable of video/audio now work only with arrow key. Now you can slice clip in position of audio button.

205. By Vladimir Yakovlev on 2010-02-11

openshot/openshot_render.py now executable

204. By Vladimir Yakovlev on 2010-02-07

Rounding splitting position.
Split track on video position if clicked in 10 pixels around.

203. By Vladimir Yakovlev on 2010-02-07

Some more av format translations

202. By Vladimir Yakovlev on 2010-02-07

No need to compare categories by name in on_icvCategories_selection_changed, left icon list is not sortable.

201. By Vladimir Yakovlev on 2010-02-07

AV Formats localization

=== modified file 'openshot/classes/clip.py'
--- openshot/classes/clip.py	2010-02-27 19:51:35 +0000
+++ openshot/classes/clip.py	2010-04-06 18:25:42 +0000
@@ -74,6 +74,17 @@
 		# end_time = 25.0
 		# position_on_track = 3.0
 		
+	def __cmp__(self, other):
+		return cmp(self.position_on_track, other.position_on_track)
+
+	def __eq__(self, other):
+		if type(self)<>type(other): return False
+		if self.position_on_track == other.position_on_track: return True
+		else: return False
+
+	def __ne__(self,other):
+		if type(self)<>type(other): return False
+		return self.position_on_track <> other.position_on_track
 
 	def length(self):
 		# calculate the length of this clip (in decimal seconds)
@@ -1640,6 +1651,14 @@
 		seconds_for_x = x / pixels_per_second
 		original_clip_length = self.length()
 		original_end_time = self.end_time
+				
+		#split in video position if clicked not far from it
+		(isArrow, isRazor, isSnap, isResize) = self.parent.parent.project.form.get_toolbar_options()
+		if isSnap:
+			video_frame = self.parent.parent.project.form.MyVideo.p.position()
+			video_position = video_frame / self.parent.parent.project.fps()
+			video_pixel = video_position*pixels_per_second
+			if abs(video_pixel - x) < 10: seconds_for_x = video_position
 
 		# remove clip from goocanvas
 		parent = canvas_item.get_parent()
@@ -1884,6 +1903,10 @@
 		
 		
 	def on_visible_click (self, item, target, event):
+		#work only with arrow cursor
+		(isArrow, isRazor, isSnap, isResize) = self.parent.parent.project.form.get_toolbar_options()
+		if not isArrow: return
+		
 		# get a reference to the 2 main canvas objects & theme
 		theme = self.parent.parent.project.theme
 		
@@ -1915,6 +1938,10 @@
 	
 	
 	def on_audio_click (self, item, target, event):
+		#work only with arrow cursor
+		(isArrow, isRazor, isSnap, isResize) = self.parent.parent.project.form.get_toolbar_options()
+		if not isArrow: return
+		
 		# get a reference to the 2 main canvas objects & theme
 		theme = self.parent.parent.project.theme
 		

=== modified file 'openshot/classes/track.py'
--- openshot/classes/track.py	2010-01-31 22:50:27 +0000
+++ openshot/classes/track.py	2010-04-06 18:25:42 +0000
@@ -19,6 +19,7 @@
 import uuid
 import gtk, goocanvas
 from classes import clip, files, transition
+import warnings
 
 # init the foreign language
 from language import Language_Init
@@ -320,16 +321,14 @@
 	
 	def reorder_clips(self):
 		# get a list of all clips on this track
-		self.clips.sort(self.compare_clip)
+		self.clips.sort()
 		
 		
 	def compare_clip(self, MyClip1, MyClip2):
-		if MyClip1.position_on_track > MyClip2.position_on_track:
-			return 1
-		elif MyClip1.position_on_track == MyClip2.position_on_track:
-			return 0
-		else:
-			return -1
+		warnings.warn('compare_clip not need more.'
+			' Just use clip1==clip2 or sorted([clip1,clip2])',
+			DeprecationWarning,2)
+		return cmp(MyClip1,MyClip2)
 
 		
 	def reorder_transitions(self):
@@ -343,4 +342,4 @@
 		elif MyClip1.position_on_track == MyClip2.position_on_track:
 			return 0
 		else:
-			return -1
\ No newline at end of file
+			return -1

=== modified file 'openshot/openshot_render.py' (properties changed: -x to +x)
=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2010-03-30 04:23:04 +0000
+++ openshot/windows/MainGTK.py	2010-04-06 18:25:42 +0000
@@ -1177,6 +1177,42 @@
 		print "on_mnuNewTitle_activate called with self.%s" % widget.get_name()
 		Titles.frmNewTitle(form=self, project=self.project)
 
+	def on_mnuClearSpace_activate(self, widget, *args):
+		print "on_mnuClearSpace_activate called with self.%s" % widget.get_name()
+		
+		def moveClips(pos,length):
+			for clip in all_clips:
+				if clip.position_on_track>=pos:
+					clip.position_on_track-=length
+			ph = self.project.sequences[0].play_head_position
+			if ph >= pos:
+				self.project.sequences[0].move_play_head(ph-length)
+				self.project.sequences[0].update_video()
+			for trans in self.project.sequences[0].tracks[0].transitions:
+				if trans.position_on_track>=pos:
+					trans.position_on_track-=length
+
+		#create large clip pool
+		all_clips=[]
+		for track in self.project.sequences[0].tracks:
+			for clip in track.clips: all_clips.append(clip)
+		
+		all_clips = sorted(all_clips)
+		for clip in all_clips:
+			index = all_clips.index(clip)
+			space = 0
+			if index == 0 :
+				space = clip.position_on_track
+			elif index > 0:
+				prevs=filter(lambda x: x.position_on_track < clip.position_on_track, all_clips)
+				prev = max(prevs,key=lambda x: x.position_on_track+x.length())
+				space = clip.position_on_track - \
+					(prev.position_on_track+prev.length())
+			if space > 0: moveClips(clip.position_on_track,space)
+
+		self.project.sequences[0].Render()
+		self.project.sequences[0].RenderPlayHead()
+		self.project.set_project_modified(is_modified=True, refresh_xml=True, type = _("Space Cleared"))
 
 	def on_mnuNewSequence_activate(self, widget, *args):
 		print "on_mnuNewSequence_activate called with self.%s" % widget.get_name()

=== modified file 'openshot/windows/glade/Main.glade'
--- openshot/windows/glade/Main.glade	2010-03-11 07:13:31 +0000
+++ openshot/windows/glade/Main.glade	2010-04-06 18:25:42 +0000
@@ -244,6 +244,20 @@
                       </widget>
                     </child>
                     <child>
+                      <widget class="GtkImageMenuItem" id="mnuClearSpace">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Clear Space</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnuClearSpace_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="menu-item-image30">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-new</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>        
+                    <child>
                       <widget class="GtkImageMenuItem" id="mnuNewSequence">
                         <property name="label" translatable="yes">New Sequence...</property>
                         <property name="use_underline">True</property>

=== modified file 'openshot/windows/preferences.py'
--- openshot/windows/preferences.py	2010-02-19 06:26:14 +0000
+++ openshot/windows/preferences.py	2010-04-06 18:25:42 +0000
@@ -90,14 +90,17 @@
 		
 		self.VCodecList = gtk.ListStore(str)
 		self.tvVCodecs.set_model(self.VCodecList)
+
 		tree.treeviewAddGeneralTextColumn(self.tvVCodecs,_('Video Codecs'),0)
 		
 		self.ACodecList = gtk.ListStore(str)
 		self.tvACodecs.set_model(self.ACodecList)
+
 		tree.treeviewAddGeneralTextColumn(self.tvACodecs,_('Audio Codecs'),0)
 		
 		self.FormatsList = gtk.ListStore(str)
 		self.tvFormats.set_model(self.FormatsList)
+
 		tree.treeviewAddGeneralTextColumn(self.tvFormats,_('Formats'),0)	
 		
 		self.populate_codecs()
@@ -200,15 +203,7 @@
 		selected = icon_view.get_selected_items()
 		if len(selected) == 0: return
 		i = selected[0][0]
-		category = self.model[i][0]
-		if category == _("General"):
-			self.nbPrefPages.set_current_page(0)
-		#When adding extra categories,
-		#include them in this 'If' statement
-		elif category == _("AV Formats"):
-			self.nbPrefPages.set_current_page(1)
-		elif category == _("Profiles"):
-			self.nbPrefPages.set_current_page(2)
+		self.nbPrefPages.set_current_page(i)
 			
 	def on_btnManageProfiles_clicked(self, widget, *args):
 		print "on_btnManageProfiles_clicked"
@@ -395,4 +390,4 @@
 	frm_titles.run()
 
 if __name__ == "__main__":
-	main()
\ No newline at end of file
+	main()