Merge lp:~mixxxdevelopers/mixxx/features_library into lp:~mixxxdevelopers/mixxx/trunk

[RJ Skerry-Ryan]

This branch is the combination of both lp:~ywwg/mixxx/features_library and lp:~raffitea/mixxx/features_library.

The combined set of features added here by both Tobias and Owen are:

* Adding a times played column to the library
* Adding a rating column to the library
* Adding a played column to the library
* Version bump to schema version 6, clear all the headerstate so that the new columns show up
* Adding a checkbox widget to the times-played column which is shown next to the # of times the track was played in the library track table
* Adding a star-widget to the rating column in the library track table.
* Increase the play count of a track and set it played when it is successfully loaded to a player.
* Making search queries search based on individual terms instead of the whole phrase
* Search now searches album, location, comment, and title.
* Make artist, album, title, year, track number, genre, comment, BPM in the track table editable on a single click.
* Disable loading track by hitting enter to avoid accidental loads from editing
* Rewrite part of WStatusLight (Owen, can you describe what the change here was?)
* Test for the existence of the 1.7-library conversion file result and skip legacy import if it exists.
* Added some logic to record the creation date of a Track, but it isn't used anywhere as far as I can tell.

Thanks to Tobias and Owen for this great work!

[lp:~mixxxdevelopers/mixxx/features_library]

2489. By RJ Skerry-Ryan on 2010-10-19

Clear the prepare and missing headers on upgarde to schema version 6.

[RAFFI TEA (raffitea)]

Please note that Jus requested a way to specify the rating colour via skins. I have not found a good solution to that since star rating editors are created from delegates and I do not know how to read from skin.xml there :-( A singleton 'SkinManager' would be great.

BTW: Star ratings look good on Windows and Ubuntu 9.04. On Ubuntu 10.10 is does not look nice anymore (maybe QT 7.0 related)

[Albert Santoni (gamegod)]

Yeeeeeeeeah Qt 4.7 on Ubuntu 10.10:
http://dl.dropbox.com/u/215333/Mixxx/Screenshot-Mixxx%20features_library.png

[Albert Santoni (gamegod)]

I've reviewed your code and everything pretty much looks good to me.

review: Approve

[Albert Santoni (gamegod)]

Actually, I lied. I think we should make the Key column hidden by default, since it'll probably be blank for most people, and we don't yet offer key analysis. What do you think?

[RAFFI TEA (raffitea)]

It sounds reasonable. How can I archive such a behaviour?

[RAFFI TEA (raffitea)]

Key columns are now hidden by default. Basically, I have extended TrackModel with a method 'isColumnHiddenByDefault(int column)'. All concrete TrackModels such as LibraryTableModel implement this method. So we can even hide more columns by default but a user can bring it to front on request.

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2010-10-19 00:05:55 +0000
+++ mixxx/build/depends.py	2010-10-19 05:33:52 +0000
@@ -454,6 +454,9 @@
                    "library/featuredartistswebview.cpp",
                    "library/bundledsongswebview.cpp",
                    "library/songdownloader.cpp",
+                   "library/starrating.cpp",
+                   "library/stardelegate.cpp",
+                   "library/stareditor.cpp",
 
                    "xmlparse.cpp",
                    "parser.cpp",
@@ -676,7 +679,7 @@
             build.env.Append(LINKFLAGS = ['/nodefaultlib:LIBCMT.lib',
                                           '/nodefaultlib:LIBCMTd.lib',
                                           '/entry:mainCRTStartup'])
-            # Makes the program not launch a shell first 
+            # Makes the program not launch a shell first
             if build.toolchain_is_msvs:
                 build.env.Append(LINKFLAGS = '/subsystem:windows')
             elif build.toolchain_is_gnu:
 
=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2010-09-14 14:45:35 +0000
+++ mixxx/res/schema.xml	2010-10-19 05:33:52 +0000
@@ -146,4 +146,22 @@
       ALTER TABLE LibraryHashes ADD COLUMN needs_verification INTEGER DEFAULT 0;
     </sql>
   </revision>
+  <revision version="6">
+    <description>
+      Add timesplayed and rating column. Reset header state.
+    </description>
+    <sql>
+      ALTER TABLE library ADD COLUMN timesplayed integer DEFAULT 0;
+      ALTER TABLE library ADD COLUMN rating integer DEFAULT 0;
+
+      UPDATE library SET timesplayed = played;
+      UPDATE library SET played = 0;
+
+      DELETE FROM settings WHERE name="mixxx.db.model.library.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.playlist.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.crate.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.prepare.header_state";
+      DELETE FROM settings WHERE name="mixxx.db.model.missing.header_state";
+    </sql>
+  </revision>
 </schema>
 
=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2010-08-27 20:29:12 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2010-10-19 05:33:52 +0000
@@ -6,6 +6,9 @@
 #include "trackinfoobject.h"
 #include "library/trackcollection.h"
 #include "library/basesqltablemodel.h"
+#include "mixxxutils.cpp"
+#include "library/starrating.h"
+
 
 BaseSqlTableModel::BaseSqlTableModel(QObject* parent,
                                      TrackCollection* pTrackCollection,
@@ -20,6 +23,44 @@
 }
 
 BaseSqlTableModel::~BaseSqlTableModel() {
+
+}
+
+void BaseSqlTableModel::initHeaderData() {
+    //Set the column heading labels, rename them for translations and have
+    //proper capitalization
+    setHeaderData(fieldIndex(LIBRARYTABLE_TIMESPLAYED),
+                  Qt::Horizontal, tr("Played"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_ARTIST),
+                  Qt::Horizontal, tr("Artist"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_TITLE),
+                  Qt::Horizontal, tr("Title"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_ALBUM),
+                  Qt::Horizontal, tr("Album"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_GENRE),
+                  Qt::Horizontal, tr("Genre"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
+                  Qt::Horizontal, tr("Year"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
+                  Qt::Horizontal, tr("Type"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_LOCATION),
+                  Qt::Horizontal, tr("Location"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),
+                  Qt::Horizontal, tr("Comment"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_DURATION),
+                  Qt::Horizontal, tr("Duration"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_RATING),
+                  Qt::Horizontal, tr("Rating"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_BITRATE),
+                  Qt::Horizontal, tr("Bitrate"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_BPM),
+                  Qt::Horizontal, tr("BPM"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_TRACKNUMBER),
+                  Qt::Horizontal, tr("Track #"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_DATETIMEADDED),
+                  Qt::Horizontal, tr("Date Added"));
+    setHeaderData(fieldIndex(PLAYLISTTRACKSTABLE_POSITION),
+                  Qt::Horizontal, tr("#"));
 }
 
 bool BaseSqlTableModel::select() {
@@ -48,9 +89,10 @@
     return result;
 }
 
-QVariant BaseSqlTableModel::data(const QModelIndex& index, int role) const {
-    if (!index.isValid())
+QVariant BaseSqlTableModel::getBaseValue(const QModelIndex& index, int role) const {
+    if (!index.isValid()) {
         return QVariant();
+    }
 
     int row = index.row();
     int col = index.column();
@@ -62,7 +104,12 @@
 
     int trackId = m_rowToTrackId[row];
 
-    if (role == Qt::DisplayRole && m_trackOverrides.contains(trackId)) {
+    /*
+     * The if-block below is only executed when a table item has been edited.
+     *
+     */
+    if ((role == Qt::DisplayRole || role == Qt::ToolTipRole || role == Qt::EditRole) &&
+        m_trackOverrides.contains(trackId)) {
         //qDebug() << "Returning override for track" << trackId;
         TrackPointer pTrack = m_trackDAO.getTrack(trackId);
 
@@ -86,16 +133,146 @@
         } else if (fieldIndex(LIBRARYTABLE_COMMENT) == col) {
             return QVariant(pTrack->getComment());
         } else if (fieldIndex(LIBRARYTABLE_DURATION) == col) {
-            return QVariant(pTrack->getDuration());
+            return pTrack->getDuration();
         } else if (fieldIndex(LIBRARYTABLE_BITRATE) == col) {
             return QVariant(pTrack->getBitrate());
         } else if (fieldIndex(LIBRARYTABLE_BPM) == col) {
             return QVariant(pTrack->getBpm());
+        } else if (fieldIndex(LIBRARYTABLE_PLAYED) == col) {
+            return QVariant(pTrack->getPlayed());
+        } else if (fieldIndex(LIBRARYTABLE_TIMESPLAYED) == col) {
+            return QVariant(pTrack->getTimesPlayed());
+        } else if (fieldIndex(LIBRARYTABLE_RATING) == col) {
+            return pTrack->getRating();
         }
     }
+
+    // If none of these work, hand off to the lower layer to deal with. The role
+    // might not be Edit/Display/ToolTip, or we might have a bug.
     return QSqlTableModel::data(index, role);
 }
 
+
+QVariant BaseSqlTableModel::data(const QModelIndex& index, int role) const {
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    int row = index.row();
+    int col = index.column();
+
+    //qDebug() << "BaseSqlTableModel::data() column:" << col << "role:" << role;
+
+    // This value is the value in its most raw form. It was looked up either
+    // from the SQL table or from the cached track layer.
+    QVariant value = getBaseValue(index, role);
+
+    // Format the value based on whether we are in a tooltip, display, or edit
+    // role
+    if (role == Qt::ToolTipRole || role == Qt::DisplayRole) {
+        if (index.column() == fieldIndex(LIBRARYTABLE_DURATION)) {
+            if (qVariantCanConvert<int>(value))
+                value = MixxxUtils::secondsToMinutes(qVariantValue<int>(value));
+        } else if (index.column() == fieldIndex(LIBRARYTABLE_RATING)) {
+            if (qVariantCanConvert<int>(value))
+                value = qVariantFromValue(StarRating(value.toInt()));
+        } else if (index.column() == fieldIndex(LIBRARYTABLE_TIMESPLAYED)) {
+            if (qVariantCanConvert<int>(value))
+                value =  QString("(%1)").arg(value.toInt());
+        } else if (index.column() == fieldIndex(LIBRARYTABLE_PLAYED)) {
+            // Convert to a bool. Not really that useful since it gets converted
+            // right back to a QVariant
+            value = (value == "true") ? true : false;
+        }
+    } else if (role == Qt::EditRole) {
+        if (index.column() == fieldIndex(LIBRARYTABLE_BPM)) {
+            return value.toDouble();
+        } else if (index.column() == fieldIndex(LIBRARYTABLE_TIMESPLAYED)) {
+            return index.sibling(index.row(), fieldIndex(LIBRARYTABLE_PLAYED)).data().toBool();
+        } else if (index.column() == fieldIndex(LIBRARYTABLE_RATING)) {
+            if (qVariantCanConvert<int>(value))
+                value = qVariantFromValue(StarRating(value.toInt()));
+        }
+    } else if (role == Qt::CheckStateRole) {
+        if (index.column() == fieldIndex(LIBRARYTABLE_TIMESPLAYED)) {
+            bool played = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_PLAYED)).data().toBool();
+            value = played ? Qt::Checked : Qt::Unchecked;
+        }
+    }
+
+    return value;
+}
+
+bool BaseSqlTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (!index.isValid())
+        return false;
+
+    int row = index.row();
+    int col = index.column();
+
+    //qDebug() << "BaseSqlTableModel::setData() column:" << col << "value:" << value << "role:" << role;
+
+    // Over-ride sets to TIMESPLAYED and re-direct them to PLAYED
+    if (role == Qt::CheckStateRole) {
+        if (index.column() == fieldIndex(LIBRARYTABLE_TIMESPLAYED)) {
+            QString val = value.toInt() > 0 ? QString("true") : QString("false");
+            QModelIndex playedIndex = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_PLAYED));
+            return setData(playedIndex, val, Qt::EditRole);
+        }
+    }
+
+    Q_ASSERT(m_rowToTrackId.contains(row));
+    if (!m_rowToTrackId.contains(row)) {
+        return QSqlTableModel::setData(index, value, role);
+    }
+
+    int trackId = m_rowToTrackId[row];
+    TrackPointer pTrack = m_trackDAO.getTrack(trackId);
+
+    // TODO(XXX) Qt properties could really help here.
+    if (fieldIndex(LIBRARYTABLE_ARTIST) == col) {
+        pTrack->setArtist(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_TITLE) == col) {
+        pTrack->setTitle(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_ALBUM) == col) {
+        pTrack->setAlbum(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_YEAR) == col) {
+        pTrack->setYear(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_GENRE) == col) {
+        pTrack->setGenre(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_FILETYPE) == col) {
+        pTrack->setType(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_TRACKNUMBER) == col) {
+        pTrack->setTrackNumber(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_LOCATION) == col) {
+        pTrack->setLocation(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_COMMENT) == col) {
+        pTrack->setComment(value.toString());
+    } else if (fieldIndex(LIBRARYTABLE_DURATION) == col) {
+        pTrack->setDuration(value.toInt());
+    } else if (fieldIndex(LIBRARYTABLE_BITRATE) == col) {
+        pTrack->setBitrate(value.toInt());
+    } else if (fieldIndex(LIBRARYTABLE_BPM) == col) {
+        //QVariant::toFloat needs >= QT 4.6.x
+        pTrack->setBpm((float) value.toDouble());
+    } else if (fieldIndex(LIBRARYTABLE_PLAYED) == col) {
+        pTrack->setPlayed(value.toBool());
+    } else if (fieldIndex(LIBRARYTABLE_TIMESPLAYED) == col) {
+        pTrack->setTimesPlayed(value.toInt());
+    } else if (fieldIndex(LIBRARYTABLE_RATING) == col) {
+        StarRating starRating = qVariantValue<StarRating>(value);
+        pTrack->setRating(starRating.starCount());
+    }
+
+    // Do not save the track here. Changing the track dirties it and the caching
+    // system will automatically save the track once it is unloaded from
+    // memory. rryan 10/2010
+    //m_trackDAO.saveTrack(pTrack);
+
+    return true;
+}
+
 void BaseSqlTableModel::trackChanged(int trackId) {
     m_trackOverrides.insert(trackId);
     if (m_trackIdToRow.contains(trackId)) {
@@ -129,7 +306,7 @@
 
     QString table = m_qTableName;
     QString field = database().driver()->escapeIdentifier(f.name(),
-                                                           QSqlDriver::FieldName);
+                                                          QSqlDriver::FieldName);
     s.append(QLatin1String("ORDER BY "));
     QString sort_field = QString("%1.%2").arg(table).arg(field);
 
@@ -149,3 +326,48 @@
     s += m_eSortOrder == Qt::AscendingOrder ? QLatin1String(" ASC") : QLatin1String(" DESC");
     return s;
 }
