Merge branch 'alpha' of tomsrv:tomamp into alpha

diff --git a/debian/changelog b/debian/changelog
index a0b1419..25fecc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+tomamp (0.2.1-maemo1) unstable; urgency=low
+
+  * New application icon
+  * Bugfixes
+
+ -- Tamas Marki <tmarki@gmail.com>  Tue, 30 Aug 2010 17:44:07 +0200
+
+
+tomamp (0.2-maemo1) unstable; urgency=low
+
+  * Swappable toolbars
+  * Lots of new file formats supported
+  * Auto/landscape/portrait orientation in Maemo 5
+  * Change column order and hide columns
+  * Control column
+  * Enqueue song feature
+  * Playlist controls (up, down, remove)
+  * Options dialog
+  
+
+ -- Tamas Marki <tmarki@gmail.com>  Tue, 20 Aug 2010 23:08:07 +0200
+
 tomamp (0.1-maemo2) unstable; urgency=low
 
   * Package fix again :(

diff --git a/tomamp/images/Tomamp.png b/tomamp/images/Tomamp.png
index 5a92bc5..a540721 100644 (file)
Binary files a/tomamp/images/Tomamp.png and b/tomamp/images/Tomamp.png differ

diff --git a/tomamp/mainwindow.cpp b/tomamp/mainwindow.cpp
index 15bf4e0..ece1b0e 100644 (file)
--- a/tomamp/mainwindow.cpp
+++ b/tomamp/mainwindow.cpp
@@ -106,7 +106,7 @@ void MainWindow::addFiles()
     QString ext = "*." + plman.allowedExt().join(" *.");
     ext = "Music files (" + ext + ");;Playlists (*.m3u *.pls)";
     QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Files To Add"),
-                                                      folder, ext, 0, QFileDialog::DontUseNativeDialog);
+                                                      folder, ext);
 
     if (files.isEmpty())
         return;
@@ -166,7 +166,7 @@ void MainWindow::addUrl()
 
 void MainWindow::about()
 {
-    QMessageBox::information(this, tr("About TomAmp v0.2"),
+    QMessageBox::information(this, tr("About TomAmp v0.2.1"),
         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"

diff --git a/tomamp/optiondialog.cpp b/tomamp/optiondialog.cpp
index a7d22b9..ccaecbd 100644 (file)
--- a/tomamp/optiondialog.cpp
+++ b/tomamp/optiondialog.cpp
@@ -20,7 +20,7 @@ OptionDialog::~OptionDialog ()
     foreach (QObject* child, children())
     {
         QCheckBox* cb = qobject_cast<QCheckBox*>(child);
-        if (cb && cb->isChecked ())
+        if (cb && cb->isChecked () && availableHeaders.indexOf(cb->text()) >= 0)
         {
             h << cb->text ();
         }
@@ -53,9 +53,10 @@ void OptionDialog::setupUi()
     sub->addWidget(lab);
     headerLayout = new QVBoxLayout;
     QStringList headers = settings.value ("headers", QStringList ()).toStringList();
-    qDebug () << "Available headers: " << availableHeaders;
+    if (!headers.size())
+        headers = availableHeaders.mid(0, 3);
     foreach (QString str, availableHeaders)
-    {\
+    {
         QHBoxLayout *cont = new QHBoxLayout;
         QCheckBox* box = new QCheckBox (str);
         if (headers.indexOf(str) >= 0)