changed from QDialog, with its crappy way of closing in qpe to QMainWindow

3 files changed, 35 insertions, 35 deletions

diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index cdee87c..ed601cf 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -72,2 +72,3 @@ void SoundSettings::reject()
 {
+  qDebug("here");
     Config config( "qpe");
@@ -90,4 +91,4 @@ void SoundSettings::reject()
 //   sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
-
-    QDialog::reject();
+    ::exit(-1);
+//    QDialog::reject();
 }
@@ -115,3 +116,4 @@ void SoundSettings::accept()
 //     cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked());  
-    QDialog::accept();
+//    QDialog::accept();
+    ::exit(0);
 }
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index 937b068..563b438 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -3,3 +3,3 @@
 **
-** Created: Sun May 19 12:11:35 2002
+** Created: Thu May 23 11:23:54 2002
 **      by:  The User Interface Compiler (uic)
@@ -81,5 +81,5 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     if ( !name )
-  setName( "SoundSettingsBase" );
+        setName( "SoundSettingsBase" );
     resize( 255, 301 ); 
-    setCaption( tr( "Vmemo Settings" ) );
+    setCaption( tr( "Sound Settings" ) );
     SoundSettingsBaseLayout = new QGridLayout( this ); 
@@ -97,12 +97,12 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     GroupBox3Layout->setAlignment( Qt::AlignTop );
-    GroupBox3Layout->setSpacing( 2 );
-    GroupBox3Layout->setMargin( 2 );
+    GroupBox3Layout->setSpacing( 6 );
+    GroupBox3Layout->setMargin( 11 );
 
     Layout10 = new QVBoxLayout; 
-    Layout10->setSpacing( 2 );
-    Layout10->setMargin( 2 );
+    Layout10->setSpacing( 6 );
+    Layout10->setMargin( 0 );
 
     Layout16 = new QHBoxLayout; 
-    Layout16->setSpacing( 2 );
-    Layout16->setMargin( 2 );
+    Layout16->setSpacing( 6 );
+    Layout16->setMargin( 0 );
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -123,4 +123,4 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     Layout13 = new QHBoxLayout; 
-    Layout13->setSpacing( 2 );
-    Layout13->setMargin( 2 );
+    Layout13->setSpacing( 6 );
+    Layout13->setMargin( 0 );
 
@@ -140,4 +140,4 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     Layout12 = new QHBoxLayout; 
-    Layout12->setSpacing( 2 );
-    Layout12->setMargin( 2 );
+    Layout12->setSpacing( 6 );
+    Layout12->setMargin( 0 );
 
@@ -165,4 +165,4 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     Layout17 = new QHBoxLayout; 
-    Layout17->setSpacing( 2 );
-    Layout17->setMargin( 2 );
+    Layout17->setSpacing( 6 );
+    Layout17->setMargin( 0 );
     QSpacerItem* spacer_7 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -186,4 +186,4 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     Layout12_2 = new QVBoxLayout; 
-    Layout12_2->setSpacing( 2 );
-    Layout12_2->setMargin( 2 );
+    Layout12_2->setSpacing( 6 );
+    Layout12_2->setMargin( 0 );
 
@@ -195,3 +195,3 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     Layout11 = new QVBoxLayout( privateLayoutWidget ); 
-    Layout11->setSpacing( 2 );
+    Layout11->setSpacing( 6 );
     Layout11->setMargin( 0 );
@@ -203,8 +203,6 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     sampleRate = new QComboBox( FALSE, privateLayoutWidget, "sampleRate" );
-    sampleRate->insertItem( tr( "8000" ) );
     sampleRate->insertItem( tr( "11025" ) );
     sampleRate->insertItem( tr( "22050" ) );
-    sampleRate->insertItem( tr( "33075" ) );
+    sampleRate->insertItem( tr( "32000" ) );
     sampleRate->insertItem( tr( "44100" ) );
-    sampleRate->setFixedWidth(90);
     Layout11->addWidget( sampleRate );
@@ -231,11 +229,11 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
 
-// //     touchsound = new QCheckBox( this, "touchsound" );
-// //     touchsound->setText( tr( "Screen sounds" ) );
-// //     Layout12_2->addWidget( touchsound );
+    touchsound = new QCheckBox( this, "touchsound" );
+    touchsound->setText( tr( "Screen sounds" ) );
+    Layout12_2->addWidget( touchsound );
 
-// //     keysound = new QCheckBox( this, "keysound" );
-// //     keysound->setText( tr( "Keyboard sounds" ) );
-// //     Layout12_2->addWidget( keysound );
-     QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-     Layout12_2->addItem( spacer_9 );
+    keysound = new QCheckBox( this, "keysound" );
+    keysound->setText( tr( "Keyboard sounds" ) );
+    Layout12_2->addWidget( keysound );
+    QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
+    Layout12_2->addItem( spacer_9 );
 
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h
index 8ad80f6..66ba34a 100644
--- a/noncore/settings/sound/soundsettingsbase.h
+++ b/noncore/settings/sound/soundsettingsbase.h
@@ -3,3 +3,3 @@
 **
-** Created: Sun May 19 12:11:23 2002
+** Created: Thu May 23 11:23:38 2002
 **      by:  The User Interface Compiler (uic)
@@ -47,4 +47,4 @@ public:
     QComboBox* LocationComboBox;
-/*     QCheckBox* touchsound; */
-/*     QCheckBox* keysound; */
+    QCheckBox* touchsound;
+    QCheckBox* keysound;