Merge lp:~mhaulo/mixxx/crate-and-playlist-lock into lp:~mixxxdevelopers/mixxx/trunk

[Mika Haulo]

An implementation for wishlist issue #661466 (https://bugs.launchpad.net/mixxx/+bug/661466).

[Phillip Whelan (pwhelan)]

Line 217 could be problematic. Different optimization levels and/or compilers can switch the order of boolean expressions.

review: Needs Fixing (code review)

[lp:~mhaulo/mixxx/crate-and-playlist-lock]

2633. By Mika Haulo on 2011-01-30

A fix to prevent compiler switching the order of boolean expressions.

[Mika Haulo (mhaulo)]

Yep, you're right about that. r2633 should fix it.

[RJ Skerry-Ryan (rryan)]

@Phil The && operator isn't associative, so the compiler should never violate the evaluation order. Tons of code out there relies on short-circuiting for evaluation. Is this documented somewhere? I'd be pretty shocked if there was an optimizing compiler out there that would do that.

@Mika This all looks very good. I think we should keep the 'Remove' option in the context menu for the crate and playlist table models though and just make it not enabled. Ideally we could add a lock icon to the QAction so that there is some feedback that the option is locked. Also, as for drag-and-dropping onto the playlist or crate I think it would be more natural to just deny the drag-and-drop so it shows up as an 'X' as they hover over it instead of showing the "+" and then popping up a dialog box. What do you think?

Thanks!
RJ

[RJ Skerry-Ryan (rryan)]

Here are my thoughts on what needs fixing:

- Since you've worked on this (I'm guessing you based it on Mixxx 1.9) a feature to rename crates and playlists was added to trunk. The locking should affect renaming of the crates and playlists too.

- As I mentioned above, to reject drags to locked Playlists/Crates, just implement Crate/PlaylistFeature::dragMoveAcceptChild to return false if the crate/playlist is locked.

- I think the 'Remove' option for Crates and Playlists should be grayed out instead of omitted so that people don't wonder where it went.

- Similarly, the Remove option in the track-table view should be grayed out instead of omitted.

- Crates and playlists that are locked should be grayed out in the 'Add to Crate' and 'Add to Playlist' context menu's in the TrackTableView.

I'm totally up for helping fix these minor things if you're short on time. When it's ready we can merge it to trunk and it'll be part of the Mixxx 1.10 release. Thanks again for your work, Mika. Finally, sorry it took me so long to get a review done for this -- life changes were afoot :).

Cheers,
RJ

review: Needs Fixing

[Mika Haulo (mhaulo)]

On Friday 11 February 2011 05:02:54 RJ Ryan wrote:

> @Mika This all looks very good. I think we should keep the 'Remove' option
> in the context menu for the crate and playlist table models though and
> just make it not enabled. Ideally we could add a lock icon to the QAction
> so that there is some feedback that the option is locked. Also, as for
> drag-and-dropping onto the playlist or crate I think it would be more
> natural to just deny the drag-and-drop so it shows up as an 'X' as they
> hover over it instead of showing the "+" and then popping up a dialog box.
> What do you think?

Sure, that makes sense. I'll make some fixes soon.

> - Since you've worked on this (I'm guessing you based it on Mixxx 1.9) a
> feature to rename crates and playlists was added to trunk. The locking
> should affect renaming of the crates and playlists too.
>

There was some discussion if locking should affect renaming (and deleting) or
not. I decided to leave renaming enabled and wait for comments. But I guess it
makes more sense that locking really prevents all modifications, including
renaming.

--
MH

[lp:~mhaulo/mixxx/crate-and-playlist-lock]

2634. By Mika Haulo on 2011-02-15

Review fixes

[Mika Haulo (mhaulo)]

On Feb 11, 2011, at 5:27 AM, RJ Ryan wrote:
>
> I'm totally up for helping fix these minor things if you're short on time.

Thanks RJ, I would actually appreciate some help at least on testing. I started in a new job on monday and the next couple of weeks feel a little bit hectic. I pushed some changes you proposed to my branch. Seems to be working on my machine, but if there's anything else to do or fix, go ahead and take control if you want.

--
MH

[RJ Skerry-Ryan (rryan)]

Hey Mika,

I tested everything out and merged your branch into the Mixxx trunk after fixing a couple minor issues.

Thanks so much for your work on this! I've credited you in the credits as "Mika Haulo". Please let me know if you'd like me to change it to something different. This code will see its first release in Mixxx 1.10.0.

RJ Ryan

review: Approve

=== added file 'mixxx/res/images/library/ic_library_locked.png'
Binary files mixxx/res/images/library/ic_library_locked.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/library/ic_library_locked.png	2011-02-15 19:56:49 +0000 differ
=== modified file 'mixxx/res/images/templates/ic_template_library_and_preferences.svg'
--- mixxx/res/images/templates/ic_template_library_and_preferences.svg	2010-11-22 15:24:51 +0000
+++ mixxx/res/images/templates/ic_template_library_and_preferences.svg	2011-02-15 19:56:49 +0000
@@ -13,7 +13,7 @@
    inkscape:export-filename=""
    style="display:inline"
    sodipodi:docname="ic_template_library_and_preferences.svg"
-   inkscape:version="0.48.0 r9654"
+   inkscape:version="0.48+devel r9889"
    id="svg2"
    height="32"
    width="32"
@@ -32,7 +32,7 @@
      id="namedview26"
      showgrid="true"
      inkscape:zoom="10"
-     inkscape:cx="30.145312"
+     inkscape:cx="11.595312"
      inkscape:cy="29.45"
      inkscape:window-x="1280"
      inkscape:window-y="0"
