summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp107
-rw-r--r--noncore/settings/sound/soundsettings.h5
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp201
-rw-r--r--noncore/settings/sound/soundsettingsbase.h23
4 files changed, 53 insertions, 283 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index a163d38..99fccf7 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -32,36 +32,32 @@
#include <qcombobox.h>
#include <sys/utsname.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
: SoundSettingsBase( parent, objname, TRUE, fl )
{
keyReset=FALSE;
Config config( "qpe");
config.setGroup( "Volume" );
- volume->setValue(100-config.readNumEntry("VolumePercent"));
- mic->setValue(100-config.readNumEntry("Mic"));
-// touchsound->setChecked(config.readBoolEntry("TouchSound"));
-// keysound->setChecked(config.readBoolEntry("KeySound"));
Config cfg("Vmemo");
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
AlertCheckBox->setChecked(cfg.readBoolEntry("Alert"));
cfg.setGroup("Record");
int rate=config.readNumEntry("SampleRate", 22050);
if(rate == 8000)
sampleRate->setCurrentItem(0);
else if(rate == 11025)
sampleRate->setCurrentItem(1);
else if(rate == 22050)
sampleRate->setCurrentItem(2);
else if(rate == 33075)
sampleRate->setCurrentItem(3);
else if(rate==44100)
sampleRate->setCurrentItem(4);
@@ -87,136 +83,43 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
#else
#endif
int sRate=cfg.readNumEntry("SizeLimit", 30);
qDebug("%d",sRate);
if(sRate ==30)
timeLimitComboBox->setCurrentItem(0);
else if(sRate==20)
timeLimitComboBox->setCurrentItem(1);
else if(sRate == 15)
timeLimitComboBox->setCurrentItem(2);
else if(sRate == 10)
timeLimitComboBox->setCurrentItem(3);
else
timeLimitComboBox->setCurrentItem(4);
-
sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
cfg.setGroup("Defaults");
keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
updateStorageCombo();
-
- 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) ) );
-
connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &)));
connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT( setKeyButton(const QString &)));
connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &)));
// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
}
-
-// void SoundSettings::reject()
-// {
-// qDebug("reject");
-// Config config( "qpe");
-// config.setGroup( "Volume");
-
-// setVolume(100-config.readNumEntry("VolumePercent"));
-// setMic(100-config.readNumEntry("Mic"));
-
-// // config.setGroup("Record");
-// // int rate=config.readNumEntry("SampleRate", 11025);
-// // if(rate == 11025)
-// // sampleRate->setCurrentItem(0);
-// // else if(rate == 22050)
-// // sampleRate->setCurrentItem(1);
-// // else if(rate == 32000)
-// // sampleRate->setCurrentItem(2);
-// // else if(rate==44100)
-// // sampleRate->setCurrentItem(3);
-// // stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
-// // sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
-// qDebug("QDialog::reject();");
-// ::exit(-1);
-// }
-
-// void SoundSettings::accept()
-// {
-// qDebug("accept");
-// Config config( "qpe" );
-// config.setGroup( "Volume" );
-// config.writeEntry("VolumePercent",100-volume->value());
-// config.writeEntry("Mic",100-mic->value());
-// // config.writeEntry("TouchSound",touchsound->isChecked());
-// // config.writeEntry("KeySound",keysound->isChecked());
-
-// Config cfg("Vmemo");
-// cfg.writeEntry("Alert",AlertCheckBox->isChecked());
-// setVolume(volume->value());
-// setMic(mic->value());
-
-// cfg.setGroup("Record");
-// cfg.writeEntry("SampleRate",sampleRate->currentText());
-// cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
-// cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
-// // Config cfg( "VMemo" );
-// // cfg.setGroup( "Defaults" );
-// // cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked());
-// qDebug("QDialog::accept();");
-// ::exit(0);
-// }
-
-void SoundSettings::setVolume(int v)
-{
- Config config( "qpe" );
- config.setGroup( "Volume" );
- config.writeEntry("VolumePercent",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( "qpe" );
- config.setGroup( "Volume" );
- 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( "qpe" );
- config.setGroup( "Volume" );
- volume->setValue(100-config.readNumEntry("VolumePercent"));
-}
-
-void SoundSettings::micChanged( bool )
-{
- Config config( "qpe" );
- config.setGroup( "Volume" );
- mic->setValue(100-config.readNumEntry("Mic"));
-}
-
void SoundSettings::updateStorageCombo() {
Config config( "Vmemo" );
config.setGroup( "System" );
QString loc = config.readEntry("RecLocation","/");
int i=0;
int set=0;
StorageInfo storageInfo;
QString sName, sPath;
QStringList list;
list << "Documents : "+QPEApplication::documentDir();
list << "tmp : /tmp";
const QList<FileSystem> &fs = storageInfo.fileSystems();
QListIterator<FileSystem> it ( fs );
for( ; it.current(); ++it ){
@@ -231,44 +134,34 @@ int set=0;
}
LocationComboBox->insertStringList(list);
qDebug("set item %d", set);
LocationComboBox->setCurrentItem(set);
}
void SoundSettings::setLocation(const QString & string) {
Config config( "Vmemo" );
config.setGroup( "System" );
config.writeEntry("RecLocation",string);
qDebug("set location "+string);
config.write();
}
void SoundSettings::cleanUp() {
- qDebug("cleanup");
- Config config( "qpe" );
- config.setGroup( "Volume" );
- config.writeEntry("VolumePercent",100-volume->value());
- config.writeEntry("Mic",100-mic->value());
-// config.writeEntry("TouchSound",touchsound->isChecked());
-// config.writeEntry("KeySound",keysound->isChecked());
-
Config cfg("Vmemo");
cfg.writeEntry("Alert",AlertCheckBox->isChecked());
- setVolume(volume->value());
- setMic(mic->value());
cfg.setGroup("Record");
cfg.writeEntry("SampleRate",sampleRate->currentText());
cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
if(keyReset) QCopEnvelope ("QPE/System", "restart()");
}
void SoundSettings::setKeyButton(const QString &name) {
Config cfg("Vmemo");
cfg.setGroup("Defaults");
cfg.writeEntry( "toggleKey", keyComboBox->currentItem() );
keyReset = TRUE;
if(keyComboBox->currentItem() == 1)
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index 94d5d48..6b8b835 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -29,26 +29,21 @@ class SoundSettings : public SoundSettingsBase
Q_OBJECT
public:
SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
protected:
/* void accept(); */
/* void reject(); */
void updateStorageCombo();
void updateLocationCombo();
private slots:
void setKeyButton(const QString &);
void setSizeLimitButton(const QString &);
void setLocation(const QString &);
void cleanUp();
- void setVolume(int);
- void setMic(int);
-
- void volumeChanged( bool muted );
- void micChanged( bool muted );
};
#endif // SOUNDSETTINGS_H
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index 8be1b3d..4c28ae9 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -70,222 +70,113 @@ static const char* const image1_data[] = {
/*
* Constructs a SoundSettingsBase which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool modal, WFlags fl )
: QMainWindow( parent, name, fl )
{
QPixmap image0( ( const char** ) image0_data );
QPixmap image1( ( const char** ) image1_data );
if ( !name )
setName( "SoundSettingsBase" );
- resize( 255, 301 );
setCaption( tr( "Vmemo Settings" ) );
SoundSettingsBaseLayout = new QGridLayout( this );
- SoundSettingsBaseLayout->setSpacing( 6 );
- SoundSettingsBaseLayout->setMargin( 11 );
+ SoundSettingsBaseLayout->setSpacing( 4 );
+ SoundSettingsBaseLayout->setMargin( 6 );
- GroupBox3 = new QGroupBox( this, "GroupBox3" );
- GroupBox3->setFrameShape( QGroupBox::Box );
- GroupBox3->setFrameShadow( QGroupBox::Sunken );
- GroupBox3->setTitle( tr( "Levels" ) );
- GroupBox3->setColumnLayout(0, Qt::Vertical );
- GroupBox3->layout()->setSpacing( 0 );
- GroupBox3->layout()->setMargin( 0 );
- GroupBox3Layout = new QVBoxLayout( GroupBox3->layout() );
- GroupBox3Layout->setAlignment( Qt::AlignTop );
- GroupBox3Layout->setSpacing( 2 );
- GroupBox3Layout->setMargin( 2 );
-
- Layout10 = new QVBoxLayout;
- Layout10->setSpacing( 2 );
- Layout10->setMargin( 2 );
-
- Layout16 = new QHBoxLayout;
- Layout16->setSpacing( 2 );
- Layout16->setMargin( 2 );
- QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout16->addItem( spacer );
-
- PixmapLabel1_2 = new QLabel( GroupBox3, "PixmapLabel1_2" );
- PixmapLabel1_2->setPixmap( image0 );
- PixmapLabel1_2->setScaledContents( FALSE );
- Layout16->addWidget( PixmapLabel1_2 );
-
- TextLabel1_2 = new QLabel( GroupBox3, "TextLabel1_2" );
- TextLabel1_2->setText( tr( "Loud" ) );
- Layout16->addWidget( TextLabel1_2 );
- QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout16->addItem( spacer_2 );
- Layout10->addLayout( Layout16 );
-
- Layout13 = new QHBoxLayout;
- Layout13->setSpacing( 2 );
- Layout13->setMargin( 2 );
-
- volLabel = new QLabel( GroupBox3, "volLabel" );
- volLabel->setText( tr( "Output" ) );
- Layout13->addWidget( volLabel );
- QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout13->addItem( spacer_3 );
-
- micLabel = new QLabel( GroupBox3, "micLabel" );
- micLabel->setText( tr( "Mic" ) );
- Layout13->addWidget( micLabel );
- QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout13->addItem( spacer_4 );
- Layout10->addLayout( Layout13 );
-
- Layout12 = new QHBoxLayout;
- Layout12->setSpacing( 2 );
- Layout12->setMargin( 2 );
-
- volume = new QSlider( GroupBox3, "volume" );
- volume->setMaxValue( 100 );
- volume->setValue( 50 );
- volume->setOrientation( QSlider::Vertical );
- volume->setTickmarks( QSlider::Right );
- volume->setTickInterval( 5 );
- Layout12->addWidget( volume );
- QSpacerItem* spacer_5 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout12->addItem( spacer_5 );
-
- mic = new QSlider( GroupBox3, "mic" );
- mic->setMaxValue( 100 );
- mic->setValue( 50 );
- mic->setOrientation( QSlider::Vertical );
- mic->setTickmarks( QSlider::Right );
- mic->setTickInterval( 5 );
- Layout12->addWidget( mic );
- QSpacerItem* spacer_6 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout12->addItem( spacer_6 );
- Layout10->addLayout( Layout12 );
-
- Layout17 = new QHBoxLayout;
- Layout17->setSpacing( 2 );
- Layout17->setMargin( 2 );
- QSpacerItem* spacer_7 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout17->addItem( spacer_7 );
-
- PixmapLabel2_2 = new QLabel( GroupBox3, "PixmapLabel2_2" );
- PixmapLabel2_2->setPixmap( image1 );
- PixmapLabel2_2->setScaledContents( FALSE );
- Layout17->addWidget( PixmapLabel2_2 );
-
- TextLabel2_2 = new QLabel( GroupBox3, "TextLabel2_2" );
- TextLabel2_2->setText( tr( "Silent" ) );
- Layout17->addWidget( TextLabel2_2 );
- QSpacerItem* spacer_8 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout17->addItem( spacer_8 );
- Layout10->addLayout( Layout17 );
- GroupBox3Layout->addLayout( Layout10 );
-
- SoundSettingsBaseLayout->addWidget( GroupBox3, 0, 0 );
-
- Layout12_2 = new QVBoxLayout;
- Layout12_2->setSpacing( 2 );
- Layout12_2->setMargin( 2 );
-
- GroupBox1 = new QGroupBox( this, "GroupBox1" );
- GroupBox1->setTitle( tr( "Vmemo" ) );
+ stereoCheckBox = new QCheckBox( this, "stereoCheckBox" );
+ stereoCheckBox->setText( tr( "Stereo" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget(stereoCheckBox , 0, 0, 0, 0 );
- QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" );
- privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 230 ) );
+ sixteenBitCheckBox = new QCheckBox( this, "sixteenBitCheckBox" );
+ sixteenBitCheckBox->setText( tr( "16 bit" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget( sixteenBitCheckBox , 0, 0, 1, 1 );
- Layout11 = new QVBoxLayout( privateLayoutWidget );
- Layout11->setSpacing( 2 );
- Layout11->setMargin( 0 );
+ AlertCheckBox = new QCheckBox( this, "AlertCheckBox" );
+ AlertCheckBox->setText( tr( "Visual Alerts" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget( AlertCheckBox , 0, 0, 2, 2 );
- sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" );
- sampleRateLabel->setText( tr( "Sample Rate" ) );
- Layout11->addWidget( sampleRateLabel );
+ QSpacerItem* spacer0 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding );
+ SoundSettingsBaseLayout->addItem( spacer0, 0, 3 );
+
+ sampleRateLabel = new QLabel(this, "sampleRateLabel" );
+ sampleRateLabel->setText( tr( "Sample Rate:" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget( sampleRateLabel , 1, 1, 0, 0 );
- sampleRate = new QComboBox( FALSE, privateLayoutWidget, "sampleRate" );
+ sampleRate = new QComboBox( FALSE,this, "sampleRate" );
sampleRate->insertItem( tr( "8000" ) );
sampleRate->insertItem( tr( "11025" ) );
sampleRate->insertItem( tr( "22050" ) );
sampleRate->insertItem( tr( "33075" ) );
sampleRate->insertItem( tr( "44100" ) );
- sampleRate->setFixedWidth(90);
- Layout11->addWidget( sampleRate );
-
- stereoCheckBox = new QCheckBox( privateLayoutWidget, "stereoCheckBox" );
- stereoCheckBox->setText( tr( "Stereo" ) );
- Layout11->addWidget( stereoCheckBox );
+// sampleRate->setFixedWidth(90);
+ SoundSettingsBaseLayout->addMultiCellWidget( sampleRate, 2, 2, 0, 2 );
- sixteenBitCheckBox = new QCheckBox( privateLayoutWidget, "sixteenBitCheckBox" );
- sixteenBitCheckBox->setText( tr( "16 bit" ) );
- Layout11->addWidget( sixteenBitCheckBox );
+// QSpacerItem* spacer = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding );
+// SoundSettingsBaseLayout->addItem( spacer, 1, 3 );
- AlertCheckBox = new QCheckBox( privateLayoutWidget, "AlertCheckBox" );
- AlertCheckBox->setText( tr( "Visual Alerts" ) );
- Layout11->addWidget( AlertCheckBox );
+ TextLabel1 = new QLabel( this, "TextLabel1" );
+ TextLabel1->setText( tr( "Recording Directory:" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget( TextLabel1, 3, 3, 0, 0 );
- TextLabel1 = new QLabel( privateLayoutWidget, "TextLabel1" );
- TextLabel1->setText( tr( "Location:" ) );
- Layout11->addWidget( TextLabel1 );
+ LocationComboBox = new QComboBox( FALSE, this, "LocationComboBox" );
+ SoundSettingsBaseLayout->addMultiCellWidget( LocationComboBox, 4, 4, 0, 2 );
- LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" );
- Layout11->addWidget( LocationComboBox );
+// QSpacerItem* spacer1 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding );
+// SoundSettingsBaseLayout->addItem( spacer1, 2, 3 );
QLabel *TextLabelKey;
- TextLabelKey = new QLabel( privateLayoutWidget, "TextLabelKey" );
- TextLabelKey->setText( tr( "Record Key:" ) );
- Layout11->addWidget( TextLabelKey );
+ TextLabelKey = new QLabel( this, "TextLabelKey" );
+ TextLabelKey->setText( tr( "Recording Key:" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget(TextLabelKey , 5, 5, 0, 0 );
- keyComboBox = new QComboBox( FALSE, privateLayoutWidget, "keyComboBox" );
+ keyComboBox = new QComboBox( FALSE, this, "keyComboBox" );
keyComboBox->insertItem( tr( "" ) );
keyComboBox->insertItem( tr( "Taskbar Icon" ) );
keyComboBox->insertItem( tr( "Key_Escape" ) );
keyComboBox->insertItem( tr( "Key_Space" ) );
keyComboBox->insertItem( tr( "Key_Home" ) );
keyComboBox->insertItem( tr( "Key_Calender" ) );
keyComboBox->insertItem( tr( "Key_Contacts" ) );
keyComboBox->insertItem( tr( "Key_Menu" ) );
keyComboBox->insertItem( tr( "Key_Mail" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 2 );
- Layout11->addWidget( keyComboBox );
+// QSpacerItem* spacer2 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding );
+// SoundSettingsBaseLayout->addItem( spacer2, 3, 3 );
QLabel *timeLimitLabel;
- timeLimitLabel= new QLabel( privateLayoutWidget, "timeLimitLabel" );
- timeLimitLabel->setText( tr( "Recording Limit:" ) );
- Layout11->addWidget( timeLimitLabel );
+ timeLimitLabel= new QLabel( this, "timeLimitLabel" );
+ timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) );
+ SoundSettingsBaseLayout->addMultiCellWidget( timeLimitLabel , 7, 7, 0, 0 );
- timeLimitComboBox = new QComboBox( FALSE, privateLayoutWidget, "timeLimitComboBox" );
+ timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" );
timeLimitComboBox->insertItem( tr( "30" ) );
timeLimitComboBox->insertItem( tr( "20" ) );
timeLimitComboBox->insertItem( tr( "15" ) );
timeLimitComboBox->insertItem( tr( "10" ) );
timeLimitComboBox->insertItem( tr( "5" ) );
+ timeLimitComboBox->insertItem( tr( "Unlimited" ) );
- Layout11->addWidget(timeLimitComboBox);
- QLabel *timeLimitLabel2;
- timeLimitLabel2= new QLabel( privateLayoutWidget, "timeLimitLabel2" );
- timeLimitLabel2->setText( tr( "seconds" ) );
- Layout11->addWidget( timeLimitLabel2 );
-
- Layout12_2->addWidget( GroupBox1 );
-// // touchsound = new QCheckBox( this, "touchsound" );
-// // touchsound->setText( tr( "Screen sounds" ) );
-// // Layout12_2->addWidget( touchsound );
+ SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 2);
-// // keysound = new QCheckBox( this, "keysound" );
-// // keysound->setText( tr( "Keyboard sounds" ) );
-// // Layout12_2->addWidget( keysound );
+// QSpacerItem* spacer3 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding );
+// SoundSettingsBaseLayout->addItem( spacer3, 4, 3 );
- SoundSettingsBaseLayout->addLayout( Layout12_2, 0, 1 );
+ QSpacerItem* spacer4 = new QSpacerItem( 20, 20,QSizePolicy::Expanding, QSizePolicy::Expanding );
+ SoundSettingsBaseLayout->addItem( spacer4, 9, 0 );
}
/*
* Destroys the object and frees any allocated resources
*/
SoundSettingsBase::~SoundSettingsBase()
{
// no need to delete child widgets, Qt does it all for us
}
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h
index 5622b70..30f32ca 100644
--- a/noncore/settings/sound/soundsettingsbase.h
+++ b/noncore/settings/sound/soundsettingsbase.h
@@ -17,51 +17,42 @@ class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QCheckBox;
class QComboBox;
class QGroupBox;
class QLabel;
class QSlider;
class SoundSettingsBase : public QMainWindow
{
Q_OBJECT
public:
SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~SoundSettingsBase();
- QGroupBox* GroupBox3;
QLabel* PixmapLabel1_2;
QLabel* TextLabel1_2;
- QLabel* volLabel;
- QLabel* micLabel;
- QSlider* volume;
- QSlider* mic;
- QLabel* PixmapLabel2_2;
- QLabel* TextLabel2_2;
- QGroupBox* GroupBox1;
+/* QLabel* volLabel; */
+/* QLabel* micLabel; */
+/* QSlider* volume; */
+/* QSlider* mic; */
+/* QLabel* PixmapLabel2_2; */
+/* QLabel* TextLabel2_2; */
+/* QGroupBox* GroupBox1; */
QLabel* sampleRateLabel;
QComboBox* sampleRate;
QCheckBox* stereoCheckBox;
QCheckBox* sixteenBitCheckBox;
QCheckBox* AlertCheckBox;
QLabel* TextLabel1;
QComboBox* LocationComboBox;
QComboBox* keyComboBox;
QComboBox* timeLimitComboBox;
bool keyReset;
protected:
QGridLayout* SoundSettingsBaseLayout;
- QVBoxLayout* GroupBox3Layout;
- QVBoxLayout* Layout10;
- QHBoxLayout* Layout16;
- QHBoxLayout* Layout13;
- QHBoxLayout* Layout12;
- QHBoxLayout* Layout17;
- QVBoxLayout* Layout12_2;
- QVBoxLayout* Layout11;
protected slots:
};
#endif // SOUNDSETTINGSBASE_H