| -rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp index 2122007..946616f 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.cpp +++ b/noncore/applets/volumeapplet2/volumeapplet.cpp @@ -126,88 +126,91 @@ bool VolumeAppletControl::volMuted ( ) const return m_vol_muted; } 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 )); _control = new VolumeAppletControl( this, "control" ); } VolumeApplet::~VolumeApplet() { } int VolumeApplet::position() { return 4; } void VolumeApplet::paintEvent( QPaintEvent* ) { - QPainter p ( this ); + 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 ); OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); int volPercent = mixer->volume( "Vol" ) >> 8; int pixelsWide = volPercent * ( width() - 4 ) / 100; p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); +*/ // if ( _control-> volMuted ( )) { // p. setPen ( red ); // p. drawLine ( 1, 2, width() - 2, height() - 5 ); // p. drawLine ( 1, 3, width() - 2, height() - 4 ); // p. drawLine ( width() - 2, 2, 1, height() - 5 ); // p. drawLine ( width() - 2, 3, 1, height() - 4 ); // } // QPainter p(this); // p.drawPixmap(0, 2, _pixmap ); } void VolumeApplet::mousePressEvent( QMouseEvent* ) { if ( !_control->isVisible() ) { popup( _control ); } else { _control->hide(); } } EXPORT_OPIE_APPLET_v1( VolumeApplet ) |