this will break all functionality for now

[groove] / groove.cpp

diff --git a/groove.cpp b/groove.cpp
index 46da9d3..050a743 100644 (file)
--- a/groove.cpp
+++ b/groove.cpp
@@ -1,5 +1,5 @@
 #include "groove.h"
-
+#include "qmaemo5rotator.h"
 
 
 groove::groove(QWidget *parent) :
@@ -12,16 +12,25 @@ groove::groove(QWidget *parent) :
     player = new sPlayer();
     QHBoxLayout *layout = new QHBoxLayout();
     QVBoxLayout *vlayout = new QVBoxLayout();
+    QHBoxLayout *bottomLayout = new QHBoxLayout();
     button = new QPushButton("Search");
     QPushButton *dButton = new QPushButton("Play");
+    QPushButton *stopButton = new QPushButton("Stop");
+    QPushButton *moreButton = new QPushButton("...");
     resultView = new QTableView();
     QMenu *pushMenu = new QMenu();
     //showFullScreen();
     lineEdit->insert("");
     lineEdit->setDisabled(true);
     pushMenu->addAction("Song:");
-    pushMenu->addAction("Artist:");
-    pushMenu->addAction("Album:");
+    //pushMenu->addAction("Artist:");
+    //pushMenu->addAction("Album:");
+
+    QMenu *moreAction = new QMenu();
+    moreAction->addAction("Playlist");
+    moreAction->addAction("Add current song to playlist");
+    moreAction->addAction("Show download Progress");
+    moreButton->setMenu(moreAction);
 
     //sMethod->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Maximum);
     sMethod->setMaximumWidth(sMethod->sizeHint().rwidth());
@@ -37,14 +46,22 @@ groove::groove(QWidget *parent) :
     resultView->setSelectionMode(QAbstractItemView::SingleSelection);
     resultView->setEditTriggers(QAbstractItemView::NoEditTriggers);
     resultView->setColumnHidden(2,true);
+    resultView->setColumnHidden(3,true);
     resultView->setAutoScroll(false);
-
+    /*QPalette pal = resultView->palette();
+    pal.setBrush(QPalette::Highlight,QBrush(Qt::transparent,Qt::NoBrush));
+    resultView->setPalette(pal);*/
+    portrait = false;
     layout->addWidget(sMethod);
+    rot = new QMaemo5Rotator(QMaemo5Rotator::AutomaticBehavior,this);
     layout->addWidget(lineEdit);
     layout->addWidget(button);
     vlayout->addLayout(layout);
     vlayout->addWidget(resultView);
-    vlayout->addWidget(dButton);
+    vlayout->addLayout(bottomLayout);
+    bottomLayout->addWidget(dButton);
+    bottomLayout->addWidget(stopButton);
+    bottomLayout->addWidget(moreButton);
     vlayout->setMenuBar(mBar);
     setLayout(vlayout);
     setWindowTitle("GrooveShark");
@@ -56,7 +73,12 @@ groove::groove(QWidget *parent) :
     connect(lineEdit,SIGNAL(returnPressed()),this, SLOT(search()));
     connect(pushMenu,SIGNAL(triggered(QAction*)),this,SLOT(changeS(QAction*)));
     connect(dButton,SIGNAL(clicked()),this, SLOT(play()));
-    connect(gs,SIGNAL(sKeyFound()),this,SLOT(startP()));
+    connect(stopButton,SIGNAL(clicked()),this,SLOT(stop()));
+    connect(moreButton,SIGNAL(clicked()),this,SLOT(moreB()));
+    //connect(rotator,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChanged()));
+    pl = new playlist();
+    pl->setGscom(gs);
+    player->setPlaylist(pl);
 }
 void groove::search()
 {
@@ -112,17 +134,26 @@ void groove::play()
         if(item == 0)
             return;
         //gs->getSong();
-        gs->getSong(item->text());
+        player->play(pl->addSong(item));
     }
     //selected.
     //if
 }
-void groove::startP()
+void groove::stop()
 {
-    if(!gs->sku.isValid())
-        return;
-    player->~sPlayer();
-    player = new sPlayer();
-    player->play(gs->streamID,gs->sku);
-
+    player->stop();
+}
+void groove::moreB()
+{
+    qDebug() << "He pressed the button";
+}
+void groove::orientationChanged()
+{
+#ifdef Q_WS_MAEMO_5
+    QRect screenGeometry = QApplication::desktop()->screenGeometry();
+    if (screenGeometry.width() > screenGeometry.height())
+        portrait = false;
+    else
+        portrait = true;
+#endif
 }