Merge lp:~xapantu/beat-box/albumview into lp:beat-box

[xapantu]

Add a new album view based on cairo, see http://xapantu.users.sourceforge.net/out-11.ogv

Improvements:
- It uses the gtk theme/fonts/colors
- It will avoid beatbox to depend on WebKit (at least by default, maybe the plugins will need it)

[lp:~xapantu/beat-box/albumview]

209. By xapantu on 2011-06-11

iconview

210. By xapantu on 2011-06-11

Auto resize icon view

211. By xapantu on 2011-06-11

Item activated support, all should work now

212. By xapantu on 2011-06-11

Avoid gtkwarnings

[xapantu (xapantu)]

I updated a few things, all should work fine now (the resizing and the selection) :)

[lp:~xapantu/beat-box/albumview]

213. By xapantu on 2011-06-11

Fix search

214. By xapantu on 2011-06-11

Code cleanup

Unmerged revisions

214. By xapantu on 2011-06-11

Code cleanup

213. By xapantu on 2011-06-11

Fix search

212. By xapantu on 2011-06-11

Avoid gtkwarnings

211. By xapantu on 2011-06-11

Item activated support, all should work now

210. By xapantu on 2011-06-11

Auto resize icon view

209. By xapantu on 2011-06-11

iconview

=== modified file 'src/Widgets/FilterView.vala'
--- src/Widgets/FilterView.vala	2011-06-08 21:43:10 +0000
+++ src/Widgets/FilterView.vala	2011-06-11 19:11:29 +0000
@@ -1,22 +1,58 @@
 using Gtk;
 using Gee;
-using WebKit;
 
-public class ArtistItem : Widget {
-	Label artistLabel;
+public class BeatBox.AlbumView : IconView {
+    Gtk.ListStore listmodel;
+    public AlbumView()
+    {
+        listmodel = new Gtk.ListStore(4, typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string));
+        set_model(listmodel);
+        set_markup_column(1);
+        set_pixbuf_column(0);
+        item_width = 150;
+    }
+    
+    public void add_album(string album_, string artist_, string image_path)
+    {
+        var album = album_.replace("&", "&"); /* to avoid gtk warnings */
+        var artist = artist_.replace("&", "&");
+        Gdk.Pixbuf pix = null;
+        try
+        {
+            pix = new Gdk.Pixbuf.from_file_at_scale(image_path, 120, 120, true);
+        }
+        catch(Error e)
+        {
+            warning("Couldn't load this image: %s\n", image_path);
+        }
+        TreeIter iter;
+        listmodel.append (out iter);
+        listmodel.set(iter,
+                      0, pix,
+                      1, "%s\n<span color='%s'>%s</span>".printf(album,
+                        get_style().text[StateType.INSENSITIVE].to_string(),
+                        artist),
+                      2, album,
+                      3, artist);
+    }
+    
+    public void clear()
+    {
+        listmodel.clear();
+    }
 }
 
 public class BeatBox.FilterView : ScrolledWindow {
 	LibraryManager lm;
 	LibraryWindow lw;
 	LinkedList<int> songs;
-	
-	WebView view;
+
 	Table table;
 	
 	private Collection<int> showingSongs;
 	private string last_search;
 	LinkedList<string> timeout_search;
+	AlbumView albums;
 	
 	string defaultPath;
 	
@@ -42,34 +78,22 @@
 	}
 	
 	public void buildUI() {
-		view = new WebView();
-		Viewport v = new Viewport(null, null);
-		
         set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
-		
-		view.settings.enable_default_context_menu = false;
-		
-		v.set_shadow_type(ShadowType.NONE);
-		v.add(view);
-		add(v);
+
+		albums = new AlbumView();
+		albums.item_activated.connect( (tree_path) => {
+		        TreeIter iter;
+		        albums.get_model().get_iter(out iter, tree_path);
+		        string album_name, album_artist;
+		        albums.get_model().get(iter, 2, out album_name, 3, out album_artist);
+		        itemClicked(album_name, album_artist);
+		    });
+		add(albums);
 		
 		show_all();
-		
-		view.navigation_requested.connect(navigationRequested);
 		lw.searchField.changed.connect(searchFieldChanged);
 	}
 	
