author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (unidiff) | |
tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/multimedia/opieplayer2/playlistwidgetgui.h | |
parent | 1c58d1407f9584fedcdae390a04e2b37e5853361 (diff) | |
download | opie-e16d333ec2e8509fc665921ca106c25325bae9e0.zip opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.gz opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidgetgui.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h index c965b0d..c0cd37a 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h | |||
@@ -34,17 +34,14 @@ | |||
34 | #ifndef PLAY_LIST_WIDGET_GUI_H | 34 | #ifndef PLAY_LIST_WIDGET_GUI_H |
35 | #define PLAY_LIST_WIDGET_GUI_H | 35 | #define PLAY_LIST_WIDGET_GUI_H |
36 | 36 | ||
37 | #include <qmainwindow.h> | 37 | #include <qmainwindow.h> |
38 | #include <qpe/applnk.h> | ||
39 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
40 | #include <qpe/qpemenubar.h> | ||
41 | 39 | ||
42 | #include <qtabwidget.h> | 40 | #include <qtabwidget.h> |
43 | #include <qpe/fileselector.h> | 41 | #include <qpe/fileselector.h> |
44 | #include <qpushbutton.h> | ||
45 | #include <qpopupmenu.h> | ||
46 | #include <qaction.h> | 42 | #include <qaction.h> |
43 | #include <qtoolbutton.h> | ||
47 | #include <qslider.h> | 44 | #include <qslider.h> |
48 | #include <qlcdnumber.h> | 45 | #include <qlcdnumber.h> |
49 | 46 | ||
50 | class PlayListWidgetPrivate; | 47 | class PlayListWidgetPrivate; |
@@ -52,9 +49,9 @@ class PlayListSelection; | |||
52 | class MediaPlayerState; | 49 | class MediaPlayerState; |
53 | class PlayListFileView; | 50 | class PlayListFileView; |
54 | 51 | ||
55 | class Config; | 52 | class Config; |
56 | class QPEToolBar; | 53 | class QToolBar; |
57 | class QListViewItem; | 54 | class QListViewItem; |
58 | class QListView; | 55 | class QListView; |
59 | class QPoint; | 56 | class QPoint; |
60 | class QAction; | 57 | class QAction; |
@@ -79,9 +76,8 @@ public: | |||
79 | setAutoRaise( TRUE ); | 76 | setAutoRaise( TRUE ); |
80 | setFocusPolicy( QWidget::NoFocus ); | 77 | setFocusPolicy( QWidget::NoFocus ); |
81 | setToggleButton( t ); | 78 | setToggleButton( t ); |
82 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); | 79 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); |
83 | QPEMenuToolFocusManager::manager()->addWidget( this ); | ||
84 | } | 80 | } |
85 | }; | 81 | }; |
86 | 82 | ||
87 | class MenuItem : public QAction { | 83 | class MenuItem : public QAction { |
@@ -120,9 +116,9 @@ protected: | |||
120 | QPopupMenu *skinsMenu; | 116 | QPopupMenu *skinsMenu; |
121 | PlayListWidgetPrivate *d; // Private implementation data | 117 | PlayListWidgetPrivate *d; // Private implementation data |
122 | QVBox *vbox1; | 118 | QVBox *vbox1; |
123 | QVBox *vbox5; | 119 | QVBox *vbox5; |
124 | QPEToolBar *bar; | 120 | QToolBar *bar; |
125 | QWidget *playListTab; | 121 | QWidget *playListTab; |
126 | void setActiveWindow(); // need to handle this to show the right view | 122 | void setActiveWindow(); // need to handle this to show the right view |
127 | void setView( char ); | 123 | void setView( char ); |
128 | 124 | ||