From ca8fa8c30a4fe35b0bcd442ba6d5808bf96198d9 Mon Sep 17 00:00:00 2001
From: tmarki <tmarki@gmail.com>
Date: Fri, 20 Aug 2010 14:07:25 +0200
Subject: [PATCH] notification on playlist save error, small changes

---
 tomamp/mainwindow.cpp      |   16 +++++++++++++---
 tomamp/playlistmanager.cpp |    7 ++++---
 tomamp/playlistmanager.h   |    2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/tomamp/mainwindow.cpp b/tomamp/mainwindow.cpp
index dfd2cbc..2a71244 100644
--- a/tomamp/mainwindow.cpp
+++ b/tomamp/mainwindow.cpp
@@ -143,7 +143,7 @@ void MainWindow::addUrl()
 
 void MainWindow::about()
 {
-    QMessageBox::information(this, tr("About TomAmp v0.1"),
+    QMessageBox::information(this, tr("About TomAmp v0.2"),
         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"
@@ -724,7 +724,7 @@ void MainWindow::enqueueSelected()
         mediaObject->queue().clear();
         mediaObject->enqueue(plman.at(sel));
 #ifdef Q_WS_MAEMO_5
-        QMaemo5InformationBox::information(this, tr ("Song enqueued as next song"),
+        QMaemo5InformationBox::information(this, tr ("Enqueued as next song"),
         QMaemo5InformationBox::DefaultTimeout);
 #endif
 
@@ -767,7 +767,16 @@ void MainWindow::savePlaylist ()
     QString filename = QFileDialog::getSaveFileName(this, tr("Please select file name"), "", "Playlist Files (*.m3u *.pls)");
     if (filename.isEmpty())
         return;
-    plman.savePlaylist(filename);
+    if (!plman.savePlaylist(filename))
+    {
+#ifdef Q_WS_MAEMO_5
+        QMaemo5InformationBox::information(this, tr ("Error writing playlist file"),
+        QMaemo5InformationBox::DefaultTimeout);
+#else
+        QMessageBox::critical(this, "Write error", "Error writing playlist file", QMessageBox::Ok);
+#endif
+    }
+
 }
 
 void MainWindow::loadPlaylist ()
@@ -842,6 +851,7 @@ void MainWindow::setRowFromItem (int row, const PlaylistItem& item)
         {
             QTableWidgetItem *item3 = new QTableWidgetItem(item.album);
             item3->setFlags(item3->flags() ^ Qt::ItemIsEditable);
+
             musicTable->setItem(row, col, item3);
         }
     }
diff --git a/tomamp/playlistmanager.cpp b/tomamp/playlistmanager.cpp
index b7fef15..1f56d71 100644
--- a/tomamp/playlistmanager.cpp
+++ b/tomamp/playlistmanager.cpp
@@ -138,11 +138,11 @@ void PlaylistManager::metaStateChanged(Phonon::State newState, Phonon::State old
     }
 }
 
-void PlaylistManager::savePlaylist(const QString& filenam)
+bool PlaylistManager::savePlaylist(const QString& filenam)
 {
     QString filename = filenam;
     if (filename.isEmpty())
-        return;
+        return false;
     bool writepls = false;
     if (filename.length() < 4 || (filename.right(4).toLower() != ".m3u" && filename.right(4).toLower() != ".pls"))
     {
@@ -176,11 +176,12 @@ void PlaylistManager::savePlaylist(const QString& filenam)
         if (writepls)
             f.write ("Version=2\n");
         f.close ();
+        return true;
     }
     catch (...)
     {
-//        QMessageBox::critical(this, "Write error", "Could not write playlist file", QMessageBox::Ok);
     }
+    return false;
 }
 
 void PlaylistManager::loadPlaylist(const QString& filename)
diff --git a/tomamp/playlistmanager.h b/tomamp/playlistmanager.h
index 395a066..0f6385b 100644
--- a/tomamp/playlistmanager.h
+++ b/tomamp/playlistmanager.h
@@ -40,7 +40,7 @@ public:
     bool moveItemUp (int i);
     bool moveItemDown (int i);
 public slots:
-    void savePlaylist(const QString& filename);
+    bool savePlaylist(const QString& filename);
     void loadPlaylist(const QString& filename);
     void clearPlaylist();
     void addPlaylist (const QString& filename);
-- 
1.7.9.5