+
+Qt::ItemFlags BaseSqlTableModel::readWriteFlags(const QModelIndex &index) const
+{
+    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    //Enable dragging songs from this data model to elsewhere (like the waveform
+    //widget to load a track into a Player).
+    defaultFlags |= Qt::ItemIsDragEnabled;
+
+    if ( index.column() == fieldIndex(LIBRARYTABLE_FILETYPE)
+         || index.column() == fieldIndex(LIBRARYTABLE_LOCATION)
+         || index.column() == fieldIndex(LIBRARYTABLE_DURATION)
+         || index.column() == fieldIndex(LIBRARYTABLE_BITRATE)
+         || index.column() == fieldIndex(LIBRARYTABLE_DATETIMEADDED))
+    {
+        return defaultFlags | QAbstractItemModel::flags(index);
+    }
+    else if (index.column() == fieldIndex(LIBRARYTABLE_TIMESPLAYED)) {
+        return defaultFlags | QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
+    }
+    else {
+        return defaultFlags | QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
+    }
+}
+
+Qt::ItemFlags BaseSqlTableModel::readOnlyFlags(const QModelIndex &index) const
+{
+    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
+    if (!index.isValid())
+      return Qt::ItemIsEnabled;
+
+    //Enable dragging songs from this data model to elsewhere (like the waveform widget to
+    //load a track into a Player).
+    defaultFlags |= Qt::ItemIsDragEnabled;
+
+    return defaultFlags;
+
+}
+
+Qt::ItemFlags BaseSqlTableModel::flags(const QModelIndex &index) const
+{
+    return readWriteFlags(index);
+}
 
=== modified file 'mixxx/src/library/basesqltablemodel.h'
--- mixxx/src/library/basesqltablemodel.h	2010-07-15 19:07:16 +0000
+++ mixxx/src/library/basesqltablemodel.h	2010-10-19 05:33:52 +0000
@@ -23,12 +23,21 @@
     virtual void setSort(int column, Qt::SortOrder order);
     virtual bool select();
     virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-
+    virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    /** Use this if you want a model that is read-only. */
+    virtual Qt::ItemFlags readOnlyFlags(const QModelIndex &index) const;
+    /** Use this if you want a model that can be changed  */
+    virtual Qt::ItemFlags readWriteFlags(const QModelIndex &index) const;
+    /** calls readWriteFlags() by default */
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
   protected:
     virtual QString orderByClause() const;
+    virtual void initHeaderData();
   private slots:
     void trackChanged(int trackId);
   private:
+    QVariant getBaseValue(const QModelIndex& index, int role = Qt::DisplayRole) const;
+
     QString m_qTableName;
     int m_iSortColumn;
     Qt::SortOrder m_eSortOrder;
 