@@ -781,9 +781,9 @@
     <rdf:RDF>
       <rdf:Description
          rdf:about="">
-        <dc:title></dc:title>
-        <dc:creator></dc:creator>
-        <dc:rights></dc:rights>
+        <dc:title />
+        <dc:creator />
+        <dc:rights />
         <dc:description />
         <dc:format>image/svg+xml</dc:format>
         <dc:language>en</dc:language>
@@ -933,6 +933,29 @@
     </g>
     <g
        inkscape:groupmode="layer"
+       id="layer5"
+       inkscape:label="locked.png"
+       style="display:none"
+       sodipodi:insensitive="true">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.5,14 c 0,0 0.012953,-3 0,-4.5 -0.012957,-1.5004487 0.4612148,-5.9608363 6.5,-6 6,-0.038912 6.495685,4.4997009 6.5,7 0.0026,1.5 0,3.5 0,3.5"
+         id="path8889"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csssc" />
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 6,14 c -1,0 -2,1 -2,2 l 0,12 c 0,1 1,2 2,2 l 20,0 c 1,0 2,-1 2,-2 l 0,-12 c 0,-1 -1,-2 -2,-2 z M 9.03125,18 23,18 c 0.522127,0 0.997189,0.476401 0.997189,1 0,0.523599 -0.475062,1 -0.997189,1 L 9.03125,20 C 8.4410263,20 8,19.478827 8,19 8,18.521173 8.4261918,18 9.03125,18 z m 0,4 L 23,22 c 0.522127,0 0.997189,0.476401 0.997189,1 0,0.523599 -0.475062,1 -0.997189,1 L 9.03125,24 C 8.4896665,24 8,23.478827 8,23 8,22.521173 8.4836539,22 9.03125,22 z m 0,4 L 23,26 c 0.522127,0 0.997189,0.476401 0.997189,1 0,0.523599 -0.475062,1 -0.997189,1 L 9.03125,28 C 8.4799385,28 8,27.478827 8,27 8,26.521173 8.4473629,26 9.03125,26 z"
+         id="rect8885"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssssssssscssscaccssscaccssscac" />
+      <g
+         id="g8895"
+         style="fill:#0e232e;stroke:#0e232e;stroke-width:0.99776536"
+         transform="matrix(1.0044843,0,0,1,26.044843,18)" />
+    </g>
+    <g
+       inkscape:groupmode="layer"
        id="layer39"
        inkscape:label="library.png"
        style="display:none"
@@ -1225,7 +1248,7 @@
            sodipodi:cy="7"
            sodipodi:rx="5"
            sodipodi:ry="5"
-           d="M 12,7 A 5,5 0 1 1 2,7 5,5 0 1 1 12,7 z"
+           d="M 12,7 C 12,9.7614237 9.7614237,12 7,12 4.2385763,12 2,9.7614237 2,7 2,4.2385763 4.2385763,2 7,2 c 2.7614237,0 5,2.2385763 5,5 z"
            transform="matrix(1.9222927,0,0,1.9222927,0.5439511,-13.456048)" />
         <path
            sodipodi:type="arc"
@@ -1235,7 +1258,7 @@
            sodipodi:cy="6"
            sodipodi:rx="1.4933327"
            sodipodi:ry="1.4933327"
-           d="M 7.4933327,6 A 1.4933327,1.4933327 0 1 1 4.5066673,6 1.4933327,1.4933327 0 1 1 7.4933327,6 z"
+           d="M 7.4933327,6 C 7.4933327,6.8247449 6.8247449,7.4933327 6,7.4933327 5.1752551,7.4933327 4.5066673,6.8247449 4.5066673,6 4.5066673,5.1752551 5.1752551,4.5066673 6,4.5066673 6.8247449,4.5066673 7.4933327,5.1752551 7.4933327,6 z"
            transform="matrix(1.3392862,0,0,1.3392862,5.9642827,-8.0357171)" />
       </g>
     </g>

=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2010-12-22 21:42:46 +0000
+++ mixxx/res/mixxx.qrc	2011-02-15 19:56:49 +0000
@@ -24,6 +24,7 @@
         <file>images/library/ic_library_crates.png</file>
         <file>images/library/ic_library_itunes.png</file>
         <file>images/library/ic_library_library.png</file>
+        <file>images/library/ic_library_locked.png</file>
         <file>images/library/ic_library_playlist.png</file>
         <file>images/library/ic_library_prepare.png</file>
         <file>images/library/ic_library_promotracks.png</file>

=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2011-01-06 13:53:48 +0000
+++ mixxx/res/schema.xml	2011-02-15 19:56:49 +0000
@@ -228,4 +228,13 @@
         );
     </sql>
   </revision>
+  <revision version="10" min_compatible="3">
+    <description>
+      Playlist and crate locks
+    </description>
+    <sql>
+      ALTER TABLE crates ADD COLUMN locked integer DEFAULT 0;
+      ALTER TABLE playlists ADD COLUMN locked integer DEFAULT 0;
+    </sql>
+  </revision>
 </schema>

