context menu for removing playlist items, lots of fixes, basic functions seem to...

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1b17c7c..78fc6bb 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -34,15 +34,10 @@ MainWindow::MainWindow()
     setupUi();
     timeLcd->display("00:00");
     plman.addStringList(settings.value("lastPlaylist").toStringList());
     setupUi();
     timeLcd->display("00:00");
     plman.addStringList(settings.value("lastPlaylist").toStringList());

-//    shuffleList = settings.value("shuffleList", QList<int>()).toList();
-    QList<QVariant> tmp = settings.value("shuffleList").toList();
-    for (int i = 0; i < tmp.size (); ++i)
-        shuffleList.append (tmp[i].toInt());
-    if (!shuffleList.size())
-        setupShuffleList();
+    setupShuffleList();

     int curind = settings.value("currentIndex", -1).toInt ();
     if (curind >= 0)
     int curind = settings.value("currentIndex", -1).toInt ();
     if (curind >= 0)

-        setItem (curind);
+        setItem (curind, false);

     audioOutput->setVolume(settings.value("volume", .5).toReal());
 }
 
     audioOutput->setVolume(settings.value("volume", .5).toReal());
 }
 

@@ -53,10 +48,11 @@ MainWindow::~MainWindow()
     settings.setValue("lastPlaylist", plman.playlistStrings());
     settings.setValue("volume", audioOutput->volume());
     settings.setValue("currentIndex", plman.indexOf(mediaObject->currentSource()));
     settings.setValue("lastPlaylist", plman.playlistStrings());
     settings.setValue("volume", audioOutput->volume());
     settings.setValue("currentIndex", plman.indexOf(mediaObject->currentSource()));

-    QList<QVariant> tmp;
-    for (int i = 0; i < shuffleList.size(); ++i)
-        tmp.append (i);
-    settings.setValue("shuffleList", tmp);
+    for (int i = 0; i < musicTable->columnCount(); ++i)
+    {
+        QString lab = QString ("colWidth_%1").arg (i);
+        settings.setValue(lab, musicTable->columnWidth(i));
+    }

 }
 
 void MainWindow::addFiles()
 }
 
 void MainWindow::addFiles()

@@ -148,6 +144,7 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState
             playAction->setEnabled(false);
             pauseAction->setEnabled(true);
             stopAction->setEnabled(true);
             playAction->setEnabled(false);
             pauseAction->setEnabled(true);
             stopAction->setEnabled(true);

+            lastPlayed = plman.indexOf(mediaObject->currentSource());

             break;
         case Phonon::StoppedState:
             stopAction->setEnabled(false);
             break;
         case Phonon::StoppedState:
             stopAction->setEnabled(false);

@@ -156,6 +153,7 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState
             playAction->setVisible(true);
             pauseAction->setEnabled(false);
             timeLcd->display("00:00");
             playAction->setVisible(true);
             pauseAction->setEnabled(false);
             timeLcd->display("00:00");

+            unhighlightRow(plman.indexOf(mediaObject->currentSource()));

             break;
         case Phonon::PausedState:
             pauseAction->setEnabled(false);
             break;
         case Phonon::PausedState:
             pauseAction->setEnabled(false);

@@ -166,9 +164,10 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState
             qDebug () << "Queue size: " << mediaObject->queue().size ();
             if (mediaObject->queue().size ())
             {
             qDebug () << "Queue size: " << mediaObject->queue().size ();
             if (mediaObject->queue().size ())
             {

-                mediaObject->setCurrentSource(mediaObject->queue()[0]);
-                musicTable->selectRow(plman.indexOf(mediaObject->currentSource()));
-                mediaObject->play();
+/*                mediaObject->setCurrentSource(mediaObject->queue()[0]);
+                musicTable->selectRow(plman.indexOf(mediaObject->currentSource()));*/
+                setItem (plman.indexOf(mediaObject->queue()[0]), true);
+//                mediaObject->play();

             }
             mediaObject->clearQueue();
             break;
             }
             mediaObject->clearQueue();
             break;

@@ -185,7 +184,9 @@ void MainWindow::next()
     bool wasPlaying = (mediaObject->state () == Phonon::PlayingState);
     if (mediaObject->state () == Phonon::ErrorState)
         wasPlaying = true;
     bool wasPlaying = (mediaObject->state () == Phonon::PlayingState);
     if (mediaObject->state () == Phonon::ErrorState)
         wasPlaying = true;

