bugfixes, README file
[tomamp] / mainwindow.cpp
index 22901c6..14cf5ee 100644 (file)
@@ -5,53 +5,55 @@
 #include "mainwindow.h"
 #include "time.h"
 
-#define AVOID_INPUT_DIALOG 1
+//#define AVOID_INPUT_DIALOG 0
 
 MainWindow::MainWindow()
-    : settings (tr ("TomAmp"), "TomAmp")
+    : plman (this), settings (tr ("TomAmp"), "TomAmp"), isPlaying (false)
 {
     audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
     mediaObject = new Phonon::MediaObject(this);
-    metaInformationResolver = new Phonon::MediaObject(this);
 
-    mediaObject->setTickInterval(500);
+    mediaObject->setTickInterval(1000);
     connect(mediaObject, SIGNAL(tick(qint64)), this, SLOT(tick(qint64)));
     connect(mediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
         this, SLOT(stateChanged(Phonon::State,Phonon::State)));
-    connect(metaInformationResolver, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
-        this, SLOT(metaStateChanged(Phonon::State,Phonon::State)));
     connect(mediaObject, SIGNAL(currentSourceChanged(Phonon::MediaSource)),
         this, SLOT(sourceChanged(Phonon::MediaSource)));
     connect(mediaObject, SIGNAL(aboutToFinish()), this, SLOT(aboutToFinish()));
+    connect (&plman, SIGNAL (playlistChanged (int)), this, SLOT (playlistChanged(int)));
+    connect (&plman, SIGNAL (itemUpdated(int)), this, SLOT (itemUpdated (int)));
 
     Phonon::createPath(mediaObject, audioOutput);
 
+    qsrand (time (NULL));
     repeat = settings.value("repeat", false).toBool();
     shuffle = settings.value("shuffle", false).toBool();
-    qsrand (time (NULL));
     setupShuffleList();
     setupActions();
     setupMenus();
     setupUi();
     timeLcd->display("00:00");
-    addStringList(settings.value("lastPlaylist").toStringList());
+    plman.addStringList(settings.value("lastPlaylist").toStringList());
+    setupShuffleList();
+    int curind = settings.value("currentIndex", -1).toInt ();
+    if (curind >= 0)
+        setItem (curind, false);
     audioOutput->setVolume(settings.value("volume", .5).toReal());
+    QApplication::setWindowIcon(QIcon (QPixmap (":images/tomamp")));
 }
 
 MainWindow::~MainWindow()
 {
     settings.setValue("shuffle", shuffle);
-    QStringList curList;
-    foreach (Phonon::MediaSource src, sources)
+    settings.setValue("repeat", repeat);
+    settings.setValue("lastPlaylist", plman.playlistStrings());
+    settings.setValue("volume", audioOutput->volume());
+    settings.setValue("currentIndex", plman.indexOf(mediaObject->currentSource()));
+    for (int i = 0; i < musicTable->columnCount(); ++i)
     {
-        if (src.type () == Phonon::MediaSource::LocalFile)
-            curList.append(src.fileName());
-        else
-            curList.append(src.url().toString());
+        QString lab = QString ("colWidth_%1").arg (i);
+        settings.setValue(lab, musicTable->columnWidth(i));
     }
-    settings.setValue("lastPlaylist", curList);
-    settings.setValue("volume", audioOutput->volume());
-    qDebug () << "cucc: " << musicTable->columnWidth(1);
 }
 
 void MainWindow::addFiles()
@@ -60,26 +62,25 @@ void MainWindow::addFiles()
     if (folder.isEmpty())
         folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
     QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Files To Add"),
-                    folder);
+                    folder, "Music files (*.mp3 *.ogg *.wav *.flac);;Playlists (*.m3u *.pls)");
 
     if (files.isEmpty())
         return;
 
     QString dir = QFileInfo (files[0]).absoluteDir().absolutePath();
     settings.setValue("LastFolder", dir);
-    int index = sources.size();
+    QStringList toadd;
     foreach (QString string, files)
     {
-        Phonon::MediaSource source (string);
-        sources.append(source);
+        if (string.toLower().endsWith(".pls") || string.toLower().endsWith(".m3u"))
+            plman.addPlaylist(string);
+        else
+            toadd.append (string);
     }
-    if (!sources.isEmpty())
-        metaInformationResolver->setCurrentSource(sources.at(index));
-    setupShuffleList();
-
+    plman.addStringList(toadd);
 }
 
