new sound config

2 files changed, 103 insertions, 32 deletions

diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index e393f0f..e8921f0 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -54,4 +54,4 @@ void VolumeControl::createView(bool showMic)
 {
-    Config cfg("Sound");
-    cfg.setGroup("System");
+    Config cfg("qpe");
+    cfg.setGroup("Volume");
 //showMic = TRUE;
@@ -70,2 +70,5 @@ void VolumeControl::createView(bool showMic)
     
+    upButton->setFixedHeight(26);
+    downButton->setFixedHeight(26);
+    
     vboxButtons->addWidget( upButton );
@@ -81,3 +84,3 @@ void VolumeControl::createView(bool showMic)
     slider->setFocusPolicy( QWidget::NoFocus );
-    slider->setValue(cfg.readNumEntry("Volume"));
+    slider->setValue(cfg.readNumEntry("VolumePercent"));
 
@@ -89,3 +92,3 @@ void VolumeControl::createView(bool showMic)
 
-    if (showMic == TRUE)  {
+//    if (showMic == TRUE)  {
         mic = new QSlider(this);
@@ -108,3 +111,3 @@ void VolumeControl::createView(bool showMic)
         hbox->addLayout( mbox, 1);
-    }
+      //  }
   
@@ -113,8 +116,34 @@ void VolumeControl::createView(bool showMic)
   
+    QVBoxLayout *klbox = new QVBoxLayout(this);
+
+    QLabel *Label1;
+    Label1 = new QLabel( this, "Label1" );
+    Label1->setText( tr( "Enable Sounds for:" ));
+ 
+    alarmSound = new QCheckBox( tr("Alarm Sound"), this );
+    alarmSound->setFocusPolicy( QWidget::NoFocus );
+
+    keyclicks = new QCheckBox( tr("Key Clicks"), this );
+    keyclicks->setFocusPolicy( QWidget::NoFocus );
+
+    screentaps = new QCheckBox( tr("Screen taps"), this );
+    screentaps->setFocusPolicy( QWidget::NoFocus );
+
+    
+    keyclicks->setChecked( cfg.readBoolEntry("KeySound",0));
+    screentaps->setChecked( cfg.readBoolEntry("TouchSound",0));
+    alarmSound->setChecked( cfg.readBoolEntry("AlarmSound",1));
+
+    klbox->setMargin( 3 );
+    klbox->setSpacing( 0 );
+    klbox->addWidget( Label1, 1);
+    klbox->addWidget( alarmSound, 1);
+    klbox->addWidget( keyclicks, 1);
+    klbox->addWidget( screentaps, 1);
     vbox->setMargin( 3 );
     vbox->setSpacing( 0 );
-    if (showMic == TRUE)
+//    if (showMic == TRUE)
         vbox->addLayout( hbox, 1 );
-    else
-        vbox->addLayout( sbox, 1);
+//    else
+//        vbox->addLayout( sbox, 1);
     vbox->addWidget( muteBox, 0, Qt::AlignVCenter | Qt::AlignHCenter );
@@ -123,5 +152,7 @@ void VolumeControl::createView(bool showMic)
     hboxLayout->addLayout(vbox);
+    hboxLayout->addLayout( klbox);
+  
   
     setFixedHeight( 120 );
-    setFixedWidth( sizeHint().width() );
+//     setFixedWidth( sizeHint().width() );
     setFocusPolicy(QWidget::NoFocus);
@@ -181,4 +212,4 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
 {
-  Config cfg("Sound");
-  cfg.setGroup("System");
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
   
@@ -189,3 +220,3 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
   
-  volumePercent = cfg.readNumEntry("Volume",50);
+  volumePercent = cfg.readNumEntry("VolumePercent",50);
   micPercent = cfg.readNumEntry("Mic", 50);
@@ -231,8 +262,7 @@ void VolumeApplet::showVolControl(bool showMic)
 {
-  Config cfg("Sound");
-  cfg.setGroup("System");
-  volumePercent = cfg.readNumEntry("Volume",50);
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
+  volumePercent = cfg.readNumEntry("VolumePercent",50);
   micPercent = cfg.readNumEntry("Mic", 50);
-  QString show = cfg.readEntry("ShowMic", "FALSE");
-  if(show == "TRUE") showMic = TRUE;
+  
   // Create a small volume control window to adjust the volume with
@@ -240,7 +270,7 @@ void VolumeApplet::showVolControl(bool showMic)
   vc->slider->setValue( 100 - volumePercent );
-  if (showMic)
-  {
+//   if (showMic)
+//   {
     vc->mic->setValue( 100 - micPercent );
     connect( vc->mic, SIGNAL( valueChanged( int ) ), this, SLOT( micMoved( int ) ) );
-  }
+//  }
 
@@ -249,4 +279,16 @@ void VolumeApplet::showVolControl(bool showMic)
   connect( vc->muteBox, SIGNAL( toggled( bool ) ), this, SLOT( mute( bool ) ) );
+
+   Config config("qpe");
+   config.setGroup("Volume");
+
+   vc->keyclicks->setChecked( config.readBoolEntry("KeySound",0));
+   vc->screentaps->setChecked( config.readBoolEntry("TouchSound",0));
+   vc->alarmSound->setChecked( config.readBoolEntry("AlarmSound",1));
+
+  connect( vc->alarmSound, SIGNAL(toggled(bool)), this, SLOT( alarmSoundCheckToggled(bool)));
+  connect( vc->keyclicks, SIGNAL(toggled(bool)), this, SLOT( keyclicksCheckToggled(bool)));
+  connect( vc->screentaps, SIGNAL(toggled(bool)), this, SLOT( screentapsCheckToggled(bool)));
+
   QPoint curPos = mapToGlobal( rect().topLeft() );
-  vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 120 );
+  vc->move( curPos.x()-(vc->sizeHint().width()/2+50), curPos.y() - 120 );
   vc->show();
@@ -304,5 +346,5 @@ void VolumeApplet::readSystemVolume()
 {
-    Config cfg("Sound");
-    cfg.setGroup("System");
-    volumePercent = cfg.readNumEntry("Volume");
+    Config cfg("qpe");
+    cfg.setGroup("Volume");
+    volumePercent = cfg.readNumEntry("VolumePercent");
 }
@@ -311,4 +353,4 @@ void VolumeApplet::readSystemMic()
 {
-    Config cfg("Sound");
-    cfg.setGroup("System");
+    Config cfg("qpe");
+    cfg.setGroup("Volume");
     micPercent = cfg.readNumEntry("Mic");
@@ -335,5 +377,5 @@ void VolumeApplet::writeSystemVolume()
   {
-  Config cfg("Sound");
-  cfg.setGroup("System");
-  cfg.writeEntry("Volume",volumePercent);
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
+  cfg.writeEntry("VolumePercent",volumePercent);
   }
@@ -348,4 +390,4 @@ void VolumeApplet::writeSystemMic()
   {
-  Config cfg("Sound");
-  cfg.setGroup("System");
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
   cfg.writeEntry("Mic",micPercent);
@@ -380 +422,23 @@ void VolumeApplet::paintEvent( QPaintEvent* )
 }
+
+void VolumeApplet::screentapsCheckToggled(bool b) {
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
+  cfg.writeEntry("TouchSound",b );
+  cfg.write();
+}
+
+void VolumeApplet::keyclicksCheckToggled(bool b) {
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
+  cfg.writeEntry("KeySound",b);
+  cfg.write();
+}
+
+void VolumeApplet::alarmSoundCheckToggled(bool b) {
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
+  cfg.writeEntry("AlarmSound",b);
+  cfg.write();
+}
+
diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h
index 3a2da43..6e631f2 100644
--- a/core/applets/volumeapplet/volume.h
+++ b/core/applets/volumeapplet/volume.h
@@ -25,3 +25,2 @@
 #include <qwidget.h>
-#include <qpushbutton.h>
 #include <qframe.h>
@@ -44,2 +43,6 @@ public:
     QCheckBox *muteBox;
+    QCheckBox *alarmSound;
+    QCheckBox *screentaps;
+    QCheckBox *keyclicks;
+
 
@@ -96,2 +99,6 @@ private:
 
+protected slots:
+    void alarmSoundCheckToggled(bool);
+    void keyclicksCheckToggled(bool);
+    void screentapsCheckToggled(bool); 
 };