X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fui.py;h=dda0eccd0014c8d4bfa507d4e4a1c1f1f42c3193;hp=e7311b70bfa71f8f5bd5cc75cd0aa103677d767b;hb=61536ca548691b15e7f63340a0fbfb5a3055d5be;hpb=99b9e55a7165a70a2e2f8846a214246d49faf9d0 diff --git a/jamaui/ui.py b/jamaui/ui.py index e7311b7..dda0ecc 100644 --- a/jamaui/ui.py +++ b/jamaui/ui.py @@ -38,7 +38,7 @@ gobject.threads_init() log = logging.getLogger(__name__) -VERSION = '1' +VERSION = '0.2' try: import hildon @@ -47,8 +47,8 @@ except: log.critical('Using GTK widgets, install "python2.5-hildon" ' 'for this to work properly.') else: - log.critical('This ui only works in maemo') - sys.exit(1) + log.critical('This ui (probably) only works in maemo') + import helldon as hildon from dbus.mainloop.glib import DBusGMainLoop @@ -56,21 +56,14 @@ DBusGMainLoop(set_as_default=True) import jamaendo +from postoffice import postoffice from playerwindow import open_playerwindow from search import SearchWindow from featured import FeaturedWindow from radios import RadiosWindow from favorites import FavoritesWindow - -class PlaylistsWindow(hildon.StackableWindow): - def __init__(self): - hildon.StackableWindow.__init__(self) - self.set_title("Playlists") - - label = gtk.Label("Playlists") - vbox = gtk.VBox(False, 0) - vbox.pack_start(label, True, True, 0) - self.add(vbox) +from playlists import PlaylistsWindow +from listbox import ButtonListDialog class Jamaui(object): def __init__(self): @@ -79,11 +72,13 @@ class Jamaui(object): self.window = None def create_window(self): + log.debug("Creating main window...") self.app = hildon.Program() self.window = hildon.StackableWindow() self.app.add_window(self.window) self.window.set_title("jamaendo") + self.window.connect("destroy", self.destroy) self.CONFDIR = os.path.expanduser('~/MyDocs/.jamaendo') @@ -91,8 +86,9 @@ class Jamaui(object): settings.set_filename(os.path.join(self.CONFDIR, 'ui_settings')) settings.load() - def save_settings(self): - settings.save() + postoffice.connect('request-album-cover', self, self.on_request_cover) + postoffice.connect('request-images', self, self.on_request_images) + log.debug("Created main window.") def create_menu(self): self.menu = hildon.AppMenu() @@ -102,20 +98,20 @@ class Jamaui(object): #search.connect("clicked", self.on_search) #self.menu.append(search) - #player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO) - #player.set_label("Open player") - #player.connect("clicked", self.on_player) - #self.menu.append(player) + player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO) + player.set_label("Open player") + player.connect("clicked", self.on_player) + self.menu.append(player) player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO) player.set_label("Favorites") player.connect("clicked", self.on_favorites) self.menu.append(player) - #player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO) - #player.set_label("Playlists") - #player.connect("clicked", self.on_playlists) - #self.menu.append(player) + player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO) + player.set_label("Playlists") + player.connect("clicked", self.on_playlists) + self.menu.append(player) player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO) player.set_label("Settings") @@ -167,6 +163,18 @@ class Jamaui(object): btn.connect('clicked', callback) self.bbox.add(btn) + def on_request_cover(self, albumid, size): + jamaendo.get_album_cover_async(self.got_album_cover, int(albumid), size) + + def on_request_images(self, urls): + jamaendo.get_images_async(self.got_images, urls) + + def got_album_cover(self, albumid, size, cover): + postoffice.notify('album-cover', albumid, size, cover) + + def got_images(self, images): + postoffice.notify('images', images) + #def add_featured_button(self): # self.featured_sel = hildon.TouchSelector(text=True) # self.featured_sel.append_text("Albums of the week") @@ -181,18 +189,46 @@ class Jamaui(object): # self.bbox.add(btn) def destroy(self, widget): + postoffice.disconnect(['request-album-cover', 'request-images'], self) + settings.save() + from player import the_player + if the_player: + the_player.stop() gtk.main_quit() def show_about(self, w, win): dialog = gtk.AboutDialog() dialog.set_program_name("jamaendo") - dialog.set_website("http://github.com/krig") - dialog.set_website_label("http://github.com/krig") + dialog.set_website("http://jamaendo.garage.maemo.org/") + dialog.set_website_label("http://jamaendo.garage.maemo.org/") dialog.set_version(VERSION) - dialog.set_license("GNU GPL v3") + dialog.set_license("""Copyright (c) 2010, Kristoffer Gronlund +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Jamaendo nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +""") dialog.set_authors(("Kristoffer Gronlund ", - "Based on Panucci and gPodder, by", - "Thomas Perl ")) + "Based on Panucci, written by Thomas Perl ")) dialog.set_comments("""Jamaendo plays music from the music catalog of JAMENDO. JAMENDO is an online platform that distributes musical works under Creative Commons licenses.""") @@ -208,7 +244,7 @@ JAMENDO is an online platform that distributes musical works under Creative Comm dialog.destroy() def open_link(self, d, url, data): - print "url: %s" % (url) + #print "url: %s" % (url) import webbrowser webbrowser.open_new(url) @@ -220,16 +256,15 @@ JAMENDO is an online platform that distributes musical works under Creative Comm # dialog.hide() def on_featured(self, button): - dialog = hildon.PickerDialog(self.window) - sel = hildon.TouchSelector(text=True) - for feature, _ in FeaturedWindow.features: - sel.append_text(feature) - dialog.set_selector(sel) - dialog.set_title("Featured") - if dialog.run() == gtk.RESPONSE_OK: - txt = sel.get_current_text() - self.featuredwnd = FeaturedWindow(txt) + dialog = ButtonListDialog('Featured', self.window) + def fn(btn, feature): + self.featuredwnd = FeaturedWindow(feature) self.featuredwnd.show_all() + dialog.response(gtk.RESPONSE_OK) + for feature, _ in FeaturedWindow.features: + dialog.add_button(feature, fn, feature) + dialog.show_all() + dialog.run() dialog.destroy() def on_radios(self, button): @@ -261,11 +296,11 @@ JAMENDO is an online platform that distributes musical works under Creative Comm result = dialog.run() val = entry.get_text() dialog.destroy() - print val, result + #print val, result if val and result == gtk.RESPONSE_OK: - print "new user name:", val + #print "new user name:", val settings.user = val - self.save_settings() + settings.save() def on_favorites(self, button): @@ -273,7 +308,7 @@ JAMENDO is an online platform that distributes musical works under Creative Comm self.favoriteswnd.show_all() def on_player(self, button): - open_playerwindow([]) + open_playerwindow() ''' def on_search(self, button):