X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fui.py;h=dda0eccd0014c8d4bfa507d4e4a1c1f1f42c3193;hp=8babaf5ce73cfad87bf5288d1a7ce7e61c5a94c9;hb=61536ca548691b15e7f63340a0fbfb5a3055d5be;hpb=3eba0a22b3bffc6f661fa0334ad90ea1a844748c

diff --git a/jamaui/ui.py b/jamaui/ui.py
index 8babaf5..dda0ecc 100644
--- a/jamaui/ui.py
+++ b/jamaui/ui.py
@@ -1,8 +1,36 @@
+#!/usr/bin/env python
+#
+# This file is part of Jamaendo.
+# Copyright (c) 2010 Kristoffer Gronlund
+#
+# Jamaendo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Jamaendo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Jamaendo.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Player code heavily based on http://thpinfo.com/2008/panucci/:
+#  A resuming media player for Podcasts and Audiobooks
+#  Copyright (c) 2008-05-26 Thomas Perl <thpinfo.com>
+#  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
+#
+# Jamaendo jamendo.com API wrapper licensed under the New BSD License;
+# see module for details.
+#
+
 import os, sys
 import gtk
 import gobject
 import util
 import logging
+from settings import settings
 
 import ossohelper
 
@@ -10,6 +38,8 @@ gobject.threads_init()
 
 log = logging.getLogger(__name__)
 
+VERSION = '0.2'
+
 try:
     import hildon
 except:
@@ -17,92 +47,49 @@ 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
 
 DBusGMainLoop(set_as_default=True)
 
+import jamaendo
+
+from postoffice import postoffice
 from playerwindow import open_playerwindow
 from search import SearchWindow
-
-class ArtistWindow(hildon.StackableWindow):
-    def __init__(self):
-        hildon.StackableWindow.__init__(self)
-        self.set_title("View Artist")
-
-        label = gtk.Label("Artist information")
-        vbox = gtk.VBox(False, 0)
-        vbox.pack_start(label, True, True, 0)
-        self.add(vbox)
-
-class AlbumWindow(hildon.StackableWindow):
-    def __init__(self):
-        hildon.StackableWindow.__init__(self)
-        self.set_title("View Album")
-
-        label = gtk.Label("Album information")
-        vbox = gtk.VBox(False, 0)
-        vbox.pack_start(label, True, True, 0)
-        self.add(vbox)
-
-class RadiosWindow(hildon.StackableWindow):
-    def __init__(self):
-        hildon.StackableWindow.__init__(self)
-        self.set_title("Radios")
-
-        label = gtk.Label("Radios")
-        vbox = gtk.VBox(False, 0)
-        vbox.pack_start(label, True, True, 0)
-        self.add(vbox)
-
-class FeaturedWindow(hildon.StackableWindow):
-    def __init__(self):
-        hildon.StackableWindow.__init__(self)
-        self.set_title("Featured")
-
-        label = gtk.Label("featured")
-        vbox = gtk.VBox(False, 0)
-        vbox.pack_start(label, True, True, 0)
-        self.add(vbox)
-
-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)
-
-class FavoritesWindow(hildon.StackableWindow):
-    def __init__(self):
-        hildon.StackableWindow.__init__(self)
-        self.set_title("Favorites")
-
-        label = gtk.Label("favorites")
-        vbox = gtk.VBox(False, 0)
-        vbox.pack_start(label, True, True, 0)
-        self.add(vbox)
+from featured import FeaturedWindow
+from radios import RadiosWindow
+from favorites import FavoritesWindow
+from playlists import PlaylistsWindow
+from listbox import ButtonListDialog
 
 class Jamaui(object):
-    _BG = 'bg.png' # /opt/jamaendo/data/bg.png
-
     def __init__(self):
         self.app = None
         self.menu = None
         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')
+        jamaendo.set_cache_dir(self.CONFDIR)
+        settings.set_filename(os.path.join(self.CONFDIR, 'ui_settings'))
+        settings.load()
+
+        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()
 
@@ -126,6 +113,12 @@ class Jamaui(object):
         player.connect("clicked", self.on_playlists)
         self.menu.append(player)
 
+        player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+        player.set_label("Settings")
+        player.connect("clicked", self.on_settings)
+        self.menu.append(player)
+
+
         # Don't use localdb ATM
         #refresh = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         #refresh.set_label("Refresh")
