From 1cc97c3b70f59b90dc4bf032a14198dc8bd07f2e Mon Sep 17 00:00:00 2001 From: drw Date: Wed, 15 Jun 2005 19:44:04 +0000 Subject: Resource -> OResource and fix doc headers --- (limited to 'core') 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 @@ /* OPIE */ #include -#include #include #include +#include /* QT */ #include @@ -92,9 +92,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : // odebug << "skin path " + skinPath << oendl; - pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); - imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); - imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); + pixBg = new QPixmap( Opie::Core::OResource::loadPixmap( QString("%1/background").arg(skinPath) ) ); + imgUp = new QImage( Opie::Core::OResource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); + imgDn = new QImage( Opie::Core::OResource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); 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 @@ #include "inputDialog.h" -#include - #include +#include + +#include #include #include @@ -18,8 +19,8 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags setCaption( tr( name ) ); QPushButton *browserButton; - browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); - browserButton->setGeometry( QRect( 205, 10, 22, 22)); + browserButton = new QPushButton( Opie::Core::OResource::loadPixmap("fileopen", Opie::Core::OResource::SmallIcon),"",this,"BrowseButton"); + browserButton->setGeometry( QRect( 205, 10, AppLnk::smallIconSize(), AppLnk::smallIconSize())); connect( browserButton, SIGNAL(released()),this,SLOT(browse())); LineEdit1 = new QLineEdit( this, "LineEdit1" ); 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 @@ /* -                This file is part of the Opie Project +                 This file is part of the Opie Project - Copyright (c) 2002 L. Potter + Copyright (C) 2002 L. Potter =. .=l. -           .>+-= - _;:,     .>    :=|. This program is free software; you can -.> <`_,   >  .   <= redistribute it and/or modify it under -:`=1 )Y*s>-.--   : the terms of the GNU General Public -.="- .-=="i,     .._ License as published by the Free Software - - .   .-<_>     .<> Foundation; either version 2 of the License, -     ._= =}       : or (at your option) any later version. -    .%`+i>       _;_. -    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU -..}^=.=       =       ; General Public License for more -++=   -.     .`     .: details. - :     =  ...= . :.=- - -.   .:....=;==+<; You should have received a copy of the GNU -  -_. . .   )=.  = General Public License along with -    --        :-=` this library; see the file COPYING.LIB. +           .>+-= + _;:,     .>    :=|. This program is free software; you can +.> <`_,   >  .   <= redistribute it and/or modify it under +:`=1 )Y*s>-.--   : the terms of the GNU Library General Public +.="- .-=="i,     .._ License as published by the Free Software + - .   .-<_>     .<> Foundation; either version 2 of the License, +     ._= =}       : or (at your option) any later version. +    .%`+i>       _;_. +    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU +..}^=.=       =       ; Library General Public License for more +++=   -.     .`     .: details. +:     =  ...= . :.=- + -.   .:....=;==+<; You should have received a copy of the GNU +  -_. . .   )=.  = Library General Public License along with +    --        :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ #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 @@ /* -                This file is part of the Opie Project +                 This file is part of the Opie Project - Copyright (c) 2002 L. Potter + Copyright (C) 2002 L. Potter =. .=l. -           .>+-= - _;:,     .>    :=|. This program is free software; you can -.> <`_,   >  .   <= redistribute it and/or modify it under -:`=1 )Y*s>-.--   : the terms of the GNU General Public -.="- .-=="i,     .._ License as published by the Free Software - - .   .-<_>     .<> Foundation; either version 2 of the License, -     ._= =}       : or (at your option) any later version. -    .%`+i>       _;_. -    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU -..}^=.=       =       ; General Public License for more -++=   -.     .`     .: details. - :     =  ...= . :.=- - -.   .:....=;==+<; You should have received a copy of the GNU -  -_. . .   )=.  = General Public License along with -    --        :-=` this library; see the file COPYING.LIB. +           .>+-= + _;:,     .>    :=|. This program is free software; you can +.> <`_,   >  .   <= redistribute it and/or modify it under +:`=1 )Y*s>-.--   : the terms of the GNU Library General Public +.="- .-=="i,     .._ License as published by the Free Software + - .   .-<_>     .<> Foundation; either version 2 of the License, +     ._= =}       : or (at your option) any later version. +    .%`+i>       _;_. +    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU +..}^=.=       =       ; Library General Public License for more +++=   -.     .`     .: details. +:     =  ...= . :.=- + -.   .:....=;==+<; You should have received a copy of the GNU +  -_. . .   )=.  = Library General Public License along with +    --        :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ #ifndef OM3U_H @@ -39,7 +38,6 @@ #include #include #include -#include #include #include 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 @@ #include "videowidget.h" /* OPIE */ +#include #include #include #include +#include /* QT */ #include @@ -88,8 +90,9 @@ public: ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) : QToolButton( parent, name ) { setTextLabel( name ); - setPixmap( Resource::loadPixmap( icon ) ); + setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ); setAutoRaise( TRUE ); + setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); setFocusPolicy( QWidget::NoFocus ); setToggleButton( t ); connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); @@ -127,7 +130,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) setBackgroundMode( PaletteButton ); setCaption( tr("OpiePlayer") ); - setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "opieplayer/MPEGPlayer", Opie::Core::OResource::SmallIcon ) ); setToolBarsMovable( FALSE ); @@ -143,7 +146,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) bar->setLabel( tr( "Play Operations" ) ); // d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", // this , SLOT( addSelected()) ); - tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); + tbDeletePlaylist = new QPushButton( Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),"",bar,"close"); tbDeletePlaylist->setFlat(TRUE); tbDeletePlaylist->setFixedSize(20,20); @@ -177,9 +180,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) QPopupMenu *pmView = new QPopupMenu( this ); menu->insertItem( tr( "View" ), pmView ); - fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); + fullScreenButton = new QAction(tr("Full Screen"), Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), + QString::null, 0, this, 0); fullScreenButton->addTo(pmView); - scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0); + scaleButton = new QAction(tr("Scale"), Opie::Core::OResource::loadPixmap("opieplayer/scale", Opie::Core::OResource::SmallIcon), + QString::null, 0, this, 0); scaleButton->addTo(pmView); @@ -1001,7 +1006,7 @@ void PlayListWidget::populateAudioView() { // odebug << dit.current()->name() << oendl; newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number(size ), storage, dit.current()->file()); - newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); + newItem->setPixmap(0, Opie::Core::OResource::loadPixmap( "opieplayer/musicfile", Opie::Core::OResource::SmallIcon )); } } @@ -1030,7 +1035,7 @@ void PlayListWidget::populateVideoView() { newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file() ).size() ), storage, Vdit.current()->file()); - newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); + newItem->setPixmap(0, Opie::Core::OResource::loadPixmap( "opieplayer/videofile", Opie::Core::OResource::SmallIcon )); } } } 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 @@ #include "mediaplayerstate.h" /* OPIE */ -#include #include #include #include #include +#include /* QT */ +#include #include #include @@ -90,9 +91,9 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : // QString skinPath = "opieplayer2/skins/" + skin; - pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); - imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); - imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); + pixBg = new QPixmap( Opie::Core::OResource::loadPixmap( QString("%1/background").arg(skinPath) ) ); + imgUp = new QImage( Opie::Core::OResource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); + imgDn = new QImage( Opie::Core::OResource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); imgButtonMask->fill( 0 ); -- cgit v0.9.0.2