-	public static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
-		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
-		alignment.top_padding = top;
-		alignment.right_padding = right;
-		alignment.bottom_padding = bottom;
-		alignment.left_padding = left;
-		
-		alignment.add(widget);
-		return alignment;
-	}
-	
 	/** Goes through the hashmap and generates html. If artist,album, or genre
 	 * is set, makes sure that only items that fit those filters are
 	 * shown
@@ -82,69 +106,25 @@
 		 * loading of lists/icon lists */
 		if(showingSongs.size == toShow.size)
 			return;
-		
-		string html = """<!DOCTYPE html> <html lang="en"><head> 
-        <style media="screen" type="text/css"> 
-            body { 
-                background: #fff; 
-                font-family: "Droid Sans",sans-serif; 
-                margin-top: 10px;
-            }
-            #main {
-				width: 100%;
-				margin: 0px auto;
-			}
-            #main ul {
-                padding-bottom: 10px;
-                margin: auto;
-            }
-            #main ul li {
-                float: left;
-                width: 150px;
-                height: 200px;
-                display: inline-block;
-                list-style-type: none;
-                padding-right: 10px;
-                padding-left: 10px;
-                padding-bottom: 5px;
-                overflow: hidden;
-            }
-            #main ul li img {
-                width: 150px;
-                height: 150px;
-            }
-            #main ul li p {
-                clear: both;
-                overflow: hidden;
-                text-align: center;
-                margin-top: 0px;
-                font-size: 12px;
-                margin-bottom: 0px;
-            }
-        </style></head><body><div id="main"><ul>""";
         
         stdout.printf("sorting songs\n");
         // first sort the songs so we know they are grouped by artists, then albums
 		toShow.sort((CompareFunc)songCompareFunc);
+		albums.clear();
 		
 		string previousAlbum = "";
 		stdout.printf("creating html with loop\n");
 		// NOTE: things to keep in mind are search, miller column, artist="", album="" cases
 		foreach(Song s in toShow) {
 			if(s.album != previousAlbum) {
-				html += "<li><a href=\"" + s.album + "<seperater>" + s.artist + "\"><img width=\"150\" height=\"150\" src=\"file://" + (GLib.File.new_for_path(s.getAlbumArtPath()).query_exists() ? s.getAlbumArtPath() : defaultPath) + "\" /></a><p>" + ( (s.album == "") ? "Miscellaneous" : s.album) + "</p><p>" + s.artist + "</p></li>";
+				albums.add_album(s.album, s.artist, (GLib.File.new_for_path(s.getAlbumArtPath()).query_exists() ? s.getAlbumArtPath() : defaultPath));
+				
 				previousAlbum = s.album;
 			}
 		}
 		
-		html += "</ul></div></body></html>"; // finish up the last song, finish up html
-		
-		stdout.printf("loading string\n");
-		view.load_string(html, "text/html", "utf8", "file://");
-		needsUpdate = false;
-		stdout.printf("loaded\n");
-		
 		showingSongs = toShow;
+		show_all();
 	}
 	
 	public static int songCompareFunc(Song a, Song b) {
@@ -154,19 +134,6 @@
 			return (a.artist.down() > b.artist.down()) ? 1 : -1;
 	}
 	
-	public virtual NavigationResponse navigationRequested(WebFrame frame, NetworkRequest request) {
-		if(request.uri.contains("<seperater>")) {
-			// switch the view
-			string[] splitUp = request.uri.split("<seperater>", 0);
-			
-			itemClicked(splitUp[0], splitUp[1]);
-			
-			return WebKit.NavigationResponse.IGNORE;
-		}
-		
-		return WebKit.NavigationResponse.ACCEPT;
-	}
-	
 	public virtual void searchFieldChanged() {
 		if(isCurrentView && lw.searchField.get_text().length != 1) {
 			timeout_search.offer_head(lw.searchField.get_text().down());