Merge lp:~markellmtthw/beat-box/fix-927849 into lp:beat-box

[Matthew Markell]

[Victor Martinez (victored)]

This works perfectly.

Although it's not used, you also need to update the get_column_type() function in AlbumViewModel.vala.

Also, It would be nice if you added markup to the text, making the album name bigger than the artists name :)

review: Needs Fixing

[Victor Martinez (victored)]

I forgot to mention that the tooltip doesn't work when either the album or artist names contain an ampersand '&'

[xapantu (xapantu)]

Did you try to add a .replace("&", "&");?

2012/2/8 Victor Eduardo <email address hidden>

> I forgot to mention that the tooltip doesn't work when either the album or
> artist names contain an ampersand '&'
> --
> https://code.launchpad.net/~markellmtthw/beat-box/fix-927849/+merge/92079
> Your team BeatBox Team is subscribed to branch lp:beat-box.
>

[Victor Martinez (victored)]

Yes, that's what he needs to do :)

[lp:~markellmtthw/beat-box/fix-927849]

528. By Matthew Markell on 2012-02-08

Did a little more work on Album view tooltips. Album names are bolded, ampersand's are converted and I updated the get_column_type() function

[Victor Martinez (victored)]

Thanks for your work Matthew.

review: Approve

=== modified file 'src/Views/AlbumView/AlbumIconView.vala'
--- src/Views/AlbumView/AlbumIconView.vala	2012-02-04 00:01:35 +0000
+++ src/Views/AlbumView/AlbumIconView.vala	2012-02-08 19:54:25 +0000
@@ -91,6 +91,8 @@
 		icons.margin = 20;
 		add(icons);
 		
+		icons.set_tooltip_column(2);
+		
 		show_all();
 		
 		icons.button_release_event.connect(buttonReleaseEvent);
@@ -99,6 +101,7 @@
 		this.size_allocate.connect(resized);
 		this.focus_out_event.connect(on_focus_out);
 		
+		
 		//this.grab_focus ();
 	}
 	
 
=== modified file 'src/Views/AlbumView/AlbumViewModel.vala'
--- src/Views/AlbumView/AlbumViewModel.vala	2012-02-04 21:57:13 +0000
+++ src/Views/AlbumView/AlbumViewModel.vala	2012-02-08 19:54:25 +0000
@@ -71,6 +71,8 @@
 			return typeof(Gdk.Pixbuf);
 		else if(col == 1)
 			return typeof(string);
+		else if(col == 2)
+			return typeof(string);
 		else
 			return typeof(Media);
 		
@@ -148,7 +150,8 @@
 				val = TEXT_MARKUP.printf(album.replace("&", "&"), album_artist.replace("&", "&"));
 			}
 			else if(column == 2) {
-				val = s;
+//				val = s;
+				val = TEXT_MARKUP.printf ("<b>" + s.album.replace("&", "&amp;") + "</b>" , " " + s.album_artist.replace("&", "&amp;"));
 			}
             else {
                 val = Value(get_column_type(column));