=== modified file 'mixxx/src/library/cratetablemodel.cpp'
--- mixxx/src/library/cratetablemodel.cpp	2010-09-14 20:32:32 +0000
+++ mixxx/src/library/cratetablemodel.cpp	2010-10-19 05:33:52 +0000
@@ -33,11 +33,14 @@
     QString queryString = QString("CREATE TEMPORARY VIEW IF NOT EXISTS %1 AS "
                                   "SELECT "
                                   "library." + LIBRARYTABLE_ID + "," +
+                                  LIBRARYTABLE_PLAYED + "," +
+                                  LIBRARYTABLE_TIMESPLAYED + "," +
                                   LIBRARYTABLE_ARTIST + "," +
                                   LIBRARYTABLE_TITLE + "," +
                                   LIBRARYTABLE_ALBUM + "," +
                                   LIBRARYTABLE_YEAR + "," +
                                   LIBRARYTABLE_DURATION + "," +
+                                  LIBRARYTABLE_RATING + "," +
                                   LIBRARYTABLE_GENRE + "," +
                                   LIBRARYTABLE_FILETYPE + "," +
                                   LIBRARYTABLE_TRACKNUMBER + "," +
@@ -69,34 +72,8 @@
 
     select();
 
-    setHeaderData(fieldIndex(LIBRARYTABLE_ID),
-                  Qt::Horizontal, tr("ID"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ARTIST),
-                  Qt::Horizontal, tr("Artist"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TITLE),
-                  Qt::Horizontal, tr("Title"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ALBUM),
-                  Qt::Horizontal, tr("Album"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_GENRE),
-                  Qt::Horizontal, tr("Genre"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
-                  Qt::Horizontal, tr("Year"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
-                  Qt::Horizontal, tr("Type"));
-    setHeaderData(fieldIndex("location"),
-                  Qt::Horizontal, tr("Location"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),
-                  Qt::Horizontal, tr("Comment"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DURATION),
-                  Qt::Horizontal, tr("Duration"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TRACKNUMBER),
-                  Qt::Horizontal, tr("Track #"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BITRATE),
-                  Qt::Horizontal, tr("Bitrate"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BPM),
-                  Qt::Horizontal, tr("BPM"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DATETIMEADDED),
-                  Qt::Horizontal, tr("Date Added"));
+    // BaseSqlTableModel sets up the header names
+    initHeaderData();
 }
 
 bool CrateTableModel::addTrack(const QModelIndex& index, QString location) {
@@ -186,12 +163,22 @@
         filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + ")";
     else {
         QSqlField search("search", QVariant::String);
-        search.setValue("%" + searchText + "%");
-        QString escapedText = database().driver()->formatValue(search);
-        filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + " AND " +
-                "(artist LIKE " + escapedText + " OR " +
-                "album LIKE " + escapedText + " OR " +
-                "title  LIKE " + escapedText + "))";
+
+
+        filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER;
+
+        foreach(QString term, searchText.split(" "))
+        {
+            search.setValue("%" + term + "%");
+            QString escapedText = database().driver()->formatValue(search);
+            filter += " AND (artist LIKE " + escapedText + " OR " +
+                    "album LIKE " + escapedText + " OR " +
+                    "location LIKE " + escapedText + " OR " +
+                    "comment LIKE " + escapedText + " OR " +
+                    "title  LIKE " + escapedText + ")";
+        }
+
+        filter += ")";
     }
 
     setFilter(filter);
@@ -203,6 +190,7 @@
 
 bool CrateTableModel::isColumnInternal(int column) {
     if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_PLAYED) ||
         column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
         column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)) {
         return true;
@@ -235,42 +223,10 @@
     return mimeData;
 }
 
-Qt::ItemFlags CrateTableModel::flags(const QModelIndex& index) const {
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    //Enable dragging songs from this data model to elsewhere (like the waveform
-    //widget to load a track into a Player).
-    defaultFlags |= Qt::ItemIsDragEnabled;
-
-    return defaultFlags;
-}
-
 QItemDelegate* CrateTableModel::delegateForColumn(int i) {
     return NULL;
 }
 
-QVariant CrateTableModel::data(const QModelIndex& item, int role) const {
-    if (!item.isValid())
-        return QVariant();
-
-    QVariant value;
-
-    if (role == Qt::ToolTipRole)
-        value = BaseSqlTableModel::data(item, Qt::DisplayRole);
-    else
-        value = BaseSqlTableModel::data(item, role);
-
-    if ((role == Qt::DisplayRole || role == Qt::ToolTipRole) &&
-        item.column() == fieldIndex(LIBRARYTABLE_DURATION)) {
-        if (qVariantCanConvert<int>(value)) {
-            value = MixxxUtils::secondsToMinutes(qVariantValue<int>(value));
-        }
-    }
-    return value;
-}
-
 TrackModel::CapabilitiesFlags CrateTableModel::getCapabilities() const {
     return TRACKMODELCAPS_RECEIVEDROPS | TRACKMODELCAPS_ADDTOPLAYLIST |
             TRACKMODELCAPS_ADDTOCRATE | TRACKMODELCAPS_ADDTOAUTODJ;
 
=== modified file 'mixxx/src/library/cratetablemodel.h'
--- mixxx/src/library/cratetablemodel.h	2010-09-13 06:23:38 +0000
+++ mixxx/src/library/cratetablemodel.h	2010-10-19 05:33:52 +0000
@@ -20,9 +20,7 @@
 
     void setCrate(int crateId);
 
-    virtual QVariant data(const QModelIndex& item, int role) const;
     QMimeData* mimeData(const QModelIndexList &indexes) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
 
     // From TrackModel
     virtual TrackPointer getTrack(const QModelIndex& index) const;
 
=== modified file 'mixxx/src/library/dao/trackdao.cpp'
--- mixxx/src/library/dao/trackdao.cpp	2010-09-17 04:15:33 +0000
+++ mixxx/src/library/dao/trackdao.cpp	2010-10-19 05:33:52 +0000
@@ -19,6 +19,18 @@
 
 }
 
+void TrackDAO::finish()
+{
+    //clear out played information on exit
+    //crash prevention: if mixxx crashes, played information will be maintained
+    qDebug() << "Clearing played information for this session";
+    QSqlQuery query(m_database);
+    if (!query.exec("UPDATE library SET played=0"))
+    {
+        qDebug() << "Error clearing played value";
+    }
+}
+
 TrackDAO::~TrackDAO()
 {
 }
@@ -187,13 +199,15 @@
 
 void TrackDAO::prepareLibraryInsert(QSqlQuery& query) {
     query.prepare("INSERT INTO library (artist, title, album, year, genre, tracknumber, "
-                  "filetype, location, comment, url, duration, "
+                  "filetype, location, comment, url, duration, rating, "
                   "bitrate, samplerate, cuepoint, bpm, wavesummaryhex, "
+                  "timesplayed, "
                   "channels, mixxx_deleted, header_parsed) "
                   "VALUES (:artist, "
                   ":title, :album, :year, :genre, :tracknumber, "
-                  ":filetype, :location, :comment, :url, :duration, "
+                  ":filetype, :location, :comment, :url, :duration, :rating,"
                   ":bitrate, :samplerate, :cuepoint, :bpm, :wavesummaryhex, "
+                  ":timesplayed, "
                   ":channels, :mixxx_deleted, :header_parsed)");
 }
 
@@ -209,6 +223,7 @@
     query.bindValue(":comment", pTrack->getComment());
     query.bindValue(":url", pTrack->getURL());
     query.bindValue(":duration", pTrack->getDuration());
+    query.bindValue(":rating", pTrack->getRating());
     query.bindValue(":bitrate", pTrack->getBitrate());
     query.bindValue(":samplerate", pTrack->getSampleRate());
     query.bindValue(":cuepoint", pTrack->getCuePoint());
@@ -216,7 +231,7 @@
     const QByteArray* pWaveSummary = pTrack->getWaveSummary();
     if (pWaveSummary) //Avoid null pointer deref
         query.bindValue(":wavesummaryhex", *pWaveSummary);
-    //query.bindValue(":timesplayed", pTrack->getCuePoint());
+    query.bindValue(":timesplayed", pTrack->getTimesPlayed());
     //query.bindValue(":datetime_added", pTrack->getDateAdded());
     query.bindValue(":channels", pTrack->getChannels());
     query.bindValue(":mixxx_deleted", 0);
@@ -322,7 +337,7 @@
     time.start();
 
     //qDebug() << "TrackDAO::addTrack" << QThread::currentThread() << m_database.connectionName();
- 	//qDebug() << "TrackCollection::addTrack(), inserting into DB";
+    //qDebug() << "TrackCollection::addTrack(), inserting into DB";
     Q_ASSERT(pTrack); //Why you be giving me NULL pTracks
 
     //Start the transaction
@@ -500,12 +515,14 @@
         QString url = query.value(query.record().indexOf("url")).toString();
         int duration = query.value(query.record().indexOf("duration")).toInt();
         int bitrate = query.value(query.record().indexOf("bitrate")).toInt();
+        int rating = query.value(query.record().indexOf("rating")).toInt();
         int samplerate = query.value(query.record().indexOf("samplerate")).toInt();
         int cuepoint = query.value(query.record().indexOf("cuepoint")).toInt();
         QString bpm = query.value(query.record().indexOf("bpm")).toString();
         QByteArray* wavesummaryhex = new QByteArray(
             query.value(query.record().indexOf("wavesummaryhex")).toByteArray());
-        //int timesplayed = query.value(query.record().indexOf("timesplayed")).toInt();
+        int timesplayed = query.value(query.record().indexOf("timesplayed")).toInt();
+        int played = query.value(query.record().indexOf("played")).toInt();
         int channels = query.value(query.record().indexOf("channels")).toInt();
         int filesize = query.value(query.record().indexOf("filesize")).toInt();
         QString filetype = query.value(query.record().indexOf("filetype")).toString();
@@ -525,6 +542,7 @@
         track->setYear(year);
         track->setGenre(genre);
         track->setTrackNumber(tracknumber);
+        track->setRating(rating);
 
         track->setComment(comment);
         track->setURL(url);
@@ -535,7 +553,8 @@
         track->setBpm(bpm.toFloat());
         track->setWaveSummary(wavesummaryhex, false);
         delete wavesummaryhex;
-        //track->setTimesPlayed //Doesn't exist wtfbbq
+        track->setTimesPlayed(timesplayed);
+        track->setPlayed(played);
         track->setChannels(channels);
         track->setType(filetype);
         track->setLocation(location);
@@ -607,7 +626,8 @@
     time.start();
     QSqlQuery query(m_database);
 
-    query.prepare("SELECT library.id, artist, title, album, year, genre, tracknumber, filetype, track_locations.location as location, track_locations.filesize as filesize, comment, url, duration, bitrate, samplerate, cuepoint, bpm, wavesummaryhex, channels, header_parsed FROM Library INNER JOIN track_locations ON library.location = track_locations.id WHERE library.id=" + QString("%1").arg(id));
+    query.prepare("SELECT library.id, artist, title, album, year, genre, tracknumber, filetype, rating, track_locations.location as location, track_locations.filesize as filesize, comment, url, duration, bitrate, samplerate, cuepoint, bpm, wavesummaryhex, channels, header_parsed, timesplayed, played FROM Library INNER JOIN track_locations ON library.location = track_locations.id WHERE library.id=" + QString("%1").arg(id));
+
     TrackPointer pTrack;
 
     if (query.exec()) {
@@ -641,9 +661,10 @@
                   "SET artist=:artist, "
                   "title=:title, album=:album, year=:year, genre=:genre, "
                   "filetype=:filetype, tracknumber=:tracknumber, "
-                  "comment=:comment, url=:url, duration=:duration, "
+                  "comment=:comment, url=:url, duration=:duration, rating=:rating, "
                   "bitrate=:bitrate, samplerate=:samplerate, cuepoint=:cuepoint, "
                   "bpm=:bpm, wavesummaryhex=:wavesummaryhex, "
+                  "timesplayed=:timesplayed, played=:played, "
                   "channels=:channels, header_parsed=:header_parsed "
                   "WHERE id="+QString("%1").arg(trackId));
     query.bindValue(":artist", pTrack->getArtist());
@@ -660,10 +681,12 @@
     query.bindValue(":samplerate", pTrack->getSampleRate());
     query.bindValue(":cuepoint", pTrack->getCuePoint());
     query.bindValue(":bpm", pTrack->getBpm());
+    query.bindValue(":rating", pTrack->getRating());
     const QByteArray* pWaveSummary = pTrack->getWaveSummary();
     if (pWaveSummary) //Avoid null pointer deref
         query.bindValue(":wavesummaryhex", *pWaveSummary);
-    //query.bindValue(":timesplayed", pTrack->getCuePoint());
+    query.bindValue(":timesplayed", pTrack->getTimesPlayed());
+    query.bindValue(":played", pTrack->getPlayed());
     query.bindValue(":channels", pTrack->getChannels());
     query.bindValue(":header_parsed", pTrack->getHeaderParsed() ? 1 : 0);
     //query.bindValue(":location", pTrack->getLocation());
 
=== modified file 'mixxx/src/library/dao/trackdao.h'
--- mixxx/src/library/dao/trackdao.h	2010-09-13 06:23:38 +0000
+++ mixxx/src/library/dao/trackdao.h	2010-10-19 05:33:52 +0000
@@ -38,6 +38,9 @@
 const QString LIBRARYTABLE_MIXXXDELETED = "mixxx_deleted";
 const QString LIBRARYTABLE_DATETIMEADDED = "datetime_added";
 const QString LIBRARYTABLE_HEADERPARSED = "header_parsed";
+const QString LIBRARYTABLE_TIMESPLAYED = "timesplayed";
+const QString LIBRARYTABLE_PLAYED = "played";
+const QString LIBRARYTABLE_RATING = "rating";
 
 const QString TRACKLOCATIONSTABLE_ID = "id";
 const QString TRACKLOCATIONSTABLE_LOCATION = "location";
@@ -52,6 +55,7 @@
   public:
     //TrackDAO() {};
     TrackDAO(QSqlDatabase& database, CueDAO& cueDao);
+    void finish();
     virtual ~TrackDAO();
     void setDatabase(QSqlDatabase& database) { m_database = database; };
 
 
=== modified file 'mixxx/src/library/legacylibraryimporter.cpp'
--- mixxx/src/library/legacylibraryimporter.cpp	2010-09-11 08:15:14 +0000
+++ mixxx/src/library/legacylibraryimporter.cpp	2010-10-19 05:33:52 +0000
@@ -174,9 +174,16 @@
             }
         }
 
-        //now change the file to mixxxtrack.bak so that its not readded next time program loads
-        file.copy(QDir::homePath().append("/").append(SETTINGS_PATH).append("mixxxtrack.bak"));
-        file.remove();
+        QString upgrade_filename = QDir::homePath().append("/").append(SETTINGS_PATH).append("DBUPGRADED");
+        //now create stub so that the library is not readded next time program loads
+        QFile upgradefile(upgrade_filename);
+        if (!upgradefile.open(QIODevice::WriteOnly | QIODevice::Text))
+            qDebug() << "Couldn't open" << upgrade_filename << "for writing";
+        else
+        {
+            file.write("",0);
+            file.close();
+        }
     } else {
         qDebug() << errorMsg << " line: " << errorLine << " column: " << errorColumn;
     }
 
=== modified file 'mixxx/src/library/libraryscanner.cpp'
--- mixxx/src/library/libraryscanner.cpp	2010-09-18 19:30:15 +0000
+++ mixxx/src/library/libraryscanner.cpp	2010-10-19 05:33:52 +0000
@@ -55,10 +55,10 @@
      */
     QString iTunesArtFolder = "";
 #if defined(__WINDOWS__)
-		iTunesArtFolder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "\\iTunes\\Album Artwork";
-		iTunesArtFolder.replace(QString("\\"), QString("/"));
+    iTunesArtFolder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "\\iTunes\\Album Artwork";
+    iTunesArtFolder.replace(QString("\\"), QString("/"));
 #elif defined(__APPLE__)
-		iTunesArtFolder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "/iTunes/Album Artwork";
+    iTunesArtFolder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "/iTunes/Album Artwork";
 #endif
     m_directoriesBlacklist << iTunesArtFolder;
     qDebug() << "iTunes Album Art path is:" << iTunesArtFolder;
@@ -109,7 +109,7 @@
 
     //Print out any SQL error, if there was one.
     if (query.lastError().isValid()) {
-     	qDebug() << query.lastError();
+        qDebug() << query.lastError();
     }
 
     QString dir;