-void MainWindow::addFolders()
+void MainWindow::addFolder()
 {
     QString folder = settings.value("LastFolder").toString();
     if (folder.isEmpty())
@@ -88,29 +89,22 @@ void MainWindow::addFolders()
             tr("Select Directory To Add"),
             folder);
 
-    QStringList filters;
-    filters << "*.mp3";
-
-    QStringList files = QDir (dir).entryList(filters);
-
-    if (files.isEmpty())
+    if (dir.isEmpty())
         return;
 
     settings.setValue("LastFolder", dir);
-    int index = sources.size();
-    foreach (QString string, files)
-    {
-        QString fname = dir + "/" + string;
-        qDebug () << fname;
-        Phonon::MediaSource source(fname);
-        sources.append(source);
-    }
-    if (!sources.isEmpty())
-        metaInformationResolver->setCurrentSource(sources.at(index));
-    setupShuffleList();
 
+    QStringList filters;
+    QStringList files = QDir (dir).entryList(filters, QDir::AllDirs);
+    files.removeAll(".");
+    files.removeAll("..");
+    bool recursive = false;
+    if (files.size())
+        recursive = QMessageBox::question(this, "Add all folders", "Subfolders have been detected, add everything?", QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes;
+    plman.parseAndAddFolder(dir, recursive);
 }
 
+
 void MainWindow::addUrl()
 {
 #ifdef AVOID_INPUT_DIALOG
@@ -118,29 +112,13 @@ void MainWindow::addUrl()
 #else
     QString url = QInputDialog::getText(this, "Get URL", "Please type in the stream URL");
 #endif
-    int index = sources.size();
-    if (!url.isEmpty())
-    {
-        Phonon::MediaSource source(url);
-        sources.append(source);
-    }
-    if (!sources.isEmpty())
-        metaInformationResolver->setCurrentSource(sources.at(index));
-    setupShuffleList();
+    if (url.isEmpty() || !url.toLower().startsWith("http"))
+        return;
+    QStringList toadd;
+    toadd << url;
+    plman.addStringList(toadd);
 }
 
