Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 20f0dab..dd341c0 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <qcheckbox.h> | 32 | #include <qcheckbox.h> |
33 | #include <qlineedit.h> | 33 | #include <qlineedit.h> |
34 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
35 | #include <qlabel.h> | ||
35 | 36 | ||
36 | #include <sys/utsname.h> | 37 | #include <sys/utsname.h> |
37 | #include <sys/time.h> | 38 | #include <sys/time.h> |
@@ -40,11 +41,12 @@ | |||
40 | #include <stdio.h> | 41 | #include <stdio.h> |
41 | #include <sys/stat.h> | 42 | #include <sys/stat.h> |
42 | 43 | ||
44 | |||
43 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | 45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
44 | : SoundSettingsBase( parent, objname, TRUE, fl ) | 46 | : SoundSettingsBase( parent, objname, TRUE, fl ) |
45 | { | 47 | { |
46 | keyReset=FALSE; | 48 | keyReset=FALSE; |
47 | 49 | noWarning=false; | |
48 | Config config( "qpe"); | 50 | Config config( "qpe"); |
49 | config.setGroup( "Volume" ); | 51 | config.setGroup( "Volume" ); |
50 | Config cfg("Vmemo"); | 52 | Config cfg("Vmemo"); |
@@ -64,10 +66,12 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
64 | else if(rate==44100) | 66 | else if(rate==44100) |
65 | sampleRate->setCurrentItem(4); | 67 | sampleRate->setCurrentItem(4); |
66 | 68 | ||
67 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only | 69 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); |
70 | //TODO hide if zaurus- mono only | ||
68 | 71 | ||
69 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) //since ipaq and zaurus have particular | 72 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
70 | //devices | 73 | //since ipaq and zaurus have particular |
74 | //devices | ||
71 | bool systemZaurus=FALSE; | 75 | bool systemZaurus=FALSE; |
72 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 76 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
73 | if (uname(&name) != -1) {// TODO change this here,... | 77 | if (uname(&name) != -1) {// TODO change this here,... |
@@ -106,9 +110,14 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
106 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); | 110 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); |
107 | 111 | ||
108 | updateStorageCombo(); | 112 | updateStorageCombo(); |
109 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); | 113 | connect( LocationComboBox,SIGNAL(activated(const QString &)), this, |
110 | connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT( setKeyButton(const QString &))); | 114 | SLOT( setLocation(const QString &))); |
111 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &))); | 115 | connect( keyComboBox,SIGNAL(activated( int)), this, |
116 | SLOT( setKeyButton( int))); | ||
117 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)), this, | ||
118 | SLOT( setSizeLimitButton(const QString &))); | ||
119 | connect( restartCheckBox,SIGNAL( toggled( bool)), this, | ||
120 | SLOT( restartOpie( bool))); | ||
112 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 121 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
113 | } | 122 | } |
114 | 123 | ||
@@ -134,7 +143,7 @@ void SoundSettings::updateStorageCombo() { | |||
134 | list << name + ": " +path; | 143 | list << name + ": " +path; |
135 | if( loc.find( path,0,TRUE) != -1) | 144 | if( loc.find( path,0,TRUE) != -1) |
136 | set = i; | 145 | set = i; |
137 | // if(dit.current()->file().find(path) != -1 ) storage=name; | 146 | // if(dit.current()->file().find(path) != -1 ) storage=name; |
138 | i++; | 147 | i++; |
139 | } | 148 | } |
140 | 149 | ||
@@ -160,28 +169,24 @@ void SoundSettings::cleanUp() { | |||
160 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | 169 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); |
161 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | 170 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); |
162 | 171 | ||
163 | if(keyReset) { | 172 | if(keyReset && noWarning) { |
164 | switch ( QMessageBox::warning(this,tr("Restart"), | 173 | QCopEnvelope ("QPE/System", "restart()"); |
165 | tr("To implement a new key switch\nOpie will have to be restarted./n<B>Restart</B> Opie now?"), | ||
166 | tr("Yes"),tr("No"),0,1,1) ) { | ||
167 | case 0: | ||
168 | QCopEnvelope ("QPE/System", "restart()"); | ||
169 | break; | ||
170 | }; | ||
171 | } | 174 | } |
172 | } | 175 | } |
173 | 176 | ||
174 | void SoundSettings::setKeyButton(const QString &name) { | 177 | void SoundSettings::setKeyButton( int index) { |
175 | Config cfg("Vmemo"); | 178 | Config cfg("Vmemo"); |
176 | cfg.setGroup("Defaults"); | 179 | cfg.setGroup("Defaults"); |
177 | cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); | 180 | cfg.writeEntry( "toggleKey", index ); |
178 | keyReset = TRUE; | 181 | keyReset = TRUE; |
179 | if(keyComboBox->currentItem() == 1) | 182 | if( index == 1) { |
180 | cfg.writeEntry( "hideIcon", 0 ); | 183 | cfg.writeEntry( "hideIcon", 0 ); |
181 | else | 184 | keyLabel->setText(tr("Shows icon")); |
185 | } | ||
186 | else { | ||
182 | cfg.writeEntry( "hideIcon", 1); | 187 | cfg.writeEntry( "hideIcon", 1); |
183 | 188 | keyLabel->setText(tr("Hides icon")); | |
184 | 189 | } | |
185 | cfg.write(); | 190 | cfg.write(); |
186 | } | 191 | } |
187 | 192 | ||
@@ -199,3 +204,8 @@ void SoundSettings::setSizeLimitButton(const QString &index) { | |||
199 | cfg.writeEntry("SizeLimit", index); | 204 | cfg.writeEntry("SizeLimit", index); |
200 | cfg.write(); | 205 | cfg.write(); |
201 | } | 206 | } |
207 | |||
208 | void SoundSettings::restartOpie(bool b) { | ||
209 | noWarning=b; | ||
210 | } | ||
211 | |||