@@ -167,15 +167,25 @@
 
     QTime t2;
     t2.start();
-    //Try to upgrade the library from 1.7 (XML) to 1.8+ (DB) if needed
-    LegacyLibraryImporter libImport(m_trackDao, m_playlistDao);
-    connect(&libImport, SIGNAL(progress(QString)),
-            m_pProgress, SLOT(slotUpdate(QString)),
-            Qt::BlockingQueuedConnection);
-    m_database.transaction();
-    libImport.import();
-    m_database.commit();
-    qDebug("Legacy importer took %d ms", t2.elapsed());
+
+    //Try to upgrade the library from 1.7 (XML) to 1.8+ (DB) if needed. If the
+    //upgrade_filename already exists, then do not try to upgrade since we have
+    //already done it.
+    QString upgrade_filename = QDir::homePath().append("/").append(SETTINGS_PATH).append("DBUPGRADED");
+    qDebug() << "upgrade filename is " << upgrade_filename;
+    QFile upgradefile(upgrade_filename);
+    if (!upgradefile.exists())
+    {
+        LegacyLibraryImporter libImport(m_trackDao, m_playlistDao);
+        connect(&libImport, SIGNAL(progress(QString)),
+                m_pProgress, SLOT(slotUpdate(QString)),
+                Qt::BlockingQueuedConnection);
+        m_database.transaction();
+        libImport.import();
+        m_database.commit();
+        qDebug("Legacy importer took %d ms", t2.elapsed());
+
+    }
 
     //Refresh the name filters in case we loaded new
     //SoundSource plugins.
 
=== modified file 'mixxx/src/library/librarytablemodel.cpp'
--- mixxx/src/library/librarytablemodel.cpp	2010-09-14 20:32:32 +0000
+++ mixxx/src/library/librarytablemodel.cpp	2010-10-19 05:33:52 +0000
@@ -20,11 +20,14 @@
     query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS library_view AS "
                   "SELECT "
                   "library." + LIBRARYTABLE_ID + "," +
+                  "library." + LIBRARYTABLE_PLAYED + "," +
+                  "library." + LIBRARYTABLE_TIMESPLAYED + "," +
                   "library." + LIBRARYTABLE_ARTIST + "," +
                   "library." + LIBRARYTABLE_TITLE + "," +
                   "library." + LIBRARYTABLE_ALBUM + "," +
                   "library." + LIBRARYTABLE_YEAR + "," +
                   "library." + LIBRARYTABLE_DURATION + "," +
+                  "library." + LIBRARYTABLE_RATING + "," +
                   "library." + LIBRARYTABLE_GENRE + "," +
                   "library." + LIBRARYTABLE_FILETYPE + "," +
                   "library." + LIBRARYTABLE_TRACKNUMBER + "," +
@@ -43,7 +46,7 @@
 
     //Print out any SQL error, if there was one.
     if (query.lastError().isValid()) {
-     	qDebug() << __FILE__ << __LINE__ << query.lastError();
+        qDebug() << __FILE__ << __LINE__ << query.lastError();
     }
 
     //setTable("library");
@@ -56,34 +59,9 @@
     //and shows it...
     //setRelation(fieldIndex(LIBRARYTABLE_LOCATION), QSqlRelation("track_locations", "id", "location"));
 
-    //Set the column heading labels, rename them for translations and have
-    //proper capitalization
-    setHeaderData(fieldIndex(LIBRARYTABLE_ARTIST),
-                  Qt::Horizontal, tr("Artist"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TITLE),
-                  Qt::Horizontal, tr("Title"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ALBUM),
-                  Qt::Horizontal, tr("Album"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_GENRE),
-                  Qt::Horizontal, tr("Genre"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
-                  Qt::Horizontal, tr("Year"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
-                  Qt::Horizontal, tr("Type"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_LOCATION),
-                  Qt::Horizontal, tr("Location"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),
-                  Qt::Horizontal, tr("Comment"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DURATION),
-                  Qt::Horizontal, tr("Duration"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BITRATE),
-                  Qt::Horizontal, tr("Bitrate"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BPM),
-                  Qt::Horizontal, tr("BPM"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TRACKNUMBER),
-                  Qt::Horizontal, tr("Track #"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DATETIMEADDED),
-                  Qt::Horizontal, tr("Date Added"));
+
+    // BaseSqlTabelModel will setup the header info
+    initHeaderData();
 
     //Sets up the table filter so that we don't show "deleted" tracks (only show mixxx_deleted=0).
     slotSearch("");
@@ -126,15 +104,15 @@
 
 TrackPointer LibraryTableModel::getTrack(const QModelIndex& index) const
 {
-	int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
-	return m_trackDao.getTrack(trackId);
+    int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
+    return m_trackDao.getTrack(trackId);
 }
 
 QString LibraryTableModel::getTrackLocation(const QModelIndex& index) const
 {
-	const int locationColumnIndex = fieldIndex(LIBRARYTABLE_LOCATION);
-	QString location = index.sibling(index.row(), locationColumnIndex).data().toString();
-	return location;
+    const int locationColumnIndex = fieldIndex(LIBRARYTABLE_LOCATION);
+    QString location = index.sibling(index.row(), locationColumnIndex).data().toString();
+    return location;
 }
 
 void LibraryTableModel::removeTracks(const QModelIndexList& indices) {
@@ -152,9 +130,9 @@
 
 void LibraryTableModel::removeTrack(const QModelIndex& index)
 {
-	int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
-	m_trackDao.removeTrack(trackId);
-	select(); //Repopulate the data model.
+    int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
+    m_trackDao.removeTrack(trackId);
+    select(); //Repopulate the data model.
 }
 
 void LibraryTableModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
@@ -181,12 +159,21 @@
         filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + ")";
     else {
         QSqlField search("search", QVariant::String);
-        search.setValue("%" + searchText + "%");
-        QString escapedText = database().driver()->formatValue(search);
-        filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + " AND " +
-                "(artist LIKE " + escapedText + " OR " +
-                "album LIKE " + escapedText + " OR " +
-                "title  LIKE " + escapedText + "))";
+
+        filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER;
+
+        foreach(QString term, searchText.split(" "))
+        {
+            search.setValue("%" + term + "%");
+            QString escapedText = database().driver()->formatValue(search);
+            filter += " AND (artist LIKE " + escapedText + " OR " +
+                    "album LIKE " + escapedText + " OR " +
+                    "location LIKE " + escapedText + " OR " +
+                    "comment LIKE " + escapedText + " OR " +
+                    "title  LIKE " + escapedText + ")";
+        }
+
+        filter += ")";
     }
     setFilter(filter);
 }
@@ -205,6 +192,7 @@
         (column == fieldIndex(LIBRARYTABLE_SAMPLERATE)) ||
         (column == fieldIndex(LIBRARYTABLE_MIXXXDELETED)) ||
         (column == fieldIndex(LIBRARYTABLE_HEADERPARSED)) ||
+        (column == fieldIndex(LIBRARYTABLE_PLAYED)) ||
         (column == fieldIndex(LIBRARYTABLE_CHANNELS)) ||
         (column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED))) {
         return true;
@@ -216,26 +204,6 @@
     return NULL;
 }
 
-QVariant LibraryTableModel::data(const QModelIndex& item, int role) const {
-    if (!item.isValid())
-        return QVariant();
-
-    QVariant value;
-    if (role == Qt::ToolTipRole)
-        value = BaseSqlTableModel::data(item, Qt::DisplayRole);
-    else
-        value = BaseSqlTableModel::data(item, role);
-
-    if ((role == Qt::DisplayRole || role == Qt::ToolTipRole) &&
-        item.column() == fieldIndex(LIBRARYTABLE_DURATION)) {
-        if (qVariantCanConvert<int>(value)) {
-            value = MixxxUtils::secondsToMinutes(qVariantValue<int>(value));
-        }
-    }
-
-    return value;
-}
-
 QMimeData* LibraryTableModel::mimeData(const QModelIndexList &indexes) const {
     QMimeData *mimeData = new QMimeData();
     QList<QUrl> urls;
@@ -263,26 +231,6 @@
     return mimeData;
 }
 
-Qt::ItemFlags LibraryTableModel::flags(const QModelIndex &index) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
-    if (!index.isValid())
-      return Qt::ItemIsEnabled;
-
-	//Enable dragging songs from this data model to elsewhere (like the waveform
-	//widget to load a track into a Player).
-    defaultFlags |= Qt::ItemIsDragEnabled;
-
-    /** FIXME: This doesn't seem to work - Albert */
-    const int bpmColumnIndex = fieldIndex(LIBRARYTABLE_BPM);
-    if (index.column() == bpmColumnIndex)
-    {
-        return defaultFlags | Qt::ItemIsEditable;
-    }
-
-    return defaultFlags;
-}
-
 TrackModel::CapabilitiesFlags LibraryTableModel::getCapabilities() const
 {
     return TRACKMODELCAPS_RECEIVEDROPS | TRACKMODELCAPS_ADDTOPLAYLIST |
 
=== modified file 'mixxx/src/library/librarytablemodel.h'
--- mixxx/src/library/librarytablemodel.h	2010-09-13 06:23:38 +0000
+++ mixxx/src/library/librarytablemodel.h	2010-10-19 05:33:52 +0000
@@ -27,11 +27,9 @@
     virtual bool addTrack(const QModelIndex& index, QString location);
     virtual void moveTrack(const QModelIndex& sourceIndex,
                            const QModelIndex& destIndex);
-    virtual QVariant data(const QModelIndex& item, int role) const;
 
 
     QMimeData* mimeData(const QModelIndexList &indexes) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
     QItemDelegate* delegateForColumn(const int i);
     TrackModel::CapabilitiesFlags getCapabilities() const;
     static const QString DEFAULT_LIBRARYFILTER;
 
=== modified file 'mixxx/src/library/missingtablemodel.cpp'
--- mixxx/src/library/missingtablemodel.cpp	2010-09-14 20:32:32 +0000
+++ mixxx/src/library/missingtablemodel.cpp	2010-10-19 05:33:52 +0000
@@ -25,11 +25,14 @@
     query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS " + tableName + " AS "
                   "SELECT " +
                   "library." + LIBRARYTABLE_ID + "," +
+                  "library." + LIBRARYTABLE_PLAYED + "," +
+                  "library." + LIBRARYTABLE_TIMESPLAYED + "," +
                   "library." + LIBRARYTABLE_ARTIST + "," +
                   "library." + LIBRARYTABLE_TITLE + "," +
                   "library." + LIBRARYTABLE_ALBUM + "," +
                   "library." + LIBRARYTABLE_YEAR + "," +
                   "library." + LIBRARYTABLE_DURATION + "," +
+                  "library." + LIBRARYTABLE_RATING + "," +
                   "library." + LIBRARYTABLE_GENRE + "," +
                   "library." + LIBRARYTABLE_FILETYPE + "," +
                   "library." + LIBRARYTABLE_TRACKNUMBER + "," +
@@ -58,36 +61,7 @@
 
     qDebug() << "Created MissingTracksModel!";
 
-    //Set the column heading labels, rename them for translations and have
-    //proper capitalization
-    setHeaderData(fieldIndex("track_locations.location"),
-                  Qt::Horizontal, tr("Location"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ARTIST),
-                  Qt::Horizontal, tr("Artist"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TITLE),
-                  Qt::Horizontal, tr("Title"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ALBUM),
-                  Qt::Horizontal, tr("Album"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_GENRE),
-                  Qt::Horizontal, tr("Genre"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
-                  Qt::Horizontal, tr("Year"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
-                  Qt::Horizontal, tr("Type"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_LOCATION),
-                  Qt::Horizontal, tr("Location"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),
-                  Qt::Horizontal, tr("Comment"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DURATION),
-                  Qt::Horizontal, tr("Duration"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TRACKNUMBER),
-                  Qt::Horizontal, tr("Track #"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BITRATE),
-                  Qt::Horizontal, tr("Bitrate"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BPM),
-                  Qt::Horizontal, tr("BPM"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DATETIMEADDED),
-                  Qt::Horizontal, tr("Date Added"));
+    initHeaderData();    //derived from BaseSqlModel
 
     slotSearch("");
 
@@ -168,6 +142,7 @@
 
 bool MissingTableModel::isColumnInternal(int column) {
     if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_PLAYED) ||
         column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
         column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED))
         return true;
@@ -200,42 +175,16 @@
     return mimeData;
 }
 