=== modified file 'mixxx/src/library/cratefeature.cpp'
--- mixxx/src/library/cratefeature.cpp	2011-01-13 18:40:56 +0000
+++ mixxx/src/library/cratefeature.cpp	2011-02-15 19:56:49 +0000
@@ -33,7 +33,11 @@
 
     m_pRenameCrateAction = new QAction(tr("Rename"),this);
     connect(m_pRenameCrateAction, SIGNAL(triggered()),
-			this, SLOT(slotRenameCrate()));
+            this, SLOT(slotRenameCrate()));
+
+    m_pLockCrateAction = new QAction(tr("Lock"),this);
+    connect(m_pLockCrateAction, SIGNAL(triggered()),
+            this, SLOT(slotToggleCrateLock()));
 
     m_pImportPlaylistAction = new QAction(tr("Import Playlist"),this);
     connect(m_pImportPlaylistAction, SIGNAL(triggered()),
@@ -55,8 +59,18 @@
             QModelIndex ind = m_crateListTableModel.index(row, idColumn);
             QString crate_name = m_crateListTableModel.data(ind).toString();
             TreeItem *playlist_item = new TreeItem(crate_name, crate_name, this, rootItem);
+            CrateDAO crateDao = m_pTrackCollection->getCrateDAO();
+            int crateID = crateDao.getCrateIdByName(crate_name);
+            bool locked = crateDao.isCrateLocked(crateID);
+            
+            if (locked) {
+                playlist_item->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+            }
+            else {
+                playlist_item->setIcon(QIcon());
+            }
+            
             rootItem->appendChild(playlist_item);
-            
     }
     m_childModel.setRootItem(rootItem);
 
@@ -67,6 +81,7 @@
     delete m_pCreateCrateAction;
     delete m_pDeleteCrateAction;
     delete m_pRenameCrateAction;
+    delete m_pLockCrateAction;
     delete m_pImportPlaylistAction;
 
 }
@@ -101,8 +116,10 @@
     qDebug() << "CrateFeature::dropAcceptChild adding track"
              << trackId << "to crate" << crateId;
 
+    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
+
     if (trackId >= 0)
-        return m_pTrackCollection->getCrateDAO().addTrackToCrate(trackId, crateId);
+        return crateDao.addTrackToCrate(trackId, crateId);
     return false;
 }
 
@@ -112,7 +129,12 @@
 
 bool CrateFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
     //TODO: Filter by supported formats regex and reject anything that doesn't match.
