-rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.cpp | 3 | ||||
-rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp index 946616f..fad8e42 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.cpp +++ b/noncore/applets/volumeapplet2/volumeapplet.cpp @@ -132,49 +132,50 @@ void VolumeAppletControl::showEvent( QShowEvent* e ) odebug << "showEvent" << oendl; QWidget::showEvent( e ); } void VolumeAppletControl::hideEvent( QHideEvent* e ) { odebug << "hideEvent" << oendl; QWidget::hideEvent( e ); } QSize VolumeAppletControl::sizeHint() const { int wd = QPEApplication::desktop()->width(); return QSize( wd, 200 ); //QFrame::sizeHint(); } VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) :OTaskbarApplet( parent, name ) { setFixedHeight( AppLnk::smallIconSize() +4); setFixedWidth( AppLnk::smallIconSize() ); - _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon )); + _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ); +// _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon )); _control = new VolumeAppletControl( this, "control" ); } VolumeApplet::~VolumeApplet() { } int VolumeApplet::position() { return 4; } void VolumeApplet::paintEvent( QPaintEvent* ) { QPainter p(this); p.drawPixmap(0, 2, _pixmap ); /* p. drawPixmap ( (width()- _pixmap->width())/2, QMAX( (height()-4-_pixmap->height() )/2, 1), *_pixmap ); p. setPen ( darkGray ); p. drawRect ( 1, height() - 4, width() - 2, 4 ); diff --git a/noncore/applets/volumeapplet2/volumeapplet.h b/noncore/applets/volumeapplet2/volumeapplet.h index 953c305..e5dd4b9 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.h +++ b/noncore/applets/volumeapplet2/volumeapplet.h @@ -84,29 +84,29 @@ class VolumeAppletControl : public QFrame protected: virtual void showEvent( QShowEvent* ); virtual void hideEvent( QHideEvent* ); void build(); private: QGridLayout* l; }; class VolumeApplet : public Opie::Ui::OTaskbarApplet { public: VolumeApplet( QWidget* parent = 0, const char* name = 0 ); ~VolumeApplet(); static int position(); protected: virtual void paintEvent( QPaintEvent* ); virtual void mousePressEvent( QMouseEvent* ); private: VolumeAppletControl* _control; - QPixmap* _pixmap; + QPixmap _pixmap; }; #endif |