+/** Override flags from BaseSqlModel since we don't want edit this model */
 Qt::ItemFlags MissingTableModel::flags(const QModelIndex &index) const
 {
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
-    if (!index.isValid())
-      return Qt::ItemIsEnabled;
-
-    //defaultFlags |= Qt::ItemIsDragEnabled;
-    //defaultFlags = 0;
-
-    return defaultFlags;
+    return readOnlyFlags(index);
 }
 
 QItemDelegate* MissingTableModel::delegateForColumn(const int i) {
     return NULL;
 }
 
-QVariant MissingTableModel::data(const QModelIndex& item, int role) const {
-    if (!item.isValid())
-        return QVariant();
-
-    QVariant value;
-
-    if (role == Qt::ToolTipRole)
-        value = BaseSqlTableModel::data(item, Qt::DisplayRole);
-    else
-        value = BaseSqlTableModel::data(item, role);
-
-    if ((role == Qt::DisplayRole || role == Qt::ToolTipRole) &&
-        item.column() == fieldIndex(LIBRARYTABLE_DURATION)) {
-        if (qVariantCanConvert<int>(value)) {
-            value = MixxxUtils::secondsToMinutes(qVariantValue<int>(value));
-        }
-    }
-    return value;
-}
-
 TrackModel::CapabilitiesFlags MissingTableModel::getCapabilities() const
 {
     return 0;
 
=== modified file 'mixxx/src/library/missingtablemodel.h'
--- mixxx/src/library/missingtablemodel.h	2010-09-13 06:23:38 +0000
+++ mixxx/src/library/missingtablemodel.h	2010-10-19 05:33:52 +0000
@@ -26,7 +26,7 @@
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);
     virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
-    virtual QVariant data(const QModelIndex& item, int role) const;
+   
     QMimeData* mimeData(const QModelIndexList &indexes) const;
     Qt::ItemFlags flags(const QModelIndex &index) const;
     QItemDelegate* delegateForColumn(const int i);
 
=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2010-09-14 20:32:32 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2010-10-19 05:33:52 +0000
@@ -44,11 +44,14 @@
                   "PlaylistTracks." + PLAYLISTTRACKSTABLE_POSITION + "," +
                   //"playlist_id, " + //DEBUG
                   "library." + LIBRARYTABLE_ID + "," +
+                  "library." + LIBRARYTABLE_PLAYED + "," +
+                  "library." + LIBRARYTABLE_TIMESPLAYED + "," +
                   "library." + LIBRARYTABLE_ARTIST + "," +
                   "library." + LIBRARYTABLE_TITLE + "," +
                   "library." + LIBRARYTABLE_ALBUM + "," +
                   "library." + LIBRARYTABLE_YEAR + "," +
                   "library." + LIBRARYTABLE_DURATION + "," +
+                  "library." + LIBRARYTABLE_RATING + "," +
                   "library." + LIBRARYTABLE_GENRE + "," +
                   "library." + LIBRARYTABLE_FILETYPE + "," +
                   "library." + LIBRARYTABLE_TRACKNUMBER + "," +
@@ -79,36 +82,7 @@
 
     setTable(playlistTableName);
 
-    //Set the column heading labels, rename them for translations and have
-    //proper capitalization
-    setHeaderData(fieldIndex(PLAYLISTTRACKSTABLE_POSITION),
-                  Qt::Horizontal, tr("#"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ARTIST),
-                  Qt::Horizontal, tr("Artist"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TITLE),
-                  Qt::Horizontal, tr("Title"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_ALBUM),
-                  Qt::Horizontal, tr("Album"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_GENRE),
-                  Qt::Horizontal, tr("Genre"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
-                  Qt::Horizontal, tr("Year"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
-                  Qt::Horizontal, tr("Type"));
-    setHeaderData(fieldIndex("location"),
-                  Qt::Horizontal, tr("Location"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),
-                  Qt::Horizontal, tr("Comment"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DURATION),
-                  Qt::Horizontal, tr("Duration"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_TRACKNUMBER),
-                  Qt::Horizontal, tr("Track #"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BITRATE),
-                  Qt::Horizontal, tr("Bitrate"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_DATETIMEADDED),
-                  Qt::Horizontal, tr("Date Added"));
-    setHeaderData(fieldIndex(LIBRARYTABLE_BPM),
-                  Qt::Horizontal, tr("BPM"));
+    initHeaderData();    //derived from BaseSqlModel
 
     slotSearch("");
 
@@ -323,6 +297,7 @@
 
 bool PlaylistTableModel::isColumnInternal(int column) {
     if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_PLAYED) ||
         column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
         column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED))
         return true;
@@ -354,43 +329,11 @@
     return mimeData;
 }
 
-Qt::ItemFlags PlaylistTableModel::flags(const QModelIndex &index) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
-    if (!index.isValid())
-      return Qt::ItemIsEnabled;
-
-    //Enable dragging songs from this data model to elsewhere (like the waveform widget to
-    //load a track into a Player).
-    defaultFlags |= Qt::ItemIsDragEnabled;
-
-    return defaultFlags;
-}
 
 QItemDelegate* PlaylistTableModel::delegateForColumn(const int i) {
     return NULL;
 }
 
-QVariant PlaylistTableModel::data(const QModelIndex& item, int role) const {
-    if (!item.isValid())
-        return QVariant();
-
-    QVariant value;
-
-    if (role == Qt::ToolTipRole)
-        value = BaseSqlTableModel::data(item, Qt::DisplayRole);
-    else
-        value = BaseSqlTableModel::data(item, role);
-
-    if ((role == Qt::DisplayRole || role == Qt::ToolTipRole) &&
-        item.column() == fieldIndex(LIBRARYTABLE_DURATION)) {
-        if (qVariantCanConvert<int>(value)) {
-            value = MixxxUtils::secondsToMinutes(qVariantValue<int>(value));
-        }
-    }
-    return value;
-}
-
 TrackModel::CapabilitiesFlags PlaylistTableModel::getCapabilities() const
 {
     TrackModel::CapabilitiesFlags caps = TRACKMODELCAPS_RECEIVEDROPS | TRACKMODELCAPS_REORDER | TRACKMODELCAPS_ADDTOCRATE | TRACKMODELCAPS_ADDTOPLAYLIST;
 
=== added file 'mixxx/src/library/playlisttablemodel.h'
--- mixxx/src/library/playlisttablemodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/playlisttablemodel.h	2010-10-19 05:33:52 +0000
@@ -0,0 +1,51 @@
+#ifndef PLAYLISTTABLEMODEL_H
+#define PLAYLISTTABLEMODEL_H
+
+#include <QtSql>
+#include <QItemDelegate>
+#include <QtCore>
+#include "trackmodel.h"
+#include "library/basesqltablemodel.h"
+#include "library/librarytablemodel.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackdao.h"
+
+class TrackCollection;
+
+class PlaylistTableModel : public BaseSqlTableModel, public virtual TrackModel
+{
+    Q_OBJECT
+  public:
+    PlaylistTableModel(QObject* parent, TrackCollection* pTrackCollection);
+    virtual ~PlaylistTableModel();
+    void setPlaylist(int playlistId);
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
+    virtual QString getTrackLocation(const QModelIndex& index) const;
+    virtual void search(const QString& searchText);
+    virtual const QString currentSearch();
+    virtual bool isColumnInternal(int column);
+    virtual void removeTrack(const QModelIndex& index);
+    virtual void removeTracks(const QModelIndexList& indices);
+    virtual bool addTrack(const QModelIndex& index, QString location);
+    virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
+    
+    QMimeData* mimeData(const QModelIndexList &indexes) const;
+   
+    QItemDelegate* delegateForColumn(const int i);
+    TrackModel::CapabilitiesFlags getCapabilities() const;
+
+  private slots:
+    void slotSearch(const QString& searchText);
+
+  signals:
+    void doSearch(const QString& searchText);
+
+  private:
+    TrackCollection* m_pTrackCollection;
+    PlaylistDAO& m_playlistDao;
+    TrackDAO& m_trackDao;
+    int m_iPlaylistId;
+    QString m_currentSearch;
+};
+
+#endif
 
=== removed file 'mixxx/src/library/playlisttablemodel.h'
--- mixxx/src/library/playlisttablemodel.h	2010-09-13 06:23:38 +0000
+++ mixxx/src/library/playlisttablemodel.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-#ifndef PLAYLISTTABLEMODEL_H
-#define PLAYLISTTABLEMODEL_H
-
-#include <QtSql>
-#include <QItemDelegate>
-#include <QtCore>
-#include "trackmodel.h"
-#include "library/basesqltablemodel.h"
-#include "library/librarytablemodel.h"
-#include "library/dao/playlistdao.h"
-#include "library/dao/trackdao.h"
-
-class TrackCollection;
-
-class PlaylistTableModel : public BaseSqlTableModel, public virtual TrackModel
-{
-    Q_OBJECT
-  public:
-    PlaylistTableModel(QObject* parent, TrackCollection* pTrackCollection);
-    virtual ~PlaylistTableModel();
-    void setPlaylist(int playlistId);
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
-    virtual QString getTrackLocation(const QModelIndex& index) const;
-    virtual void search(const QString& searchText);
-    virtual const QString currentSearch();
-    virtual bool isColumnInternal(int column);
-    virtual void removeTrack(const QModelIndex& index);
-    virtual void removeTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
-    virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
-    virtual QVariant data(const QModelIndex& item, int role) const;
-    QMimeData* mimeData(const QModelIndexList &indexes) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    QItemDelegate* delegateForColumn(const int i);
-    TrackModel::CapabilitiesFlags getCapabilities() const;
-
-  private slots:
-    void slotSearch(const QString& searchText);
-
-  signals:
-    void doSearch(const QString& searchText);
-
-  private:
-    TrackCollection* m_pTrackCollection;
-    PlaylistDAO& m_playlistDao;
-    TrackDAO& m_trackDao;
-    int m_iPlaylistId;
-    QString m_currentSearch;
-};
-
-#endif
 
=== modified file 'mixxx/src/library/rhythmboxtrackmodel.cpp'
--- mixxx/src/library/rhythmboxtrackmodel.cpp	2010-10-15 21:17:06 +0000
+++ mixxx/src/library/rhythmboxtrackmodel.cpp	2010-10-19 05:33:52 +0000
@@ -160,6 +160,9 @@
     pTrack->setGenre(songNode.firstChildElement("genre").text());
     pTrack->setDuration(songNode.firstChildElement("duration").text().toUInt());
 
+    // TODO(ywwg) why was this added? constructor above does the same -- rryan
+    pTrack->setLocation(trackLocation);
+
     // Have QObject handle deleting this track
     return TrackPointer(pTrack, &QObject::deleteLater);
 }
 
