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.cpp | |
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.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index 5fc0c39..293bf45 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |||
@@ -31,21 +31,12 @@ | |||
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpemenubar.h> | 34 | |
35 | #include <qpe/qpetoolbar.h> | 35 | #include <qtoolbar.h> |
36 | #include <qpe/fileselector.h> | ||
37 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
38 | #include <qpe/storage.h> | 37 | |
39 | #include <qpe/mimetype.h> | ||
40 | #include <qpe/config.h> | ||
41 | #include <qpe/global.h> | ||
42 | #include <qpe/resource.h> | ||
43 | |||
44 | #include <qpopupmenu.h> | ||
45 | #include <qaction.h> | ||
46 | #include <qcursor.h> | ||
47 | #include <qdir.h> | ||
48 | #include <qlayout.h> | 38 | #include <qlayout.h> |
39 | #include <qmenubar.h> | ||
49 | 40 | ||
50 | #include "playlistselection.h" | 41 | #include "playlistselection.h" |
51 | #include "playlistwidget.h" | 42 | #include "playlistwidget.h" |
@@ -53,9 +44,6 @@ | |||
53 | #include "inputDialog.h" | 44 | #include "inputDialog.h" |
54 | #include "playlistfileview.h" | 45 | #include "playlistfileview.h" |
55 | 46 | ||
56 | //only needed for the random play | ||
57 | #include <stdlib.h> | ||
58 | |||
59 | #include "mediaplayerstate.h" | 47 | #include "mediaplayerstate.h" |
60 | 48 | ||
61 | PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name ) | 49 | PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name ) |
@@ -68,14 +56,14 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg | |||
68 | setToolBarsMovable( FALSE ); | 56 | setToolBarsMovable( FALSE ); |
69 | 57 | ||
70 | // Create Toolbar | 58 | // Create Toolbar |
71 | QPEToolBar *toolbar = new QPEToolBar( this ); | 59 | QToolBar *toolbar = new QToolBar( this ); |
72 | toolbar->setHorizontalStretchable( TRUE ); | 60 | toolbar->setHorizontalStretchable( TRUE ); |
73 | 61 | ||
74 | // Create Menubar | 62 | // Create Menubar |
75 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); | 63 | QMenuBar *menu = new QMenuBar( toolbar ); |
76 | menu->setMargin( 0 ); | 64 | menu->setMargin( 0 ); |
77 | 65 | ||
78 | bar = new QPEToolBar( this ); | 66 | bar = new QToolBar( this ); |
79 | bar->setLabel( tr( "Play Operations" ) ); | 67 | bar->setLabel( tr( "Play Operations" ) ); |
80 | 68 | ||
81 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); | 69 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); |
@@ -148,7 +136,7 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg | |||
148 | Alayout->setSpacing( 2 ); | 136 | Alayout->setSpacing( 2 ); |
149 | Alayout->setMargin( 2 ); | 137 | Alayout->setMargin( 2 ); |
150 | // no m3u's here please | 138 | // no m3u's here please |
151 | audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;audio/x-ogg", "opieplayer2/musicfile", aTab, "Audioview" ); | 139 | audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;application/ogg", "opieplayer2/musicfile", aTab, "Audioview" ); |
152 | Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); | 140 | Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); |
153 | tabWidget->insertTab( aTab, tr( "Audio" ) ); | 141 | tabWidget->insertTab( aTab, tr( "Audio" ) ); |
154 | 142 | ||