-void MainWindow::addStringList(const QStringList& list)
-{
-    int index = sources.size();
-    foreach (QString string, list)
-    {
-        Phonon::MediaSource source(string);
-        sources.append(source);
-    }
-    if (!sources.isEmpty())
-        metaInformationResolver->setCurrentSource(sources.at(index));
-    setupShuffleList();
-}
 
 void MainWindow::about()
 {
@@ -148,25 +126,25 @@ void MainWindow::about()
         tr("TomAmp is a simple playlist-based music player.\n\n"
         "(c) 2010 Tamas Marki <tmarki@gmail.com>\n\n"
         "Please send comments and bug reports to the above e-mail address.\n\n"
-        "Icons by deleket (http://www.deleket.com)"));
+        "Icons by http://itweek.deviantart.com/"));
 }
 
 void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState */)
 {
-    qDebug () << "State: " << newState;
     switch (newState)
     {
         case Phonon::ErrorState:
             if (mediaObject->errorType() == Phonon::FatalError)
             {
-                QMessageBox::warning(this, tr("Fatal Error"),
-                mediaObject->errorString());
+//                QMessageBox::warning(this, tr("Fatal Error"),
+//                mediaObject->errorString() + mediaObject->currentSource().fileName() + ", " + mediaObject->currentSource().url().toString());
             }
             else
             {
-                QMessageBox::warning(this, tr("Error"),
-                mediaObject->errorString());
+//                QMessageBox::warning(this, tr("Error"),
+//                mediaObject->errorString());
             }
+            next ();
             break;
         case Phonon::PlayingState:
             setWindowTitle(mediaObject->metaData().value("TITLE") + " - TomAmp");
@@ -175,14 +153,17 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState
             playAction->setEnabled(false);
             pauseAction->setEnabled(true);
             stopAction->setEnabled(true);
+            //lastPlayed = plman.indexOf(mediaObject->currentSource());
             break;
         case Phonon::StoppedState:
+            setWindowTitle("TomAmp");
             stopAction->setEnabled(false);
             playAction->setEnabled(true);
             pauseAction->setVisible(false);
             playAction->setVisible(true);
             pauseAction->setEnabled(false);
             timeLcd->display("00:00");
+            unhighlightRow(plman.indexOf(mediaObject->currentSource()));
             break;
         case Phonon::PausedState:
             pauseAction->setEnabled(false);
@@ -190,17 +171,8 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState
             pauseAction->setVisible(false);
             playAction->setVisible(true);
             playAction->setEnabled(true);
-            qDebug () << "Queue size: " << mediaObject->queue().size ();
-            if (mediaObject->queue().size ())
-            {
-                mediaObject->setCurrentSource(mediaObject->queue()[0]);
-                musicTable->selectRow(sources.indexOf(mediaObject->currentSource()));
-                mediaObject->play();
-            }
-            mediaObject->clearQueue();
             break;
         case Phonon::BufferingState:
-            qDebug () << "Buffering";
             break;
         default:
         ;
@@ -209,143 +181,250 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState
 
 void MainWindow::next()
 {
-
-}
-
-void MainWindow::previous()
-{
-
+    bool wasPlaying = isPlaying;
+    if (mediaObject->state () == Phonon::ErrorState)
+        wasPlaying = true;
+    int index = plman.indexOf(mediaObject->currentSource());
+    if (shuffle)
+    {
+        index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1;
+        while (index < shuffleList.size () && !plman.getItem(shuffleList[index]).playable)
+        {
+            index += 1;
+        }
+        if (index < shuffleList.size ())
+        {
+            setItem (index, wasPlaying);
+        }
+        else if (repeat)
+        {
+            index = 0;
+            while ((index) < shuffleList.size () && !plman.getItem(shuffleList[index]).playable)
+            {
+                index += 1;
+            }
+            setItem (index, wasPlaying);
+        }
+    }
+    else
+    {
+        index++;
+        while ((index) < plman.size () && !plman.getItem(index).playable)
+        {
+            index += 1;
+        }
+        if (index < plman.size())
+        {
+            setItem (index, wasPlaying);
+        }
+        else if (repeat)
+        {
+            index = 0;
+            while ((index) < plman.size () && !plman.getItem(index).playable)
+            {
+                index += 1;
+            }
+            setItem (index, wasPlaying);
+        }
+    }
 }
 
-void MainWindow::tick(qint64 time)
+void MainWindow::setItem(int i, bool doplay)
 {
-    QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);
-
-    timeLcd->display(displayTime.toString("mm:ss"));
+    if (i < plman.size() && i >= 0)
+    {
+        if (lastPlayed >= 0)
+            unhighlightRow(lastPlayed);
+        if (shuffle)
+        {
+            mediaObject->setCurrentSource(plman.at (shuffleList[i]));
+        }
+        else
+        {
+            mediaObject->setCurrentSource(plman.at(i));
+        }
+    }
+    if (doplay && mediaObject->currentSource().type() != Phonon::MediaSource::Invalid)
+    {
+        play();
+    }
+    else
+        stop ();
 }
 
-void MainWindow::tableClicked(int row, int /* column */)
+void MainWindow::previous()
 {
-//    bool wasPlaying = mediaObject->state() == Phonon::PlayingState;
-
-    mediaObject->stop();
-    mediaObject->clearQueue();
-
-    if (row >= sources.size())
-        return;
-
-    mediaObject->setCurrentSource(sources[row]);
-
-    mediaObject->play();
-    int ind = shuffleList.indexOf(row);
-    shuffleList.removeAt(ind);
-    shuffleList.insert(0, row);
-    qDebug () << "Modified shuffle list: " << shuffleList;
-}
+    bool wasPlaying = isPlaying;//(mediaObject->state () == Phonon::PlayingState);
+    if (mediaObject->state () == Phonon::ErrorState)
+        wasPlaying = true;
+    int index = plman.indexOf(mediaObject->currentSource());
+    if (shuffle)
+    {
+        index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) - 1;
+        while (index >= 0 && !plman.getItem(shuffleList[index]).playable)
+        {
+            index--;
+        }
+        if (index >= 0)
+        {
+            setItem (index, wasPlaying);
+        }
+        else if (repeat)
+        {
+            index = plman.size () - 1;
+            while (index >= 0 && !plman.getItem(shuffleList[index]).playable)
+            {
+                index--;
+            }
+            setItem (index, wasPlaying);
+        }
+/*        if (index < 0)
+            wasPlaying = false;*/
 
-void MainWindow::sourceChanged(const Phonon::MediaSource &source)
-{
-    musicTable->selectRow(sources.indexOf(source));
-    timeLcd->display("00:00");
+    }
+    else
+    {
+        index--;
+        while ((index) >= 0 && !plman.getItem(index).playable)
+        {
+            index--;
+        }
+        if (index >= 0)
+        {
+            setItem (index, wasPlaying);
+        }
+        else if (repeat)
+        {
+            index = plman.size() - 1;
+            while ((index) >= 0 && !plman.getItem(index).playable)
+            {
+                index--;
+            }
+            setItem (index, wasPlaying);
+        }
+    }
 }
 