-    qDebug () << "NEXT, repeat=" << repeat << ", shuffle=" << shuffle;
+    qDebug () << "NEXT, repeat=" << repeat << ", shuffle=" << shuffle << ", ShuffleLis size=" << shuffleList.size ();
+    if (shuffleList.size() != plman.size())
+        qDebug () << "WHOA STRANGE SHUFFLE: " << shuffleList;

     int index = plman.indexOf(mediaObject->currentSource());
     qDebug () << "Current index is " << index;
     if (shuffle)
     int index = plman.indexOf(mediaObject->currentSource());
     qDebug () << "Current index is " << index;
     if (shuffle)

@@ -200,7 +201,7 @@ void MainWindow::next()
         qDebug () << "Shuffle next 2 " << index;
         if (index < shuffleList.size ())
         {
         qDebug () << "Shuffle next 2 " << index;
         if (index < shuffleList.size ())
         {

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         else if (repeat)
         {
         }
         else if (repeat)
         {

@@ -210,10 +211,10 @@ void MainWindow::next()
                 qDebug () << "Index increase 2a " << index;
                 index += 1;
             }
                 qDebug () << "Index increase 2a " << index;
                 index += 1;
             }

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         }

-        if (index >= shuffleList.size ())
-            wasPlaying = false;
+/*        if (index >= shuffleList.size ())
+            wasPlaying = false;*/

 
     }
     else
 
     }
     else

@@ -228,7 +229,7 @@ void MainWindow::next()
         qDebug () << "Normal next 2 " << index;
         if (index < plman.size())
         {
         qDebug () << "Normal next 2 " << index;
         if (index < plman.size())
         {

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         else if (repeat)
         {
         }
         else if (repeat)
         {

@@ -239,65 +240,42 @@ void MainWindow::next()
                 index += 1;
                 qDebug () << "Index increase " << index;
             }
                 index += 1;
                 qDebug () << "Index increase " << index;
             }

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         }

-        if (index >= shuffleList.size ())
-            wasPlaying = false;
+/*        if (index >= shuffleList.size ())
+            wasPlaying = false;*/

     }
     }

-    if (wasPlaying)
-        mediaObject->play();
+/*    if (wasPlaying)
+        mediaObject->play();*/

     qDebug () << "wasPlaying: " << wasPlaying << ", playbutton visible: " << playAction->isVisible();
 }
 
     qDebug () << "wasPlaying: " << wasPlaying << ", playbutton visible: " << playAction->isVisible();
 }
 

-void MainWindow::setItem(int i)
+void MainWindow::setItem(int i, bool doplay)

 {
 {

-    int curInd = plman.indexOf(mediaObject->currentSource());
-    for (int j = 0; j < 3 && curInd >= 0 && curInd < shuffleList.size (); ++j)
-    {
-        QTableWidgetItem* item = musicTable->item(curInd, j);
-        if (item)
-        {
-            QFont font = item->font();
-            font.setBold(false);
-            font.setItalic(false);
-            item->setFont(font);
-        }
-    }

     if (i < plman.size() && i >= 0)
     {
     if (i < plman.size() && i >= 0)
     {

+        if (lastPlayed >= 0)
+            unhighlightRow(lastPlayed);

         if (shuffle)
         {
         if (shuffle)
         {

-            for (int j = 0; j < 3; ++j)
-            {
-                QTableWidgetItem* item = musicTable->item(shuffleList[i], j);
-                if (item)
-                {
-                    QFont font = item->font();
-                    font.setBold(true);
-                    font.setItalic(true);
-                    item->setFont(font);
-                }
-            }
+            qDebug () << "SetItem with shuffle, index = " << i << " real index is " << shuffleList[i];
+            qDebug () << "ShuffleList: " << shuffleList;
+            if (doplay)
+                highlightRow(shuffleList[i]);

             mediaObject->setCurrentSource(plman.at (shuffleList[i]));
             mediaObject->setCurrentSource(plman.at (shuffleList[i]));

-            musicTable->selectRow (shuffleList[i]);
+//            musicTable->selectRow (shuffleList[i]);

         }
         else
         {
         }
         else
         {

-            for (int j = 0; j < 3; ++j)
-            {
-                QTableWidgetItem* item = musicTable->item(i, j);
-                if (item)
-                {
-                    QFont font = item->font();
-                    font.setBold(true);
-                    font.setItalic(true);
-                    item->setFont(font);
-                }
-            }
+            qDebug () << "SetItem without shuffle, index = " << i;
+            if (doplay)
+                highlightRow(i);

             mediaObject->setCurrentSource(plman.at(i));
             mediaObject->setCurrentSource(plman.at(i));

-            musicTable->selectRow (i);
+//            musicTable->selectRow (i);

         }
     }
         }
     }

+    if (doplay && mediaObject->currentSource().type() != Phonon::MediaSource::Invalid)
+        mediaObject->play();

 }
 
 void MainWindow::previous()
 }
 
 void MainWindow::previous()

