summaryrefslogtreecommitdiff
authorjeremy <jeremy>2002-02-10 13:17:18 (UTC)
committer jeremy <jeremy>2002-02-10 13:17:18 (UTC)
commit16db9b9928f9111f384c202c43a95fac88279b3d (patch) (side-by-side diff)
treed3e65025008058f9005ceb3fe01283bf057a03ac
parent65fd59aacde1272bf390bf16ec151ff09b3542b2 (diff)
downloadopie-16db9b9928f9111f384c202c43a95fac88279b3d.zip
opie-16db9b9928f9111f384c202c43a95fac88279b3d.tar.gz
opie-16db9b9928f9111f384c202c43a95fac88279b3d.tar.bz2
Added support fon the new setMic, micChanged messages in opie base. Also
added support for defining the application to run when the rec button is pressed on the ipaq.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sound/opie-sound.control2
-rw-r--r--noncore/settings/sound/soundsettings.cpp44
-rw-r--r--noncore/settings/sound/soundsettings.h4
3 files changed, 46 insertions, 4 deletions
diff --git a/noncore/settings/sound/opie-sound.control b/noncore/settings/sound/opie-sound.control
index a1fe50f..a03c834 100644
--- a/noncore/settings/sound/opie-sound.control
+++ b/noncore/settings/sound/opie-sound.control
@@ -5,5 +5,5 @@ Maintainer: Warwick Allison <warwick@trolltech.com>
Architecture: arm
Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
+Version: $QPE_VERSION-$SUB_VERSION.1
Depends: opie-base ($QPE_VERSION)
Description: Sound settings dialog
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 92281f8..1143e82 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -22,7 +22,8 @@
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
-
+#include <qapplication.h>
#include <qslider.h>
#include <qcheckbox.h>
+#include <qlineedit.h>
SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
@@ -30,11 +31,16 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
{
Config config( "Sound" );
-
config.setGroup( "System" );
volume->setValue(100-config.readNumEntry("Volume"));
+ mic->setValue(100-config.readNumEntry("Mic"));
touchsound->setChecked(config.readBoolEntry("Touch"));
keysound->setChecked(config.readBoolEntry("Key"));
+ dblClickRuns->setText(config.readEntry("DblClickVolumeRuns",
+ "/opt/QtPalmtop/bin/vmemomanager"));
connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int)));
+ connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int)));
+ connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
+ connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
}
@@ -44,4 +50,5 @@ void SoundSettings::reject()
config.setGroup( "System" );
setVolume(100-config.readNumEntry("Volume"));
+ setMic(100-config.readNumEntry("Mic"));
QDialog::reject();
@@ -53,6 +60,8 @@ void SoundSettings::accept()
config.setGroup( "System" );
config.writeEntry("Volume",100-volume->value());
+ config.writeEntry("Mic",100-mic->value());
config.writeEntry("Touch",touchsound->isChecked());
config.writeEntry("Key",keysound->isChecked());
+ config.writeEntry("DblClickVolumeRuns", dblClickRuns->text());
setVolume(volume->value());
QDialog::accept();
@@ -61,4 +70,33 @@ void SoundSettings::accept()
void SoundSettings::setVolume(int v)
{
- QCopEnvelope( "QPE/System", "setVolume(int,int)" ) << 0 << 100-v;
+ Config config( "Sound" );
+ config.setGroup( "System" );
+ config.writeEntry("Volume",100-v);
+#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
+ QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
+#endif
+}
+
+void SoundSettings::setMic(int m)
+{
+ Config config( "Sound" );
+ config.setGroup( "System" );
+ config.writeEntry("Mic",100-m);
+#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
+ QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE;
+#endif
+}
+
+void SoundSettings::volumeChanged( bool )
+{
+ Config config( "Sound" );
+ config.setGroup( "System" );
+ volume->setValue(100-config.readNumEntry("Volume"));
+}
+
+void SoundSettings::micChanged( bool )
+{
+ Config config( "Sound" );
+ config.setGroup( "System" );
+ mic->setValue(100-config.readNumEntry("Mic"));
}
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index b5c8cee..7679c1e 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -38,4 +38,8 @@ protected:
private slots:
void setVolume(int);
+ void setMic(int);
+
+ void volumeChanged( bool muted );
+ void micChanged( bool muted );
};