From 486ad124967306e4a65a63f9d4bf60ea1ba38544 Mon Sep 17 00:00:00 2001 From: llornkcor Date: Thu, 23 May 2002 17:32:43 +0000 Subject: changed from QDialog, with its crappy way of closing in qpe to QMainWindow --- (limited to 'noncore/settings') 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 @@ -70,6 +70,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) void SoundSettings::reject() { + qDebug("here"); Config config( "qpe"); config.setGroup( "Volume"); @@ -88,8 +89,8 @@ void SoundSettings::reject() // sampleRate->setCurrentItem(3); // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); - - QDialog::reject(); + ::exit(-1); +// QDialog::reject(); } void SoundSettings::accept() @@ -113,7 +114,8 @@ void SoundSettings::accept() // Config cfg( "VMemo" ); // cfg.setGroup( "Defaults" ); // cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked()); - QDialog::accept(); +// QDialog::accept(); + ::exit(0); } void SoundSettings::setVolume(int v) 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 @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'soundsettingsbase.ui' ** -** Created: Sun May 19 12:11:35 2002 +** Created: Thu May 23 11:23:54 2002 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -79,9 +79,9 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m QPixmap image0( ( const char** ) image0_data ); QPixmap image1( ( const char** ) image1_data ); if ( !name ) - setName( "SoundSettingsBase" ); + setName( "SoundSettingsBase" ); resize( 255, 301 ); - setCaption( tr( "Vmemo Settings" ) ); + setCaption( tr( "Sound Settings" ) ); SoundSettingsBaseLayout = new QGridLayout( this ); SoundSettingsBaseLayout->setSpacing( 6 ); SoundSettingsBaseLayout->setMargin( 11 ); @@ -95,16 +95,16 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m GroupBox3->layout()->setMargin( 0 ); GroupBox3Layout = new QVBoxLayout( GroupBox3->layout() ); 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 ); Layout16->addItem( spacer ); @@ -121,8 +121,8 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m Layout10->addLayout( Layout16 ); Layout13 = new QHBoxLayout; - Layout13->setSpacing( 2 ); - Layout13->setMargin( 2 ); + Layout13->setSpacing( 6 ); + Layout13->setMargin( 0 ); volLabel = new QLabel( GroupBox3, "volLabel" ); volLabel->setText( tr( "Output" ) ); @@ -138,8 +138,8 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m Layout10->addLayout( Layout13 ); Layout12 = new QHBoxLayout; - Layout12->setSpacing( 2 ); - Layout12->setMargin( 2 ); + Layout12->setSpacing( 6 ); + Layout12->setMargin( 0 ); volume = new QSlider( GroupBox3, "volume" ); volume->setMaxValue( 100 ); @@ -163,8 +163,8 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m Layout10->addLayout( Layout12 ); 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 ); Layout17->addItem( spacer_7 ); @@ -184,8 +184,8 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m SoundSettingsBaseLayout->addWidget( GroupBox3, 0, 0 ); Layout12_2 = new QVBoxLayout; - Layout12_2->setSpacing( 2 ); - Layout12_2->setMargin( 2 ); + Layout12_2->setSpacing( 6 ); + Layout12_2->setMargin( 0 ); GroupBox1 = new QGroupBox( this, "GroupBox1" ); GroupBox1->setTitle( tr( "Vmemo" ) ); @@ -193,7 +193,7 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" ); privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 169 ) ); Layout11 = new QVBoxLayout( privateLayoutWidget ); - Layout11->setSpacing( 2 ); + Layout11->setSpacing( 6 ); Layout11->setMargin( 0 ); sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" ); @@ -201,12 +201,10 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m Layout11->addWidget( sampleRateLabel ); 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 ); stereoCheckBox = new QCheckBox( privateLayoutWidget, "stereoCheckBox" ); @@ -229,15 +227,15 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m Layout11->addWidget( LocationComboBox ); Layout12_2->addWidget( GroupBox1 ); -// // 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 ); SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 ); } 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 @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'soundsettingsbase.ui' ** -** Created: Sun May 19 12:11:23 2002 +** Created: Thu May 23 11:23:38 2002 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -45,8 +45,8 @@ public: QCheckBox* AlertCheckBox; QLabel* TextLabel1; QComboBox* LocationComboBox; -/* QCheckBox* touchsound; */ -/* QCheckBox* keysound; */ + QCheckBox* touchsound; + QCheckBox* keysound; protected: QGridLayout* SoundSettingsBaseLayout; -- cgit v0.9.0.2