-void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldState */)
+void MainWindow::highlightRow (int i)
 {
-    if (newState == Phonon::ErrorState)
+    for (int j = 0; j < 3; ++j)
     {
-        QMessageBox::warning(this, tr("Error opening files"),
-        metaInformationResolver->errorString());
-        while (!sources.isEmpty() &&
-            !(sources.takeLast() == metaInformationResolver->currentSource())) {}  /* loop */;
-        return;
+        QTableWidgetItem* item = musicTable->item(i, j);
+        if (item)
+        {
+            QFont font = item->font();
+            font.setBold(true);
+            font.setItalic(true);
+            item->setFont(font);
+        }
     }
+}
 
-    if (newState != Phonon::StoppedState && newState != Phonon::PausedState)
+void MainWindow::unhighlightRow (int i)
+{
+    for (int j = 0; j < 3; ++j)
     {
-        return;
+        QTableWidgetItem* item = musicTable->item(i, j);
+        if (item)
+        {
+            QFont font = item->font();
+            font.setBold(false);
+            font.setItalic(false);
+            item->setFont(font);
+        }
     }
+}
 
-    if (metaInformationResolver->currentSource().type() == Phonon::MediaSource::Invalid)
-        return;
-
-    QMap<QString, QString> metaData = metaInformationResolver->metaData();
 
-    QString title = metaData.value("TITLE");
-    if (title == "")
-        title = metaInformationResolver->currentSource().fileName();
+void MainWindow::tick(qint64 time)
+{
+    QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);
 
-    if (title == "")
-        title = metaInformationResolver->currentSource().url().toString();
+    timeLcd->display(displayTime.toString("mm:ss"));
+}
 
-    QTableWidgetItem *titleItem = new QTableWidgetItem(title);
-    titleItem->setFlags(titleItem->flags() ^ Qt::ItemIsEditable);
-    QTableWidgetItem *artistItem = new QTableWidgetItem(metaData.value("ARTIST"));
-    artistItem->setFlags(artistItem->flags() ^ Qt::ItemIsEditable);
-    QTableWidgetItem *albumItem = new QTableWidgetItem(metaData.value("ALBUM"));
-    albumItem->setFlags(albumItem->flags() ^ Qt::ItemIsEditable);
+void MainWindow::tableClicked(int row, int /* column */)
+{
+//    bool wasPlaying = mediaObject->state() == Phonon::PlayingState;
 
-    int currentRow = musicTable->rowCount();
-    musicTable->insertRow(currentRow);
-    musicTable->setItem(currentRow, 0, artistItem);
-    musicTable->setItem(currentRow, 1, titleItem);
-    musicTable->setItem(currentRow, 2, albumItem);
+/*    mediaObject->stop();
+    mediaObject->clearQueue();*/
 
+    if (row >= plman.size())
+        return;
 
-    if (musicTable->selectedItems().isEmpty())
+    int index = row;
+    while (index < shuffleList.size () && !plman.getItem(index).playable)
     {
-        musicTable->selectRow(0);
-        mediaObject->setCurrentSource(metaInformationResolver->currentSource());
+        index += 1;
     }
-
-    Phonon::MediaSource source = metaInformationResolver->currentSource();
-    int index = sources.indexOf(metaInformationResolver->currentSource()) + 1;
-    if (sources.size() > index)
+    if (plman.size() > index)
     {
-        metaInformationResolver->setCurrentSource(sources.at(index));
+        if (shuffle)
+            index = shuffleList.indexOf(index);
+        setItem (index, true);
+//        mediaObject->play();
     }
     else
     {
-        musicTable->resizeColumnsToContents();
-/*        if (musicTable->columnWidth(0) > 300)
-            musicTable->setColumnWidth(0, 300);*/
+        index = 0;
+        while (index < plman.size () && !plman.getItem(index).playable)
+        {
+            index += 1;
+        }
+        if (plman.size() > index)
+        {
+            if (shuffle)
+                index = shuffleList.indexOf(index);
+            setItem (index, true);
+//            mediaObject->play();
+        }
     }
+
 }
 
+void MainWindow::sourceChanged(const Phonon::MediaSource &source)
+{
+    int ind = plman.indexOf(source);
+    highlightRow(ind);
+    unhighlightRow(lastPlayed);
+    lastPlayed = ind;
+    musicTable->selectRow(ind);
+    timeLcd->display("00:00");
+}
+
+
 void MainWindow::aboutToFinish()
 {
-    qDebug () << "Abouttotfinish";
-    int index = sources.indexOf(mediaObject->currentSource()) + 1;
+    int index = plman.indexOf(mediaObject->currentSource()) + 1;
     if (shuffle)
     {
-        index = shuffleList.indexOf(sources.indexOf(mediaObject->currentSource())) + 1;
+        index = shuffleList.indexOf(plman.indexOf(mediaObject->currentSource())) + 1;
         if (index < shuffleList.size ())
         {
-            mediaObject->enqueue(sources.at (shuffleList[index]));
+            mediaObject->enqueue(plman.at (shuffleList[index]));
         }
         else if (repeat)
         {
-            mediaObject->enqueue(sources.at (shuffleList[0]));
+            mediaObject->enqueue(plman.at (shuffleList[0]));
         }
 
     }
     else
     {
-        if (sources.size() > index)
+        if (plman.size() > index)
         {
-            mediaObject->enqueue(sources.at(index));
-            qDebug () << "Enqueue " << index << " pfm " << mediaObject->prefinishMark();
+            mediaObject->enqueue(plman.at(index));
         }
         else if (repeat)
         {
-            mediaObject->enqueue(sources.at(0));
-            qDebug () << "Enqueue " << 0 << " pfm " << mediaObject->prefinishMark();
+            mediaObject->enqueue(plman.at(0));
         }
     }
 }
 
 void MainWindow::finished()
 {
-    qDebug () << "Finished";
 }
 
 void MainWindow::setupActions()
@@ -364,11 +443,17 @@ void MainWindow::setupActions()
     nextAction->setShortcut(tr("Ctrl+N"));
     previousAction = new QAction(QIcon (QPixmap (":images/previous")), tr("Previous"), this);
     previousAction->setShortcut(tr("Ctrl+R"));
-    repeatAction = new QAction(QIcon (QPixmap (":images/repeat")), tr("Repeat"), this);
+    if (repeat)
+        repeatAction = new QAction(QIcon (QPixmap (":images/repeatActive")), tr("Repeat"), this);
+    else
+        repeatAction = new QAction(QIcon (QPixmap (":images/repeat")), tr("Repeat"), this);
     repeatAction->setCheckable(true);
     repeatAction->setChecked(repeat);
     repeatAction->setShortcut(tr("Ctrl+I"));
-    shuffleAction = new QAction(QIcon (QPixmap (":images/shuffle")), tr("Shuffle"), this);
+    if (shuffle)
+        shuffleAction = new QAction(QIcon (QPixmap (":images/shuffleActive")), tr("Shuffle"), this);
+    else
+        shuffleAction = new QAction(QIcon (QPixmap (":images/shuffle")), tr("Shuffle"), this);
     shuffleAction->setCheckable(true);
     shuffleAction->setChecked(shuffle);
     shuffleAction->setShortcut(tr("Ctrl+H"));
@@ -393,105 +478,89 @@ void MainWindow::setupActions()
     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(playAction, SIGNAL(triggered()), this, SLOT(play()));
     connect(pauseAction, SIGNAL(triggered()), mediaObject, SLOT(pause()) );
-    connect(stopAction, SIGNAL(triggered()), mediaObject, SLOT(stop()));
+    connect(stopAction, SIGNAL(triggered()), this, SLOT(stop()));
     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(addFolders()));
+    connect(addFoldersAction, SIGNAL(triggered()), this, SLOT(addFolder()));
     connect(addUrlAction, SIGNAL(triggered()), this, SLOT(addUrl()));
     connect (savePlaylistAction, SIGNAL (triggered()), this, SLOT (savePlaylist()));
     connect (loadPlaylistAction, SIGNAL (triggered()), this, SLOT (loadPlaylist()));