-    return true;
+    QString crateName = index.data().toString();
+    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
+    int crateId = crateDao.getCrateIdByName(crateName);
+    bool locked = crateDao.isCrateLocked(crateId);
+    
+    return !locked;
 }
 
 void CrateFeature::bindWidget(WLibrarySidebar* sidebarWidget,
@@ -152,12 +174,27 @@
 void CrateFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index) {
     //Save the model index so we can get it in the action slots...
     m_lastRightClickedIndex = index;
+    QString crateName = index.data().toString();
+    CrateDAO& crateDAO = m_pTrackCollection->getCrateDAO();
+    int crateId = crateDAO.getCrateIdByName(crateName);
+    bool locked = crateDAO.isCrateLocked(crateId);
+    m_pDeleteCrateAction->setEnabled(!locked);
+    m_pRenameCrateAction->setEnabled(!locked);
+    
+    if (locked) {
+        m_pLockCrateAction->setText(tr("Unlock"));
+
+    }
+    else {
+        m_pLockCrateAction->setText(tr("Lock"));
+    }
 
     QMenu menu(NULL);
     menu.addAction(m_pCreateCrateAction);
     menu.addSeparator();
     menu.addAction(m_pRenameCrateAction);
     menu.addAction(m_pDeleteCrateAction);
+    menu.addAction(m_pLockCrateAction);
     menu.addSeparator();
     menu.addAction(m_pImportPlaylistAction);
     menu.exec(globalPos);
@@ -222,9 +259,12 @@
 
 void CrateFeature::slotDeleteCrate() {
     QString crateName = m_lastRightClickedIndex.data().toString();
-    int crateId = m_pTrackCollection->getCrateDAO().getCrateIdByName(crateName);
+    CrateDAO crateDao = m_pTrackCollection->getCrateDAO();
+    int crateId = crateDao.getCrateIdByName(crateName);
+    bool locked = crateDao.isCrateLocked(crateId);
+    bool deleted = crateDao.deleteCrate(crateId);
 
-    if (m_pTrackCollection->getCrateDAO().deleteCrate(crateId)) {
+    if (deleted) {
         clearChildModel();
         m_crateListTableModel.select();
         constructChildModel();
@@ -282,6 +322,29 @@
         qDebug() << "Failed to rename crateId" << crateId;
     }
 }
+
+void CrateFeature::slotToggleCrateLock()
+{
+    QString crateName = m_lastRightClickedIndex.data().toString();
+    CrateDAO& crateDAO = m_pTrackCollection->getCrateDAO();
+    int crateId = crateDAO.getCrateIdByName(crateName);
+    bool locked = !crateDAO.isCrateLocked(crateId);
+
+    if (!crateDAO.setCrateLocked(crateId, locked)) {
+        qDebug() << "Failed to toggle lock of crateId " << crateId;
+    }
+
+    TreeItem* crateItem = m_childModel.getItem(m_lastRightClickedIndex);
+    
+    if (locked) {
+        crateItem->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+    }
+    else {
+        crateItem->setIcon(QIcon());
+    }
+}
+
+
 /**
   * Purpose: When inserting or removing playlists,
   * we require the sidebar model not to reset.
@@ -291,18 +354,45 @@
 {
     QList<TreeItem*> data_list;
     int idColumn = m_crateListTableModel.record().indexOf("name");
+<<<<<<< TREE
     //Access the invisible root item
     TreeItem* root = m_childModel.getItem(QModelIndex());
     
+=======
+    CrateDAO crateDao = m_pTrackCollection->getCrateDAO();
+
+>>>>>>> MERGE-SOURCE
     for (int row = 0; row < m_crateListTableModel.rowCount(); ++row) {
             QModelIndex ind = m_crateListTableModel.index(row, idColumn);
             QString crate_name = m_crateListTableModel.data(ind).toString();
+<<<<<<< TREE
             //Create the TreeItem whose parent is the invisible root item
             TreeItem* item = new TreeItem(crate_name, crate_name, this, root);
             data_list.append(item);
     }   
     //Append all the newly created TreeItems in a dynamic way to the childmodel 
     m_childModel.insertRows(data_list, 0, m_crateListTableModel.rowCount());  
+=======
+            data_list.append(crate_name);
+    }
+    
+    m_childModel.insertRows(data_list, 0, m_crateListTableModel.rowCount());
+    
+    for (int row = 0; row < m_childModel.rowCount(); ++row) {
+        QModelIndex ind = m_childModel.index(row, 0);
+        QString crate_name = m_childModel.data(ind, Qt::DisplayRole).toString();
+        int crateID = crateDao.getCrateIdByName(crate_name);
+        bool locked = crateDao.isCrateLocked(crateID);
+        TreeItem* playlist_item = m_childModel.getItem(ind);
+        
+        if (locked) {
+            playlist_item->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+        }
+        else {
+            playlist_item->setIcon(QIcon());
+        }
+    }
+>>>>>>> MERGE-SOURCE
 }
 /**
   * Clears the child model dynamically

=== modified file 'mixxx/src/library/cratefeature.h'
--- mixxx/src/library/cratefeature.h	2011-01-01 14:49:21 +0000
+++ mixxx/src/library/cratefeature.h	2011-02-15 19:56:49 +0000
@@ -43,6 +43,7 @@
     void slotCreateCrate();
     void slotDeleteCrate();
     void slotRenameCrate();
+    void slotToggleCrateLock();
     void slotImportPlaylist();
 
   private:
@@ -53,6 +54,7 @@
     QAction *m_pCreateCrateAction;
     QAction *m_pDeleteCrateAction;
     QAction *m_pRenameCrateAction;
+    QAction *m_pLockCrateAction;
     QAction *m_pImportPlaylistAction;
     QSqlTableModel m_crateListTableModel;
     CrateTableModel m_crateTableModel;

=== modified file 'mixxx/src/library/cratetablemodel.cpp'
--- mixxx/src/library/cratetablemodel.cpp	2010-11-16 22:08:45 +0000
+++ mixxx/src/library/cratetablemodel.cpp	2011-02-15 19:56:49 +0000
@@ -117,29 +117,38 @@
 }
 
 void CrateTableModel::removeTracks(const QModelIndexList& indices) {
-    const int trackIdIndex = fieldIndex(LIBRARYTABLE_ID);
-
-    QList<int> trackIds;
-    foreach (QModelIndex index, indices) {
-        int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
-        trackIds.append(trackId);
-    }
-
     CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-    foreach (int trackId, trackIds) {
-        crateDao.removeTrackFromCrate(trackId, m_iCrateId);
+    bool locked = crateDao.isCrateLocked(m_iCrateId);
+
+    if (!locked) {
+        const int trackIdIndex = fieldIndex(LIBRARYTABLE_ID);
+
+        QList<int> trackIds;
+        foreach (QModelIndex index, indices) {
+            int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
+            trackIds.append(trackId);
+        }
+
+        foreach (int trackId, trackIds) {
+            crateDao.removeTrackFromCrate(trackId, m_iCrateId);
+        }
+
+        select();
     }
-
-    select();
 }
 
 void CrateTableModel::removeTrack(const QModelIndex& index) {
-    const int trackIdIndex = fieldIndex(LIBRARYTABLE_ID);
-    int trackId = index.sibling(index.row(), trackIdIndex).data().toInt();
-    if (m_pTrackCollection->getCrateDAO().removeTrackFromCrate(trackId, m_iCrateId)) {
-        select();
-    } else {
-        // TODO(XXX) feedback
+    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
+    bool locked = crateDao.isCrateLocked(m_iCrateId);
+
+    if (!locked) {
+        const int trackIdIndex = fieldIndex(LIBRARYTABLE_ID);
+        int trackId = index.sibling(index.row(), trackIdIndex).data().toInt();
+        if (m_pTrackCollection->getCrateDAO().removeTrackFromCrate(trackId, m_iCrateId)) {
+            select();
+        } else {
+            // TODO(XXX) feedback
+        }
     }
 }
 
@@ -235,6 +244,18 @@
 }
 
 TrackModel::CapabilitiesFlags CrateTableModel::getCapabilities() const {
-    return TRACKMODELCAPS_RECEIVEDROPS | TRACKMODELCAPS_ADDTOPLAYLIST |
-            TRACKMODELCAPS_ADDTOCRATE | TRACKMODELCAPS_ADDTOAUTODJ;
+    
+    CapabilitiesFlags caps =  TRACKMODELCAPS_RECEIVEDROPS  |
+                              TRACKMODELCAPS_ADDTOPLAYLIST |
+                              TRACKMODELCAPS_ADDTOCRATE    |
+                              TRACKMODELCAPS_ADDTOAUTODJ;
+
+    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
+    bool locked = crateDao.isCrateLocked(m_iCrateId);
+
+    if (locked) {
+        caps |= TRACKMODELCAPS_LOCKED;
+    }
+    
+    return caps;
 }

=== modified file 'mixxx/src/library/dao/cratedao.cpp'
--- mixxx/src/library/dao/cratedao.cpp	2010-12-27 10:08:14 +0000
+++ mixxx/src/library/dao/cratedao.cpp	2011-02-15 19:56:49 +0000
@@ -70,6 +70,51 @@
     return true;
 }
 
+bool CrateDAO::setCrateLocked(int crateId, bool locked) {
+    qDebug() << "setCrateLocked()";
+
+    // SQLite3 doesn't support boolean value. Using integer instead.
+    int lock = 0;
+
+    if (locked) {
+        lock = 1;
+    }
+
+    Q_ASSERT(m_database.transaction());
+    QSqlQuery query;
+    query.prepare("UPDATE " CRATE_TABLE " SET locked = :lock WHERE id = :id");
+    query.bindValue(":lock", lock);
+    query.bindValue(":id", crateId);
+
+    if (!query.exec()) {
+        qDebug() << query.executedQuery() << query.lastError();
+        Q_ASSERT(m_database.rollback());
+        return false;
+    }
+
+    Q_ASSERT(m_database.commit());
+    return true;
+}
+
+bool CrateDAO::isCrateLocked(int crateId) {
+    qDebug() << "isCrateLocked()";
+
+    QSqlQuery query;
+    query.prepare("SELECT locked FROM " CRATE_TABLE " WHERE id = :id");
+    query.bindValue(":id", crateId);
+
+    if (query.exec()) {
+        if (query.next()) {
+            int lockValue = query.value(0).toInt();
+            return lockValue == 1;
+        }
+    } else {
+        qDebug() << query.lastError();
+    }
+    
+    return false;
+}
+
 bool CrateDAO::deleteCrate(int crateId) {
     Q_ASSERT(m_database.transaction());
 

=== modified file 'mixxx/src/library/dao/cratedao.h'
--- mixxx/src/library/dao/cratedao.h	2010-12-27 10:08:14 +0000
+++ mixxx/src/library/dao/cratedao.h	2011-02-15 19:56:49 +0000
@@ -24,6 +24,8 @@
     bool createCrate(const QString& name);
     bool deleteCrate(int crateId);
     bool renameCrate(int crateId, const QString& newName);
+    bool setCrateLocked(int crateId, bool locked);
+    bool isCrateLocked(int crateId);
     int getCrateIdByName(const QString& name);
     int getCrateId(int position);
     QString crateName(int crateId);

=== modified file 'mixxx/src/library/dao/playlistdao.cpp'
--- mixxx/src/library/dao/playlistdao.cpp	2010-12-27 10:08:14 +0000
+++ mixxx/src/library/dao/playlistdao.cpp	2011-02-15 19:56:49 +0000
@@ -166,6 +166,51 @@
 }
 
 
+bool PlaylistDAO::setPlaylistLocked(int playlistId, bool locked) {
+    qDebug() << "setPlaylistLocked()";
+
+    // SQLite3 doesn't support boolean value. Using integer instead.
+    int lock = 0;
+    
+    if (locked) {
+        lock = 1;
+    }
+
+    Q_ASSERT(m_database.transaction());
+    QSqlQuery query;
+    query.prepare("UPDATE Playlists SET locked = :lock WHERE id = :id");
+    query.bindValue(":lock", lock);
+    query.bindValue(":id", playlistId);
+
+    if (!query.exec()) {
+        qDebug() << query.executedQuery() << query.lastError();
+        Q_ASSERT(m_database.rollback());
+        return false;
+    }
+
+    Q_ASSERT(m_database.commit());
+    return true;
+}
+
+bool PlaylistDAO::isPlaylistLocked(int playlistId) {
+    qDebug() << "isPlaylistLocked()";
+
+    QSqlQuery query;
+    query.prepare("SELECT locked FROM Playlists WHERE id = :id");
+    query.bindValue(":id", playlistId);
+    
+    if (query.exec()) {
+        if (query.next()) {
+            int lockValue = query.value(0).toInt();
+            return lockValue == 1;
+        }
+    } else {
+        qDebug() << query.lastError();
+    }
+
+    return false;
+}
+
 /** Append a track to a playlist */
 void PlaylistDAO::appendTrackToPlaylist(int trackId, int playlistId)
 {

=== modified file 'mixxx/src/library/dao/playlistdao.h'
--- mixxx/src/library/dao/playlistdao.h	2010-12-27 10:08:14 +0000
+++ mixxx/src/library/dao/playlistdao.h	2011-02-15 19:56:49 +0000
@@ -19,6 +19,10 @@
     void deletePlaylist(int playlistId);
     /** Rename a playlist */
     void renamePlaylist(int playlistId, const QString& newName);
+    /** Lock or unlock a playlist */
+    bool setPlaylistLocked(int playlistId, bool locked);
+    /** Find out the state of a playlist lock */
+    bool isPlaylistLocked(int playlistId);
     /** Append a track to a playlist */
     void appendTrackToPlaylist(int trackId, int playlistId);
     /** Find out how many playlists exist. */

=== modified file 'mixxx/src/library/playlistfeature.cpp'
--- mixxx/src/library/playlistfeature.cpp	2011-01-13 18:40:56 +0000
+++ mixxx/src/library/playlistfeature.cpp	2011-02-15 19:56:49 +0000
@@ -38,6 +38,10 @@
     connect(m_pRenamePlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotRenamePlaylist()));
 
+    m_pLockPlaylistAction = new QAction(tr("Lock"),this);
+    connect(m_pLockPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotTogglePlaylistLock()));
+
     m_pImportPlaylistAction = new QAction(tr("Import Playlist"),this);
     connect(m_pImportPlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotImportPlaylist()));
