Index: plugins/jamendo/jamendo-loading.glade =================================================================== --- plugins/jamendo/jamendo-loading.glade (revision 5083) +++ plugins/jamendo/jamendo-loading.glade (working copy) @@ -20,365 +20,382 @@ False - - 12 + True - False - 6 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - + True - jamendo_logo.png - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - + GTK_SHADOW_IN - - - True - <b>Jamendo</b> - False - True - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - + + + 12 + True + False + 6 - - - True - jamendo is a new model for artists to promote, publish, and be paid for their music. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + jamendo_logo.png + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + - - - True - On jamendo, the artists distribute their music under Creative Commons licenses. + + + True + <b>Jamendo</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + True + jamendo is a new model for artists to promote, publish, and be paid for their music. + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + On jamendo, the artists distribute their music under Creative Commons licenses. In a nutshell, they allow you to download, remix and share their music freely. It's a "Some rights reserved" agreement, perfectly suited for the new century. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - These new rules make jamendo able to use the new powerful means of digital distribution like + + + True + These new rules make jamendo able to use the new powerful means of digital distribution like Peer-to-Peer networks such as BitTorrent or eMule to legally distribute albums at near-zero cost. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - jamendo users can discover and share albums, but also review them or start a discussion on the forums. + + + True + jamendo users can discover and share albums, but also review them or start a discussion on the forums. Albums are democratically rated based on the visitors’ reviews. If they fancy an artist they can support him by making a donation. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - jamendo is the only platform that joins together : - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + jamendo is the only platform that joins together : + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - 5 - 1 - False - 0 - 0 + + + True + 5 + 1 + False + 0 + 0 - - - True - * Free, simple and quick access to the music, for everyone. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + * Free, simple and quick access to the music, for everyone. + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + - - - True - * A legal framework protecting the artists (thanks to the Creative Commons licenses). - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - + + + True + * A legal framework protecting the artists (thanks to the Creative Commons licenses). + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - * The use of the latest Peer-to-Peer technologies - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - + + + True + * The use of the latest Peer-to-Peer technologies + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + - - - True - * The possibility of making direct donations to the artists. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - + + + True + * The possibility of making direct donations to the artists. + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + - - - True - * An adaptive music recommendation system based on iRATE to help listeners discover new artists based on their tastes + + + True + * An adaptive music recommendation system based on iRATE to help listeners discover new artists based on their tastes and on other criteria such as their location. - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + 0 + True + True + + + + + + True + You can find more information at http://www.jamendo.com/ + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - 0 - 1 - 4 - 5 - fill - - - - 0 - True - True - - - - - True - You can find more information at http://www.jamendo.com/ - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - Index: plugins/jamendo/jamendo/JamendoSource.py =================================================================== --- plugins/jamendo/jamendo/JamendoSource.py (revision 5083) +++ plugins/jamendo/jamendo/JamendoSource.py (working copy) @@ -282,8 +282,8 @@ def __show_loading_screen(self, show): if self.__info_screen is None: # load the glade stuff - gladexml = gtk.glade.XML(self.__plugin.find_file("jamendo-loading.glade"), root="jamendo_loading_vbox") - self.__info_screen = gladexml.get_widget("jamendo_loading_vbox") + gladexml = gtk.glade.XML(self.__plugin.find_file("jamendo-loading.glade"), root="jamendo_loading_scrolledwindow") + self.__info_screen = gladexml.get_widget("jamendo_loading_scrolledwindow") self.pack_start(self.__info_screen) self.get_entry_view().set_no_show_all (True) self.__info_screen.set_no_show_all (True) Index: plugins/magnatune/magnatune/MagnatuneSource.py =================================================================== --- plugins/magnatune/magnatune/MagnatuneSource.py (revision 5083) +++ plugins/magnatune/magnatune/MagnatuneSource.py (working copy) @@ -388,8 +388,8 @@ def __show_loading_screen(self, show): if self.__info_screen is None: # load the glade stuff - gladexml = gtk.glade.XML(self.__plugin.find_file("magnatune-loading.glade"), root="magnatune_loading_vbox") - self.__info_screen = gladexml.get_widget("magnatune_loading_vbox") + gladexml = gtk.glade.XML(self.__plugin.find_file("magnatune-loading.glade"), root="magnatune_loading_scrolledwindow") + self.__info_screen = gladexml.get_widget("magnatune_loading_scrolledwindow") self.pack_start(self.__info_screen) self.get_entry_view().set_no_show_all (True) self.__info_screen.set_no_show_all (True) Index: plugins/magnatune/magnatune-loading.glade =================================================================== --- plugins/magnatune/magnatune-loading.glade (revision 5083) +++ plugins/magnatune/magnatune-loading.glade (working copy) @@ -20,681 +20,699 @@ False - - 12 + True - False - 6 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - + True - magnatune_logo_color_small.png - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - + GTK_SHADOW_IN - - - True - <b>Magnatune online music store</b> - False - True - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - + + + 12 + True + False + 6 - - - True - True - Magnatune is an online record label that is not evil. Some of their key attributes are: + + + True + magnatune_logo_color_small.png + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + <b>Magnatune online music store</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + True + True + Magnatune is an online record label that is not evil. Some of their key attributes are: - False - False - GTK_JUSTIFY_LEFT - False - True - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - + False + False + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + - - - True - 20 - 1 - False - 0 - 0 + + + True + 20 + 1 + False + 0 + 0 - - - True - * Free listening of all songs - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - + + + True + * Free listening of all songs + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - * All albums and artists hand-picked - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + * All albums and artists hand-picked + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + - - - True - * Very simple user interface, quick to play music - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - + + + True + * Very simple user interface, quick to play music + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + - - - True - * Radio stations and "genre mix" playlists allow background listening - can do work while listening to our music - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - + + + True + * Radio stations and "genre mix" playlists allow background listening - can do work while listening to our music + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + - - - True - * No need to "register" to listen or buy - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - + + + True + * No need to "register" to listen or buy + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + - - - True - * Smaller selection means easier to find good music - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - + + + True + * Smaller selection means easier to find good music + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 5 + 6 + fill + + + - - - True - * Wide variety of genres, can fit any mood - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - + + + True + * Wide variety of genres, can fit any mood + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 6 + 7 + fill + + + - - - True - * Our genres are hard to find in record stores and not on radio (though do appear on college radio) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 7 - 8 - fill - - - + + + True + * Our genres are hard to find in record stores and not on radio (though do appear on college radio) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 7 + 8 + fill + + + - - - True - * Downloads and CDs are both available (no other site on the internet sells both) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 8 - 9 - fill - - - + + + True + * Downloads and CDs are both available (no other site on the internet sells both) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 8 + 9 + fill + + + - - - True - * Perfect quality downloads (CD copy) are available when you download (not inferior quality sound) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 9 - 10 - fill - - - + + + True + * Perfect quality downloads (CD copy) are available when you download (not inferior quality sound) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 9 + 10 + fill + + + - - - True - * No copy protection on the music (DRM) which allows playing music on any device (unlike iTunes/MSN/etc) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 10 - 11 - fill - - - + + + True + * No copy protection on the music (DRM) which allows playing music on any device (unlike iTunes/MSN/etc) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 10 + 11 + fill + + + - - - True - * Extensive biographical info about each musician, and artist photo -- feel a strong connection to the artist - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 11 - 12 - fill - - - + + + True + * Extensive biographical info about each musician, and artist photo -- feel a strong connection to the artist + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 11 + 12 + fill + + + - - - True - * Full color, high quality cover art PDF available for most albums - easy to print - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 12 - 13 - fill - - - + + + True + * Full color, high quality cover art PDF available for most albums - easy to print + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 12 + 13 + fill + + + - - - True - * Variable pricing scheme means you can pay as little as $5 for an album if you choose - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 13 - 14 - fill - - - + + + True + * Variable pricing scheme means you can pay as little as $5 for an album if you choose + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 13 + 14 + fill + + + - - - True - * 50% of payment goes to artist (makes buyer feel good: they're helping the world) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 14 - 15 - fill - - - + + + True + * 50% of payment goes to artist (makes buyer feel good: they're helping the world) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 14 + 15 + fill + + + - - - True - * Not venture-capital backed big business - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 15 - 16 - fill - - - + + + True + * Not venture-capital backed big business + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 15 + 16 + fill + + + - - - True - * Not part of the "evil" major label machine - for those that hate the music biz and want to help topple it - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 16 - 17 - fill - - - + + + True + * Not part of the "evil" major label machine - for those that hate the music biz and want to help topple it + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 16 + 17 + fill + + + - - - True - * Founder/owner runs it -- support a small business - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 17 - 18 - fill - - - + + + True + * Founder/owner runs it -- support a small business + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 17 + 18 + fill + + + - - - True - * Low pressure environment - nothing flashing, no audio ads while listening to albums - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 18 - 19 - fill - - - + + + True + * Low pressure environment - nothing flashing, no audio ads while listening to albums + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 18 + 19 + fill + + + - - - True - * Music selection is unique to Magnatune, unlike most on-line stores that have more-or-less the same (gigantic) selection + + + True + * Music selection is unique to Magnatune, unlike most on-line stores that have more-or-less the same (gigantic) selection - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 19 + 20 + fill + + + + + + 0 + True + True + + + + + + True + You can find more information at http://www.magnatune.com/ + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - 0 - 1 - 19 - 20 - fill - - - - 0 - True - True - - - - - True - You can find more information at http://www.magnatune.com/ - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - -