projects
/
groove
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://vcs.maemo.org/git/groove
[groove]
/
groove.h
diff --git
a/groove.h
b/groove.h
index
3bb0000
..
d407c69
100644
(file)
--- a/
groove.h
+++ b/
groove.h
@@
-3,10
+3,17
@@
#include <QtGui>
#include "gscom.h"
#include "splayer.h"
#include <QtGui>
#include "gscom.h"
#include "splayer.h"
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
#include "qmaemo5rotator.h"
#include "qmaemo5rotator.h"
+#endif
#include <QMenuBar>
#include "playlist.h"
#include "grooveprogressbar.h"
#include <QMenuBar>
#include "playlist.h"
#include "grooveprogressbar.h"
+#include "topbar.h"
+#include "vkb.h"
+#include "bottombar.h"
+//#include "mpgplayer.h"
+#include "plistwin.h"
class groove : public QWidget
{
class groove : public QWidget
{
@@
-24,10
+31,14
@@
public slots:
void stop();
void moreB();
void orientationChanged();
void stop();
void moreB();
void orientationChanged();
+ void performSearch(QString);
private slots:
void progressUpdate(int,qint64,qint64);
void addSongPlaylist();
private slots:
void progressUpdate(int,qint64,qint64);
void addSongPlaylist();
+ void showOthers();
private:
private:
+ //mpgplayer *mpg;
+ bottomBar *bBar;
sPlayer *player;
QMenuBar *mBar;
QPushButton *sMethod;
sPlayer *player;
QMenuBar *mBar;
QPushButton *sMethod;
@@
-37,9
+48,11
@@
private:
QPushButton *button;
bool portrait;
gscom *gs;
QPushButton *button;
bool portrait;
gscom *gs;
+ pListWin *pwindow;
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)
QMaemo5Rotator *rot;
QMaemo5Rotator *rot;
+#endif
playlist *pl;
playlist *pl;
- grooveProgressBar *pd;
};
};