-    connect (clearPlaylistAction, SIGNAL (triggered()), this, SLOT (clearPlaylist()));
+    connect (clearPlaylistAction, SIGNAL (triggered()), &plman, SLOT (clearPlaylist()));
     connect (nextAction, SIGNAL(triggered()), this, SLOT(next()));
     connect (previousAction, SIGNAL(triggered()), this, SLOT(previous()));
     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::savePlaylist()
+void MainWindow::removeSelectedItem()
 {
-    QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u)");
-    if (filename.isEmpty())
-        return;
-    if (filename.length() < 4 || filename.right(4).toLower() != ".m3u")
-        filename += ".m3u";
-    QFile f (filename);
-    try
-    {
-        f.open(QFile::WriteOnly);
-        for (int i = 0; i < sources.size(); ++i)
-        {
-            if (sources[i].type() == Phonon::MediaSource::LocalFile)
-                f.write (sources[i].fileName().toAscii());
-            else
-                f.write(sources[i].url().toString().toAscii());
-            f.write ("\n");
-        }
-        f.close ();
-    }
-    catch (...)
-    {
-        QMessageBox::critical(this, "Write error", "Could not write playlist file", QMessageBox::Ok);
-    }
+    int row = musicTable->currentRow();
+    if (row >= 0)
+        plman.removeItem(row);
 }
 
-void MainWindow::loadPlaylist()
+void MainWindow::removeAllButSelectedItem()
 {
-    QString filename = QFileDialog::getOpenFileName(this, tr("Select playlist file to load"), "", "*.m3u");
-    QFile f(filename);
-    f.open (QFile::ReadOnly);
-    QString tmp = f.readAll();
-    f.close ();
-    QStringList lines = tmp.split("\n");
-    clearPlaylist();
-    foreach (QString l, lines)
+    int row = musicTable->currentRow();
+    if (row >= 0)
     {
-        if (l.isEmpty() || (!QFileInfo (l).exists() && (l.indexOf("http") != 0)))
-        {
-            qDebug () << "not loadable: " << l;\
-            continue;
-        }
-        qDebug () << "Load " << l;
-        Phonon::MediaSource source(l);
-        sources.append(source);
+        QString uri = plman.getItem(row).uri;
+        QStringList lst;
+        lst << uri;
+        plman.clearPlaylist();
+        plman.addStringList(lst);
     }
-    if (!sources.isEmpty())
-        metaInformationResolver->setCurrentSource(sources.at(0));
-    setupShuffleList();
-}
-
-void MainWindow::clearPlaylist()
-{
-    sources.clear();
-    while (musicTable->rowCount())
-        musicTable->removeRow(0);
-    mediaObject->clear();
 }
 
 void MainWindow::repeatToggle ()
 {
     repeat = !repeat;
-    qDebug() << "Repeat toggled to " << repeat;
     settings.setValue("repeat", QVariant (repeat));
+    if (repeat)
+        repeatAction->setIcon(QIcon (QPixmap (":images/repeatActive")));
+    else
+        repeatAction->setIcon(QIcon (QPixmap (":images/repeat")));
 }
 
 void MainWindow::shuffleToggle ()
 {
     shuffle = !shuffle;
     settings.setValue("shuffle", QVariant (shuffle));
+    if (shuffle)
+        shuffleAction->setIcon(QIcon (QPixmap (":images/shuffleActive")));
+    else
+        shuffleAction->setIcon(QIcon (QPixmap (":images/shuffle")));
 }
 
 void MainWindow::volumeToggle ()
 {
-    qDebug () << "Volumetoggle: " << volumeAction->isChecked();
     volumeSlider->setVisible(volumeAction->isChecked());
 }
 
