ready for 1.6.2 release: disable plugins/breadcrumbs, add sboyd to ab…

…out dialog dev list, update website, etc.

CHANGELOG

@@ -1,3 +1,6 @@
+v1.6.2 - April 13, 2009
+	+ Bug: Fix cli options (e.g. 'sonata play')
+
 v1.6.1 - April 11, 2009
 	+ Reduce library's filesystem view row height
 	+ More auto-applying of preferences (e.g. format tab)

TODO

@@ -1,4 +1,4 @@
-v1.6.2
+v1.6.3
 	disconnect/connect/reconnect ui weirdness
 	sonata freezes with gail/accessibility enabled during new library searching
 	translations - bold, commas for arabic (ahmad farghal email)

sonata/about.py

@@ -174,7 +174,7 @@ def about_load(self, stats):
         if stats:
             self.about_dialog.set_copyright(self.statstext(stats))
         self.about_dialog.set_license(self.license)
-        self.about_dialog.set_authors(['Scott Horowitz <stonecrest@gmail.com>', 'Tuukka Hastrup <Tuukka.Hastrup@iki.fi>'])
+        self.about_dialog.set_authors(['Scott Horowitz <stonecrest@gmail.com>', 'Tuukka Hastrup <Tuukka.Hastrup@iki.fi>', 'Stephen Boyd <bebarino@gmail.com>'])
         self.about_dialog.set_artists(['Adrian Chromenko <adrian@rest0re.org>\nhttp://oss.rest0re.org/'])
         self.about_dialog.set_translator_credits(translators)
         gtk.about_dialog_set_url_hook(self.show_website)

sonata/library.py

@@ -84,19 +84,21 @@ def __init__(self, config, client, artwork, TAB_LIBRARY, album_filename, setting
         self.libraryview = ui.button(relief=gtk.RELIEF_NONE)
         self.libraryview.set_tooltip_text(_("Library browsing view"))
         # disabled as breadcrumbs replace this:
-#		self.searchbox.pack_start(self.libraryview, False, False, 1)
-#		self.searchbox.pack_start(gtk.VSeparator(), False, False, 2)
+        self.searchbox.pack_start(self.libraryview, False, False, 1)
+        self.searchbox.pack_start(gtk.VSeparator(), False, False, 2)
         self.searchbox.pack_start(ui.label(_("Search") + ":"), False, False, 3)
         self.searchbox.pack_start(self.searchtext, True, True, 2)
         self.searchbox.pack_start(self.searchcombo, False, False, 2)
         self.searchbox.pack_start(self.searchbutton, False, False, 2)
-        self.libraryvbox.pack_start(self.breadcrumbs, False, False, 2)
+        #self.libraryvbox.pack_start(self.breadcrumbs, False, False, 2)
         self.libraryvbox.pack_start(expanderwindow2, True, True)
         self.libraryvbox.pack_start(self.searchbox, False, False, 2)
 
         self.tab = new_tab(self.libraryvbox, gtk.STOCK_HARDDISK, TAB_LIBRARY, self.library)
 
         # Assign some pixbufs for use in self.library
+        self.openpb2 = self.library.render_icon(gtk.STOCK_OPEN, gtk.ICON_SIZE_LARGE_TOOLBAR)
+        self.harddiskpb2 = self.library.render_icon(gtk.STOCK_HARDDISK, gtk.ICON_SIZE_LARGE_TOOLBAR)
         self.openpb = self.library.render_icon(gtk.STOCK_OPEN, gtk.ICON_SIZE_MENU)
         self.harddiskpb = self.library.render_icon(gtk.STOCK_HARDDISK, gtk.ICON_SIZE_MENU)
         self.albumpb = gtk.gdk.pixbuf_new_from_file_at_size(album_filename, consts.LIB_COVER_SIZE, consts.LIB_COVER_SIZE)
@@ -365,7 +367,7 @@ def library_browse(self, _widget=None, root=None):
         # Update library artwork as necessary
         self.on_library_scrolled(None, None)
 
-        self.update_breadcrumbs()
+        #self.update_breadcrumbs()
 
     def update_breadcrumbs(self):
         # remove previous buttons
@@ -459,9 +461,13 @@ def update_breadcrumbs(self):
             b.show_all()
 
     def library_populate_add_parent_rows(self):
-        return [] # disabled as breadcrumbs replace these
-        bd = [('0', [self.harddiskpb, self.library_set_data(path='/'), '/'])]
-        bd += [('1', [self.openpb, self.library_set_data(path='..'), '..'])]
+        #return [] # disabled as breadcrumbs replace these
+        if self.config.lib_view == consts.VIEW_FILESYSTEM:
+            bd = [('0', [self.harddiskpb, self.library_set_data(path='/'), '/'])]
+            bd += [('1', [self.openpb, self.library_set_data(path='..'), '..'])]
+        else:
+            bd = [('0', [self.harddiskpb2, self.library_set_data(path='/'), '/'])]
+            bd += [('1', [self.openpb2, self.library_set_data(path='..'), '..'])]
         return bd
 
     def library_populate_filesystem_data(self, path):

sonata/preferences.py

@@ -104,7 +104,7 @@ def on_prefs_real(self, extras_cbs, display_cbs, behavior_cbs, format_cbs):
                 (_("Plugins"), 'plugins'),
                 ]
 