@@ -320,7 +298,7 @@ void MainWindow::previous()
         qDebug () << "Shuffle next 2 " << index;
         if (index >= 0)
         {
         qDebug () << "Shuffle next 2 " << index;
         if (index >= 0)
         {

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         else if (repeat)
         {
         }
         else if (repeat)
         {

@@ -330,10 +308,10 @@ void MainWindow::previous()
                 qDebug () << "Index increase 2a " << index;
                 index--;
             }
                 qDebug () << "Index increase 2a " << index;
                 index--;
             }

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         }

-        if (index < 0)
-            wasPlaying = false;
+/*        if (index < 0)
+            wasPlaying = false;*/

 
     }
     else
 
     }
     else

@@ -348,7 +326,7 @@ void MainWindow::previous()
         qDebug () << "Normal next 2 " << index;
         if (index >= 0)
         {
         qDebug () << "Normal next 2 " << index;
         if (index >= 0)
         {

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         else if (repeat)
         {
         }
         else if (repeat)
         {

@@ -359,46 +337,49 @@ void MainWindow::previous()
                 index--;
                 qDebug () << "Index increase " << index;
             }
                 index--;
                 qDebug () << "Index increase " << index;
             }

-            setItem (index);
+            setItem (index, wasPlaying);

         }
         }

-        if (index < 0)
-            wasPlaying = false;
+/*        if (index < 0)
+            wasPlaying = false;*/

     }
     }

-    if (wasPlaying)
-        mediaObject->play();
+/*    if (wasPlaying)
+        mediaObject->play();*/

     qDebug () << "wasPlaying: " << wasPlaying << ", playbutton visible: " << playAction->isVisible();
 
     qDebug () << "wasPlaying: " << wasPlaying << ", playbutton visible: " << playAction->isVisible();
 

-/*    bool wasPlaying = (mediaObject->state () == Phonon::PlayingState);
-    int index = plman.indexOf(mediaObject->currentSource()) - 1;
-    if (shuffle)
+
+}
+
+void MainWindow::highlightRow (int i)
+{
+    for (int j = 0; j < 3; ++j)

     {
     {

-        index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) - 1;
-        if (index >= 0)
-        {
-            mediaObject->setCurrentSource(plman.at (shuffleList[index]));
-        }
-        else if (repeat)
+        QTableWidgetItem* item = musicTable->item(i, j);
+        if (item)

         {
         {

-            mediaObject->setCurrentSource(plman.at (shuffleList[shuffleList.size() - 1]));
+            QFont font = item->font();
+            font.setBold(true);
+            font.setItalic(true);
+            item->setFont(font);

         }
         }

-

     }
     }

-    else
+}
+
+void MainWindow::unhighlightRow (int i)
+{
+    for (int j = 0; j < 3; ++j)

     {
     {

-        if (index >= 0)
-        {
-            mediaObject->setCurrentSource(plman.at(index));
-        }
-        else if (repeat)
+        QTableWidgetItem* item = musicTable->item(i, j);
+        if (item)

         {
         {

-            mediaObject->setCurrentSource(plman.at(plman.size() - 1));
+            QFont font = item->font();
+            font.setBold(false);
+            font.setItalic(false);
+            item->setFont(font);

         }
     }
         }
     }

-    if (wasPlaying)
-        mediaObject->play();*/
-

 }
 
 }
 

+

 void MainWindow::tick(qint64 time)
 {
     QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);
 void MainWindow::tick(qint64 time)
 {
     QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);

@@ -425,8 +406,8 @@ void MainWindow::tableClicked(int row, int /* column */)
     {
         if (shuffle)
             index = shuffleList.indexOf(index);
     {
         if (shuffle)
             index = shuffleList.indexOf(index);

-        setItem (index);
-        mediaObject->play();
+        setItem (index, true);
+//        mediaObject->play();

     }
     else
     {
     }
     else
     {

@@ -439,8 +420,8 @@ void MainWindow::tableClicked(int row, int /* column */)
         {
             if (shuffle)
                 index = shuffleList.indexOf(index);
         {
             if (shuffle)
                 index = shuffleList.indexOf(index);

-            setItem (index);
-            mediaObject->play();
+            setItem (index, true);
+//            mediaObject->play();

         }
     }
 
         }
     }
 