=== added file 'mixxx/src/library/stardelegate.cpp'
--- mixxx/src/library/stardelegate.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/stardelegate.cpp	2010-10-19 05:33:52 +0000
@@ -0,0 +1,114 @@
+/***************************************************************************
+                           stardelegate.cpp
+                              -------------------
+    copyright            : (C) 2010 Tobias Rafreider
+	copyright            : (C) 2009 Nokia Corporation
+
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include <QtDebug>
+#include <QtGui>
+
+#include "stardelegate.h"
+#include "stareditor.h"
+#include "starrating.h"
+
+/*
+ * The function is invoked once for each item, represented by a QModelIndex object from the model.
+ * If the data stored in the item is a StarRating, we paint it use a star editor for displaying;
+ * otherwise, we let QItemDelegate paint it for us.
+ * This ensures that the StarDelegate can handle the most common data types.
+ */
+void StarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    // Populate the correct colors based on the styling
+    QStyleOptionViewItem newOption = option;
+    initStyleOption(&newOption, index);
+
+    // Set the palette appropriately based on whether the row is selected or not
+    if (newOption.state & QStyle::State_Selected) {
+        painter->fillRect(newOption.rect, newOption.palette.highlight());
+        painter->setBrush(newOption.palette.highlightedText());
+    } else {
+        painter->fillRect(newOption.rect, newOption.palette.base());
+        painter->setBrush(newOption.palette.text());
+    }
+
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarRating starRating = qVariantValue<StarRating>(index.data());
+        starRating.paint(painter, newOption.rect, newOption.palette, StarRating::ReadOnly);
+    } else {
+        QStyledItemDelegate::paint(painter, newOption, index);
+    }
+}
+
+QSize StarDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarRating starRating = qVariantValue<StarRating>(index.data());
+        return starRating.sizeHint();
+    } else {
+        return QStyledItemDelegate::sizeHint(option, index);
+    }
+}
+/*
+ * If the item is a StarRating, we create a StarEditor and connect
+ * its editingFinished() signal to our commitAndCloseEditor() slot,
+ * so we can update the model when the editor closes.
+ */
+QWidget *StarDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,const QModelIndex &index) const
+{
+    // Populate the correct colors based on the styling
+    QStyleOptionViewItem newOption = option;
+    initStyleOption(&newOption, index);
+
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarEditor *editor = new StarEditor(parent, newOption);
+        connect(editor, SIGNAL(editingFinished()),
+        this, SLOT(commitAndCloseEditor()));
+        return editor;
+    } else {
+        return QStyledItemDelegate::createEditor(parent, newOption, index);
+    }
+}
+
+void StarDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarRating starRating = qVariantValue<StarRating>(index.data());
+        StarEditor *starEditor = qobject_cast<StarEditor *>(editor);
+        starEditor->setStarRating(starRating);
+    } else {
+        QStyledItemDelegate::setEditorData(editor, index);
+    }
+}
+
+void StarDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+{
+    if (qVariantCanConvert<StarRating>(index.data())) {
+        StarEditor *starEditor = qobject_cast<StarEditor *>(editor);
+        model->setData(index, qVariantFromValue(starEditor->starRating()));
+    } else {
+        QStyledItemDelegate::setModelData(editor, model, index);
+    }
+}
+/*
+ * When the user is done editing, we emit commitData() and closeEditor() (both declared in QAbstractItemDelegate),
+ * to tell the model that there is edited data and to inform the view that the editor is no longer needed.
+ */
+void StarDelegate::commitAndCloseEditor()
+{
+    StarEditor *editor = qobject_cast<StarEditor *>(sender());
+    emit commitData(editor);
+    emit closeEditor(editor);
+}
 
=== added file 'mixxx/src/library/stardelegate.h'
--- mixxx/src/library/stardelegate.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/stardelegate.h	2010-10-19 05:33:52 +0000
@@ -0,0 +1,56 @@
+/***************************************************************************
+                           stardelegate.h
+                              -------------------
+     copyright            : (C) 2010 Tobias Rafreider
+	 copyright            : (C) 2009 Nokia Corporation
+
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#ifndef STARDELEGATE_H
+#define STARDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+/*
+ * When displaying data in a QListView, QTableView, or QTreeView,
+ * the individual items are drawn by a delegate.
+ * Also, when the user starts editing an item (e.g., by double-clicking the item),
+ * the delegate provides an editor widget that is placed on top of the item while editing takes place.
+ *
+ * By default a QListView, QTableView, or QTreeView has a QItemDelegate attached,
+ * which inherits QAbstractItemDelegate and handles the most common data types (notably int and QString).
+ * If we need to support custom data types, or want to customize the rendering or the editing for
+ * existing data types, we can subclass QAbstractItemDelegate or QItemDelegate or QStyledItemDelegate
+ */
+class StarDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+
+public:
+    StarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {}
+    /** reimplemented from QItemDelegate and is called whenever the view needs to repaint an item **/
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    /** eturns an item's preferred size **/
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    /** called when the user starts editing an item: **/
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,const QModelIndex &index) const;
+    /** called when an editor is created to initialize it with data from the model: **/
+    void setEditorData(QWidget *editor, const QModelIndex &index) const;
+    /** called when editing is finished, to commit data from the editor to the model: **/
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
+
+private slots:
+    void commitAndCloseEditor();
+};
+
+#endif
 
=== added file 'mixxx/src/library/stareditor.cpp'
--- mixxx/src/library/stareditor.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/stareditor.cpp	2010-10-19 05:33:52 +0000
@@ -0,0 +1,95 @@
+/***************************************************************************
+                           stareditor.cpp
+                              -------------------
+     copyright            : (C) 2010 Tobias Rafreider
+	 copyright            : (C) 2009 Nokia Corporation
+
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ * StarEditor inherits QWidget and is used by StarDelegate to let the user *
+ * edit a star rating in the library using the mouse.                      *
+ *																		   *
+ * The class has been adapted from the official "Star Delegate Example",   *
+ * see http://doc.trolltech.com/4.5/itemviews-stardelegate.html            *
+ ***************************************************************************/
+
+ #include <QtGui>
+
+ #include "stareditor.h"
+ #include "starrating.h"
+
+/*
+ * We enable mouse tracking on the widget so we can follow the cursor even
+ * when the user doesn't hold down any mouse button. We also turn on
+ * QWidget's auto-fill background feature to obtain an opaque background.
+ * (Without the call, the view's background would shine through the editor.)
+ */
+StarEditor::StarEditor(QWidget *parent, const QStyleOptionViewItem &option)
+        : QWidget(parent)
+{
+    setPalette(option.palette);
+    setMouseTracking(true);
+    setAutoFillBackground(true);
+}
+
+QSize StarEditor::sizeHint() const
+ {
+    return m_starRating.sizeHint();
+ }
+/*
+ * We simply call StarRating::paint() to draw the stars,
+ * just like we did when implementing StarDelegate
+ */
+void StarEditor::paintEvent(QPaintEvent *)
+ {
+    QPainter painter(this);
+    m_starRating.paint(&painter, rect(), palette(), StarRating::Editable);
+ }
+/*
+ * In the mouse event handler, we call setStarCount() on
+ * the private data member m_starRating to reflect the current cursor position,
+ * and we call QWidget::update() to force a repaint.
+ */
+ void StarEditor::mouseMoveEvent(QMouseEvent *event)
+ {
+    int star = starAtPosition(event->x());
+
+    if (star != m_starRating.starCount() && star != -1) {
+       m_starRating.setStarCount(star);
+       update();
+    }
+ }
+/*
+ * When the user releases a mouse button, we simply emit the editingFinished() signal.
+ */
+ void StarEditor::mouseReleaseEvent(QMouseEvent * /* event */)
+ {
+    emit editingFinished();
+ }
+/*
+ * The method uses basic linear algebra to find out which star is under the cursor.
+ */
+ int StarEditor::starAtPosition(int x)
+ {
+     // If the mouse is very close to the left edge, set 0 stars.
+     if (x < m_starRating.sizeHint().width() * 0.05) {
+         return 0;
+     }
+     int star = (x / (m_starRating.sizeHint().width() / m_starRating.maxStarCount())) + 1;
+
+     if (star <= 0 || star > m_starRating.maxStarCount())
+         return 0;
+
+     return star;
+ }
 
=== added file 'mixxx/src/library/stareditor.h'
--- mixxx/src/library/stareditor.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/stareditor.h	2010-10-19 05:33:52 +0000
@@ -0,0 +1,61 @@
+/***************************************************************************
+                           stareditor.h
+                              -------------------
+     copyright            : (C) 2010 Tobias Rafreider
+	 copyright            : (C) 2009 Nokia Corporation
+
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ * StarEditor inherits QWidget and is used by StarDelegate to let the user *
+ * edit a star rating in the library using the mouse.                      *
+ *																		   *
+ * The class has been adapted from the official "Star Delegate Example",   *
+ * see http://doc.trolltech.com/4.5/itemviews-stardelegate.html            *
+ ***************************************************************************/
+
+#ifndef STAREDITOR_H
+#define STAREDITOR_H
+
+#include <QWidget>
+
+#include "starrating.h"
+
+class StarEditor : public QWidget
+{
+	Q_OBJECT
+
+public:
+    StarEditor(QWidget *parent, const QStyleOptionViewItem& option);
+
+    QSize sizeHint() const;
+    void setStarRating(const StarRating &starRating) {
+        m_starRating = starRating;
+    }
+    StarRating starRating() { return m_starRating; }
+
+signals:
+    void editingFinished();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+private:
+    int starAtPosition(int x);
+
+    StarRating m_starRating;
+};
+
+#endif
 
