author | drw <drw> | 2005-04-29 00:12:13 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-29 00:12:13 (UTC) |
commit | caedcea372fd99c7fae116ac3d0d1625f88bf138 (patch) (unidiff) | |
tree | 7f9de6acc31e510bddae7a56eacfe6f17befedc8 /core | |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-volumeapplet | 1 | Package: opie-volumeapplet |
2 | Files: plugins/applets/libvolumeapplet.so* | 2 | Files: plugins/applets/libvolumeapplet.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | 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 |
9 | Volume applet for the Opie environment taskbar. | 9 | Volume applet for the Opie environment taskbar. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
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 | |||
@@ -19,17 +19,17 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "volume.h" | 21 | #include "volume.h" |
22 | 22 | ||
23 | /* OPIE */ | 23 | /* OPIE */ |
24 | #include <opie2/oledbox.h> | 24 | #include <opie2/oledbox.h> |
25 | #include <opie2/odevice.h> | 25 | #include <opie2/odevice.h> |
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> |
29 | #include <qpe/config.h> | 29 | #include <qpe/config.h> |
30 | #include <qpe/qcopenvelope_qws.h> | 30 | #include <qpe/qcopenvelope_qws.h> |
31 | using namespace Opie::Core; | 31 | using namespace Opie::Core; |
32 | using namespace Opie::Ui; | 32 | using namespace Opie::Ui; |
33 | 33 | ||
34 | /* QT */ | 34 | /* QT */ |
35 | #include <qpainter.h> | 35 | #include <qpainter.h> |
@@ -267,27 +267,24 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa | |||
267 | QLabel *l; | 267 | QLabel *l; |
268 | 268 | ||
269 | vbox = new QVBoxLayout ( ); | 269 | vbox = new QVBoxLayout ( ); |
270 | vbox-> setSpacing ( 4 ); | 270 | vbox-> setSpacing ( 4 ); |
271 | grid-> addLayout ( vbox, 1, 0 ); | 271 | grid-> addLayout ( vbox, 1, 0 ); |
272 | 272 | ||
273 | upButton = new QPushButton ( this ); | 273 | upButton = new QPushButton ( this ); |
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 ); |
279 | 277 | ||
280 | vbox-> addWidget ( upButton ); | 278 | vbox-> addWidget ( upButton ); |
281 | 279 | ||
282 | downButton = new QPushButton ( this ); | 280 | downButton = new QPushButton ( this ); |
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 ); |
287 | 284 | ||
288 | vbox-> addWidget ( downButton ); | 285 | vbox-> addWidget ( downButton ); |
289 | 286 | ||
290 | volSlider = new QSlider ( this ); | 287 | volSlider = new QSlider ( this ); |
291 | volSlider-> setRange ( 0, 100 ); | 288 | volSlider-> setRange ( 0, 100 ); |
292 | volSlider-> setTickmarks ( QSlider::Both ); | 289 | volSlider-> setTickmarks ( QSlider::Both ); |
293 | volSlider-> setTickInterval ( 20 ); | 290 | volSlider-> setTickInterval ( 20 ); |
@@ -722,19 +719,17 @@ void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd ) | |||
722 | //=========================================================================== | 719 | //=========================================================================== |
723 | 720 | ||
724 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) | 721 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) |
725 | : QWidget( parent, name ) | 722 | : QWidget( parent, name ) |
726 | { | 723 | { |
727 | setFixedWidth ( AppLnk::smallIconSize() ); | 724 | setFixedWidth ( AppLnk::smallIconSize() ); |
728 | setFixedHeight ( AppLnk::smallIconSize()+4 ); | 725 | setFixedHeight ( AppLnk::smallIconSize()+4 ); |
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" ); |
734 | 729 | ||
735 | connect ( qApp, SIGNAL( volumeChanged(bool)), m_dialog, SLOT( volumeChanged(bool))); | 730 | connect ( qApp, SIGNAL( volumeChanged(bool)), m_dialog, SLOT( volumeChanged(bool))); |
736 | connect ( qApp, SIGNAL( micChanged(bool)), m_dialog, SLOT ( micChanged(bool))); | 731 | connect ( qApp, SIGNAL( micChanged(bool)), m_dialog, SLOT ( micChanged(bool))); |
737 | } | 732 | } |
738 | 733 | ||
739 | VolumeApplet::~VolumeApplet() | 734 | VolumeApplet::~VolumeApplet() |
740 | { | 735 | { |