Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index db2bf1b..c0a0029 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -25,15 +25,17 @@ | |||
25 | #include "mediaplayerstate.h" | 25 | #include "mediaplayerstate.h" |
26 | #include "inputDialog.h" | 26 | #include "inputDialog.h" |
27 | #include "audiowidget.h" | 27 | #include "audiowidget.h" |
28 | #include "videowidget.h" | 28 | #include "videowidget.h" |
29 | 29 | ||
30 | /* OPIE */ | 30 | /* OPIE */ |
31 | #include <qpe/qpeapplication.h> | ||
31 | #include <qpe/qpemenubar.h> | 32 | #include <qpe/qpemenubar.h> |
32 | #include <qpe/lnkproperties.h> | 33 | #include <qpe/lnkproperties.h> |
33 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | #include <opie2/oresource.h> | ||
34 | 36 | ||
35 | /* QT */ | 37 | /* QT */ |
36 | #include <qtoolbar.h> | 38 | #include <qtoolbar.h> |
37 | #include <qaction.h> | 39 | #include <qaction.h> |
38 | #include <qlayout.h> | 40 | #include <qlayout.h> |
39 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
@@ -85,14 +87,15 @@ public: | |||
85 | 87 | ||
86 | class ToolButton : public QToolButton { | 88 | class ToolButton : public QToolButton { |
87 | public: | 89 | public: |
88 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 90 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
89 | : QToolButton( parent, name ) { | 91 | : QToolButton( parent, name ) { |
90 | setTextLabel( name ); | 92 | setTextLabel( name ); |
91 | setPixmap( Resource::loadPixmap( icon ) ); | 93 | setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ); |
92 | setAutoRaise( TRUE ); | 94 | setAutoRaise( TRUE ); |
95 | setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); | ||
93 | setFocusPolicy( QWidget::NoFocus ); | 96 | setFocusPolicy( QWidget::NoFocus ); |
94 | setToggleButton( t ); | 97 | setToggleButton( t ); |
95 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); | 98 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); |
96 | QPEMenuToolFocusManager::manager()->addWidget( this ); | 99 | QPEMenuToolFocusManager::manager()->addWidget( this ); |
97 | } | 100 | } |
98 | }; | 101 | }; |
@@ -124,13 +127,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
124 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), | 127 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), |
125 | this, SLOT( qcopReceive(const QCString&,const QByteArray&)) ); | 128 | this, SLOT( qcopReceive(const QCString&,const QByteArray&)) ); |
126 | 129 | ||
127 | setBackgroundMode( PaletteButton ); | 130 | setBackgroundMode( PaletteButton ); |
128 | 131 | ||
129 | setCaption( tr("OpiePlayer") ); | 132 | setCaption( tr("OpiePlayer") ); |
130 | setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); | 133 | setIcon( Opie::Core::OResource::loadPixmap( "opieplayer/MPEGPlayer", Opie::Core::OResource::SmallIcon ) ); |
131 | 134 | ||
132 | setToolBarsMovable( FALSE ); | 135 | setToolBarsMovable( FALSE ); |
133 | 136 | ||
134 | // Create Toolbar | 137 | // Create Toolbar |
135 | QToolBar *toolbar = new QToolBar( this ); | 138 | QToolBar *toolbar = new QToolBar( this ); |
136 | toolbar->setHorizontalStretchable( TRUE ); | 139 | toolbar->setHorizontalStretchable( TRUE ); |
@@ -140,13 +143,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
140 | menu->setMargin( 0 ); | 143 | menu->setMargin( 0 ); |
141 | 144 | ||
142 | QToolBar *bar = new QToolBar( this ); | 145 | QToolBar *bar = new QToolBar( this ); |
143 | bar->setLabel( tr( "Play Operations" ) ); | 146 | bar->setLabel( tr( "Play Operations" ) ); |
144 | // d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", | 147 | // d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", |
145 | // this , SLOT( addSelected()) ); | 148 | // this , SLOT( addSelected()) ); |
146 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); | 149 | tbDeletePlaylist = new QPushButton( Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),"",bar,"close"); |
147 | tbDeletePlaylist->setFlat(TRUE); | 150 | tbDeletePlaylist->setFlat(TRUE); |
148 | 151 | ||
149 | tbDeletePlaylist->setFixedSize(20,20); | 152 | tbDeletePlaylist->setFixedSize(20,20); |
150 | 153 | ||
151 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", | 154 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", |
152 | this , SLOT(addSelected()) ); | 155 | this , SLOT(addSelected()) ); |
@@ -174,15 +177,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
174 | new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) ); | 177 | new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) ); |
175 | new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) ); | 178 | new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) ); |
176 | 179 | ||
177 | QPopupMenu *pmView = new QPopupMenu( this ); | 180 | QPopupMenu *pmView = new QPopupMenu( this ); |
178 | menu->insertItem( tr( "View" ), pmView ); | 181 | menu->insertItem( tr( "View" ), pmView ); |
179 | 182 | ||
180 | fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); | 183 | fullScreenButton = new QAction(tr("Full Screen"), Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), |
184 | QString::null, 0, this, 0); | ||
181 | fullScreenButton->addTo(pmView); | 185 | fullScreenButton->addTo(pmView); |
182 | scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0); | 186 | scaleButton = new QAction(tr("Scale"), Opie::Core::OResource::loadPixmap("opieplayer/scale", Opie::Core::OResource::SmallIcon), |
187 | QString::null, 0, this, 0); | ||
183 | scaleButton->addTo(pmView); | 188 | scaleButton->addTo(pmView); |
184 | 189 | ||
185 | 190 | ||
186 | skinsMenu = new QPopupMenu( this ); | 191 | skinsMenu = new QPopupMenu( this ); |
187 | menu->insertItem( tr( "Skins" ), skinsMenu ); | 192 | menu->insertItem( tr( "Skins" ), skinsMenu ); |
188 | skinsMenu->isCheckable(); | 193 | skinsMenu->isCheckable(); |
@@ -998,13 +1003,13 @@ void PlayListWidget::populateAudioView() { | |||
998 | size=0; | 1003 | size=0; |
999 | else | 1004 | else |
1000 | size = QFile( dit.current()->file() ).size(); | 1005 | size = QFile( dit.current()->file() ).size(); |
1001 | // odebug << dit.current()->name() << oendl; | 1006 | // odebug << dit.current()->name() << oendl; |
1002 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), | 1007 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), |
1003 | QString::number(size ), storage, dit.current()->file()); | 1008 | QString::number(size ), storage, dit.current()->file()); |
1004 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); | 1009 | newItem->setPixmap(0, Opie::Core::OResource::loadPixmap( "opieplayer/musicfile", Opie::Core::OResource::SmallIcon )); |
1005 | } | 1010 | } |
1006 | } | 1011 | } |
1007 | 1012 | ||
1008 | } | 1013 | } |
1009 | 1014 | ||
1010 | void PlayListWidget::populateVideoView() { | 1015 | void PlayListWidget::populateVideoView() { |
@@ -1027,13 +1032,13 @@ void PlayListWidget::populateVideoView() { | |||
1027 | 1032 | ||
1028 | QListViewItem * newItem; | 1033 | QListViewItem * newItem; |
1029 | if ( QFile( Vdit.current()->file()).exists() ) { | 1034 | if ( QFile( Vdit.current()->file()).exists() ) { |
1030 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), | 1035 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), |
1031 | QString::number( QFile( Vdit.current()->file() ).size() ), | 1036 | QString::number( QFile( Vdit.current()->file() ).size() ), |
1032 | storage, Vdit.current()->file()); | 1037 | storage, Vdit.current()->file()); |
1033 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); | 1038 | newItem->setPixmap(0, Opie::Core::OResource::loadPixmap( "opieplayer/videofile", Opie::Core::OResource::SmallIcon )); |
1034 | } | 1039 | } |
1035 | } | 1040 | } |
1036 | } | 1041 | } |
1037 | 1042 | ||
1038 | void PlayListWidget::openFile() { | 1043 | void PlayListWidget::openFile() { |
1039 | QString filename, name; | 1044 | QString filename, name; |