*

[groove] / groove.cpp

diff --git a/groove.cpp b/groove.cpp
index 3c17a36..50accae 100644 (file)
--- a/groove.cpp
+++ b/groove.cpp
@@ -67,6 +67,8 @@ groove::groove(QWidget *parent) :
     layout->addWidget(lineEdit);
     layout->addWidget(button);
     vlayout->setContentsMargins(QMargins(0,0,0,0));
+    //vlayout->setMargin(0);
+    vlayout->setSpacing(0);
     vlayout->addWidget(ok);
     //vlayout->addLayout(layout);
     stack = new QStackedWidget();
@@ -82,7 +84,6 @@ groove::groove(QWidget *parent) :
     bottomLayout->addWidget(nextB);
     bottomLayout->addWidget(moreButton);*/
     vlayout->setMenuBar(mBar);
-    vlayout->setContentsMargins(QMargins(0,0,0,0));
     setLayout(vlayout);
     setWindowTitle("Groove");
     //Create New Grooveshark connection
@@ -113,13 +114,21 @@ groove::groove(QWidget *parent) :
     connect(bBar,SIGNAL(pause()),this,SLOT(stop()));
 
     connect(bBar,SIGNAL(back()),player,SLOT(back()));
+    connect(bBar,SIGNAL(settings()),this,SLOT(showSettings()));
     bBar->setPlaybackProgress(100,100);
     pwindow = new pWin();
     stack->addWidget(pwindow);
     stack->setCurrentWidget(resultView);
     connect(bBar,SIGNAL(list()),this,SLOT(togglePlaylist()));
+    pwindow->setModel(pl);
 
 }
+void groove::showSettings(){
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
+    rot->test();
+#endif
+}
+
 void groove::togglePlaylist()
 {
     if(stack->currentWidget()==pwindow)
@@ -132,6 +141,7 @@ void groove::performSearch(QString s)
 {
     qDebug() << s;
     resultView->setModel(gs->getSongModel(s));
+    this->stack->setCurrentWidget(this->resultView);
 }
 
 void groove::search()
@@ -169,8 +179,8 @@ void groove::finishedS()
     model = gs->getModel();
     resultView->setModel(model);
     button->setText("Search");
-    resultView->setColumnWidth(0,resultView->viewport()->width()/2);
-    resultView->setColumnWidth(1,resultView->viewport()->width()/2);
+    resultView->setColumnWidth(0,resultView->maximumViewportSize().width()/2);
+    resultView->setColumnWidth(1,resultView->maximumViewportSize().width()/2);
     lineEdit->setDisabled(false);
     resultView->setColumnHidden(2,true);
 }
@@ -199,7 +209,7 @@ void groove::play()
         if(item == 0)
             return;
         //gs->getSong();
-        player->play(pl->addSong(item));
+        player->play(pl->addSong(item,model->item(selected.first().row(),0)->text()));
     }
     //selected.
     //if
@@ -215,12 +225,12 @@ void groove::addSongPlaylist()
         //gs->getSong();
         if(pl->currentplaying() == -1)
         {
-            player->play(pl->addSong(item));
+            player->play(pl->addSong(item,model->item(selected.first().row(),0)->text()));
         }
         else
-            pl->addSong(item);
+            pl->addSong(item,model->item(selected.first().row(),0)->text());
         model->item(selected.first().row(),1)->setText("Added to Playlist");;
-        pwindow->addSong(model->item(selected.first().row(),0)->text());
+        //pwindow->addSong(model->item(selected.first().row(),0)->text());
     }
 
 }
@@ -241,6 +251,16 @@ void groove::progressUpdate(int p, qint64 d, qint64 t)
     bBar->setPlaybackProgress(d,t);
     //}
 }
+void groove::resizeEvent(QResizeEvent *)
+{
+    if(resultView->isColumnHidden(2))
+    {
+    resultView->setColumnWidth(0,resultView->maximumViewportSize().width()/2);
+    resultView->setColumnWidth(1,resultView->maximumViewportSize().width()/2);
+    }
+    else
+        resultView->setColumnWidth(0,resultView->maximumViewportSize().width());
+}
 
 void groove::orientationChanged()
 {