author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/settings/security/security.cpp | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/security/security.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index c4726b3..00ea105 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp | |||
@@ -102,40 +102,44 @@ void Security::updateGUI() | |||
102 | : tr("Change passcode" ) ); | 102 | : tr("Change passcode" ) ); |
103 | passcode_poweron->setEnabled( !empty ); | 103 | passcode_poweron->setEnabled( !empty ); |
104 | clearpasscode->setEnabled( !empty ); | 104 | clearpasscode->setEnabled( !empty ); |
105 | 105 | ||
106 | autologinToggle->setChecked(autoLogin); | 106 | autologinToggle->setChecked(autoLogin); |
107 | userlist->setEnabled(autoLogin); | 107 | userlist->setEnabled(autoLogin); |
108 | 108 | ||
109 | } | 109 | } |
110 | 110 | ||
111 | 111 | ||
112 | void Security::show() | 112 | void Security::show() |
113 | { | 113 | { |
114 | valid=FALSE; | 114 | //valid=FALSE; |
115 | setEnabled(FALSE); | 115 | setEnabled(FALSE); |
116 | SecurityBase::show(); | 116 | SecurityBase::show(); |
117 | if ( passcode.isEmpty() ) { | 117 | if ( passcode.isEmpty() ) { |
118 | // could insist... | 118 | // could insist... |
119 | //changePassCode(); | 119 | //changePassCode(); |
120 | //if ( passcode.isEmpty() ) | 120 | //if ( passcode.isEmpty() ) |
121 | //reject(); | 121 | //reject(); |
122 | } else { | 122 | } else { |
123 | QString pc = enterPassCode(tr("Enter passcode")); | 123 | |
124 | if ( pc != passcode ) { | 124 | if (!valid) // security passcode was not asked yet, so ask now |
125 | QMessageBox::critical(this, tr("Passcode incorrect"), | 125 | { |
126 | tr("The passcode entered is incorrect.\nAccess denied")); | 126 | QString pc = enterPassCode(tr("Enter passcode")); |
127 | reject(); | 127 | if ( pc != passcode ) { |
128 | return; | 128 | QMessageBox::critical(this, tr("Passcode incorrect"), |
129 | } | 129 | tr("The passcode entered is incorrect.\nAccess denied")); |
130 | reject(); | ||
131 | return; | ||
132 | } | ||
133 | } | ||
130 | } | 134 | } |
131 | setEnabled(TRUE); | 135 | setEnabled(TRUE); |
132 | valid=TRUE; | 136 | valid=TRUE; |
133 | } | 137 | } |
134 | 138 | ||
135 | void Security::accept() | 139 | void Security::accept() |
136 | { | 140 | { |
137 | applySecurity(); | 141 | applySecurity(); |
138 | QDialog::accept(); | 142 | QDialog::accept(); |
139 | QCopEnvelope env("QPE/System", "securityChanged()" ); | 143 | QCopEnvelope env("QPE/System", "securityChanged()" ); |
140 | } | 144 | } |
141 | 145 | ||
@@ -204,41 +208,47 @@ void Security::loadUsers ( void ) | |||
204 | if (*account.at(1)!="*") { | 208 | if (*account.at(1)!="*") { |
205 | 209 | ||
206 | userlist->insertItem(*account.at(0)); | 210 | userlist->insertItem(*account.at(0)); |
207 | // Highlight this item if it is set to autologinToggle | 211 | // Highlight this item if it is set to autologinToggle |
208 | if ( *account.at(0) == autoLoginName) | 212 | if ( *account.at(0) == autoLoginName) |
209 | userlist->setCurrentItem(userlist->count()-1); | 213 | userlist->setCurrentItem(userlist->count()-1); |
210 | } | 214 | } |
211 | } | 215 | } |
212 | passwd.close(); | 216 | passwd.close(); |
213 | } | 217 | } |
214 | 218 | ||
215 | } | 219 | } |
220 | |||
216 | void Security::toggleAutoLogin(bool val) | 221 | void Security::toggleAutoLogin(bool val) |
217 | { | 222 | { |
218 | autoLogin=val; | 223 | autoLogin=val; |
219 | userlist->setEnabled(val); | 224 | userlist->setEnabled(val); |
220 | if (!autoLogin) | 225 | if (!autoLogin) |
221 | autoLoginName=userlist->currentText(); | 226 | autoLoginName=userlist->currentText(); |
222 | } | 227 | } |
228 | |||
229 | |||
230 | |||
231 | |||
223 | void Security::setSyncNet(const QString& sn) | 232 | void Security::setSyncNet(const QString& sn) |
224 | { | 233 | { |
225 | int auth_peer,auth_peer_bits; | 234 | int auth_peer,auth_peer_bits; |
226 | parseNet(sn,auth_peer,auth_peer_bits); | 235 | parseNet(sn,auth_peer,auth_peer_bits); |
227 | selectNet(auth_peer,auth_peer_bits); | 236 | selectNet(auth_peer,auth_peer_bits); |
228 | } | 237 | } |
229 | 238 | ||
230 | void Security::applySecurity() | 239 | void Security::applySecurity() |
231 | { | 240 | { |
232 | if ( valid ) { | 241 | if ( valid ) { |
242 | <<<<<<< security.cpp | ||
233 | Config cfg("Security"); | 243 | Config cfg("Security"); |
234 | cfg.setGroup("Passcode"); | 244 | cfg.setGroup("Passcode"); |
235 | cfg.writeEntry("passcode",passcode); | 245 | cfg.writeEntry("passcode",passcode); |
236 | cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); | 246 | cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); |
237 | cfg.setGroup("Sync"); | 247 | cfg.setGroup("Sync"); |
238 | int auth_peer=0; | 248 | int auth_peer=0; |
239 | int auth_peer_bits; | 249 | int auth_peer_bits; |
240 | QString sn = syncnet->currentText(); | 250 | QString sn = syncnet->currentText(); |
241 | parseNet(sn,auth_peer,auth_peer_bits); | 251 | parseNet(sn,auth_peer,auth_peer_bits); |
242 | cfg.writeEntry("auth_peer",auth_peer); | 252 | cfg.writeEntry("auth_peer",auth_peer); |
243 | cfg.writeEntry("auth_peer_bits",auth_peer_bits); | 253 | cfg.writeEntry("auth_peer_bits",auth_peer_bits); |
244 | /* | 254 | /* |
@@ -253,24 +263,25 @@ void Security::applySecurity() | |||
253 | QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; | 263 | QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; |
254 | Config loginCfg(configFile,Config::File); | 264 | Config loginCfg(configFile,Config::File); |
255 | loginCfg.setGroup("General"); | 265 | loginCfg.setGroup("General"); |
256 | 266 | ||
257 | if (autoLogin) { | 267 | if (autoLogin) { |
258 | loginCfg.writeEntry("AutoLogin",autoLoginName); | 268 | loginCfg.writeEntry("AutoLogin",autoLoginName); |
259 | } else { | 269 | } else { |
260 | loginCfg.removeEntry("AutoLogin"); | 270 | loginCfg.removeEntry("AutoLogin"); |
261 | } | 271 | } |
262 | 272 | ||
263 | cfg.setGroup("SyncMode"); | 273 | cfg.setGroup("SyncMode"); |
264 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | 274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); |
275 | |||
265 | } | 276 | } |
266 | } | 277 | } |
267 | 278 | ||
268 | void Security::changeLoginName( int idx ) | 279 | void Security::changeLoginName( int idx ) |
269 | { | 280 | { |
270 | autoLoginName = userlist->text(idx);; | 281 | autoLoginName = userlist->text(idx);; |
271 | updateGUI(); | 282 | updateGUI(); |
272 | } | 283 | } |
273 | 284 | ||
274 | void Security::changePassCode() | 285 | void Security::changePassCode() |
275 | { | 286 | { |
276 | QString new1; | 287 | QString new1; |