X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fui.py;h=329963b232a646f1427755feb27b7c9f5f974935;hp=a276de7ec717939c2d6cac88bacc1eb480294946;hb=19020e8dae378875c8bfcd7e573ca5e91b1dfa10;hpb=3288b01ae01d4fdb65f23e80189cad301a232965
diff --git a/jamaui/ui.py b/jamaui/ui.py
index a276de7..329963b 100644
--- a/jamaui/ui.py
+++ b/jamaui/ui.py
@@ -1,19 +1,36 @@
-# debugging hack - add . to path
-import os, sys
-local_module_dir = os.path.join(os.path.dirname(sys.argv[0]), '..')
-if os.path.isdir(local_module_dir):
- sys.path.append(local_module_dir)
+#!/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 .
+#
+# 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
+# (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
-import gobject
-
-# we don't use the local DB...
-import jamaendo
-from jamaui.player import Player, Playlist
-from util import jsonprint
+from settings import settings
import ossohelper
@@ -21,6 +38,8 @@ gobject.threads_init()
log = logging.getLogger(__name__)
+VERSION = '0.1'
+
try:
import hildon
except:
@@ -35,200 +54,52 @@ from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
-class PlayerWindow(hildon.StackableWindow):
- def __init__(self, playlist=None):
- hildon.StackableWindow.__init__(self)
- self.set_title("jamaendo")
-
- self.playlist = Playlist(playlist)
- self.player = Player()
-
- vbox = gtk.VBox()
-
- hbox = gtk.HBox()
-
- self.cover = gtk.Image()
- self.cover.set_size_request(160, 160)
- self.cover.set_from_stock(gtk.STOCK_CDROM, gtk.ICON_SIZE_DIALOG)
-
- vbox2 = gtk.VBox()
-
- self.playlist_pos = gtk.Label("0/0 songs")
- self.track = gtk.Label("Track name")
- self.progress = hildon.GtkHScale()
- self.artist = gtk.Label("Artist")
- self.album = gtk.Label("Album")
-
- vbox2.pack_start(self.playlist_pos, False)
- vbox2.pack_start(self.track, False)
- vbox2.pack_start(self.progress, True, True)
- vbox2.pack_start(self.artist, False)
- vbox2.pack_start(self.album, False)
-
- hbox.pack_start(self.cover, True, True, 0)
- hbox.pack_start(vbox2, True, True, 0)
-
- vbox.pack_start(hbox, True, True, 0)
-
- btns = gtk.HButtonBox()
- btns.set_property('layout-style', gtk.BUTTONBOX_SPREAD)
-
- vbox.pack_end(btns, False, True, 0)
-
- self.add_stock_button(btns, gtk.STOCK_MEDIA_PREVIOUS, self.on_prev)
- self.add_stock_button(btns, gtk.STOCK_MEDIA_PLAY, self.on_play)
- self.add_stock_button(btns, gtk.STOCK_MEDIA_PAUSE, self.on_pause)
- self.add_stock_button(btns, gtk.STOCK_MEDIA_STOP, self.on_stop)
- self.add_stock_button(btns, gtk.STOCK_MEDIA_NEXT, self.on_next)
-
- self.add(vbox)
-
- def add_stock_button(self, btns, stock, cb):
- btn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
- btn.set_relief(gtk.RELIEF_NONE)
- btn.set_image(gtk.image_new_from_stock(stock, gtk.ICON_SIZE_SMALL_TOOLBAR))
- btn.connect('clicked', cb)
- btns.add(btn)
-
- def update_state(self):
- item = self.playlist.current()
- if item:
- if not item.name:
- item.load()
- self.track.set_text(item.name)
- self.playlist_pos.set_text("%d/%d songs",
- self.playlist.current_index(),
- len(self.playlist))
- self.artist.set_text(item.artist_name)
- self.album.set_text(item.album_name)
- self.cover.set_from_file(jamaendo.get_album_cover(item.album_id, size=160))
-
- def on_play(self, button):
- self.player.play(self.playlist)
- self.update_state()
- def on_pause(self, button):
- self.player.pause()
- def on_prev(self, button):
- self.player.prev()
- self.update_state()
- def on_next(self, button):
- self.player.next()
- self.update_state()
- def on_stop(self, button):
- self.player.stop()
-
-class SearchWindow(hildon.StackableWindow):
- def __init__(self):
- hildon.StackableWindow.__init__(self)
- self.set_title("Search")
-
- vbox = gtk.VBox(False, 0)
-
- hbox = gtk.HBox()
- self.entry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
- self.entry.set_placeholder("Search")
- self.entry.connect('activate', self.on_search)
- btn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
- btn.set_label("Go")
- btn.connect('clicked', self.on_search)
- hbox.pack_start(self.entry, True, True, 0)
- hbox.pack_start(btn, False)
-
- btnbox = gtk.HBox()
- playbtn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
- playbtn.set_label("Play selected")
- playbtn.connect('clicked', self.play_selected)
- btnbox.pack_start(playbtn, False)
-
- self.results = hildon.TouchSelector(text=True)
- self.results.connect("changed", self.selection_changed)
- self.results.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE)
-
- vbox.pack_start(hbox, False)
- vbox.pack_start(self.results, True, True, 0)
- vbox.pack_start(btnbox, False)
-
- self.add(vbox)
-
- self.idmap = {}
-
- self.pwnd = None
-
- def on_search(self, w):
- txt = self.entry.get_text()
- for album in jamaendo.search_albums(query=txt):
- title = "%s - %s" % (album.artist_name, album.name)
- self.idmap[title] = album
- self.results.append_text(title)
-
- def selection_changed(self, results, userdata):
- pass
-
- def play_selected(self, btn):
- current_selection = self.results.get_current_text()
-
- album = self.idmap[current_selection]
- tracks = jamaendo.get_tracks(album.ID)
- if tracks:
- self.pwnd = PlayerWindow(tracks)
- self.pwnd.show_all()
-
-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")
+import jamaendo
- label = gtk.Label("featured")
- vbox = gtk.VBox(False, 0)
- vbox.pack_start(label, True, True, 0)
- self.add(vbox)
+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)
-
-class FavoritesWindow(hildon.StackableWindow):
- def __init__(self):
- hildon.StackableWindow.__init__(self)
- self.set_title("Favorites")
-
- label = gtk.Label("favorites")
+ label = gtk.Label("Playlists")
vbox = gtk.VBox(False, 0)
vbox.pack_start(label, True, True, 0)
self.add(vbox)
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)
+ log.debug("Created main window.")
+
+ def save_settings(self):
+ settings.save()
+
def create_menu(self):
self.menu = hildon.AppMenu()
@@ -237,21 +108,27 @@ 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)
+ 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")
@@ -267,25 +144,16 @@ 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()
self.window.window.set_back_pixmap(background, False)
bbox = gtk.HButtonBox()
- alignment = gtk.Alignment(xalign=0.0, yalign=0.8, xscale=1.0)
+ alignment = gtk.Alignment(xalign=0.2, yalign=0.925, xscale=1.0)
alignment.add(bbox)
bbox.set_property('layout-style', gtk.BUTTONBOX_SPREAD)
self.bbox = bbox
@@ -305,22 +173,78 @@ 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 got_album_cover(self, albumid, size, cover):
+ postoffice.notify('album-cover', albumid, size, cover)
+
+ #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', self)
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_authors(("Kristoffer Gronlund (Purple Scout AB)",))
+ 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 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, 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.""")
- 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)
@@ -332,12 +256,21 @@ 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 = 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)
+ self.featuredwnd.show_all()
+ dialog.destroy()
def on_radios(self, button):
- self.radiownd = RadioWindow()
- self.radiownd.show_all()
+ self.radioswnd = RadiosWindow()
+ self.radioswnd.show_all()
def on_search(self, button):
self.searchwnd = SearchWindow()
@@ -347,13 +280,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
+ self.save_settings()
+
+
def on_favorites(self, button):
self.favoriteswnd = FavoritesWindow()
self.favoriteswnd.show_all()
def on_player(self, button):
- self.playerwnd = PlayerWindow()
- self.playerwnd.show_all()
+ open_playerwindow()
'''
def on_search(self, button):