=== added file 'mixxx/src/library/starrating.cpp'
--- mixxx/src/library/starrating.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/starrating.cpp	2010-10-19 05:33:52 +0000
@@ -0,0 +1,74 @@
+/***************************************************************************
+                           starrating.cpp
+                              -------------------
+     copyright            : (C) 2010 Tobias Rafreider
+	 copyright            : (C) 2009 Nokia Corporation
+
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include <QtGui>
+#include <math.h>
+
+#include "starrating.h"
+
+const int PaintingScaleFactor = 20;
+
+
+
+StarRating::StarRating(int starCount, int maxStarCount)
+{
+    m_myStarCount = starCount;
+    m_myMaxStarCount = maxStarCount;
+
+    m_starPolygon << QPointF(1.0, 0.5);
+    for (int i = 1; i < 5; ++i)
+        m_starPolygon << QPointF(0.5 + 0.5 * cos(0.8 * i * 3.14), 0.5 + 0.5 * sin(0.8 * i * 3.14));    m_diamondPolygon << QPointF(0.4, 0.5) << QPointF(0.5, 0.4) << QPointF(0.6, 0.5) << QPointF(0.5, 0.6) << QPointF(0.4, 0.5);
+}
+
+QSize StarRating::sizeHint() const
+{
+    return PaintingScaleFactor * QSize(m_myMaxStarCount, 1);
+}
+
+/*
+ * function paints the stars in this StarRating object on a paint device
+ */
+void StarRating::paint(QPainter *painter, const QRect &rect, const QPalette &palette, EditMode mode) const
+{
+    painter->save();
+
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->setPen(Qt::NoPen);
+
+    // Workaround for painting issue. If we are editable, assume we are
+    // selected, so use the highlight and hightlightedText colors.
+    if (mode == Editable) {
+        painter->fillRect(rect, palette.highlight());
+        painter->setBrush(palette.highlightedText());
+    }
+
+    int yOffset = (rect.height() - PaintingScaleFactor) / 2;
+    painter->translate(rect.x(), rect.y() + yOffset);
+    painter->scale(PaintingScaleFactor, PaintingScaleFactor);
+
+    for (int i = 0; i < m_myMaxStarCount; ++i) {
+        if (i < m_myStarCount) {
+            painter->drawPolygon(m_starPolygon, Qt::WindingFill);
+        } else {
+            painter->drawPolygon(m_diamondPolygon, Qt::WindingFill);
+        }
+        painter->translate(1.0, 0.0);
+    }
+
+    painter->restore();
+}
 
=== added file 'mixxx/src/library/starrating.h'
--- mixxx/src/library/starrating.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/starrating.h	2010-10-19 05:33:52 +0000
@@ -0,0 +1,62 @@
+/***************************************************************************
+                           starrating.h
+                              -------------------
+     copyright            : (C) 2010 Tobias Rafreider
+	 copyright            : (C) 2009 Nokia Corporation
+
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program 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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#ifndef STARRATING_H
+#define STARRATING_H
+
+#include <QMetaType>
+#include <QPointF>
+#include <QVector>
+#include <QPainter>
+#include <QStyledItemDelegate>
+
+/*
+ * The StarRating class represents a rating as a number of stars.
+ * In addition to holding the data, it is also capable of painting the stars on a QPaintDevice,
+ * which in this example is either a view or an editor.
+ * The myStarCount member variable stores the current rating, and myMaxStarCount stores
+ * the highest possible rating (typically 5).
+ */
+class StarRating
+{
+ public:
+    enum EditMode { Editable, ReadOnly };
+
+
+    StarRating(int starCount = 1, int maxStarCount = 5);
+
+    void paint(QPainter *painter, const QRect &rect, const QPalette &palette, EditMode mode) const;
+    QSize sizeHint() const;
+
+    int starCount() const { return m_myStarCount; }
+    int maxStarCount() const { return m_myMaxStarCount; }
+    void setStarCount(int starCount) { m_myStarCount = starCount; }
+    void setMaxStarCount(int maxStarCount) { m_myMaxStarCount = maxStarCount; }
+
+
+private:
+    QPolygonF m_starPolygon;
+    QPolygonF m_diamondPolygon;
+    int m_myStarCount;
+    int m_myMaxStarCount;
+
+};
+
+Q_DECLARE_METATYPE(StarRating)
+
+#endif
 