@@ -141,18 +134,9 @@ class Jamaui(object):
         self.menu.show_all()
         self.window.set_app_menu(self.menu)
 
-    def find_resource(self, name):
-        if os.path.isfile(os.path.join('data', name)):
-            return os.path.join('data', name)
-        elif os.path.isfile(os.path.join('/opt/jaemendo', name)):
-            return os.path.join('/opt/jaemendo', name)
-        elif os.path.isfile(os.path.join('/usr/share/jaemendo', name)):
-            return os.path.join('/usr/share/jaemendo', name)
-        else:
-            return None
 
     def setup_widgets(self):
-        bgimg = self.find_resource(self._BG)
+        bgimg = util.find_resource('bg.png')
         if bgimg:
             background, mask = gtk.gdk.pixbuf_new_from_file(bgimg).render_pixmap_and_mask()
             self.window.realize()
@@ -179,22 +163,88 @@ 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")
+    #    self.featured_sel.append_text("Tracks of the week")
+    #    self.featured_sel.append_text("New releases")
+    #    btn = hildon.PickerButton(gtk.HILDON_SIZE_THUMB_HEIGHT,
+    #                              hildon.BUTTON_ARRANGEMENT_VERTICAL)
+    #    btn.set_text("Featured", "Most listened to")
+    #    btn.set_property('width-request', 225)
+    #    btn.set_selector(self.featured_sel)
+    #    self.featured_btn = btn
+    #    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_website("http://github.com/krig")
-        dialog.set_website_label("http://github.com/krig")
-        dialog.set_authors(("Kristoffer Gronlund (Purple Scout AB)",))
+        dialog.set_program_name("jamaendo")
+        dialog.set_website("http://jamaendo.garage.maemo.org/")
+        dialog.set_website_label("http://jamaendo.garage.maemo.org/")
+        dialog.set_version(VERSION)
+        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 <COPYRIGHT HOLDER> 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 <kristoffer.gronlund@purplescout.se>",
+                            "Based on Panucci, written by Thomas Perl <thpinfo.com>"))
         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.""")
-        dialog.set_version('')
+        gtk.about_dialog_set_email_hook(self.open_link, dialog)
+        gtk.about_dialog_set_url_hook(self.open_link, dialog)
+        dialog.connect( 'response', lambda dlg, response: dlg.destroy())
+        for parent in dialog.vbox.get_children():
+            for child in parent.get_children():
+                if isinstance(child, gtk.Label):
+                    child.set_selectable(False)
+                    child.set_alignment(0.0, 0.5)
         dialog.run()
         dialog.destroy()
 
     def open_link(self, d, url, data):
+        #print "url: %s" % (url)
         import webbrowser
         webbrowser.open_new(url)
 
@@ -206,8 +256,16 @@ JAMENDO is an online platform that distributes musical works under Creative Comm
     #    dialog.hide()
 
     def on_featured(self, button):
-        self.featuredwnd = FeaturedWindow()
-        self.featuredwnd.show_all()
+        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):
         self.radioswnd = RadiosWindow()
@@ -221,12 +279,36 @@ JAMENDO is an online platform that distributes musical works under Creative Comm
         self.playlistswnd = PlaylistsWindow()
         self.playlistswnd.show_all()
 
+    def on_settings(self, button):
+        dialog = gtk.Dialog()
+        dialog.set_title("Settings")
+        dialog.add_button( gtk.STOCK_OK, gtk.RESPONSE_OK )
+        vbox = dialog.vbox
+        tbl = gtk.Table(1, 2)
+        tbl.attach(gtk.Label("Username:"), 0, 1, 0, 1)
+        entry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
+        entry.set_placeholder("jamendo.com username")
+        if settings.user:
+            entry.set_text(settings.user)
+        tbl.attach(entry, 1, 2, 0, 1)
+        vbox.pack_start(tbl, True, True, 2)
+        dialog.show_all()
+        result = dialog.run()
+        val = entry.get_text()
+        dialog.destroy()
+        #print val, result
+        if val and result == gtk.RESPONSE_OK:
+            #print "new user name:", val
+            settings.user = val
+            settings.save()
+
+
     def on_favorites(self, button):
         self.favoriteswnd = FavoritesWindow()
         self.favoriteswnd.show_all()
 
     def on_player(self, button):
-        open_playerwindow([])
+        open_playerwindow()
 
     '''
     def on_search(self, button):