+void MainWindow::play()
+{
+    mediaObject->play();
+    lastPlayed = plman.indexOf(mediaObject->currentSource());
+    highlightRow(lastPlayed);
+    isPlaying = true;
+}
+
+void MainWindow::stop()
+{
+    mediaObject->stop();
+    isPlaying = false;
+}
+
 
 void MainWindow::setupMenus()
 {
@@ -536,14 +605,14 @@ void MainWindow::setupUi()
     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->setPalette(palette);
 
     QStringList headers;
     headers << tr("Artist") << tr("Title") << tr("Album");
@@ -554,6 +623,24 @@ void MainWindow::setupUi()
     musicTable->setSelectionBehavior(QAbstractItemView::SelectRows);
     connect(musicTable, SIGNAL(cellDoubleClicked(int,int)),
         this, SLOT(tableClicked(int,int)));
+    connect(musicTable, SIGNAL(cellClicked(int,int)),
+        this, SLOT(cellClicked(int,int)));
+/*    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;
@@ -566,9 +653,6 @@ void MainWindow::setupUi()
     QVBoxLayout *playbackLayout = new QVBoxLayout;
     volumeSlider->hide ();
     playbackLayout->addWidget(bar);
-//    playbackLayout->addStretch();
-//    playbackLayout->addWidget(volumeSlider);
-//    playbackLayout->addWidget(volumeLabel);
 
     QVBoxLayout *seekAndTableLayout = new QVBoxLayout;
 
@@ -584,21 +668,115 @@ void MainWindow::setupUi()
 
     setCentralWidget(widget);
     setWindowTitle("TomAmp");
-    qDebug () << "cucc: " << musicTable->columnWidth(1);
+}
+
+void MainWindow::cellClicked(int /*row*/, int)
+{
+}
+
+void MainWindow::contextMenuEvent (QContextMenuEvent*e)
+{
+    if (!childAt (e->pos()))
+        return;
+    if (childAt (e->pos())->parentWidget() != musicTable)
+        return;
+    contextMenu->popup(e->globalPos());
 }
 
 
 void MainWindow::setupShuffleList()
 {
     QList<int> tmp;
-    for (int i = 0; i < sources.size(); ++i)
-        tmp.append(i);
+    int index = plman.indexOf(mediaObject->currentSource());
+    if (index < 0)
+        index = 0;
+    for (int i = 0; i < plman.size(); ++i)
+    {
+        if ((i != index))
+            tmp.append(i);
+    }
     shuffleList.clear();
+    shuffleList.append (index);
     while (tmp.size ())
     {
         int ind = qrand () % tmp.size();
         shuffleList.append(tmp[ind]);
         tmp.removeAt(ind);
     }
-    qDebug () << shuffleList;
+}
+
+void MainWindow::savePlaylist ()
+{
+    QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u *.pls)");
+    if (filename.isEmpty())
+        return;
+    plman.savePlaylist(filename);
+}
+
+void MainWindow::loadPlaylist ()
+{
+    QString filename = QFileDialog::getOpenFileName(this, tr("Select playlist file to load"), "", "*.m3u *.pls");
+    if (filename.isEmpty())
+        return;
+    plman.loadPlaylist (filename);
+}
+
+void MainWindow::playlistChanged(int from)
+{
+    while (musicTable->rowCount() > from)
+    {
+        musicTable->removeRow(musicTable->rowCount () - 1);
+    }
+    int firstGood = -1;
+    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));
+    }
+    if (plman.indexOf(mediaObject->currentSource()) < 0)
+    {
+        setItem (firstGood, false);
+    }
+    setupShuffleList();
+}
+
+void MainWindow::setRowFromItem (int row, const PlaylistItem& item)
+{
+    if (row >= musicTable->rowCount())
+        return;
+    if (item.artist.isEmpty() && item.title.isEmpty())
+    {
+        QTableWidgetItem *item1 = new QTableWidgetItem(item.uri);
+        item1->setFlags(item1->flags() ^ Qt::ItemIsEditable);
+        musicTable->setItem(row, 1, item1);
+    }
+    else
+    {
+        QTableWidgetItem *item1 = new QTableWidgetItem(item.artist);
+        item1->setFlags(item1->flags() ^ Qt::ItemIsEditable);
+        musicTable->setItem(row, 0, item1);
+        QTableWidgetItem *item2 = new QTableWidgetItem(item.title);
+        item2->setFlags(item2->flags() ^ Qt::ItemIsEditable);
+        musicTable->setItem(row, 1, item2);
+        QTableWidgetItem *item3 = new QTableWidgetItem(item.album);
+        item3->setFlags(item3->flags() ^ Qt::ItemIsEditable);
+        musicTable->setItem(row, 2, item3);
+    }
+}
+
+void MainWindow::itemUpdated(int index)
+{
+    if (plman.indexOf(mediaObject->currentSource()) < 0 && plman.getItem (index).playable)
+    {
+        setItem (index, false);
+    }
+    setRowFromItem (index, plman.getItem(index));
+    if (plman.indexOf(mediaObject->currentSource()) == index)
+    {
+        if (shuffle) index = shuffleList.indexOf(index);
+        setItem (index, false);
+    }
 }