summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp8
-rw-r--r--core/multimedia/opieplayer/inputDialog.cpp9
-rw-r--r--core/multimedia/opieplayer/om3u.cpp43
-rw-r--r--core/multimedia/opieplayer/om3u.h44
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp19
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp9
6 files changed, 68 insertions, 64 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index d135647..2918097 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -22,9 +22,9 @@
22 22
23/* OPIE */ 23/* OPIE */
24#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
25#include <qpe/resource.h>
26#include <qpe/config.h> 25#include <qpe/config.h>
27#include <opie2/odebug.h> 26#include <opie2/odebug.h>
27#include <opie2/oresource.h>
28 28
29/* QT */ 29/* QT */
30#include <qdir.h> 30#include <qdir.h>
@@ -92,9 +92,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
92 92
93 // odebug << "skin path " + skinPath << oendl; 93 // odebug << "skin path " + skinPath << oendl;
94 94
95 pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); 95 pixBg = new QPixmap( Opie::Core::OResource::loadPixmap( QString("%1/background").arg(skinPath) ) );
96 imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); 96 imgUp = new QImage( Opie::Core::OResource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
97 imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); 97 imgDn = new QImage( Opie::Core::OResource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
98 98
99 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); 99 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
100 imgButtonMask->fill( 0 ); 100 imgButtonMask->fill( 0 );
diff --git a/core/multimedia/opieplayer/inputDialog.cpp b/core/multimedia/opieplayer/inputDialog.cpp
index 44a1cdd..b76004e 100644
--- a/core/multimedia/opieplayer/inputDialog.cpp
+++ b/core/multimedia/opieplayer/inputDialog.cpp
@@ -1,8 +1,9 @@
1#include "inputDialog.h" 1#include "inputDialog.h"
2 2
3#include <qpe/resource.h>
4
5#include <opie2/ofiledialog.h> 3#include <opie2/ofiledialog.h>
4#include <opie2/oresource.h>
5
6#include <qpe/applnk.h>
6 7
7#include <qlineedit.h> 8#include <qlineedit.h>
8#include <qpushbutton.h> 9#include <qpushbutton.h>
@@ -18,8 +19,8 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags
18 setCaption( tr( name ) ); 19 setCaption( tr( name ) );
19 20
20 QPushButton *browserButton; 21 QPushButton *browserButton;
21 browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); 22 browserButton = new QPushButton( Opie::Core::OResource::loadPixmap("fileopen", Opie::Core::OResource::SmallIcon),"",this,"BrowseButton");
22 browserButton->setGeometry( QRect( 205, 10, 22, 22)); 23 browserButton->setGeometry( QRect( 205, 10, AppLnk::smallIconSize(), AppLnk::smallIconSize()));
23 connect( browserButton, SIGNAL(released()),this,SLOT(browse())); 24 connect( browserButton, SIGNAL(released()),this,SLOT(browse()));
24 LineEdit1 = new QLineEdit( this, "LineEdit1" ); 25 LineEdit1 = new QLineEdit( this, "LineEdit1" );
25 LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); 26 LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 7149a8e..48aa47e 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -1,32 +1,31 @@
1/* 1/*
2                This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3
4 Copyright (c) 2002 L. Potter <ljp@llornkcor.com> 4 Copyright (C) 2002 L. Potter <ljp@llornkcor.com>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU General Public 10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17 : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details. 21++=   -.     .`     .: details.
22 :     =  ...= . :.=- 22:     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29
30*/ 29*/
31 30
32#include "om3u.h" 31#include "om3u.h"
diff --git a/core/multimedia/opieplayer/om3u.h b/core/multimedia/opieplayer/om3u.h
index 9c7cf9a..b944d6f 100644
--- a/core/multimedia/opieplayer/om3u.h
+++ b/core/multimedia/opieplayer/om3u.h
@@ -1,32 +1,31 @@
1/* 1/*
2                This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3
4 Copyright (c) 2002 L. Potter <ljp@llornkcor.com> 4 Copyright (C) 2002 L. Potter <ljp@llornkcor.com>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU General Public 10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17 : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details. 21++=   -.     .`     .: details.
22 :     =  ...= . :.=- 22:     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29
30*/ 29*/
31 30
32#ifndef OM3U_H 31#ifndef OM3U_H
@@ -39,7 +38,6 @@
39#include <qpe/storage.h> 38#include <qpe/storage.h>
40#include <qpe/mimetype.h> 39#include <qpe/mimetype.h>
41#include <qpe/global.h> 40#include <qpe/global.h>
42#include <qpe/resource.h>
43 41
44#include <qdir.h> 42#include <qdir.h>
45#include <qregexp.h> 43#include <qregexp.h>
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
@@ -28,9 +28,11 @@
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>
@@ -88,8 +90,9 @@ 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 );
@@ -127,7 +130,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
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
@@ -143,7 +146,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
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);
@@ -177,9 +180,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
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
@@ -1001,7 +1006,7 @@ void PlayListWidget::populateAudioView() {
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
@@ -1030,7 +1035,7 @@ void PlayListWidget::populateVideoView() {
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}
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index c545511..89dd89e 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -22,13 +22,14 @@
22#include "mediaplayerstate.h" 22#include "mediaplayerstate.h"
23 23
24/* OPIE */ 24/* OPIE */
25#include <qpe/resource.h>
26#include <qpe/mediaplayerplugininterface.h> 25#include <qpe/mediaplayerplugininterface.h>
27#include <qpe/config.h> 26#include <qpe/config.h>
28#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
29#include <opie2/odebug.h> 28#include <opie2/odebug.h>
29#include <opie2/oresource.h>
30 30
31/* QT */ 31/* QT */
32#include <qbitmap.h>
32#include <qdir.h> 33#include <qdir.h>
33#include <qslider.h> 34#include <qslider.h>
34 35
@@ -90,9 +91,9 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
90 91
91// QString skinPath = "opieplayer2/skins/" + skin; 92// QString skinPath = "opieplayer2/skins/" + skin;
92 93
93 pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); 94 pixBg = new QPixmap( Opie::Core::OResource::loadPixmap( QString("%1/background").arg(skinPath) ) );
94 imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); 95 imgUp = new QImage( Opie::Core::OResource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
95 imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); 96 imgDn = new QImage( Opie::Core::OResource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
96 97
97 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); 98 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
98 imgButtonMask->fill( 0 ); 99 imgButtonMask->fill( 0 );