| author | drw <drw> | 2005-04-29 00:12:13 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-04-29 00:12:13 (UTC) |
| commit | caedcea372fd99c7fae116ac3d0d1625f88bf138 (patch) (side-by-side diff) | |
| tree | 7f9de6acc31e510bddae7a56eacfe6f17befedc8 /core/applets | |
| parent | 0d940522f5d849dd480bd2785d592f3d787e0941 (diff) | |
| download | opie-caedcea372fd99c7fae116ac3d0d1625f88bf138.zip opie-caedcea372fd99c7fae116ac3d0d1625f88bf138.tar.gz opie-caedcea372fd99c7fae116ac3d0d1625f88bf138.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | core/applets/volumeapplet/opie-volumeapplet.control | 2 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volume.cpp | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control index 3056520..731692a 100644 --- a/core/applets/volumeapplet/opie-volumeapplet.control +++ b/core/applets/volumeapplet/opie-volumeapplet.control @@ -6,3 +6,3 @@ Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Volume applet diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 7f0aca5..7d67311 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp @@ -26,3 +26,3 @@ #include <opie2/otaskbarapplet.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> #include <qpe/applnk.h> @@ -274,5 +274,3 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - upButton-> setPixmap ( pic ); + upButton-> setPixmap ( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); upButton-> setFocusPolicy ( QWidget::NoFocus ); @@ -283,4 +281,3 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); - pic.convertFromImage( Resource::loadImage( "down" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - downButton-> setPixmap ( pic ); + downButton-> setPixmap ( Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ) ); downButton-> setFocusPolicy ( QWidget::NoFocus ); @@ -729,5 +726,3 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) - QPixmap pic; - pic.convertFromImage( Resource::loadImage( "volume" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - m_pixmap = new QPixmap ( pic ); + m_pixmap = new QPixmap ( Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ) ); m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); |