X-Git-Url: http://git.maemo.org/git/?p=groove;a=blobdiff_plain;f=groove.h;h=046508384ebda871da4a677eda10641c42de3651;hp=3bb0000984b6f415949c0d8aba028b116557cce0;hb=refs%2Fheads%2FTest;hpb=256f3e93e093f74932bbf2ac33d9aa74d24a9134

diff --git a/groove.h b/groove.h
index 3bb0000..0465083 100644
--- a/groove.h
+++ b/groove.h
@@ -3,10 +3,17 @@
 #include <QtGui>
 #include "gscom.h"
 #include "splayer.h"
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
 #include "qmaemo5rotator.h"
+#endif
 #include <QMenuBar>
 #include "playlist.h"
 #include "grooveprogressbar.h"
+#include "topbar.h"
+#include "vkb.h"
+#include "bottombar.h"
+//#include "mpgplayer.h"
+#include "pwin.h"
 
 class groove : public QWidget
 {
@@ -24,10 +31,17 @@ public slots:
     void stop();
     void moreB();
     void orientationChanged();
+    void performSearch(QString);
 private slots:
     void progressUpdate(int,qint64,qint64);
     void addSongPlaylist();
+    void showOthers();
+    void togglePlaylist();
+    void showSettings();
 private:
+    void resizeEvent(QResizeEvent *);
+    //mpgplayer *mpg;
+    bottomBar *bBar;
     sPlayer *player;
     QMenuBar *mBar;
     QPushButton *sMethod;
@@ -37,9 +51,12 @@ private:
     QPushButton *button;
     bool portrait;
     gscom *gs;
+    pWin *pwindow;
+    QStackedWidget *stack;
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
     QMaemo5Rotator *rot;
+#endif
     playlist *pl;
-    grooveProgressBar *pd;
 
 };