@@ -61,6 +65,17 @@
             QModelIndex ind = m_playlistTableModel.index(row, idColumn);
             QString playlist_name = m_playlistTableModel.data(ind).toString();
             TreeItem *playlist_item = new TreeItem(playlist_name, playlist_name, this, rootItem);
+            int playlistID = m_playlistDao.getPlaylistIdFromName(playlist_name);
+            bool locked = m_playlistDao.isPlaylistLocked(playlistID);
+            
+            if (locked) {
+                playlist_item->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+            }
+            else {
+                playlist_item->setIcon(QIcon());
+            }
+            
+            
             rootItem->appendChild(playlist_item);
             
     }
@@ -73,6 +88,7 @@
     delete m_pDeletePlaylistAction;
     delete m_pImportPlaylistAction;
     delete m_pRenamePlaylistAction;
+    delete m_pLockPlaylistAction;
 }
 
 QVariant PlaylistFeature::title() {
@@ -120,13 +136,26 @@
 void PlaylistFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index) {
     //Save the model index so we can get it in the action slots...
     m_lastRightClickedIndex = index;
-
+    QString playlistName = index.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
+    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
+    m_pDeletePlaylistAction->setEnabled(!locked);
+    m_pRenamePlaylistAction->setEnabled(!locked);
+        
+    if (locked) {
+        m_pLockPlaylistAction->setText(tr("Unlock"));
+    }
+    else {
+        m_pLockPlaylistAction->setText(tr("Lock"));
+    }
+    
     //Create the right-click menu
     QMenu menu(NULL);
     menu.addAction(m_pCreatePlaylistAction);
     menu.addSeparator();
     menu.addAction(m_pRenamePlaylistAction);
     menu.addAction(m_pDeletePlaylistAction);
+    menu.addAction(m_pLockPlaylistAction);
     menu.addSeparator();
     menu.addAction(m_pImportPlaylistAction);
     menu.exec(globalPos);
@@ -235,20 +264,43 @@
     m_pPlaylistTableModel->setPlaylist(playlistId);
 }
 
