summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp17
-rw-r--r--noncore/settings/sound/soundsettings.h1
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp8
-rw-r--r--noncore/settings/sound/soundsettingsbase.h2
4 files changed, 24 insertions, 4 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 09d2e92..4bc86fa 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -101,25 +101,33 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
101 timeLimitComboBox->setCurrentItem(5); 101 timeLimitComboBox->setCurrentItem(5);
102 102
103 sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); 103 sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
104 104
105 cfg.setGroup("Defaults"); 105 cfg.setGroup("Defaults");
106 keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); 106 keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
107 107
108 updateStorageCombo(); 108 updateStorageCombo();
109
110 Config vmCfg("Vmemo");
111 vmCfg.setGroup("Defaults");
112 adpcmCheckBox->setChecked( vmCfg.readBoolEntry("use_ADPCM", 0));
113
109 connect( LocationComboBox,SIGNAL(activated(const QString &)), this, 114 connect( LocationComboBox,SIGNAL(activated(const QString &)), this,
110 SLOT( setLocation(const QString &))); 115 SLOT( setLocation(const QString &)));
111 connect( keyComboBox,SIGNAL(activated( int)), this, 116 connect( keyComboBox,SIGNAL(activated( int)), this,
112 SLOT( setKeyButton( int))); 117 SLOT( setKeyButton( int)));
113 connect( timeLimitComboBox,SIGNAL(activated( const QString &)), this, 118 connect( timeLimitComboBox,SIGNAL(activated( const QString &)), this,
114 SLOT( setSizeLimitButton(const QString &))); 119 SLOT( setSizeLimitButton(const QString &)));
115 connect( restartCheckBox,SIGNAL( toggled( bool)), this, 120 connect( restartCheckBox,SIGNAL( toggled( bool)), this,
116 SLOT( restartOpie( bool))); 121 SLOT( restartOpie( bool)));
117// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 122 connect( adpcmCheckBox,SIGNAL( toggled( bool)), this,
123 SLOT( slotAdpcm( bool)));
124
125 // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
118} 126}
119 127
120void SoundSettings::updateStorageCombo() { 128void SoundSettings::updateStorageCombo() {
121 129
122 Config config( "Vmemo" ); 130 Config config( "Vmemo" );
123 config.setGroup( "System" ); 131 config.setGroup( "System" );
124 QString loc = config.readEntry("RecLocation","/"); 132 QString loc = config.readEntry("RecLocation","/");
125 int i=0; 133 int i=0;
@@ -159,17 +167,16 @@ void SoundSettings::setLocation(const QString & string) {
159void SoundSettings::cleanUp() { 167void SoundSettings::cleanUp() {
160 Config cfg("Vmemo"); 168 Config cfg("Vmemo");
161 cfg.writeEntry("Alert",AlertCheckBox->isChecked()); 169 cfg.writeEntry("Alert",AlertCheckBox->isChecked());
162 170
163 cfg.setGroup("Record"); 171 cfg.setGroup("Record");
164 cfg.writeEntry("SampleRate",sampleRate->currentText()); 172 cfg.writeEntry("SampleRate",sampleRate->currentText());
165 cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); 173 cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
166 cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); 174 cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
167
168 if(keyReset && noWarning) { 175 if(keyReset && noWarning) {
169 QCopEnvelope ("QPE/System", "restart()"); 176 QCopEnvelope ("QPE/System", "restart()");
170 } 177 }
171} 178}
172 179
173void SoundSettings::setKeyButton( int index) { 180void SoundSettings::setKeyButton( int index) {
174 Config cfg("Vmemo"); 181 Config cfg("Vmemo");
175 cfg.setGroup("Defaults"); 182 cfg.setGroup("Defaults");
@@ -200,8 +207,14 @@ void SoundSettings::setSizeLimitButton(const QString &index) {
200 cfg.writeEntry("SizeLimit", index); 207 cfg.writeEntry("SizeLimit", index);
201 cfg.write(); 208 cfg.write();
202} 209}
203 210
204void SoundSettings::restartOpie(bool b) { 211void SoundSettings::restartOpie(bool b) {
205 noWarning=b; 212 noWarning=b;
206} 213}
207 214
215void SoundSettings::slotAdpcm(bool b) {
216 Config vmCfg("Vmemo");
217 vmCfg.setGroup("Defaults");
218 vmCfg.writeEntry("use_ADPCM", b);
219 vmCfg.write();
220}
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index 0f3605e..71ce6f5 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -39,13 +39,14 @@ protected:
39 void updateLocationCombo(); 39 void updateLocationCombo();
40 40
41private slots: 41private slots:
42 void setKeyButton( int); 42 void setKeyButton( int);
43 void setSizeLimitButton(const QString &); 43 void setSizeLimitButton(const QString &);
44 void setLocation(const QString &); 44 void setLocation(const QString &);
45 void cleanUp(); 45 void cleanUp();
46 void restartOpie(bool); 46 void restartOpie(bool);
47 void slotAdpcm(bool);
47}; 48};
48 49
49 50
50#endif // SOUNDSETTINGS_H 51#endif // SOUNDSETTINGS_H
51 52
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index af794ba..f283119 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -156,20 +156,24 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
156 156
157 SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 0, 1); 157 SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 0, 1);
158 158
159 159
160 restartCheckBox= new QCheckBox( this, "restartCheck" ); 160 restartCheckBox= new QCheckBox( this, "restartCheck" );
161 restartCheckBox->setText( tr( "Restart Opie if needed" ) ); 161 restartCheckBox->setText( tr( "Restart Opie if needed" ) );
162 162
163 SoundSettingsBaseLayout->addMultiCellWidget( restartCheckBox , 9, 9, 0, 0, 1); 163 SoundSettingsBaseLayout->addMultiCellWidget( restartCheckBox , 9, 9, 0, 0, 1);
164 164
165 adpcmCheckBox = new QCheckBox( this, "adpcmCheck" );
166 adpcmCheckBox->setText( tr( "Use ADPCM compression" ) );
167
168 SoundSettingsBaseLayout->addMultiCellWidget( adpcmCheckBox , 10, 10, 0, 0, 1);
165 169
166 QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); 170 QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
167 SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); 171 SoundSettingsBaseLayout->addItem( spacer4, 10, 0 );
168} 172}
169 173
170/* 174/*
171 * Destroys the object and frees any allocated resources 175 * Destroys the object and frees any allocated resources
172 */ 176 */
173SoundSettingsBase::~SoundSettingsBase() 177SoundSettingsBase::~SoundSettingsBase()
174{ 178{
175 // no need to delete child widgets, Qt does it all for us 179 // 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 e6bc186..48c31e8 100644
--- a/noncore/settings/sound/soundsettingsbase.h
+++ b/noncore/settings/sound/soundsettingsbase.h
@@ -45,16 +45,18 @@ public:
45 QCheckBox* stereoCheckBox; 45 QCheckBox* stereoCheckBox;
46 QCheckBox* sixteenBitCheckBox; 46 QCheckBox* sixteenBitCheckBox;
47 QCheckBox* AlertCheckBox; 47 QCheckBox* AlertCheckBox;
48 QLabel* TextLabel1; 48 QLabel* TextLabel1;
49 QComboBox* LocationComboBox; 49 QComboBox* LocationComboBox;
50 QComboBox* keyComboBox; 50 QComboBox* keyComboBox;
51 QComboBox* timeLimitComboBox; 51 QComboBox* timeLimitComboBox;
52 QCheckBox *restartCheckBox; 52 QCheckBox *restartCheckBox;
53 QCheckBox *adpcmCheckBox;
54
53 bool keyReset; 55 bool keyReset;
54protected: 56protected:
55 QGridLayout* SoundSettingsBaseLayout; 57 QGridLayout* SoundSettingsBaseLayout;
56protected slots: 58protected slots:
57 59
58}; 60};
59 61
60#endif // SOUNDSETTINGSBASE_H 62#endif // SOUNDSETTINGSBASE_H