author | llornkcor <llornkcor> | 2002-04-07 00:46:35 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-07 00:46:35 (UTC) |
commit | e237c0758206c34f96c11870e033412b89e37463 (patch) (side-by-side diff) | |
tree | ff61337aafa002a494a134cb61daaeda10aa0a44 /core/applets | |
parent | 014a5c29fc8a1b2e6bc2ec550134163bea86443c (diff) | |
download | opie-e237c0758206c34f96c11870e033412b89e37463.zip opie-e237c0758206c34f96c11870e033412b89e37463.tar.gz opie-e237c0758206c34f96c11870e033412b89e37463.tar.bz2 |
re-commit buttons
-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 176 | ||||
-rw-r--r-- | core/applets/volumeapplet/volume.h | 45 |
2 files changed, 185 insertions, 36 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index ee9eab3..344f86f 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp @@ -1,8 +1,8 @@ /********************************************************************** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of the Qtopia Environment. +** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the @@ -17,8 +17,9 @@ ** not clear to you. ** **********************************************************************/ + #include "volume.h" #include <qpe/resource.h> #include <qpe/qpeapplication.h> @@ -32,56 +33,99 @@ #include <qslider.h> #include <qlayout.h> #include <qframe.h> #include <qpixmap.h> +#include <qlabel.h> + #include <qpushbutton.h> #include <qtimer.h> #define RATE_TIMER_INTERVAL 100 // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. -VolumeControl::VolumeControl( QWidget *parent, const char *name ) +VolumeControl::VolumeControl( bool showMic, QWidget *parent, const char *name ) : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) { setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); + createView(showMic); +} + +void VolumeControl::createView(bool showMic) +{ + Config cfg("Sound"); + cfg.setGroup("System"); +//showMic = TRUE; + QHBoxLayout *hboxLayout = new QHBoxLayout(this); + hboxLayout->setMargin( 3 ); + hboxLayout->setSpacing( 0); - QVBoxLayout *vboxButtons = new QVBoxLayout; + QVBoxLayout *vboxButtons = new QVBoxLayout(this); upButton = new QPushButton( this ); upButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); upButton->setPixmap( Resource::loadPixmap( "up" ) ); downButton = new QPushButton( this ); downButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); downButton->setPixmap( Resource::loadPixmap( "down" ) ); vboxButtons->setSpacing( 2 ); + vboxButtons->addWidget( upButton ); vboxButtons->addWidget( downButton ); - QHBoxLayout *hbox = new QHBoxLayout; + QVBoxLayout *vbox = new QVBoxLayout( this ); + QHBoxLayout *hbox = NULL; + slider = new QSlider( this ); slider->setRange( 0, 100 ); slider->setTickmarks( QSlider::Both ); slider->setTickInterval( 20 ); slider->setFocusPolicy( QWidget::NoFocus ); - hbox->setSpacing( 4 ); - hbox->addWidget( slider ); - hbox->addLayout( vboxButtons ); + slider->setValue(cfg.readNumEntry("Volume")); + + QVBoxLayout *sbox = new QVBoxLayout(this); + sbox->setMargin( 3 ); + sbox->setSpacing( 3 ); + sbox->addWidget( new QLabel("Vol", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter ); + sbox->addWidget( slider, 0, Qt::AlignVCenter | Qt::AlignHCenter ); + + if (showMic == TRUE) { + mic = new QSlider(this); + mic->setRange( 0, 100 ); + mic->setTickmarks( QSlider::Both ); + mic->setTickInterval( 20 ); + mic->setFocusPolicy( QWidget::NoFocus ); + mic->setValue(cfg.readNumEntry("Mic")); + + QVBoxLayout *mbox = new QVBoxLayout(this); + mbox->setMargin( 3 ); + mbox->setSpacing( 3 ); + mbox->addWidget( new QLabel("Mic", this) , 0, Qt::AlignVCenter | Qt::AlignHCenter ); + mbox->addWidget( mic, 0, Qt::AlignVCenter | Qt::AlignHCenter ); + + hbox = new QHBoxLayout( this ); + hbox->setMargin( 3 ); + hbox->setSpacing( 3 ); + hbox->addLayout( sbox, 1); + hbox->addLayout( mbox, 1); + } - QVBoxLayout *vbox = new QVBoxLayout( this ); - QFrame *separator = new QFrame( this ); - separator->setFrameStyle( QFrame::HLine | QFrame::Sunken ); muteBox = new QCheckBox( tr("Mute"), this ); muteBox->setFocusPolicy( QWidget::NoFocus ); - vbox->setSpacing( 4 ); - vbox->setMargin( 6 ); - vbox->addLayout( hbox ); - vbox->addWidget( separator ); + + vbox->setMargin( 3 ); + vbox->setSpacing( 0 ); + if (showMic == TRUE) + vbox->addLayout( hbox, 1 ); + else + vbox->addLayout( sbox, 1); vbox->addWidget( muteBox, 0, Qt::AlignVCenter | Qt::AlignHCenter ); - setFixedHeight( 100 ); + hboxLayout->addLayout( vboxButtons ); + hboxLayout->addLayout(vbox); + + setFixedHeight( 120 ); setFixedWidth( sizeHint().width() ); setFocusPolicy(QWidget::NoFocus); - connect( upButton, SIGNAL( pressed() ), this, SLOT( ButtonChanged() ) ); connect( upButton, SIGNAL( released() ), this, SLOT( ButtonChanged() ) ); connect( downButton, SIGNAL( pressed() ), this, SLOT( ButtonChanged() ) ); connect( downButton, SIGNAL( released() ), this, SLOT( ButtonChanged() ) ); @@ -91,9 +135,10 @@ VolumeControl::VolumeControl( QWidget *parent, const char *name ) } void VolumeControl::keyPressEvent( QKeyEvent *e) { - switch(e->key()) { + switch(e->key()) + { case Key_Up: slider->subtractStep(); break; case Key_Down: @@ -133,32 +178,80 @@ void VolumeControl::rateTimerDone() VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { + Config cfg("Sound"); + cfg.setGroup("System"); + setFixedHeight( 18 ); setFixedWidth( 14 ); + volumePixmap = Resource::loadPixmap( "volume" ); + + volumePercent = cfg.readNumEntry("Volume",50); + micPercent = cfg.readNumEntry("Mic", 50); muted = FALSE; // ### read from pref - volumePercent = 50; // ### read from pref + micMuted = FALSE; // ### read from pref + + advancedTimer = new QTimer(this); + connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); + connect( qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); + connect( advancedTimer, SIGNAL( timeout() ),this, SLOT( advVolControl()) ); + writeSystemVolume(); + writeSystemMic(); } VolumeApplet::~VolumeApplet() { } +void VolumeApplet::keyPressEvent ( QKeyEvent * e ) +{ + QString s; + s.setNum(e->key()); + qWarning(s); +} void VolumeApplet::mousePressEvent( QMouseEvent *) { + advancedTimer->start( 750, TRUE ); +} + +void VolumeApplet::mouseReleaseEvent( QMouseEvent * ) +{ + showVolControl(FALSE); +} + +void VolumeApplet::advVolControl() +{ + showVolControl(TRUE); +} + +void VolumeApplet::showVolControl(bool showMic) +{ + Config cfg("Sound"); + cfg.setGroup("System"); + volumePercent = cfg.readNumEntry("Volume",50); + micPercent = cfg.readNumEntry("Mic", 50); + // Create a small volume control window to adjust the volume with - VolumeControl *vc = new VolumeControl; + VolumeControl *vc = new VolumeControl(showMic); vc->slider->setValue( 100 - volumePercent ); + if (showMic) + { + vc->mic->setValue( 100 - micPercent ); + connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) ); + } + vc->muteBox->setChecked( muted ); connect( vc->slider, SIGNAL( valueChanged( int ) ), this, SLOT( sliderMoved( int ) ) ); connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) ); QPoint curPos = mapToGlobal( rect().topLeft() ); - vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 100 ); + vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 ); vc->show(); + + advancedTimer->stop(); } void VolumeApplet::volumeChanged( bool nowMuted ) { @@ -178,28 +271,49 @@ void VolumeApplet::volumeChanged( bool nowMuted ) if ( previousVolume != volumePercent ) repaint( 2, height() - 3, width() - 4, 2, FALSE ); } +void VolumeApplet::micChanged( bool nowMuted ) +{ + if (!nowMuted) + readSystemMic(); + micMuted = nowMuted; +} + void VolumeApplet::mute( bool toggled ) { muted = toggled; + // clear if removing mute repaint( !toggled ); writeSystemVolume(); } + void VolumeApplet::sliderMoved( int percent ) { setVolume( 100 - percent ); } +void VolumeApplet::micMoved( int percent ) +{ + setMic( 100 - percent ); +} + void VolumeApplet::readSystemVolume() { Config cfg("Sound"); cfg.setGroup("System"); volumePercent = cfg.readNumEntry("Volume"); } +void VolumeApplet::readSystemMic() +{ + Config cfg("Sound"); + cfg.setGroup("System"); + micPercent = cfg.readNumEntry("Mic"); +} + void VolumeApplet::setVolume( int percent ) { // clamp volume percent to be between 0 and 100 volumePercent = (percent < 0) ? 0 : ((percent > 100) ? 100 : percent); @@ -207,8 +321,15 @@ void VolumeApplet::setVolume( int percent ) repaint( 2, height() - 3, width() - 4, 2, FALSE ); writeSystemVolume(); } +void VolumeApplet::setMic( int percent ) +{ + // clamp volume percent to be between 0 and 100 + micPercent = (percent < 0) ? 0 : ((percent > 100) ? 100 : percent); + writeSystemMic(); +} + void VolumeApplet::writeSystemVolume() { { Config cfg("Sound"); @@ -220,8 +341,21 @@ void VolumeApplet::writeSystemVolume() QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; #endif } +void VolumeApplet::writeSystemMic() +{ + { + Config cfg("Sound"); + cfg.setGroup("System"); + cfg.writeEntry("Mic",micPercent); + } +#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) + // Send notification that the volume has changed + QCopEnvelope( "QPE/System", "micChange(bool)" ) << micMuted; +#endif +} + void VolumeApplet::paintEvent( QPaintEvent* ) { QPainter p(this); diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h index a982f53..9fc12d8 100644 --- a/core/applets/volumeapplet/volume.h +++ b/core/applets/volumeapplet/volume.h @@ -1,8 +1,8 @@ /********************************************************************** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of the Qtopia Environment. +** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the @@ -16,43 +16,44 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ + #ifndef __VOLUME_APPLET_H__ #define __VOLUME_APPLET_H__ #include <qwidget.h> #include <qframe.h> #include <qpixmap.h> #include <qguardedptr.h> +#include <qtimer.h> class QSlider; class QCheckBox; -class QPushButton; -class QTimer; class VolumeControl : public QFrame { Q_OBJECT public: - VolumeControl( QWidget *parent=0, const char *name=0 ); + VolumeControl( bool showMic=FALSE, QWidget *parent=0, const char *name=0 ); public: QSlider *slider; + QSlider *mic; QCheckBox *muteBox; private: - void keyPressEvent( QKeyEvent * ); + QPushButton *upButton; + QPushButton *downButton; + QTimer *rateTimer; + void keyPressEvent( QKeyEvent * ); + void createView(bool showMic = FALSE); private slots: void ButtonChanged(); void rateTimerDone(); -private: - QPushButton *upButton; - QPushButton *downButton; - QTimer *rateTimer; }; class VolumeApplet : public QWidget { @@ -64,22 +65,36 @@ public: int percent( ) { return volumePercent; } public slots: void volumeChanged( bool muted ); - void setVolume( int percent ); + void micChanged( bool muted ); void sliderMoved( int percent ); void mute( bool ); + void micMoved( int percent ); + void setVolume( int percent ); + void setMic( int percent ); + + void showVolControl(bool showMic = FALSE); + void advVolControl(); + private: + int volumePercent, micPercent; + bool muted, micMuted; + QPixmap volumePixmap; + QTimer *advancedTimer; + void readSystemVolume(); void writeSystemVolume(); void mousePressEvent( QMouseEvent * ); void paintEvent( QPaintEvent* ); -private: - int volumePercent; - bool muted; - QPixmap volumePixmap; + void readSystemMic(); + void keyPressEvent ( QKeyEvent * e ); + void mouseReleaseEvent( QMouseEvent *); + void writeSystemMic(); + }; #endif // __VOLUME_APPLET_H__ + |