Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidgetgui.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index 8be7a2f..f47ddcc 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |||
@@ -38,52 +38,50 @@ | |||
38 | #include <qpe/storage.h> | 38 | #include <qpe/storage.h> |
39 | #include <qpe/mimetype.h> | 39 | #include <qpe/mimetype.h> |
40 | #include <qpe/config.h> | 40 | #include <qpe/config.h> |
41 | #include <qpe/global.h> | 41 | #include <qpe/global.h> |
42 | #include <qpe/resource.h> | 42 | #include <qpe/resource.h> |
43 | 43 | ||
44 | #include <qpopupmenu.h> | 44 | #include <qpopupmenu.h> |
45 | #include <qaction.h> | 45 | #include <qaction.h> |
46 | #include <qcursor.h> | 46 | #include <qcursor.h> |
47 | #include <qdir.h> | 47 | #include <qdir.h> |
48 | #include <qlayout.h> | 48 | #include <qlayout.h> |
49 | 49 | ||
50 | #include "playlistselection.h" | 50 | #include "playlistselection.h" |
51 | #include "playlistwidget.h" | 51 | #include "playlistwidget.h" |
52 | #include "mediaplayerstate.h" | 52 | #include "mediaplayerstate.h" |
53 | #include "inputDialog.h" | 53 | #include "inputDialog.h" |
54 | 54 | ||
55 | //only needed for the random play | 55 | //only needed for the random play |
56 | #include <stdlib.h> | 56 | #include <stdlib.h> |
57 | 57 | ||
58 | #include "audiowidget.h" | 58 | #include "audiowidget.h" |
59 | #include "videowidget.h" | 59 | #include "videowidget.h" |
60 | #include "mediaplayerstate.h" | 60 | #include "mediaplayerstate.h" |
61 | 61 | ||
62 | extern MediaPlayerState *mediaPlayerState; | 62 | PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name ) |
63 | 63 | : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) { | |
64 | PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl ) | ||
65 | : QMainWindow( parent, name, fl ) { | ||
66 | 64 | ||
67 | d = new PlayListWidgetPrivate; | 65 | d = new PlayListWidgetPrivate; |
68 | d->setDocumentUsed = FALSE; | 66 | d->setDocumentUsed = FALSE; |
69 | 67 | ||
70 | setBackgroundMode( PaletteButton ); | 68 | setBackgroundMode( PaletteButton ); |
71 | setToolBarsMovable( FALSE ); | 69 | setToolBarsMovable( FALSE ); |
72 | 70 | ||
73 | // Create Toolbar | 71 | // Create Toolbar |
74 | QPEToolBar *toolbar = new QPEToolBar( this ); | 72 | QPEToolBar *toolbar = new QPEToolBar( this ); |
75 | toolbar->setHorizontalStretchable( TRUE ); | 73 | toolbar->setHorizontalStretchable( TRUE ); |
76 | 74 | ||
77 | // Create Menubar | 75 | // Create Menubar |
78 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); | 76 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); |
79 | menu->setMargin( 0 ); | 77 | menu->setMargin( 0 ); |
80 | 78 | ||
81 | bar = new QPEToolBar( this ); | 79 | bar = new QPEToolBar( this ); |
82 | bar->setLabel( tr( "Play Operations" ) ); | 80 | bar->setLabel( tr( "Play Operations" ) ); |
83 | 81 | ||
84 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); | 82 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); |
85 | tbDeletePlaylist->setFlat( TRUE ); | 83 | tbDeletePlaylist->setFlat( TRUE ); |
86 | tbDeletePlaylist->setFixedSize( 20, 20 ); | 84 | tbDeletePlaylist->setFixedSize( 20, 20 ); |
87 | 85 | ||
88 | tbDeletePlaylist->hide(); | 86 | tbDeletePlaylist->hide(); |
89 | 87 | ||
@@ -200,29 +198,29 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags | |||
200 | playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE ); | 198 | playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE ); |
201 | Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 ); | 199 | Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 ); |
202 | 200 | ||
203 | tabWidget->insertTab( LTab, tr( "Lists" ) ); | 201 | tabWidget->insertTab( LTab, tr( "Lists" ) ); |
204 | 202 | ||
205 | setCentralWidget( vbox5 ); | 203 | setCentralWidget( vbox5 ); |
206 | } | 204 | } |
207 | 205 | ||
208 | 206 | ||
209 | 207 | ||
210 | PlayListWidgetGui::~PlayListWidgetGui() { | 208 | PlayListWidgetGui::~PlayListWidgetGui() { |
211 | } | 209 | } |
212 | 210 | ||
213 | void PlayListWidgetGui::setView( char view ) { | 211 | void PlayListWidgetGui::setView( char view ) { |
214 | if ( view == 'l' ) | 212 | if ( view == 'l' ) |
215 | showMaximized(); | 213 | showMaximized(); |
216 | else | 214 | else |
217 | hide(); | 215 | hide(); |
218 | } | 216 | } |
219 | 217 | ||
220 | 218 | ||
221 | void PlayListWidgetGui::setActiveWindow() { | 219 | void PlayListWidgetGui::setActiveWindow() { |
222 | // qDebug("SETTING active window"); | 220 | // qDebug("SETTING active window"); |
223 | // When we get raised we need to ensure that it switches views | 221 | // When we get raised we need to ensure that it switches views |
224 | MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType(); | 222 | MediaPlayerState::DisplayType origDisplayType = mediaPlayerState.displayType(); |
225 | mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate | 223 | mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); // invalidate |
226 | mediaPlayerState->setDisplayType( origDisplayType ); // now switch back | 224 | mediaPlayerState.setDisplayType( origDisplayType ); // now switch back |
227 | } | 225 | } |
228 | 226 | ||