Merge lp:~rye/openshot/stringify-none into lp:openshot/1.4

[Roman Yepishev]

Stringify None value before storing.

Stringify None.

I guess it is better to have OpenShot store literal None but since all parameters are stored as strings I decided not to change the way it works.

[Andy Finch (fincha)]

Thanks, this has now been applied to the trunk.

review: Approve

=== modified file 'openshot/windows/AddFiles.py'
--- openshot/windows/AddFiles.py	2012-04-10 20:12:04 +0000
+++ openshot/windows/AddFiles.py	2012-06-18 10:27:20 +0000
@@ -117,7 +117,10 @@
 			messagebox.show(_("Error"), _("There was an error importing the selected file(s)."))
 
 		#set the last used folder
-		preferences.Settings.app_state["import_folder"] = self.frmAddFiles.get_current_folder()
+		current_folder = self.frmAddFiles.get_current_folder()
+		if current_folder is None:
+			current_folder = "None"
+		preferences.Settings.app_state["import_folder"] = current_folder
 		
 		# clear and destroy this dialog
 		self.form.import_files_dialog = None	
@@ -164,7 +167,10 @@
 			messagebox.show(_("Error"), _("There was an error importing the selected file(s)."))
 
 		#set the last used folder
-		preferences.Settings.app_state["import_folder"] = self.frmAddFiles.get_current_folder()
+		current_folder = self.frmAddFiles.get_current_folder()
+		if current_folder is None:
+			current_folder = "None"
+		preferences.Settings.app_state["import_folder"] = current_folder
 		
 			
 		self.frmAddFiles.destroy()