+
+void PlaylistFeature::slotTogglePlaylistLock()
+{
+    QString playlistName = m_lastRightClickedIndex.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
+    bool locked = !m_playlistDao.isPlaylistLocked(playlistId);
+
+    if (!m_playlistDao.setPlaylistLocked(playlistId, locked)) {
+        qDebug() << "Failed to toggle lock of playlistId " << playlistId;
+    }
+
+    TreeItem* playlistItem = m_childModel.getItem(m_lastRightClickedIndex);
+
+    if (locked) {
+        playlistItem->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+    }
+    else {
+        playlistItem->setIcon(QIcon());
+    }
+}
+
 void PlaylistFeature::slotDeletePlaylist()
 {
     //qDebug() << "slotDeletePlaylist() row:" << m_lastRightClickedIndex.data();
-    if (m_lastRightClickedIndex.isValid()) {
-        int playlistId = m_playlistDao.getPlaylistIdFromName(m_lastRightClickedIndex.data().toString());
+    int playlistId = m_playlistDao.getPlaylistIdFromName(m_lastRightClickedIndex.data().toString());
+    
+    if (m_lastRightClickedIndex.isValid() &&
+        !m_playlistDao.isPlaylistLocked(playlistId)) {
         Q_ASSERT(playlistId >= 0);
         
         clearChildModel();
         m_playlistDao.deletePlaylist(playlistId);
         m_playlistTableModel.select();
         constructChildModel();
+        emit(featureUpdated());
     }
-
-    emit(featureUpdated());
+    
 }
 
 bool PlaylistFeature::dropAccept(QUrl url) {
@@ -295,7 +347,12 @@
 
 bool PlaylistFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
     //TODO: Filter by supported formats regex and reject anything that doesn't match.
-    return true;
+
+    QString playlistName = index.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
+    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
+    
+    return !locked;
 }
 
 TreeItemModel* PlaylistFeature::getChildModel() {
@@ -316,12 +373,47 @@
     for (int row = 0; row < m_playlistTableModel.rowCount(); ++row) {
             QModelIndex ind = m_playlistTableModel.index(row, idColumn);
             QString playlist_name = m_playlistTableModel.data(ind).toString();
+<<<<<<< TREE
             //Create the TreeItem whose parent is the invisible root item
             TreeItem* item = new TreeItem(playlist_name, playlist_name, this, root );
             data_list.append(item);
+=======
+            data_list.insert(row,playlist_name);
+            
+            int playlistID = m_playlistDao.getPlaylistIdFromName(playlist_name);
+            bool locked = m_playlistDao.isPlaylistLocked(playlistID);
+            TreeItem* playlist_item = m_childModel.getItem(ind);
+            
+            if (locked) {
+                playlist_item->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+            }
+            else {
+                playlist_item->setIcon(QIcon());
+            }
+>>>>>>> MERGE-SOURCE
     }
+<<<<<<< TREE
     //Append all the newly created TreeItems in a dynamic way to the childmodel
     m_childModel.insertRows(data_list, 0, m_playlistTableModel.rowCount());  
+=======
+    
+    m_childModel.insertRows(data_list, 0, m_playlistTableModel.rowCount());
+
+    for (int row = 0; row < m_childModel.rowCount(); ++row) {
+        QModelIndex ind = m_childModel.index(row, 0);
+        QString playlist_name = m_childModel.data(ind, Qt::DisplayRole).toString();
+        int playlistID = m_playlistDao.getPlaylistIdFromName(playlist_name);
+        bool locked = m_playlistDao.isPlaylistLocked(playlistID);
+        TreeItem* playlist_item = m_childModel.getItem(ind);
+        
+        if (locked) {
+            playlist_item->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+        }
+        else {
+            playlist_item->setIcon(QIcon());
+        }
+    }
+>>>>>>> MERGE-SOURCE
 }
 /**
   * Clears the child model dynamically, but the invisible root item remains

=== modified file 'mixxx/src/library/playlistfeature.h'
--- mixxx/src/library/playlistfeature.h	2010-12-31 15:31:04 +0000
+++ mixxx/src/library/playlistfeature.h	2011-02-15 19:56:49 +0000
@@ -47,11 +47,12 @@
 
     void slotCreatePlaylist();
     void slotDeletePlaylist();
-	void slotRenamePlaylist();
+    void slotRenamePlaylist();
+    void slotTogglePlaylistLock();
     void slotImportPlaylist();
 
  private:
- 	void constructChildModel();
+    void constructChildModel();
     void clearChildModel();
     
     PlaylistTableModel* m_pPlaylistTableModel;
@@ -60,6 +61,7 @@
     QAction *m_pCreatePlaylistAction;
     QAction *m_pDeletePlaylistAction;
     QAction *m_pRenamePlaylistAction;
+    QAction *m_pLockPlaylistAction;
     QAction *m_pImportPlaylistAction;
     QSqlTableModel m_playlistTableModel;
     QModelIndex m_lastRightClickedIndex;

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2010-11-17 21:04:30 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2011-02-15 19:56:49 +0000
@@ -139,30 +139,38 @@
 
 void PlaylistTableModel::removeTrack(const QModelIndex& index)
 {
-    const int positionColumnIndex = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
-    int position = index.sibling(index.row(), positionColumnIndex).data().toInt();
-    m_playlistDao.removeTrackFromPlaylist(m_iPlaylistId, position);
-    select(); //Repopulate the data model.
+    bool locked = m_playlistDao.isPlaylistLocked(m_iPlaylistId);
+
+    if (!locked) {
+        const int positionColumnIndex = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
+        int position = index.sibling(index.row(), positionColumnIndex).data().toInt();
+        m_playlistDao.removeTrackFromPlaylist(m_iPlaylistId, position);
+        select(); //Repopulate the data model.
+    }
 }
 
 void PlaylistTableModel::removeTracks(const QModelIndexList& indices) {
-    const int positionColumnIndex = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
-
-    QList<int> trackPositions;
-    foreach (QModelIndex index, indices) {
-        int trackPosition = index.sibling(index.row(), positionColumnIndex).data().toInt();
-        trackPositions.append(trackPosition);
-    }
-
-    qSort(trackPositions);
-    QListIterator<int> iterator(trackPositions);
-    iterator.toBack();
-
-    while (iterator.hasPrevious()) {
-        m_playlistDao.removeTrackFromPlaylist(m_iPlaylistId, iterator.previous());
-    }
-
-    select();
+    bool locked = m_playlistDao.isPlaylistLocked(m_iPlaylistId);
+
+    if (!locked) {
+        const int positionColumnIndex = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
+
+        QList<int> trackPositions;
+        foreach (QModelIndex index, indices) {
+            int trackPosition = index.sibling(index.row(), positionColumnIndex).data().toInt();
+            trackPositions.append(trackPosition);
+        }
+
+        qSort(trackPositions);
+        QListIterator<int> iterator(trackPositions);
+        iterator.toBack();
+
+        while (iterator.hasPrevious()) {
+            m_playlistDao.removeTrackFromPlaylist(m_iPlaylistId, iterator.previous());
+        }
+
+        select();
+    }
 }
 
 void PlaylistTableModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
@@ -352,5 +360,10 @@
     if (m_iPlaylistId != m_playlistDao.getPlaylistIdFromName(AUTODJ_TABLE))
         caps |= TRACKMODELCAPS_ADDTOAUTODJ;
 
+    bool locked = m_playlistDao.isPlaylistLocked(m_iPlaylistId);
+
+    if (locked)
+        caps |= TRACKMODELCAPS_LOCKED;
+
     return caps;
 }

=== modified file 'mixxx/src/library/sidebarmodel.cpp'
--- mixxx/src/library/sidebarmodel.cpp	2011-02-12 19:25:05 +0000
+++ mixxx/src/library/sidebarmodel.cpp	2011-02-15 19:56:49 +0000
@@ -188,10 +188,14 @@
             }
         } 
         else {
+            TreeItem* tree_item = (TreeItem*)index.internalPointer();
+            
             if (role == Qt::DisplayRole) {
-                TreeItem* tree_item = (TreeItem*)index.internalPointer();
                 return tree_item->data();
-            } 
+            }
+            else if (role == Qt::DecorationRole) {
+                return tree_item->getIcon();
+            }
             
         }
     }

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2010-12-22 21:23:09 +0000
+++ mixxx/src/library/trackcollection.cpp	2011-02-15 19:56:49 +0000
@@ -68,7 +68,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 9;
+    int requiredSchemaVersion = 10;
     if (!SchemaManager::upgradeToSchemaVersion(m_pConfig, m_db,
                                                requiredSchemaVersion)) {
         QMessageBox::warning(0, tr("Cannot upgrade database schema"),

=== modified file 'mixxx/src/library/trackmodel.h'
--- mixxx/src/library/trackmodel.h	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/trackmodel.h	2011-02-15 19:56:49 +0000
@@ -29,6 +29,7 @@
         TRACKMODELCAPS_ADDTOPLAYLIST  = 0x0004,
         TRACKMODELCAPS_ADDTOCRATE     = 0x0008,
         TRACKMODELCAPS_ADDTOAUTODJ    = 0x0010,
+        TRACKMODELCAPS_LOCKED         = 0x0020,
                                     //0x0004
     };
 

=== modified file 'mixxx/src/library/treeitem.cpp'
--- mixxx/src/library/treeitem.cpp	2011-01-13 18:40:56 +0000
+++ mixxx/src/library/treeitem.cpp	2011-02-15 19:56:49 +0000
@@ -126,3 +126,15 @@
     m_dataPath = data_path.toString();
     return true;
  }
+
+
+QIcon TreeItem::getIcon()
+{
+    return m_icon;
+}
+
+
+void TreeItem::setIcon(const QIcon& icon)
+{
+    m_icon = icon;
+}

=== modified file 'mixxx/src/library/treeitem.h'
--- mixxx/src/library/treeitem.h	2011-02-11 18:35:24 +0000
+++ mixxx/src/library/treeitem.h	2011-02-15 19:56:49 +0000
@@ -44,10 +44,16 @@
      bool isPlaylist() const;
      /** returns true if we have an inner node **/
      bool isFolder() const;
+<<<<<<< TREE
 
+=======
+>>>>>>> MERGE-SOURCE
      /* Returns the Library feature object to which an item belongs to */ 
      LibraryFeature* getFeature();
 
+     void setIcon(const QIcon& icon);
+     QIcon getIcon();
+
  private:
      QList<TreeItem*> m_childItems;
      QString m_dataPath;
@@ -55,6 +61,7 @@
      LibraryFeature* m_feature;
 
      TreeItem *m_parentItem;
+     QIcon m_icon;
  };
 
  #endif

