Changeset 126

Timestamp:

10/18/08 14:37:23 (4 years ago)

Author:

roeland

Message:

Moving with 1 item works
This is work on ticket #9

Files:

• gui/main_window.cpp (modified) (3 diffs)
• gui/main_window.h (modified) (1 diff)
• gui/main_window.ui (modified) (1 diff)
• gui/playlisttablemodel.cpp (modified) (3 diffs)
• gui/playlisttablemodel.h (modified) (1 diff)
• lib/mpdconnection.cpp (modified) (1 diff)
• lib/mpdconnection.h (modified) (1 diff)
• lib/mpdparseutils.cpp (modified) (1 diff)

gui/main_window.cpp

@@ -68 +68 @@
     libraryTreeView->sortByColumn(0, Qt::AscendingOrder);
 
+    // Playlist table view
     playlistTableView->setModel(&playlistModel);
     playlistTableView->verticalHeader()->hide();
     playlistTableView->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
+    playlistTableView->setDragEnabled(true);
+    playlistTableView->setAcceptDrops(true);
+    playlistTableView->setDropIndicatorShown(true);
 
     // MPD
@@ -111 +115 @@
     connect(&musicLibraryModel, SIGNAL(xmlWriten(QDateTime)), this, SLOT(databaseSaved(QDateTime)));
 
+    // Playlist
+    connect(&playlistModel, SIGNAL(moveInPlaylist(quint32, quint32)), this, SLOT(movePlaylistItems(quint32, quint32)));
+
     // Timer
     fetchStatsFactor = 0;
@@ -506 +513 @@
     settings.setValue("database/db_update",db_update);
 }
+
+void MainWindow::movePlaylistItems(quint32 from, quint32 to)
+{
+    mpd.move(from, to);
+}

gui/main_window.h

@@ -108 +108 @@
 
         void databaseSaved(QDateTime db_update);
+
+        void movePlaylistItems(quint32 from, quint32 to);
 };
 

gui/main_window.ui

@@ -589 +589 @@
           <property name="dragEnabled" >
            <bool>true</bool>
+          </property>
+          <property name="dragDropOverwriteMode" >
+           <bool>false</bool>
           </property>
           <property name="dragDropMode" >

gui/playlisttablemodel.cpp

@@ -2 +2 @@
 #include <QModelIndex>
 #include <QStringListModel>
+#include <QMimeData>
+#include <QDebug>
 
 #include "playlisttablemodel.h"
@@ -134 +136 @@
 }
 
+qint32 PlaylistTableModel::getPosByRow(qint32 row) const
+{
+    if(songs->size() <= row) {
+        return -1;
+    }
+
+    return songs->at(row)->pos;
+}
+
 Qt::DropActions PlaylistTableModel::supportedDropActions() const
 {
-    return Qt::CopyAction | Qt::MoveAction;
+    return Qt::MoveAction;
 }
 
@@ -142 +153 @@
 {
     if (index.isValid())
-        return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
+        return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
     else
         return Qt::ItemIsDropEnabled;
+}
+
+/**
+ * @return A QStringList with the mimetypes we support
+ */
+QStringList PlaylistTableModel::mimeTypes() const
+{
+    QStringList types;
+    types << "application/qtmpc_song_move_text";
+    return types;
+}
+
+/**
+ * Convert the data at indexes into mimedata ready for transport
+ *
+ * @param indexes The indexes to pack into mimedata
+ * @return The mimedata
+ */
+QMimeData *PlaylistTableModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    /*
+     * Loop over all our indexes. However we have rows*columns indexes
+     * We pack per row so ingore the columns
+     */
+    int lastrow = -1;
+    foreach (QModelIndex index, indexes) {
+        if (index.isValid()) {
+            if (index.row() == lastrow)
+                continue;
+
+            QString text = QString::number(getPosByRow(index.row()));
+            stream << text;
+            lastrow = index.row();
+        }
+    }
+
+    mimeData->setData("application/qtmpc_song_move_text", encodedData);
+    return mimeData;
+}
+
+bool PlaylistTableModel::dropMimeData(const QMimeData *data,
+     Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (data->hasFormat("application/qtmpc_song_move_text")) {
+        QByteArray encodedData = data->data("application/qtmpc_song_move_text");
+        QDataStream stream(&encodedData, QIODevice::ReadOnly);
+        QStringList newItems;
+
+        while (!stream.atEnd()) {
+            QString text;
+            stream >> text;
+
+            //We only do real moves
+            if (row < 0) {
+                continue;
+            }
+
+            quint32 from = text.toUInt();
+            quint32 to = row;
+
+            //Fix for the counting in qtableview
+            if (from < to) {
+                to -= 1;
+            }
+
+            //Don't do useless moves
+            if (from == to) {
+                continue;
+            }
+
+            emit moveInPlaylist(from, to);
+        }
+
+    }
+
+    return false;
 }
 

gui/playlisttablemodel.h

@@ -21 +21 @@
         void updateCurrentSong(quint32 id);
         qint32 getIdByRow(qint32 row) const;
+        qint32 getPosByRow(qint32 row) const;
 
         Qt::DropActions supportedDropActions() const;
-        Qt::ItemFlags flags(const QModelIndex &index) const;    
+        Qt::ItemFlags flags(const QModelIndex &index) const;
+        QStringList mimeTypes() const;
+        QMimeData *mimeData(const QModelIndexList &indexes) const;
+        bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
 
     public slots:
         void updateSongs(QList<Song *> *);
+
+    signals:
+        void moveInPlaylist(quint32 from, quint32 to);
 
     private:

lib/mpdconnection.cpp

@@ -254 +254 @@
 }
 
+void MPDConnection::move(const quint32 from, const quint32 to)
+{
+    QByteArray send = "move " + QByteArray::number(from) + " " + QByteArray::number(to);
+
+    sendCommand(send);
+
+    if(!commandOk())
+        qDebug("Couldn't move files around in playlist");
+}
+
 void MPDConnection::currentSong()
 {

lib/mpdconnection.h

@@ -39 +39 @@
         void playListInfo();
         void removeSongs(const QList<qint32> &items);
+        void move(const quint32 from, const quint32 to);
         // TODO
 

lib/mpdparseutils.cpp

@@ -116 +116 @@
             song->track = value.toInt();
         } else if(element == "Pos") {
+            song->pos = value.toInt();
         } else if(element == "Id") {
             song->id = value.toUInt();