@@ -535,6 +516,8 @@ void MainWindow::setupActions()
     aboutAction->setShortcut(tr("Ctrl+B"));
     aboutQtAction = new QAction(tr("About &Qt"), this);
     aboutQtAction->setShortcut(tr("Ctrl+Q"));
     aboutAction->setShortcut(tr("Ctrl+B"));
     aboutQtAction = new QAction(tr("About &Qt"), this);
     aboutQtAction->setShortcut(tr("Ctrl+Q"));

+/*    removeSelected = new QAction (tr("&Delete from playlist"));
+    removeSelected->setShortcut(tr ("Ctrl+D"));*/

 
     connect(playAction, SIGNAL(triggered()), mediaObject, SLOT(play()));
     connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) );
 
     connect(playAction, SIGNAL(triggered()), mediaObject, SLOT(play()));
     connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) );

@@ -542,6 +525,7 @@ void MainWindow::setupActions()
     connect(repeatAction, SIGNAL(triggered()), this, SLOT(repeatToggle()));
     connect(shuffleAction, SIGNAL(triggered()), this, SLOT(shuffleToggle()));
     connect(volumeAction, SIGNAL(triggered()), this, SLOT(volumeToggle()));
     connect(repeatAction, SIGNAL(triggered()), this, SLOT(repeatToggle()));
     connect(shuffleAction, SIGNAL(triggered()), this, SLOT(shuffleToggle()));
     connect(volumeAction, SIGNAL(triggered()), this, SLOT(volumeToggle()));

+

     connect(addFilesAction, SIGNAL(triggered()), this, SLOT(addFiles()));
     connect(addFoldersAction, SIGNAL(triggered()), this, SLOT(addFolder()));
     connect(addUrlAction, SIGNAL(triggered()), this, SLOT(addUrl()));
     connect(addFilesAction, SIGNAL(triggered()), this, SLOT(addFiles()));
     connect(addFoldersAction, SIGNAL(triggered()), this, SLOT(addFolder()));
     connect(addUrlAction, SIGNAL(triggered()), this, SLOT(addUrl()));

@@ -553,8 +537,30 @@ void MainWindow::setupActions()
     connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
     connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
     connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
     connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));

+//    connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem()));
+}
+
+void MainWindow::removeSelectedItem()
+{
+    qDebug () << "Remove Selected!";
+    int row = musicTable->currentRow();
+    if (row >= 0)
+        plman.removeItem(row);

 }
 
 }
 

+void MainWindow::removeAllButSelectedItem()
+{
+    qDebug () << "Remove Selected!";
+    int row = musicTable->currentRow();
+    if (row >= 0)
+    {
+        QString uri = plman.getItem(row).uri;
+        QStringList lst;
+        lst << uri;
+        plman.clearPlaylist();
+        plman.addStringList(lst);
+    }
+}

 
 void MainWindow::repeatToggle ()
 {
 
 void MainWindow::repeatToggle ()
 {

@@ -624,14 +630,14 @@ void MainWindow::setupUi()
     bar->addAction(nextAction);
     bar->addAction(previousAction);
 
     bar->addAction(nextAction);
     bar->addAction(previousAction);
 

-/*    QLabel *volumeLabel = new QLabel;
-    volumeLabel->setPixmap(QPixmap("images/volume.png"));*/
+    contextMenu = new QMenu (this);
+    removeSelected = contextMenu->addAction(tr ("Remove selected"));
+    removeAllButSelected = contextMenu->addAction(tr("Remove all but selected"));
+    connect (removeSelected, SIGNAL (triggered()), this, SLOT (removeSelectedItem()));
+    connect (removeAllButSelected, SIGNAL (triggered()), this, SLOT (removeAllButSelectedItem()));

 
 

-/*    QPalette palette;
-    palette.setBrush(QPalette::Light, Qt::darkGray);*/

 
     timeLcd = new QLCDNumber;
 
     timeLcd = new QLCDNumber;

-//    timeLcd->setPalette(palette);

 
     QStringList headers;
     headers << tr("Artist") << tr("Title") << tr("Album");
 
     QStringList headers;
     headers << tr("Artist") << tr("Title") << tr("Album");

@@ -644,7 +650,22 @@ void MainWindow::setupUi()
         this, SLOT(tableClicked(int,int)));
     connect(musicTable, SIGNAL(cellClicked(int,int)),
         this, SLOT(cellClicked(int,int)));
         this, SLOT(tableClicked(int,int)));
     connect(musicTable, SIGNAL(cellClicked(int,int)),
         this, SLOT(cellClicked(int,int)));

