Merge lp:~michael-sheldon/jokosher/freesound-improvements into lp:jokosher

[Michael Sheldon]

[Michael Sheldon (michael-sheldon)]

Fixes drag and drop creation of instruments, makes the usage message clearer and more permanent and uses gnome-keyring for storing passwords where available.

[lp:~michael-sheldon/jokosher/freesound-improvements]

1099. By Michael Sheldon on 2009-06-08

Update FreeSound extenion to glade 3
Add LinkButton for creating new FreeSound accounts

=== modified file 'Jokosher/Project.py'
--- Jokosher/Project.py	2009-05-29 01:23:25 +0000
+++ Jokosher/Project.py	2009-06-08 12:42:25 +0000
@@ -1320,7 +1320,13 @@
 		if not undoAction:
 			undoAction = self.NewAtomicUndoAction()
 	
-		uris = [PlatformUtils.pathname2url(filename) for filename in fileList]
+		uris = []
+		for filename in fileList:
+			if filename.find("://"):
+				uris.append(filename)
+			else:
+				# We've been passed a path, so convert it to a URI
+				uris.append(PlatformUtils.pathname2url(filename))
 
 		name, type, pixbuf, path = [x for x in Globals.getCachedInstruments() if x[1] == "audiofile"][0]
 		instr = self.AddInstrument(name, type, _undoAction_=undoAction)

=== modified file 'extensions/FreesoundSearch-0.3-py2.6.egg'
Binary files extensions/FreesoundSearch-0.3-py2.6.egg	2009-05-29 23:03:59 +0000 and extensions/FreesoundSearch-0.3-py2.6.egg	2009-06-08 12:42:25 +0000 differ
=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade'
--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade	2009-05-29 23:03:59 +0000
+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade	2009-06-08 11:45:11 +0000
@@ -72,9 +72,11 @@
 	      <child>
 		<widget class="GtkLabel" id="label1">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Search the Freesound library samples</property>
+		  <property name="label" translatable="yes">Search the Freesound library samples.
+
+&lt;b&gt;Drag and drop&lt;/b&gt; samples on to your project to add them.</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>

=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.py'
--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.py	2009-05-29 23:03:59 +0000
+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.py	2009-06-08 12:07:25 +0000
@@ -18,6 +18,12 @@
 import freesound
 import pkg_resources
 
+try:
+	import gnomekeyring as gkey
+	keyring = True
+except:
+	keyring = False
+
 import gettext
 _ = gettext.gettext
 
@@ -36,7 +42,7 @@
 	
 	# necessary extension attributes
 	EXTENSION_NAME = _("Freesound search")
-	EXTENSION_VERSION = "0.3"
+	EXTENSION_VERSION = "0.4"
 	EXTENSION_DESCRIPTION = _("Searches the Freesound library of freely" + \
 							" licenceable and useable sound clips")
 	
@@ -161,7 +167,6 @@
 		self.scrollResults.add_with_viewport(self.vboxResults)
 		self.api.set_window_icon(self.window)
 		self.imageHeader.set_from_file(pkg_resources.resource_filename(__name__, "images/banner.png"))
-		self.statusbar.push(0, _("Tip: To add a sample to your project, drag and drop it into the recording view"))
 		
 		self.window.show_all()
 		
@@ -363,12 +368,24 @@
 		self.buttonOK.set_flags(gtk.CAN_DEFAULT)
 		self.buttonOK.grab_default()
 		self.api.set_window_icon(self.loginWindow)
+	
+		# set the entry text to the saved values
+		username = self.api.get_config_value("fsUsername")
+		if username is not None and keyring:
+			password = None
+			try:
+				items = gkey.find_items_sync(gkey.ITEM_NETWORK_PASSWORD, {"username" : username})
+				if len(items) > 0:
+					password = items[0].secret
+			except gkey.DeniedError, gkey.NoMatchError:
+				pass
+		else:
+			password = self.api.get_config_value("fsPassword")
 		
-		# set the entries's text to the saved values
-		if self.api.get_config_value("fsUsername") is not None:
-			self.entryUsername.set_text(self.api.get_config_value("fsUsername"))
-		if self.api.get_config_value("fsPassword") is not None:
-			self.entryPassword.set_text(self.api.get_config_value("fsPassword"))
+		if username is not None:
+			self.entryUsername.set_text(username)
+		if password is not None:
+			self.entryPassword.set_text(password)
 		
 		if warning:
 			self.labelWarning.set_label(warning)
@@ -399,7 +416,9 @@
 	def FinishLogin(self, username, password):
 		"""
 		Attempts to login in to confirm the given credentials.
-		If successful, they're written to a local file for subsequent use.
+		If successful, the username is written to a local file for subsequent use
+		and the password is saved in the user's keyring (if available, or a local
+		file otherwise).
 		
 		The GUI calls are done using gobject.idle_add() to assure they're
 		within the main gtk thread.
@@ -408,7 +427,16 @@
 		
 		if self.freeSound.loggedIn:
 			self.api.set_config_value("fsUsername", username)
-			self.api.set_config_value("fsPassword", password)
+			if keyring:
+				gkey.item_create_sync(gkey.get_default_keyring_sync(), 
+						gkey.ITEM_NETWORK_PASSWORD, 
+						EXTENSION_DATA_NAME,
+						{"username" : username},
+						password,
+						True)
+			else:
+				self.api.set_config_value("fsPassword", password)
+
 			gobject.idle_add(self.loginWindow.destroy)
 			
 			if self.showSearch: