← Back to branch summary

~markellmtthw/beat-box/fix-920012

« back to all changes in this revision

Viewing changes to src/Views/AlbumView/AlbumViewModel.vala

  • Committer: sgringwe at gmail
  • Date: 2012-02-01 17:49:01 UTC
  • mfrom: (505.1.4 beat-box)
  • Revision ID: sgringwe@gmail.com-20120201174901-1bl290z1hwk8bvbk
merged new translations as well as victor's changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Views/AlbumView/AlbumViewModel.vala
25
25
using GLib;
26
26
 
27
27
public class BeatBox.AlbumViewModel : GLib.Object, TreeModel, TreeSortable {
 
28
 
 
29
    /* custom signals for custom treeview. for speed */
 
30
    public signal void rows_changed(LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
 
31
    public signal void rows_deleted (LinkedList<TreePath> paths);
 
32
        public signal void rows_inserted (LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
 
33
 
28
34
        LibraryManager lm;
29
35
        int stamp; // all iters must match this
30
36
        Gdk.Pixbuf defaultImage;
41
47
    public TreeIter start_visible;
42
48
    public TreeIter end_visible;
43
49
    bool removing_medias;
44
 
    
45
 
    /* custom signals for custom treeview. for speed */
46
 
    public signal void rows_changed(LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
47
 
    public signal void rows_deleted (LinkedList<TreePath> paths);
48
 
        public signal void rows_inserted (LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
49
 
        
 
50
 
 
51
        string TEXT_MARKUP = "<span weight='medium' size='10500'> %s\n</span><span foreground=\"#999\">%s</span>"; 
 
52
 
50
53
        /** Initialize data storage, columns, etc. **/
51
54
        public AlbumViewModel(LibraryManager lm, Gdk.Pixbuf defaultImage) {
52
55
                this.lm = lm;
58
61
                sort_column_id = -2;
59
62
                sort_direction = SortType.ASCENDING;
60
63
                column_sorts = new HashMap<int, CompareFuncHolder>();
61
 
       
 
64
 
62
65
                stamp = (int)GLib.Random.next_int();
63
66
        }
64
67
        
81
84
        /** Sets iter to a valid iterator pointing to path **/
82
85
        public bool get_iter (out TreeIter iter, TreePath path) {
83
86
                int path_index = path.get_indices()[0];
84
 
        iter = TreeIter ();
 
87
                iter = TreeIter ();
85
88
                
86
89
                if(rows.get_length() == 0 || path_index < 0 || path_index >= rows.get_length())
87
90
                        return false;
88
91
                
89
 
        var seq_iter = rows.get_iter_at_pos(path_index);
 
92
                var seq_iter = rows.get_iter_at_pos(path_index);
90
93
        if(seq_iter == null)
91
94
                        return false;
92
95
        
130
133
                                }
131
134
                                
132
135
                        }
133
 
                        else if(column == 1)
134
 
                                val = s.album.replace("&", "&amp;") + "\n" + "<span foreground=\"#999\">" + s.album_artist.replace("&", "&amp;") + "</span>";
 
136
                        else if(column == 1) {
 
137
                                val = TEXT_MARKUP.printf(s.album.replace("&", "&amp;"), s.album_artist.replace("&", "&amp;"));
 
138
                        }
135
139
                        else if(column == 2) {
136
140
                                val = s;
137
141
                        }