Diffstat (limited to 'noncore/settings/sound/soundsettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 79 |
1 files changed, 45 insertions, 34 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index d55a751..df3def5 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -44,13 +44,16 @@ using namespace Opie::Core; | |||
44 | 44 | ||
45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | 45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
46 | : SoundSettingsBase( parent, objname, TRUE, fl ) | 46 | : SoundSettingsBase( parent, objname, true, fl ) |
47 | { | 47 | { |
48 | keyReset=FALSE; | 48 | keyReset=false; |
49 | noWarning=false; | 49 | noWarning=false; |
50 | Config config( "qpe"); | 50 | Config config( "qpe"); |
51 | config.setGroup( "Volume" ); | 51 | config.setGroup( "Volume" ); |
52 | Config cfg("Vmemo"); | 52 | Config cfg("Vmemo"); |
53 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 53 | |
54 | AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); | 54 | |
55 | // connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp())); | ||
56 | |||
57 | AlertCheckBox->setChecked( cfg.readBoolEntry("Alert", 1)); | ||
55 | 58 | ||
56 | cfg.setGroup("Record"); | 59 | cfg.setGroup("Record"); |
@@ -73,18 +76,18 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
73 | //since ipaq and zaurus have particular | 76 | //since ipaq and zaurus have particular |
74 | //devices | 77 | //devices |
75 | bool systemZaurus=FALSE; | 78 | bool systemZaurus=false; |
76 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 79 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
77 | if (uname(&name) != -1) {// TODO change this here,... | 80 | if (uname(&name) != -1) {// TODO change this here,... |
78 | QString release=name.release; | 81 | QString release=name.release; |
79 | if( release.find("embedix",0,TRUE) != -1) { | 82 | if( release.find("embedix",0,true) != -1) { |
80 | odebug << "IS System Zaurus" << oendl; | 83 | odebug << "IS System Zaurus" << oendl; |
81 | systemZaurus=TRUE; | 84 | systemZaurus=true; |
82 | } | 85 | } |
83 | } | 86 | } |
84 | if(!systemZaurus) { | 87 | if(!systemZaurus) { |
85 | stereoCheckBox->setChecked(TRUE); | 88 | stereoCheckBox->setChecked(true); |
86 | } | 89 | } |
87 | stereoCheckBox->setEnabled(FALSE); | 90 | stereoCheckBox->setEnabled(false); |
88 | sixteenBitCheckBox->setEnabled(FALSE); | 91 | sixteenBitCheckBox->setEnabled(false); |
89 | #else | 92 | #else |
90 | #endif | 93 | #endif |
@@ -92,7 +95,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
92 | odebug << "" << sRate << "" << oendl; | 95 | odebug << "" << sRate << "" << oendl; |
93 | 96 | ||
94 | if(sRate ==30) | 97 | if(sRate == 30) |
95 | timeLimitComboBox->setCurrentItem(0); | 98 | timeLimitComboBox->setCurrentItem(0); |
96 | else if(sRate==20) | 99 | else if(sRate == 20) |
97 | timeLimitComboBox->setCurrentItem(1); | 100 | timeLimitComboBox->setCurrentItem(1); |
98 | else if(sRate == 15) | 101 | else if(sRate == 15) |
@@ -108,5 +111,6 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
108 | 111 | ||
109 | cfg.setGroup("Defaults"); | 112 | cfg.setGroup("Defaults"); |
110 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); | 113 | recordKey = cfg.readNumEntry("toggleKey"); |
114 | keyComboBox->setCurrentItem( recordKey); | ||
111 | 115 | ||
112 | updateStorageCombo(); | 116 | updateStorageCombo(); |
@@ -116,14 +120,9 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
116 | adpcmCheckBox->setChecked( vmCfg.readBoolEntry("use_ADPCM", 0)); | 120 | adpcmCheckBox->setChecked( vmCfg.readBoolEntry("use_ADPCM", 0)); |
117 | 121 | ||
118 | connect( LocationComboBox,SIGNAL(activated(const QString&)), this, | 122 | connect(LocationComboBox,SIGNAL(activated(const QString&)),this,SLOT(setLocation(const QString&))); |
119 | SLOT( setLocation(const QString&))); | 123 | connect(keyComboBox,SIGNAL(activated(int)),this,SLOT(setKeyButton(int))); |
120 | connect( keyComboBox,SIGNAL(activated(int)), this, | 124 | connect(timeLimitComboBox,SIGNAL(activated(const QString&)),this,SLOT(setSizeLimitButton(const QString&))); |
121 | SLOT( setKeyButton(int))); | 125 | connect(restartCheckBox,SIGNAL( toggled(bool)),this,SLOT(restartOpie(bool))); |
122 | connect( timeLimitComboBox,SIGNAL(activated(const QString&)), this, | 126 | connect(adpcmCheckBox,SIGNAL( toggled(bool)),this,SLOT(slotAdpcm(bool))); |
123 | SLOT( setSizeLimitButton(const QString&))); | ||
124 | connect( restartCheckBox,SIGNAL( toggled(bool)), this, | ||
125 | SLOT( restartOpie(bool))); | ||
126 | connect( adpcmCheckBox,SIGNAL( toggled(bool)), this, | ||
127 | SLOT( slotAdpcm(bool))); | ||
128 | 127 | ||
129 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 128 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
@@ -135,6 +134,6 @@ void SoundSettings::updateStorageCombo() { | |||
135 | config.setGroup( "System" ); | 134 | config.setGroup( "System" ); |
136 | QString loc = config.readEntry("RecLocation","/"); | 135 | QString loc = config.readEntry("RecLocation","/"); |
137 | int i=0; | 136 | int i = 0; |
138 | int set=0; | 137 | int set = 0; |
139 | StorageInfo storageInfo; | 138 | StorageInfo storageInfo; |
140 | QString sName, sPath; | 139 | QString sName, sPath; |
@@ -150,5 +149,5 @@ void SoundSettings::updateStorageCombo() { | |||
150 | odebug << "storage name "+name +" storage path is "+path << oendl; | 149 | odebug << "storage name "+name +" storage path is "+path << oendl; |
151 | list << name + ": " +path; | 150 | list << name + ": " +path; |
152 | if( loc.find( path,0,TRUE) != -1) | 151 | if( loc.find( path,0,true) != -1) |
153 | set = i; | 152 | set = i; |
154 | // if(dit.current()->file().find(path) != -1 ) storage=name; | 153 | // if(dit.current()->file().find(path) != -1 ) storage=name; |
@@ -169,5 +168,12 @@ void SoundSettings::setLocation(const QString & string) { | |||
169 | } | 168 | } |
170 | 169 | ||
170 | void SoundSettings::accept() { | ||
171 | cleanUp(); | ||
172 | qApp->quit(); | ||
173 | } | ||
174 | |||
175 | |||
171 | void SoundSettings::cleanUp() { | 176 | void SoundSettings::cleanUp() { |
177 | |||
172 | Config cfg("Vmemo"); | 178 | Config cfg("Vmemo"); |
173 | cfg.writeEntry("Alert",AlertCheckBox->isChecked()); | 179 | cfg.writeEntry("Alert",AlertCheckBox->isChecked()); |
@@ -180,20 +186,25 @@ void SoundSettings::cleanUp() { | |||
180 | QCopEnvelope ("QPE/System", "restart()"); | 186 | QCopEnvelope ("QPE/System", "restart()"); |
181 | } | 187 | } |
188 | cfg.setGroup("Defaults"); | ||
189 | cfg.writeEntry( "toggleKey", recordKey); | ||
190 | if( recordKey == 1) { | ||
191 | cfg.writeEntry( "hideIcon", 0 ); | ||
192 | } | ||
193 | else { | ||
194 | cfg.writeEntry( "hideIcon", 1); | ||
195 | } | ||
196 | cfg.write(); | ||
182 | } | 197 | } |
183 | 198 | ||
184 | void SoundSettings::setKeyButton( int index) { | 199 | void SoundSettings::setKeyButton( int index) { |
185 | Config cfg("Vmemo"); | 200 | recordKey = index; |
186 | cfg.setGroup("Defaults"); | 201 | restartCheckBox->setChecked(true); |
187 | cfg.writeEntry( "toggleKey", index ); | 202 | keyReset = true; |
188 | keyReset = TRUE; | ||
189 | if( index == 1) { | 203 | if( index == 1) { |
190 | cfg.writeEntry( "hideIcon", 0 ); | ||
191 | keyLabel->setText(tr("Shows icon")); | 204 | keyLabel->setText(tr("Shows icon")); |
192 | } | 205 | } |
193 | else { | 206 | else { |
194 | cfg.writeEntry( "hideIcon", 1); | ||
195 | keyLabel->setText(tr("Hides icon")); | 207 | keyLabel->setText(tr("Hides icon")); |
196 | } | 208 | } |
197 | cfg.write(); | ||
198 | } | 209 | } |
199 | 210 | ||
@@ -206,5 +217,5 @@ void SoundSettings::setSizeLimitButton(const QString &index) { | |||
206 | Config cfg("Vmemo"); | 217 | Config cfg("Vmemo"); |
207 | cfg.setGroup("Record"); | 218 | cfg.setGroup("Record"); |
208 | if(index.find("Unlimited",0,TRUE) != -1) | 219 | if(index.find("Unlimited",0,true) != -1) |
209 | cfg.writeEntry("SizeLimit", -1); | 220 | cfg.writeEntry("SizeLimit", -1); |
210 | else | 221 | else |