summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.cpp5
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
@@ -168,25 +168,28 @@ int VolumeApplet::position()
168 return 4; 168 return 4;
169} 169}
170 170
171 171
172void VolumeApplet::paintEvent( QPaintEvent* ) 172void VolumeApplet::paintEvent( QPaintEvent* )
173{ 173{
174 QPainter p ( this ); 174 QPainter p(this);
175 p.drawPixmap(0, 2, _pixmap );
175 176
177/*
176 p. drawPixmap ( (width()- _pixmap->width())/2, QMAX( (height()-4-_pixmap->height() )/2, 1), *_pixmap ); 178 p. drawPixmap ( (width()- _pixmap->width())/2, QMAX( (height()-4-_pixmap->height() )/2, 1), *_pixmap );
177 p. setPen ( darkGray ); 179 p. setPen ( darkGray );
178 p. drawRect ( 1, height() - 4, width() - 2, 4 ); 180 p. drawRect ( 1, height() - 4, width() - 2, 4 );
179 181
180 OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); 182 OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" );
181 183
182 int volPercent = mixer->volume( "Vol" ) >> 8; 184 int volPercent = mixer->volume( "Vol" ) >> 8;
183 185
184 int pixelsWide = volPercent * ( width() - 4 ) / 100; 186 int pixelsWide = volPercent * ( width() - 4 ) / 100;
185 p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); 187 p. fillRect ( 2, height() - 3, pixelsWide, 2, red );
186 p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); 188 p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray );
189*/
187 190
188// if ( _control-> volMuted ( )) { 191// if ( _control-> volMuted ( )) {
189// p. setPen ( red ); 192// p. setPen ( red );
190// p. drawLine ( 1, 2, width() - 2, height() - 5 ); 193// p. drawLine ( 1, 2, width() - 2, height() - 5 );
191// p. drawLine ( 1, 3, width() - 2, height() - 4 ); 194// p. drawLine ( 1, 3, width() - 2, height() - 4 );
192// p. drawLine ( width() - 2, 2, 1, height() - 5 ); 195// p. drawLine ( width() - 2, 2, 1, height() - 5 );