=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2010-10-07 03:05:48 +0000
+++ mixxx/src/library/trackcollection.cpp	2010-10-19 05:33:52 +0000
@@ -44,6 +44,9 @@
 {
     // Save all tracks that haven't been saved yet.
     m_trackDao.saveDirtyTracks();
+    // TODO(XXX) Maybe fold saveDirtyTracks into TrackDAO::finish now that it
+    // exists? -- rryan 10/2010
+    m_trackDao.finish();
 
     Q_ASSERT(!m_db.rollback()); //Rollback any uncommitted transaction
     //The above is an ASSERT because there should never be an outstanding
@@ -65,7 +68,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 5;
+    int requiredSchemaVersion = 6;
     if (!SchemaManager::upgradeToSchemaVersion(m_pConfig, m_db,
                                                requiredSchemaVersion)) {
         QMessageBox::warning(0, qApp->tr("Cannot upgrade database schema"),
 
=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2010-10-18 21:55:09 +0000
+++ mixxx/src/mixxx.cpp	2010-10-19 05:33:52 +0000
@@ -185,10 +185,10 @@
     QDir dir(config->getValueString(ConfigKey("[Playlist]","Directory")));
     if ((config->getValueString(ConfigKey("[Playlist]","Directory")).length()<1) || (!dir.exists()))
     {
-        QString fd = QFileDialog::getExistingDirectory(this, 
+        QString fd = QFileDialog::getExistingDirectory(this,
                          tr("Choose music library directory"),
                          QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
-        
+
         if (fd != "")
         {
             config->set(ConfigKey("[Playlist]","Directory"), fd);
 
=== modified file 'mixxx/src/player.cpp'
--- mixxx/src/player.cpp	2010-10-07 09:03:35 +0000
+++ mixxx/src/player.cpp	2010-10-19 05:33:52 +0000
@@ -178,6 +178,8 @@
     if(!m_pLoadedTrack->getHeaderParsed())
         SoundSourceProxy::ParseHeader(m_pLoadedTrack.data());
 
+    m_pLoadedTrack->incTimesPlayed();
+
     // Generate waveform summary
     //TODO: Consider reworking this visual resample stuff... need to ask rryan about this -- Albert.
     // TODO(rryan) : fix this crap -- the waveform renderers should be owned by
 
=== modified file 'mixxx/src/trackinfoobject.cpp'
--- mixxx/src/trackinfoobject.cpp	2010-10-07 03:05:48 +0000
+++ mixxx/src/trackinfoobject.cpp	2010-10-19 05:33:52 +0000
@@ -48,6 +48,7 @@
         : m_qMutex(QMutex::Recursive) {
     m_sFilename = XmlParse::selectNodeQString(nodeHeader, "Filename");
     m_sLocation = XmlParse::selectNodeQString(nodeHeader, "Filepath") + "/" +  m_sFilename;
+    QString create_date;
 
     // We don't call initialize() here because it would end up calling parse()
     // on the file. Plus those initializations weren't done before, so it might
@@ -72,6 +73,11 @@
     m_bBpmConfirm = XmlParse::selectNodeQString(nodeHeader, "BpmConfirm").toInt();
     m_fBeatFirst = XmlParse::selectNodeQString(nodeHeader, "BeatFirst").toFloat();
     m_bHeaderParsed = false;
+    create_date = XmlParse::selectNodeQString(nodeHeader, "CreateDate");
+    if (create_date == "")
+        m_dCreateDate = fileInfo.created();
+    else
+        m_dCreateDate = QDateTime::fromString(create_date);
 
     // Mixxx <1.8 recorded track IDs in mixxxtrack.xml, but we are going to
     // ignore those. Tracks will get a new ID from the database.
@@ -79,6 +85,7 @@
     m_iId = -1;
 
     m_fCuePoint = XmlParse::selectNodeQString(nodeHeader, "CuePoint").toFloat();
+    m_bPlayed = false;
 
     m_pVisualWave = 0;
     m_dVisualResampleRate = 0;
@@ -112,6 +119,7 @@
     m_iDuration = 0;
     m_iBitrate = 0;
     m_iTimesPlayed = 0;
+    m_bPlayed = false;
     m_fBpm = 0.;
     m_bBpmConfirm = false;
     m_bIsValid = false;
@@ -123,6 +131,8 @@
     m_iChannels = 0;
     m_fCuePoint = 0.0f;
     m_dVisualResampleRate = 0;
+    m_dCreateDate = QDateTime::currentDateTime();
+    m_Rating = 0;
 
     // parse() parses the metadata from file. This is not a quick operation!
     if (parseHeader)
@@ -148,6 +158,7 @@
 {
     QMutexLocker lock(&m_qMutex);
 
+    QString create_date;
     XmlParse::addElement( doc, header, "Filename", m_sFilename );
     //XmlParse::addElement( doc, header, "Filepath", m_sFilepath );
     XmlParse::addElement( doc, header, "Title", m_sTitle );
@@ -165,6 +176,7 @@
     XmlParse::addElement( doc, header, "BeatFirst", QString("%1").arg(m_fBeatFirst) );
     XmlParse::addElement( doc, header, "Id", QString("%1").arg(m_iId) );
     XmlParse::addElement( doc, header, "CuePoint", QString::number(m_fCuePoint) );
+    XmlParse::addElement( doc, header, "CreateDate", m_dCreateDate.toString() );
     //if (m_pWave) {
         //XmlParse::addHexElement(doc, header, "WaveSummaryHex", m_pWave);
     //}
@@ -255,6 +267,13 @@
     return m_sFilename;
 }
 
+QDateTime TrackInfoObject::getCreateDate() const
+{
+    QMutexLocker lock(&m_qMutex);
+    QDateTime create_date = QDateTime(m_dCreateDate);
+    return create_date;
+}
+
 bool TrackInfoObject::exists()  const
 {
     QMutexLocker lock(&m_qMutex);
@@ -439,13 +458,53 @@
     return m_iTimesPlayed;
 }
 
+void TrackInfoObject::setTimesPlayed(int t)
+{
+    QMutexLocker lock(&m_qMutex);
+    bool dirty = t != m_iTimesPlayed;
+    m_iTimesPlayed = t;
+    if (dirty)
+        setDirty(true);
+}
+
 void TrackInfoObject::incTimesPlayed()
 {
     QMutexLocker lock(&m_qMutex);
+    std::cout << "Track Played:" << m_sArtist.toStdString() << " - " << m_sTitle.toStdString();
+    qDebug() << "Track Played:" << m_sArtist << " - " << m_sTitle;
+    m_bPlayed = true;
     ++m_iTimesPlayed;
     setDirty(true);
 }
 
+bool TrackInfoObject::getPlayed() const
+{
+    QMutexLocker lock(&m_qMutex);
+    bool bPlayed = m_bPlayed;
+    return bPlayed;
+}
+
+void TrackInfoObject::setPlayed(bool bPlayed)
+{
+    QMutexLocker lock(&m_qMutex);
+    bool dirty = bPlayed != m_bPlayed;
+    m_bPlayed = bPlayed;
+    if (dirty)
+    {
+        if (bPlayed)
+        {
+            std::cout << "Track Played:" << m_sArtist.toStdString() << " - " << m_sTitle.toStdString();
+            qDebug() << "Track Played:" << m_sArtist << " - " << m_sTitle;
+        }
+        else
+        {
+            std::cout << "Track Unplayed:" << m_sArtist.toStdString() << " - " << m_sTitle.toStdString();
+            qDebug() << "Track Unplayed:" << m_sArtist << " - " << m_sTitle;
+        }
+        setDirty(true);
+    }
+}
+
 QString TrackInfoObject::getComment() const
 {
     QMutexLocker lock(&m_qMutex);
@@ -721,3 +780,18 @@
     QMutexLocker lock(&m_qMutex);
     return m_bLocationChanged;
 }
+/** Returns the rating */
+int TrackInfoObject::getRating() const{
+	QMutexLocker lock(&m_qMutex);
+
+	return m_Rating;
+}
+    /** Set rating */
+void TrackInfoObject::setRating (int rating){
+	QMutexLocker lock(&m_qMutex);
+
+	bool dirty = rating != m_Rating;
+    m_Rating = rating;
+    if (dirty)
+        setDirty(true);
+}
 
=== modified file 'mixxx/src/trackinfoobject.h'
--- mixxx/src/trackinfoobject.h	2010-10-07 03:05:48 +0000
+++ mixxx/src/trackinfoobject.h	2010-10-19 05:33:52 +0000
@@ -19,6 +19,7 @@
 #define TRACKINFOOBJECT_H
 
 #include <QList>
+#include <QDateTime>
 #include <QObject>
 #include <QFileInfo>
 #include <QMutex>
@@ -76,6 +77,8 @@
     QString getDirectory() const;
     // Returns the filename of the file.
     QString getFilename() const;
+    // Returns file creation date
+    QDateTime getCreateDate() const;
     // Returns the length of the file in bytes
     int getLength() const;
     // Returns whether the file exists on disk or not. Updated as of the time
@@ -152,11 +155,21 @@
     void setTrackNumber(QString);
     /** Return number of times the track has been played */
     int getTimesPlayed() const;
+    /** Set number of times the track has been played */
+    void setTimesPlayed(int t);
     /** Increment times played with one */
     void incTimesPlayed();
+    /** Returns true if track has been played this instance*/
+    bool getPlayed() const;
+    /** Set Played status*/
+    void setPlayed(bool);
 
     int getId() const;
 
+    /** Returns rating */
+    int getRating() const;
+    /** Sets rating */
+    void setRating(int);
 
     /** Get URL for track */
     QString getURL();
@@ -282,10 +295,14 @@
     int m_iSampleRate;
     /** Number of channels */
     int m_iChannels;
+    /**Track rating */
+    int m_Rating;;
     /** Bitrate, number of kilobits per second of audio in the track*/
     int m_iBitrate;
     /** Number of times the track has been played */
     int m_iTimesPlayed;
+    /** Has this track been played this sessions? */
+    bool m_bPlayed;
     /** Beat per minutes (BPM) */
     float m_fBpm;
     /** Minimum BPM range. If this is 0.0, then the config min BPM will be used */
@@ -302,6 +319,8 @@
     int m_iId;
     /** Cue point in samples or something */
     float m_fCuePoint;
+    /** Date. creation date of file */
+    QDateTime m_dCreateDate;
 
     // The list of cue points for the track
     QList<Cue*> m_cuePoints;
 
=== modified file 'mixxx/src/widget/wlibrarytableview.cpp'
--- mixxx/src/widget/wlibrarytableview.cpp	2010-09-19 22:08:15 +0000
+++ mixxx/src/widget/wlibrarytableview.cpp	2010-10-19 05:33:52 +0000
@@ -8,6 +8,7 @@
 #include "widget/wwidget.h"
 #include "widget/wskincolor.h"
 #include "widget/wlibrarytableview.h"
+#include "../library/stardelegate.h"
 
 WLibraryTableView::WLibraryTableView(QWidget* parent,
                                      ConfigObject<ConfigValue>* pConfig,
@@ -16,7 +17,13 @@
           m_pConfig(pConfig),
           m_vScrollBarPosKey(vScrollBarPosKey) {
 
-    //Setup properties for table
+    // Setup properties for table
+
+    // Editing starts when clicking on an already selected item.
+    setEditTriggers(QAbstractItemView::SelectedClicked);
+
+    // This is to support rating of tracks
+    setItemDelegate(new StarDelegate());
 
     //Enable selection by rows and extended selection (ctrl/shift click)
     setSelectionBehavior(QAbstractItemView::SelectRows);
 
=== modified file 'mixxx/src/widget/wstatuslight.cpp'
--- mixxx/src/widget/wstatuslight.cpp	2009-03-05 15:14:48 +0000
+++ mixxx/src/widget/wstatuslight.cpp	2010-10-19 05:33:52 +0000
@@ -26,59 +26,90 @@
 
 WStatusLight::WStatusLight(QWidget * parent) : WWidget(parent)
 {
-    m_pPixmapBack = 0;
-    m_pPixmapSL = 0;
+    m_pPixmapSLs = 0;
+    m_iNoPos = 0;
+    m_iPos = 0;
+
+    setNoPos(0);
 }
 
 WStatusLight::~WStatusLight()
 {
-    resetPositions();
+    for (int i = 0; i < m_iNoPos; i++) {
+        WPixmapStore::deletePixmap(m_pPixmapSLs[i]);
+    }
+}
+
+void WStatusLight::setNoPos(int iNoPos)
+{
+    m_iNoPos = iNoPos;
+    m_fValue = 0.;
+
+    // If pixmap array is already allocated, delete it
+    if (m_pPixmapSLs)
+        delete [] m_pPixmapSLs;
+
+    if (m_iNoPos>0)
+    {
+        m_pPixmapSLs = new QPixmap*[m_iNoPos];
+        for (int i=0; i<m_iNoPos; ++i)
+            m_pPixmapSLs[i] = 0;
+    }
 }
 
 void WStatusLight::setup(QDomNode node)
 {
     WWidget::setup(node);
-
-    // Set pixmaps
-    bool bHorizontal = false;
-    if (!selectNode(node, "Horizontal").isNull() && selectNodeQString(node, "Horizontal")=="true")
-        bHorizontal = true;
-    setPixmaps(getPath(selectNodeQString(node, "PathBack")), getPath(selectNodeQString(node, "PathStatusLight")), bHorizontal);
-}
-
-void WStatusLight::resetPositions()
-{
-    if (m_pPixmapBack)
-    {
-        WPixmapStore::deletePixmap(m_pPixmapBack);
-        m_pPixmapBack = 0;
-        WPixmapStore::deletePixmap(m_pPixmapSL);
-        m_pPixmapSL = 0;
-    }
-}
-
-void WStatusLight::setPixmaps(const QString &backFilename, const QString &vuFilename, bool bHorizontal)
-{
-    m_pPixmapBack = WPixmapStore::getPixmap(backFilename);
-    if (!m_pPixmapBack || m_pPixmapBack->size()==QSize(0,0))
-        qDebug() << "WStatusLight: Error loading back pixmap" << backFilename;
-    m_pPixmapSL = WPixmapStore::getPixmap(vuFilename);
-    if (!m_pPixmapSL || m_pPixmapSL->size()==QSize(0,0))
-        qDebug() << "WStatusLight: Error loading statuslight pixmap" << vuFilename;
-
-    setFixedSize(m_pPixmapBack->size());
-    m_bHorizontal = bHorizontal;
+    // Number of states
+    m_iNoPos = selectNodeInt(node, "NumberPos") + 1;
+    setNoPos(m_iNoPos);
+
+    for (int i=0; i<m_iNoPos; i++)
+    {
+        switch(i)
+        {
+            case 0:
+                // Set background pixmap if available
+                if (!selectNode(node, "BackPath").isNull())
+                    setPixmap(0, getPath(selectNodeQString(node, "BackPath")));
+                else
+                    m_pPixmapSLs[0] = 0;
+                break;
+            case 1:
+                setPixmap(1, getPath(selectNodeQString(node, "PathStatusLight")));
+                break;
+            default:
+                setPixmap(i, getPath(selectNodeQString(node, QString("PathStatusLight%1").arg(i))));
+        }
+    }
+}
+
+void WStatusLight::setPixmap(int iState, const QString &filename)
+{
+    int pixIdx = iState;
+    m_pPixmapSLs[pixIdx] = WPixmapStore::getPixmap(filename);
+    if (!m_pPixmapSLs[pixIdx])
+        qDebug() << "WPushButton: Error loading pixmap:" << filename << iState;
+
+    // Set size of widget equal to pixmap size
+    setFixedSize(m_pPixmapSLs[pixIdx]->size());
+}
+
+void WStatusLight::setValue(double v)
+{
+    if (m_iPos != (int)v)
+    {
+        m_iPos = (int)v;
+        update();
+    }
 }
 
 void WStatusLight::paintEvent(QPaintEvent *)
 {
-    if (m_pPixmapBack!=0 && m_pPixmapSL!=0)
+    if (m_pPixmapSLs[m_iPos])
     {
         QPainter p(this);
-
-        if(m_fValue == 0)
-            p.drawPixmap(0, 0, *m_pPixmapBack);
-        else
-            p.drawPixmap(0, 0, *m_pPixmapSL);
+        if(m_iPos != 0 && m_pPixmapSLs[0]) p.drawPixmap(0, 0, *m_pPixmapSLs[0]);
+        p.drawPixmap(0, 0, *m_pPixmapSLs[m_iPos]);
     }
 }
 
=== modified file 'mixxx/src/widget/wstatuslight.h'
--- mixxx/src/widget/wstatuslight.h	2009-03-05 15:45:39 +0000
+++ mixxx/src/widget/wstatuslight.h	2010-10-19 05:33:52 +0000
@@ -31,26 +31,24 @@
   */
 
 class WStatusLight : public WWidget  {
-   Q_OBJECT
-public: 
+    Q_OBJECT
+  public:
     WStatusLight(QWidget *parent=0);
-    ~WStatusLight();
+    virtual ~WStatusLight();
     void setup(QDomNode node);
-    void setPixmaps(const QString &backFilename, const QString &vuFilename, bool bHorizontal=false);
-    
-private:
-    /** Set position number to zero and deallocate pixmaps */
-    void resetPositions();
+    void setPixmap(int iState, const QString &filename);
+    void setNoPos(int iNoPos);
+  public slots:
+    void setValue(double v);
+  private:
     void paintEvent(QPaintEvent *);
 
     /** Current position */
     int m_iPos;
-    /** Number of positions associated with this knob */
+    /** Number of positions associated with this light */
     int m_iNoPos;
     /** Associated pixmaps */
-    QPixmap *m_pPixmapBack, *m_pPixmapSL;
-    /** True if it's a horizontal vu meter */
-    bool m_bHorizontal;
+    QPixmap **m_pPixmapSLs;
 };
 
 #endif
 
=== modified file 'mixxx/src/widget/wtracktableview.cpp'
--- mixxx/src/widget/wtracktableview.cpp	2010-09-17 06:09:27 +0000
+++ mixxx/src/widget/wtracktableview.cpp	2010-10-19 05:33:52 +0000
@@ -31,12 +31,11 @@
             this, SLOT(slotPrevTrackInfo()));
 
     m_pMenu = new QMenu(this);
+
     m_pPlaylistMenu = new QMenu(this);
     m_pPlaylistMenu->setTitle(tr("Add to Playlist"));
     m_pCrateMenu = new QMenu(this);
     m_pCrateMenu->setTitle(tr("Add to Crate"));
-    //Disable editing
-    //setEditTriggers(QAbstractItemView::NoEditTriggers);
 
     //Create all the context m_pMenu->actions (stuff that shows up when you
     //right-click)
@@ -614,13 +613,15 @@
 
 void WTrackTableView::keyPressEvent(QKeyEvent* event)
 {
-    m_selectedIndices = this->selectionModel()->selectedRows();
+
     if (event->key() == Qt::Key_Return)
     {
-        if (m_selectedIndices.size() > 0) {
-            QModelIndex index = m_selectedIndices.at(0);
-            slotMouseDoubleClicked(index);
-        }
+		/*
+		 * It is not a good idea if 'key_return'
+		 * causes a track to load since we allow in-line editing
+		 * of table items in general
+		 */
+        return;
     }
     else if (event->key() == Qt::Key_BracketLeft)
     {