-    musicTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+/*    for (int i = 0; i < 3; ++i)
+    {
+        if (!musicTable->horizontalHeaderItem(i))
+            continue;
+        musicTable->horizontalHeaderItem(i)->setBackgroundColor(QColor (128, 128, 255));;
+        musicTable->horizontalHeaderItem(i)->setForeground(QColor (255, 255, 255));
+    }*/
+    for (int i = 0; i < musicTable->columnCount(); ++i)
+    {
+        QString lab = QString ("colWidth_%1").arg (i);
+        int val = settings.value(lab, 0).toInt();
+        if (val)
+            musicTable->setColumnWidth(i, val);
+//        settings.setValue(lab, musicTable->columnWidth(i));
+    }
+

 
     QHBoxLayout *seekerLayout = new QHBoxLayout;
     QToolBar* bar2 = new QToolBar;
 
     QHBoxLayout *seekerLayout = new QHBoxLayout;
     QToolBar* bar2 = new QToolBar;

@@ -657,9 +678,6 @@ void MainWindow::setupUi()
     QVBoxLayout *playbackLayout = new QVBoxLayout;
     volumeSlider->hide ();
     playbackLayout->addWidget(bar);
     QVBoxLayout *playbackLayout = new QVBoxLayout;
     volumeSlider->hide ();
     playbackLayout->addWidget(bar);

-//    playbackLayout->addStretch();
-//    playbackLayout->addWidget(volumeSlider);
-//    playbackLayout->addWidget(volumeLabel);

 
     QVBoxLayout *seekAndTableLayout = new QVBoxLayout;
 
 
     QVBoxLayout *seekAndTableLayout = new QVBoxLayout;
 

@@ -680,23 +698,15 @@ void MainWindow::setupUi()
 
 void MainWindow::cellClicked(int /*row*/, int)
 {
 
 void MainWindow::cellClicked(int /*row*/, int)
 {

-    /*if (mediaObject->state() == Phonon::PlayingState)
-    {
-        int index = plman.indexOf(mediaObject->currentSource());
-        if (index >= 0)
-        {
-            musicTable->selectRow(index);
-        }
-    }
-    else if (row < plman.size())
-    {
-        mediaObject->setCurrentSource(plman.at(row));
-        shuffleList.removeAll(row);
-        shuffleList.insert(0, row);
-        qDebug () << shuffleList;
-    }*/

 }
 
 }
 

+void MainWindow::contextMenuEvent (QContextMenuEvent*e)
+{
+    qDebug () << "Context menu event!";
+    contextMenu->popup(e->globalPos());
+}
+
+

 void MainWindow::setupShuffleList()
 {
     QList<int> tmp;
 void MainWindow::setupShuffleList()
 {
     QList<int> tmp;

@@ -717,7 +727,6 @@ void MainWindow::setupShuffleList()
         tmp.removeAt(ind);
     }
     qDebug () << shuffleList;
         tmp.removeAt(ind);
     }
     qDebug () << shuffleList;

-    qDebug () << shuffleList;

 }
 
 void MainWindow::savePlaylist ()
 }
 
 void MainWindow::savePlaylist ()

@@ -738,12 +747,19 @@ void MainWindow::playlistChanged(int from)
     {
         musicTable->removeRow(musicTable->rowCount () - 1);
     }
     {
         musicTable->removeRow(musicTable->rowCount () - 1);
     }

+    int firstGood = -1;

     for (int i = from; i < plman.size (); ++i)
     {
     for (int i = from; i < plman.size (); ++i)
     {

+        if (firstGood < 0 && plman.getItem (i).playable)
+            firstGood = i;

         int currentRow = musicTable->rowCount();
         musicTable->insertRow(currentRow);
         setRowFromItem (currentRow, plman.getItem(i));
     }
         int currentRow = musicTable->rowCount();
         musicTable->insertRow(currentRow);
         setRowFromItem (currentRow, plman.getItem(i));
     }

+    if (plman.indexOf(mediaObject->currentSource()) < 0)
+    {
+        setItem (firstGood, false);
+    }

     setupShuffleList();
 }
 
     setupShuffleList();
 }
 

