-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> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Volume applet | 8 | 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 @@ | |||
26 | #include <opie2/otaskbarapplet.h> | 26 | #include <opie2/otaskbarapplet.h> |
27 | #include <qpe/resource.h> | 27 | #include <opie2/oresource.h> |
28 | #include <qpe/applnk.h> | 28 | #include <qpe/applnk.h> |
@@ -274,5 +274,3 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa | |||
274 | upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); | 274 | upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); |
275 | QPixmap pic; | 275 | upButton-> setPixmap ( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); |
276 | pic.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
277 | upButton-> setPixmap ( pic ); | ||
278 | upButton-> setFocusPolicy ( QWidget::NoFocus ); | 276 | upButton-> setFocusPolicy ( QWidget::NoFocus ); |
@@ -283,4 +281,3 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa | |||
283 | downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); | 281 | downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding )); |
284 | pic.convertFromImage( Resource::loadImage( "down" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 282 | downButton-> setPixmap ( Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ) ); |
285 | downButton-> setPixmap ( pic ); | ||
286 | downButton-> setFocusPolicy ( QWidget::NoFocus ); | 283 | downButton-> setFocusPolicy ( QWidget::NoFocus ); |
@@ -729,5 +726,3 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) | |||
729 | 726 | ||
730 | QPixmap pic; | 727 | m_pixmap = new QPixmap ( Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ) ); |
731 | pic.convertFromImage( Resource::loadImage( "volume" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
732 | m_pixmap = new QPixmap ( pic ); | ||
733 | m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); | 728 | m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); |