openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 516
committer: Andy Finch <we.rocked.in79@xxxxxxxxx>
branch nick: openshot
timestamp: Sat 2011-08-27 21:46:36 +0100
message:
  The RemoveFiles method was not setting the undo state correctly when removing folders, this is now fixed.
modified:
  bin/openshot
  openshot/classes/files.py
  openshot/windows/MainGTK.py


--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main

Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription

=== modified file 'bin/openshot'
--- bin/openshot	2011-02-22 07:16:08 +0000
+++ bin/openshot	2011-08-27 20:46:36 +0000
@@ -39,8 +39,8 @@
 		# insert this path into the Python path
 		sys.path.insert(0, usr_share_path)
 		print "Added %s to system path" % usr_share_path
-
-
+		
+		
 
 # If the openshot python code is found in the Python path, then
 # we should be able to import openshot and call the main() method

=== modified file 'openshot/classes/files.py'
--- openshot/classes/files.py	2011-08-16 19:51:22 +0000
+++ openshot/classes/files.py	2011-08-27 20:46:36 +0000
@@ -454,8 +454,6 @@
 		
 		item = self.FindFile(filename)
 		if item:
-			# mark project as modified
-			self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Removed file"))
 			
 			# find clips that have this file object
 			for track in self.project.sequences[0].tracks:
@@ -468,12 +466,17 @@
 			
 			# remove from file collection
 			self.items.remove(item)
+			# mark project as modified
+			self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Removed file"))
+			
 		else:
 			#is this a folder?
 			item = self.FindFolder(filename)
 			if item:
 				# remove from file collection
 				self.items.remove(item)
+				# mark project as modified
+			self.project.set_project_modified(is_modified=True, refresh_xml=True, type=_("Removed folder"))
 
   
 	#----------------------------------------------------------------------

=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2011-08-27 19:10:43 +0000
+++ openshot/windows/MainGTK.py	2011-08-27 20:46:36 +0000
@@ -4462,7 +4462,7 @@
 					self.model.remove(iter)
 					self.project.project_folder.RemoveFile(file_item.name)
 				else:
-					#folders don't have a unique id, so us the name field.
+					#folders don't have a unique id, so use the name field.
 					filename = self.remove_markup(self.model.get_value(iter, 1))
 					self.model.remove(iter)
 					self.project.project_folder.RemoveFile(filename)