@@ -773,7 +789,14 @@ void MainWindow::setRowFromItem (int row, const PlaylistItem& item)
 
 void MainWindow::itemUpdated(int index)
 {
 
 void MainWindow::itemUpdated(int index)
 {

-    setRowFromItem (index, plman.getItem(index));

     if (plman.indexOf(mediaObject->currentSource()) < 0 && plman.getItem (index).playable)
     if (plman.indexOf(mediaObject->currentSource()) < 0 && plman.getItem (index).playable)

-        mediaObject->setCurrentSource(plman.getItem(index).source);
+    {
+        setItem (index, false);
+    }
+    setRowFromItem (index, plman.getItem(index));
+    if (plman.indexOf(mediaObject->currentSource()) == index)
+    {
+        if (shuffle) index = shuffleList.indexOf(index);
+        setItem (index, false);
+    }

 }
 }

diff --git a/mainwindow.h b/mainwindow.h
index ede5f62..898df91 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -92,8 +92,14 @@ private slots:
     void loadPlaylist ();
     void playlistChanged (int from);
     void itemUpdated (int index);
     void loadPlaylist ();
     void playlistChanged (int from);
     void itemUpdated (int index);

-    void setItem (int ind);
+    void setItem (int ind, bool doplay);
+    void removeSelectedItem ();
+    void removeAllButSelectedItem ();
+    void highlightRow (int i);
+    void unhighlightRow (int i);

 
 

+protected:
+    void contextMenuEvent (QContextMenuEvent*e);

 private:
     void setupActions();
     void setupMenus();
 private:
     void setupActions();
     void setupMenus();

@@ -126,6 +132,9 @@ private:
     QAction *exitAction;
     QAction *aboutAction;
     QAction *aboutQtAction;
     QAction *exitAction;
     QAction *aboutAction;
     QAction *aboutQtAction;

+    QAction *removeSelected;
+    QAction *removeAllButSelected;
+    QMenu   *contextMenu;

     QToolBar *bar;
     QLCDNumber *timeLcd;
     QTableWidget *musicTable;
     QToolBar *bar;
     QLCDNumber *timeLcd;
     QTableWidget *musicTable;

@@ -133,6 +142,7 @@ private:
     bool        shuffle;
     QSettings settings;
     QList<int>  shuffleList;
     bool        shuffle;
     QSettings settings;
     QList<int>  shuffleList;

+    int lastPlayed;

 };
 
 #endif
 };
 
 #endif

diff --git a/playlistmanager.cpp b/playlistmanager.cpp
index 5bb7830..0293bf0 100644 (file)
--- a/playlistmanager.cpp
+++ b/playlistmanager.cpp
@@ -196,7 +196,8 @@ void PlaylistManager::loadPlaylist(const QString& filename)
 {
     qDebug () << "Attempting to load playlist: " << filename;
     QFile f(filename);
 {
     qDebug () << "Attempting to load playlist: " << filename;
     QFile f(filename);

-    f.open (QFile::ReadOnly);
+    if (!f.open (QFile::ReadOnly))
+        return;

     QString tmp = f.readAll();
     f.close ();
     QStringList lines = tmp.split("\n");
     QString tmp = f.readAll();
     f.close ();
     QStringList lines = tmp.split("\n");

@@ -232,3 +233,9 @@ QStringList PlaylistManager::playlistStrings() const
     qDebug () << "Returning playlist " << ret << " SIZE: " << items.size ();
     return ret;
 }
     qDebug () << "Returning playlist " << ret << " SIZE: " << items.size ();
     return ret;
 }

+
+void PlaylistManager::removeItem(int i)
+{
+    items.removeAt (i);
+    emit playlistChanged(i);
+}

diff --git a/playlistmanager.h b/playlistmanager.h
index f934394..49484b9 100644 (file)
--- a/playlistmanager.h
+++ b/playlistmanager.h
@@ -25,6 +25,7 @@ public:
     PlaylistManager(QWidget* parent);
     void addStringList (const QStringList&);
     void parseAndAddFolder (const QString& dir, bool recursive);
     PlaylistManager(QWidget* parent);
     void addStringList (const QStringList&);
     void parseAndAddFolder (const QString& dir, bool recursive);

+    void removeItem (int i);

 
     QStringList playlistStrings () const;
     int size () const { return items.size (); }
 
     QStringList playlistStrings () const;
     int size () const { return items.size (); }