=== modified file 'mixxx/src/library/treeitemmodel.cpp'
--- mixxx/src/library/treeitemmodel.cpp	2011-01-19 17:47:08 +0000
+++ mixxx/src/library/treeitemmodel.cpp	2011-02-15 19:56:49 +0000
@@ -45,7 +45,7 @@
  }
 
  QVariant TreeItemModel::data(const QModelIndex &index, int role) const
- {
+ {   
      if (!index.isValid())
          return QVariant();
 
@@ -53,7 +53,7 @@
          return QVariant();
 
      TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
-
+     
      return item->data();
  }
 

=== modified file 'mixxx/src/widget/wtracktableview.cpp'
--- mixxx/src/widget/wtracktableview.cpp	2011-02-11 18:35:24 +0000
+++ mixxx/src/widget/wtracktableview.cpp	2011-02-15 19:56:49 +0000
@@ -338,20 +338,24 @@
 
     if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOPLAYLIST)) {
         m_pPlaylistMenu->clear();
-
         PlaylistDAO& playlistDao = m_pTrackCollection->getPlaylistDAO();
         int numPlaylists = playlistDao.playlistCount();
+
         for (int i = 0; i < numPlaylists; ++i) {
             int iPlaylistId = playlistDao.getPlaylistId(i);
-            if (playlistDao.isHidden(iPlaylistId))
-                continue;
-            QString playlistName = playlistDao.getPlaylistName(iPlaylistId);
-            // No leak because making the menu the parent means they will be
-            // auto-deleted
-            QAction* pAction = new QAction(playlistName, m_pPlaylistMenu);
-            m_pPlaylistMenu->addAction(pAction);
-            m_playlistMapper.setMapping(pAction, iPlaylistId);
-            connect(pAction, SIGNAL(triggered()), &m_playlistMapper, SLOT(map()));
+
+            if (!playlistDao.isHidden(iPlaylistId)) {
+                
+                QString playlistName = playlistDao.getPlaylistName(iPlaylistId);
+                // No leak because making the menu the parent means they will be
+                // auto-deleted
+                QAction* pAction = new QAction(playlistName, m_pPlaylistMenu);
+                bool locked = playlistDao.isPlaylistLocked(iPlaylistId);
+                pAction->setEnabled(!locked);
+                m_pPlaylistMenu->addAction(pAction);
+                m_playlistMapper.setMapping(pAction, iPlaylistId);
+                connect(pAction, SIGNAL(triggered()), &m_playlistMapper, SLOT(map()));
+            }
         }
 
         m_pMenu->addMenu(m_pPlaylistMenu);
@@ -359,7 +363,6 @@
 
     if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOCRATE)) {
         m_pCrateMenu->clear();
-
         CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
         int numCrates = crateDao.crateCount();
         for (int i = 0; i < numCrates; ++i) {
@@ -367,6 +370,8 @@
             // No leak because making the menu the parent means they will be
             // auto-deleted
             QAction* pAction = new QAction(crateDao.crateName(iCrateId), m_pCrateMenu);
+            bool locked = crateDao.isCrateLocked(iCrateId);
+            pAction->setEnabled(!locked);
             m_pCrateMenu->addAction(pAction);
             m_crateMapper.setMapping(pAction, iCrateId);
             connect(pAction, SIGNAL(triggered()), &m_crateMapper, SLOT(map()));
@@ -375,9 +380,10 @@
         m_pMenu->addMenu(m_pCrateMenu);
     }
 
+    bool locked = modelHasCapabilities(TrackModel::TRACKMODELCAPS_LOCKED);
+    m_pRemoveAct->setEnabled(!locked);
     m_pMenu->addSeparator();
     m_pMenu->addAction(m_pRemoveAct);
-
     m_pPropertiesAct->setEnabled(oneSongSelected);
     m_pMenu->addAction(m_pPropertiesAct);