-        for display_name, name in tabs:
+        for display_name, name in tabs[:-1]:
             label = ui.label(text=display_name)
             func = getattr(self, '%s_tab' % name)
             tab = func(locals().get('%s_cbs' % name))

website/changelog.html

@@ -27,6 +27,10 @@
 
 		 <h2>Changelog</h2>
 
+			<p>April 13, 2009 (Version 1.6.2):<ul>
+			<li>Bug: Fix cli options (e.g. 'sonata play')</li>
+			</ul>
+
 			<p>April 11, 2009 (Version 1.6.1):<ul>
 			<li>Reduce library's filesystem view row height</li>
 			<li>More auto-applying of preferences (e.g. format tab)</li>

website/download.html

@@ -27,7 +27,7 @@
 
 		 <h2>Download</h2>
 
-			<p>Sonata source code is available here:&nbsp;&nbsp;<a href="http://download.berlios.de/sonata/sonata-1.6.1.tar.gz">sonata-1.6.1.tar.gz</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://download.berlios.de/sonata/sonata-1.6.1.tar.bz2">sonata-1.6.1.tar.bz2</a><br/><br/>
+			<p>Sonata source code is available here:&nbsp;&nbsp;<a href="http://download.berlios.de/sonata/sonata-1.6.2.tar.gz">sonata-1.6.2.tar.gz</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://download.berlios.de/sonata/sonata-1.6.2.tar.bz2">sonata-1.6.2.tar.bz2</a><br/><br/>
 
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Archlinux: pacman -S <a href="http://archlinux.org/packages/search/?q=sonata">sonata</a> (James Rayner)<br/>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Debian: Available in <a href="http://packages.debian.org/unstable/sound/sonata">unstable</a> (Michal Čihař)<br/>

website/index.html

@@ -32,7 +32,7 @@
 <div class="content">
 
 		 <h2>About</h2>
-		 <p>Sonata is an elegant GTK+ music client for the <a href="http://www.musicpd.org">Music Player Daemon (MPD)</a>.  The latest version is <a href="download.html">1.6.1</a>.</p>
+		 <p>Sonata is an elegant GTK+ music client for the <a href="http://www.musicpd.org">Music Player Daemon (MPD)</a>.  The latest version is <a href="download.html">1.6.2</a>.</p>
 		 <p>Sonata is licensed by the GPL and is <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>.  It has been forked from the unmaintained <a href="http://pygmy.berlios.de">Pygmy</a> project in order to fix bugs, introduce new features, and proceed down a different path.
 
 		 <h2>Features</h2>