summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/volumeapplet/opie-volumeapplet.control2
-rw-r--r--core/applets/volumeapplet/volume.cpp258
-rw-r--r--core/applets/volumeapplet/volume.h24
3 files changed, 214 insertions, 70 deletions
diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control
index a65cf6d..a2c0363 100644
--- a/core/applets/volumeapplet/opie-volumeapplet.control
+++ b/core/applets/volumeapplet/opie-volumeapplet.control
@@ -4,5 +4,5 @@ Section: opie/taskbar
4Maintainer: Warwick Allison <warwick@trolltech.com> 4Maintainer: Warwick Allison <warwick@trolltech.com>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION 6Version: $QPE_VERSION-$SUB_VERSION.1
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION)
8Description: Volume applet 8Description: Volume applet
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index 35dbf22..445cc8b 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -34,44 +34,89 @@
34#include <qframe.h> 34#include <qframe.h>
35#include <qpixmap.h> 35#include <qpixmap.h>
36#include <qlabel.h>
36 37
37 38VolumeControl::VolumeControl( bool showMic, QWidget *parent, const char *name )
38VolumeControl::VolumeControl( QWidget *parent, const char *name )
39 : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) 39 : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
40{ 40{
41 setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); 41 setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
42 42 createView(showMic);
43 QVBoxLayout *vbox = new QVBoxLayout( this ); 43}
44 slider = new QSlider( this ); 44
45 muteBox = new QCheckBox( tr("Mute"), this ); 45void VolumeControl::createView(bool showMic)
46 slider->setRange( 0, 100 ); 46{
47 slider->setTickmarks( QSlider::Both ); 47 Config cfg("Sound");
48 slider->setTickInterval( 20 ); 48 cfg.setGroup("System");
49 slider->setFocusPolicy( QWidget::NoFocus ); 49
50 muteBox->setFocusPolicy( QWidget::NoFocus ); 50 QVBoxLayout *vbox = new QVBoxLayout( this );
51 vbox->setMargin( 6 ); 51 QHBoxLayout *hbox = NULL;
52 vbox->setSpacing( 3 ); 52
53 vbox->addWidget( slider, 0, Qt::AlignVCenter | Qt::AlignHCenter ); 53 slider = new QSlider( this );
54 vbox->addWidget( muteBox ); 54 slider->setRange( 0, 100 );
55 setFixedHeight( 100 ); 55 slider->setTickmarks( QSlider::Both );
56 setFixedWidth( sizeHint().width() ); 56 slider->setTickInterval( 20 );
57 setFocusPolicy(QWidget::NoFocus); 57 slider->setFocusPolicy( QWidget::NoFocus );
58 slider->setValue(cfg.readNumEntry("Volume"));
59
60 QVBoxLayout *sbox = new QVBoxLayout(this);
61 sbox->setMargin( 3 );
62 sbox->setSpacing( 3 );
63 sbox->addWidget( new QLabel("Vol", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter );
64 sbox->addWidget( slider, 0, Qt::AlignVCenter | Qt::AlignHCenter );
65
66 if (showMic == TRUE)
67 {
68 mic = new QSlider(this);
69 mic->setRange( 0, 100 );
70 mic->setTickmarks( QSlider::Both );
71 mic->setTickInterval( 20 );
72 mic->setFocusPolicy( QWidget::NoFocus );
73 mic->setValue(cfg.readNumEntry("Mic"));
74
75 QVBoxLayout *mbox = new QVBoxLayout(this);
76 mbox->setMargin( 3 );
77 mbox->setSpacing( 3 );
78 mbox->addWidget( new QLabel("Mic", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter );
79 mbox->addWidget( mic, 0, Qt::AlignVCenter | Qt::AlignHCenter );
80
81 hbox = new QHBoxLayout( this );
82 hbox->setMargin( 3 );
83 hbox->setSpacing( 3 );
84 hbox->addLayout( sbox, 1);
85 hbox->addLayout( mbox, 1);
86 }
87
88 muteBox = new QCheckBox( tr("Mute"), this );
89 muteBox->setFocusPolicy( QWidget::NoFocus );
90
91 vbox->setMargin( 3 );
92 vbox->setSpacing( 0 );
93 if (showMic == TRUE)
94 vbox->addLayout( hbox, 1 );
95 else
96 vbox->addLayout( sbox, 1);
97 vbox->addWidget( muteBox, 0, Qt::AlignVCenter | Qt::AlignHCenter );
98
99 setFixedHeight( 120 );
100 setFixedWidth( sizeHint().width() );
101 setFocusPolicy(QWidget::NoFocus);
58} 102}
59 103
60void VolumeControl::keyPressEvent( QKeyEvent *e) 104void VolumeControl::keyPressEvent( QKeyEvent *e)
61{ 105{
62 switch(e->key()) { 106 switch(e->key())
107 {
63 case Key_Up: 108 case Key_Up:
64 slider->subtractStep(); 109 slider->subtractStep();
65 break; 110 break;
66 case Key_Down: 111 case Key_Down:
67 slider->addStep(); 112 slider->addStep();
68 break; 113 break;
69 case Key_Space: 114 case Key_Space:
70 muteBox->toggle(); 115 muteBox->toggle();
71 break; 116 break;
72 case Key_Escape: 117 case Key_Escape:
73 close(); 118 close();
74 break; 119 break;
75 } 120 }
76} 121}
77 122
@@ -81,11 +126,25 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
81 : QWidget( parent, name ) 126 : QWidget( parent, name )
82{ 127{
83 setFixedHeight( 18 ); 128 Config cfg("Sound");
84 setFixedWidth( 14 ); 129 cfg.setGroup("System");
85 volumePixmap = Resource::loadPixmap( "volume" ); 130
86 muted = FALSE; // ### read from pref 131 setFixedHeight( 18 );
87 volumePercent = 50; // ### read from pref 132 setFixedWidth( 14 );
88 connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 133
89 writeSystemVolume(); 134 volumePixmap = Resource::loadPixmap( "volume" );
135
136 volumePercent = cfg.readNumEntry("Volume",50);
137 micPercent = cfg.readNumEntry("Mic", 50);
138 muted = FALSE; // ### read from pref
139 micMuted = FALSE; // ### read from pref
140
141 advancedTimer = new QTimer(this);
142
143 connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
144 connect( qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
145 connect( advancedTimer, SIGNAL( timeout() ),this, SLOT( advVolControl()) );
146
147 writeSystemVolume();
148 writeSystemMic();
90} 149}
91 150
@@ -94,15 +153,49 @@ VolumeApplet::~VolumeApplet()
94} 153}
95 154
96void VolumeApplet::mousePressEvent( QMouseEvent *) 155void VolumeApplet::keyPressEvent ( QKeyEvent * e )
156{
157 QString s;
158 s.setNum(e->key());
159 qWarning(s);
160}
161void VolumeApplet::mousePressEvent( QMouseEvent * )
162{
163 advancedTimer->start( 750, TRUE );
164}
165
166void VolumeApplet::mouseReleaseEvent( QMouseEvent * )
97{ 167{
98 // Create a small volume control window to adjust the volume with 168 showVolControl(FALSE);
99 VolumeControl *vc = new VolumeControl; 169}
100 vc->slider->setValue( 100 - volumePercent ); 170
101 vc->muteBox->setChecked( muted ); 171void VolumeApplet::advVolControl()
102 connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) ); 172{
103 connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) ); 173 showVolControl(TRUE);
104 QPoint curPos = mapToGlobal( rect().topLeft() ); 174}
105 vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 100 ); 175
106 vc->show(); 176void VolumeApplet::showVolControl(bool showMic)
177{
178 Config cfg("Sound");
179 cfg.setGroup("System");
180 volumePercent = cfg.readNumEntry("Volume",50);
181 micPercent = cfg.readNumEntry("Mic", 50);
182
183 // Create a small volume control window to adjust the volume with
184 VolumeControl *vc = new VolumeControl(showMic);
185 vc->slider->setValue( 100 - volumePercent );
186 if (showMic)
187 {
188 vc->mic->setValue( 100 - micPercent );
189 connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) );
190 }
191
192 vc->muteBox->setChecked( muted );
193 connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) );
194 connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) );
195 QPoint curPos = mapToGlobal( rect().topLeft() );
196 vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 );
197 vc->show();
198
199 advancedTimer->stop();
107} 200}
108 201
@@ -126,8 +219,15 @@ void VolumeApplet::volumeChanged( bool nowMuted )
126} 219}
127 220
221void VolumeApplet::micChanged( bool nowMuted )
222{
223 if (!nowMuted)
224 readSystemMic();
225 micMuted = nowMuted;
226}
128 227
129void VolumeApplet::mute( bool toggled ) 228void VolumeApplet::mute( bool toggled )
130{ 229{
131 muted = toggled; 230 muted = toggled;
231
132 // clear if removing mute 232 // clear if removing mute
133 repaint( !toggled ); 233 repaint( !toggled );
@@ -141,4 +241,8 @@ void VolumeApplet::sliderMoved( int percent )
141} 241}
142 242
243void VolumeApplet::micMoved( int percent )
244{
245 setMic( 100 - percent );
246}
143 247
144void VolumeApplet::readSystemVolume() 248void VolumeApplet::readSystemVolume()
@@ -149,4 +253,10 @@ void VolumeApplet::readSystemVolume()
149} 253}
150 254
255void VolumeApplet::readSystemMic()
256{
257 Config cfg("Sound");
258 cfg.setGroup("System");
259 micPercent = cfg.readNumEntry("Mic");
260}
151 261
152void VolumeApplet::setVolume( int percent ) 262void VolumeApplet::setVolume( int percent )
@@ -159,34 +269,52 @@ void VolumeApplet::setVolume( int percent )
159} 269}
160 270
271void VolumeApplet::setMic( int percent )
272{
273 // clamp volume percent to be between 0 and 100
274 micPercent = (percent < 0) ? 0 : ((percent > 100) ? 100 : percent);
275 writeSystemMic();
276}
161 277
162void VolumeApplet::writeSystemVolume() 278void VolumeApplet::writeSystemVolume()
163{ 279{
164 { 280 {
165 Config cfg("Sound"); 281 Config cfg("Sound");
166 cfg.setGroup("System"); 282 cfg.setGroup("System");
167 cfg.writeEntry("Volume",volumePercent); 283 cfg.writeEntry("Volume",volumePercent);
168 } 284 }
169#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) 285#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
170 // Send notification that the volume has changed 286 // Send notification that the volume has changed
171 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; 287 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted;
172#endif 288#endif
173} 289}
174 290
291void VolumeApplet::writeSystemMic()
292{
293 {
294 Config cfg("Sound");
295 cfg.setGroup("System");
296 cfg.writeEntry("Mic",micPercent);
297 }
298#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
299 // Send notification that the volume has changed
300 QCopEnvelope( "QPE/System", "micChange(bool)" ) << micMuted;
301#endif
302}
175 303
176void VolumeApplet::paintEvent( QPaintEvent* ) 304void VolumeApplet::paintEvent( QPaintEvent* )
177{ 305{
178 QPainter p(this); 306 QPainter p(this);
179 307
180 if (volumePixmap.isNull()) 308 if (volumePixmap.isNull())
181 volumePixmap = Resource::loadPixmap( "volume" ); 309 volumePixmap = Resource::loadPixmap( "volume" );
182 p.drawPixmap( 0, 1, volumePixmap ); 310 p.drawPixmap( 0, 1, volumePixmap );
183 p.setPen( darkGray ); 311 p.setPen( darkGray );
184 p.drawRect( 1, height() - 4, width() - 2, 4 ); 312 p.drawRect( 1, height() - 4, width() - 2, 4 );
185 313
186 int pixelsWide = volumePercent * (width() - 4) / 100; 314 int pixelsWide = volumePercent * (width() - 4) / 100;
187 p.fillRect( 2, height() - 3, pixelsWide, 2, red ); 315 p.fillRect( 2, height() - 3, pixelsWide, 2, red );
188 p.fillRect( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); 316 p.fillRect( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray );
189 317
190 if ( muted ) { 318 if ( muted ) {
191 p.setPen( red ); 319 p.setPen( red );
192 p.drawLine( 1, 2, width() - 2, height() - 5 ); 320 p.drawLine( 1, 2, width() - 2, height() - 5 );
@@ -194,6 +322,4 @@ void VolumeApplet::paintEvent( QPaintEvent* )
194 p.drawLine( width() - 2, 2, 1, height() - 5 ); 322 p.drawLine( width() - 2, 2, 1, height() - 5 );
195 p.drawLine( width() - 2, 3, 1, height() - 4 ); 323 p.drawLine( width() - 2, 3, 1, height() - 4 );
196 } 324 }
197} 325}
198
199
diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h
index 5704cad..cb0be72 100644
--- a/core/applets/volumeapplet/volume.h
+++ b/core/applets/volumeapplet/volume.h
@@ -26,4 +26,5 @@
26#include <qpixmap.h> 26#include <qpixmap.h>
27#include <qguardedptr.h> 27#include <qguardedptr.h>
28#include <qtimer.h>
28 29
29class QSlider; 30class QSlider;
@@ -34,12 +35,14 @@ class VolumeControl : public QFrame
34 Q_OBJECT 35 Q_OBJECT
35public: 36public:
36 VolumeControl( QWidget *parent=0, const char *name=0 ); 37 VolumeControl( bool showMic=FALSE, QWidget *parent=0, const char *name=0 );
37 38
38public: 39public:
39 QSlider *slider; 40 QSlider *slider;
41 QSlider *mic;
40 QCheckBox *muteBox; 42 QCheckBox *muteBox;
41 43
42private: 44private:
43 void keyPressEvent( QKeyEvent * ); 45 void keyPressEvent( QKeyEvent * );
46 void createView(bool showMic = FALSE);
44}; 47};
45 48
@@ -55,18 +58,33 @@ public:
55public slots: 58public slots:
56 void volumeChanged( bool muted ); 59 void volumeChanged( bool muted );
60 void micChanged( bool muted );
61
57 void setVolume( int percent ); 62 void setVolume( int percent );
63 void setMic( int percent );
64
58 void sliderMoved( int percent ); 65 void sliderMoved( int percent );
66 void micMoved( int percent );
59 void mute( bool ); 67 void mute( bool );
60 68
69 void showVolControl(bool showMic = FALSE);
70 void advVolControl();
71
61private: 72private:
62 void readSystemVolume(); 73 void readSystemVolume();
74 void readSystemMic();
75
63 void writeSystemVolume(); 76 void writeSystemVolume();
77 void writeSystemMic();
78
79 void keyPressEvent ( QKeyEvent * e );
64 void mousePressEvent( QMouseEvent * ); 80 void mousePressEvent( QMouseEvent * );
81 void mouseReleaseEvent( QMouseEvent *);
65 void paintEvent( QPaintEvent* ); 82 void paintEvent( QPaintEvent* );
66 83
67private: 84private:
68 int volumePercent; 85 int volumePercent, micPercent;
69 bool muted; 86 bool muted, micMuted;
70 QPixmap volumePixmap; 87 QPixmap volumePixmap;
88 QTimer *advancedTimer;
71}; 89};
72 90