-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp index 7541f0b..9f611da 100644 --- a/noncore/settings/aqpkg/settingsimpl.cpp +++ b/noncore/settings/aqpkg/settingsimpl.cpp | |||
@@ -221,214 +221,225 @@ QWidget *SettingsImpl :: initProxyTab() | |||
221 | QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() ); | 221 | QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() ); |
222 | txtHttpProxy = new QLineEdit( grpbox ); | 222 | txtHttpProxy = new QLineEdit( grpbox ); |
223 | grplayout->addWidget( txtHttpProxy ); | 223 | grplayout->addWidget( txtHttpProxy ); |
224 | chkHttpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox ); | 224 | chkHttpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox ); |
225 | grplayout->addWidget( chkHttpProxyEnabled ); | 225 | grplayout->addWidget( chkHttpProxyEnabled ); |
226 | 226 | ||
227 | grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container ); | 227 | grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container ); |
228 | grpbox->layout()->setSpacing( 2 ); | 228 | grpbox->layout()->setSpacing( 2 ); |
229 | grpbox->layout()->setMargin( 4 ); | 229 | grpbox->layout()->setMargin( 4 ); |
230 | layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 ); | 230 | layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 ); |
231 | grplayout = new QVBoxLayout( grpbox->layout() ); | 231 | grplayout = new QVBoxLayout( grpbox->layout() ); |
232 | txtFtpProxy = new QLineEdit( grpbox ); | 232 | txtFtpProxy = new QLineEdit( grpbox ); |
233 | grplayout->addWidget( txtFtpProxy ); | 233 | grplayout->addWidget( txtFtpProxy ); |
234 | chkFtpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox ); | 234 | chkFtpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox ); |
235 | grplayout->addWidget( chkFtpProxyEnabled ); | 235 | grplayout->addWidget( chkFtpProxyEnabled ); |
236 | 236 | ||
237 | QLabel *label = new QLabel( tr( "Username:" ), container ); | 237 | QLabel *label = new QLabel( tr( "Username:" ), container ); |
238 | layout->addWidget( label, 2, 0 ); | 238 | layout->addWidget( label, 2, 0 ); |
239 | txtUsername = new QLineEdit( container ); | 239 | txtUsername = new QLineEdit( container ); |
240 | layout->addWidget( txtUsername, 2, 1 ); | 240 | layout->addWidget( txtUsername, 2, 1 ); |
241 | 241 | ||
242 | label = new QLabel( tr( "Password:" ), container ); | 242 | label = new QLabel( tr( "Password:" ), container ); |
243 | layout->addWidget( label, 3, 0 ); | 243 | layout->addWidget( label, 3, 0 ); |
244 | txtPassword = new QLineEdit( container ); | 244 | txtPassword = new QLineEdit( container ); |
245 | layout->addWidget( txtPassword, 3, 1 ); | 245 | layout->addWidget( txtPassword, 3, 1 ); |
246 | 246 | ||
247 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container ); | 247 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container ); |
248 | connect( btn, SIGNAL( clicked() ), this, SLOT( proxyApplyChanges() ) ); | 248 | connect( btn, SIGNAL( clicked() ), this, SLOT( proxyApplyChanges() ) ); |
249 | layout->addMultiCellWidget( btn, 4, 4, 0, 1 ); | 249 | layout->addMultiCellWidget( btn, 4, 4, 0, 1 ); |
250 | 250 | ||
251 | return control; | 251 | return control; |
252 | } | 252 | } |
253 | 253 | ||
254 | void SettingsImpl :: setupData() | 254 | void SettingsImpl :: setupData() |
255 | { | 255 | { |
256 | // add servers | 256 | // add servers |
257 | QString serverName; | 257 | QString serverName; |
258 | QListIterator<Server> it( dataMgr->getServerList() ); | 258 | QListIterator<Server> it( dataMgr->getServerList() ); |
259 | for ( ; it.current(); ++it ) | 259 | for ( ; it.current(); ++it ) |
260 | { | 260 | { |
261 | serverName = it.current()->getServerName(); | 261 | serverName = it.current()->getServerName(); |
262 | if ( serverName == LOCAL_SERVER || serverName == LOCAL_IPKGS ) | 262 | if ( serverName == LOCAL_SERVER || serverName == LOCAL_IPKGS ) |
263 | continue; | 263 | continue; |
264 | 264 | ||
265 | servers->insertItem( serverName ); | 265 | servers->insertItem( serverName ); |
266 | } | 266 | } |
267 | 267 | ||
268 | 268 | ||
269 | // add destinations | 269 | // add destinations |
270 | QListIterator<Destination> it2( dataMgr->getDestinationList() ); | 270 | QListIterator<Destination> it2( dataMgr->getDestinationList() ); |
271 | for ( ; it2.current(); ++it2 ) | 271 | for ( ; it2.current(); ++it2 ) |
272 | destinations->insertItem( it2.current()->getDestinationName() ); | 272 | destinations->insertItem( it2.current()->getDestinationName() ); |
273 | 273 | ||
274 | // setup proxy tab | 274 | // setup proxy tab |
275 | txtHttpProxy->setText( dataMgr->getHttpProxy() ); | 275 | txtHttpProxy->setText( dataMgr->getHttpProxy() ); |
276 | txtFtpProxy->setText( dataMgr->getFtpProxy() ); | 276 | txtFtpProxy->setText( dataMgr->getFtpProxy() ); |
277 | txtUsername->setText( dataMgr->getProxyUsername() ); | 277 | txtUsername->setText( dataMgr->getProxyUsername() ); |
278 | txtPassword->setText( dataMgr->getProxyPassword() ); | 278 | txtPassword->setText( dataMgr->getProxyPassword() ); |
279 | chkHttpProxyEnabled->setChecked( dataMgr->getHttpProxyEnabled() ); | 279 | chkHttpProxyEnabled->setChecked( dataMgr->getHttpProxyEnabled() ); |
280 | chkFtpProxyEnabled->setChecked( dataMgr->getFtpProxyEnabled() ); | 280 | chkFtpProxyEnabled->setChecked( dataMgr->getFtpProxyEnabled() ); |
281 | } | 281 | } |
282 | 282 | ||
283 | //------------------ Servers tab ---------------------- | 283 | //------------------ Servers tab ---------------------- |
284 | 284 | ||
285 | void SettingsImpl :: editServer( int sel ) | 285 | void SettingsImpl :: editServer( int sel ) |
286 | { | 286 | { |
287 | currentSelectedServer = sel; | 287 | currentSelectedServer = sel; |
288 | Server *s = dataMgr->getServer( servers->currentText() ); | 288 | Server *s = dataMgr->getServer( servers->currentText() ); |
289 | serverName = s->getServerName(); | 289 | serverName = s->getServerName(); |
290 | servername->setText( s->getServerName() ); | 290 | servername->setText( s->getServerName() ); |
291 | serverurl->setText( s->getServerUrl() ); | 291 | serverurl->setText( s->getServerUrl() ); |
292 | active->setChecked( s->isServerActive() ); | 292 | active->setChecked( s->isServerActive() ); |
293 | } | 293 | } |
294 | 294 | ||
295 | void SettingsImpl :: newServer() | 295 | void SettingsImpl :: newServer() |
296 | { | 296 | { |
297 | newserver = true; | 297 | newserver = true; |
298 | servername->setText( "" ); | 298 | servername->setText( "" ); |
299 | serverurl->setText( "" ); | 299 | serverurl->setText( "" ); |
300 | servername->setFocus(); | 300 | servername->setFocus(); |
301 | active->setChecked( true ); | 301 | active->setChecked( true ); |
302 | } | 302 | } |
303 | 303 | ||
304 | void SettingsImpl :: removeServer() | 304 | void SettingsImpl :: removeServer() |
305 | { | 305 | { |
306 | changed = true; | 306 | changed = true; |
307 | Server *s = dataMgr->getServer( servers->currentText() ); | 307 | Server *s = dataMgr->getServer( servers->currentText() ); |
308 | dataMgr->getServerList().removeRef( s ); | 308 | dataMgr->getServerList().removeRef( s ); |
309 | servers->removeItem( currentSelectedServer ); | 309 | servers->removeItem( currentSelectedServer ); |
310 | } | 310 | } |
311 | 311 | ||
312 | void SettingsImpl :: changeServerDetails() | 312 | void SettingsImpl :: changeServerDetails() |
313 | { | 313 | { |
314 | changed = true; | 314 | changed = true; |
315 | 315 | ||
316 | QString newName = servername->text(); | 316 | QString newName = servername->text(); |
317 | |||
318 | // Convert any spaces to underscores | ||
319 | char *tmpStr = new char[newName.length() + 1]; | ||
320 | for ( unsigned int i = 0 ; i < newName.length() ; ++i ) | ||
321 | { | ||
322 | if ( newName[i] == ' ' ) | ||
323 | tmpStr[i] = '_'; | ||
324 | else | ||
325 | tmpStr[i] = newName[i].latin1(); | ||
326 | } | ||
327 | tmpStr[newName.length()] = '\0'; | ||
328 | |||
329 | newName = tmpStr; | ||
330 | delete tmpStr; | ||
331 | |||
317 | if ( !newserver ) | 332 | if ( !newserver ) |
318 | { | 333 | { |
319 | Server *s = dataMgr->getServer( servers->currentText() ); | 334 | Server *s = dataMgr->getServer( servers->currentText() ); |
320 | 335 | ||
321 | // Update url | 336 | // Update url |
322 | s->setServerUrl( serverurl->text() ); | 337 | s->setServerUrl( serverurl->text() ); |
323 | s->setActive( active->isChecked() ); | 338 | s->setActive( active->isChecked() ); |
324 | 339 | ||
325 | 340 | ||
326 | // Check if server name has changed, if it has then we need to replace the key in the map | 341 | // Check if server name has changed, if it has then we need to replace the key in the map |
327 | if ( serverName != newName ) | 342 | if ( serverName != newName ) |
328 | { | 343 | { |
329 | // Update server name | 344 | // Update server name |
330 | s->setServerName( newName ); | 345 | s->setServerName( newName ); |
331 | |||
332 | // See if this server is the active server | ||
333 | // if ( dataMgr->getActiveServer() == serverName ) | ||
334 | // dataMgr->setActiveServer( newName ); | ||
335 | |||
336 | // Update list box | ||
337 | servers->changeItem( newName, currentSelectedServer ); | ||
338 | } | 346 | } |
347 | |||
348 | // Update list box | ||
349 | servers->changeItem( newName, currentSelectedServer ); | ||
339 | } | 350 | } |
340 | else | 351 | else |
341 | { | 352 | { |
342 | Server s( newName, serverurl->text() ); | 353 | Server s( newName, serverurl->text() ); |
343 | dataMgr->getServerList().append( new Server( newName, serverurl->text() ) ); | 354 | dataMgr->getServerList().append( new Server( newName, serverurl->text() ) ); |
344 | dataMgr->getServerList().last()->setActive( active->isChecked() ); | 355 | dataMgr->getServerList().last()->setActive( active->isChecked() ); |
345 | servers->insertItem( newName ); | 356 | servers->insertItem( newName ); |
346 | servers->setCurrentItem( servers->count() ); | 357 | servers->setCurrentItem( servers->count() ); |
347 | newserver = false; | 358 | newserver = false; |
348 | } | 359 | } |
349 | } | 360 | } |
350 | 361 | ||
351 | //------------------ Destinations tab ---------------------- | 362 | //------------------ Destinations tab ---------------------- |
352 | 363 | ||
353 | void SettingsImpl :: editDestination( int sel ) | 364 | void SettingsImpl :: editDestination( int sel ) |
354 | { | 365 | { |
355 | currentSelectedDestination = sel; | 366 | currentSelectedDestination = sel; |
356 | Destination *d = dataMgr->getDestination( destinations->currentText() ); | 367 | Destination *d = dataMgr->getDestination( destinations->currentText() ); |
357 | destinationName = d->getDestinationName(); | 368 | destinationName = d->getDestinationName(); |
358 | destinationname->setText( d->getDestinationName() ); | 369 | destinationname->setText( d->getDestinationName() ); |
359 | destinationurl->setText( d->getDestinationPath() ); | 370 | destinationurl->setText( d->getDestinationPath() ); |
360 | linkToRoot->setChecked( d->linkToRoot() ); | 371 | linkToRoot->setChecked( d->linkToRoot() ); |
361 | } | 372 | } |
362 | 373 | ||
363 | void SettingsImpl :: newDestination() | 374 | void SettingsImpl :: newDestination() |
364 | { | 375 | { |
365 | newdestination = true; | 376 | newdestination = true; |
366 | destinationname->setText( "" ); | 377 | destinationname->setText( "" ); |
367 | destinationurl->setText( "" ); | 378 | destinationurl->setText( "" ); |
368 | destinationname->setFocus(); | 379 | destinationname->setFocus(); |
369 | linkToRoot->setChecked( true ); | 380 | linkToRoot->setChecked( true ); |
370 | } | 381 | } |
371 | 382 | ||
372 | void SettingsImpl :: removeDestination() | 383 | void SettingsImpl :: removeDestination() |
373 | { | 384 | { |
374 | changed = true; | 385 | changed = true; |
375 | Destination *d = dataMgr->getDestination( destinations->currentText() ); | 386 | Destination *d = dataMgr->getDestination( destinations->currentText() ); |
376 | dataMgr->getDestinationList().removeRef( d ); | 387 | dataMgr->getDestinationList().removeRef( d ); |
377 | destinations->removeItem( currentSelectedDestination ); | 388 | destinations->removeItem( currentSelectedDestination ); |
378 | } | 389 | } |
379 | 390 | ||
380 | void SettingsImpl :: changeDestinationDetails() | 391 | void SettingsImpl :: changeDestinationDetails() |
381 | { | 392 | { |
382 | changed = true; | 393 | changed = true; |
383 | 394 | ||
384 | #ifdef QWS | 395 | #ifdef QWS |
385 | Config cfg( "aqpkg" ); | 396 | Config cfg( "aqpkg" ); |
386 | cfg.setGroup( "destinations" ); | 397 | cfg.setGroup( "destinations" ); |
387 | #endif | 398 | #endif |
388 | 399 | ||
389 | QString newName = destinationname->text(); | 400 | QString newName = destinationname->text(); |
390 | if ( !newdestination ) | 401 | if ( !newdestination ) |
391 | { | 402 | { |
392 | Destination *d = dataMgr->getDestination( destinations->currentText() ); | 403 | Destination *d = dataMgr->getDestination( destinations->currentText() ); |
393 | 404 | ||
394 | // Update url | 405 | // Update url |
395 | d->setDestinationPath( destinationurl->text() ); | 406 | d->setDestinationPath( destinationurl->text() ); |
396 | d->linkToRoot( linkToRoot->isChecked() ); | 407 | d->linkToRoot( linkToRoot->isChecked() ); |
397 | 408 | ||
398 | // Check if server name has changed, if it has then we need to replace the key in the map | 409 | // Check if server name has changed, if it has then we need to replace the key in the map |
399 | if ( destinationName != newName ) | 410 | if ( destinationName != newName ) |
400 | { | 411 | { |
401 | // Update server name | 412 | // Update server name |
402 | d->setDestinationName( newName ); | 413 | d->setDestinationName( newName ); |
403 | 414 | ||
404 | // Update list box | 415 | // Update list box |
405 | destinations->changeItem( newName, currentSelectedDestination ); | 416 | destinations->changeItem( newName, currentSelectedDestination ); |
406 | } | 417 | } |
407 | #ifdef QWS | 418 | #ifdef QWS |
408 | QString key = newName; | 419 | QString key = newName; |
409 | key += "_linkToRoot"; | 420 | key += "_linkToRoot"; |
410 | int val = d->linkToRoot(); | 421 | int val = d->linkToRoot(); |
411 | cfg.writeEntry( key, val ); | 422 | cfg.writeEntry( key, val ); |
412 | #endif | 423 | #endif |
413 | } | 424 | } |
414 | else | 425 | else |
415 | { | 426 | { |
416 | dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) ); | 427 | dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) ); |
417 | destinations->insertItem( newName ); | 428 | destinations->insertItem( newName ); |
418 | destinations->setCurrentItem( destinations->count() ); | 429 | destinations->setCurrentItem( destinations->count() ); |
419 | newdestination = false; | 430 | newdestination = false; |
420 | 431 | ||
421 | #ifdef QWS | 432 | #ifdef QWS |
422 | QString key = newName; | 433 | QString key = newName; |
423 | key += "_linkToRoot"; | 434 | key += "_linkToRoot"; |
424 | cfg.writeEntry( key, true ); | 435 | cfg.writeEntry( key, true ); |
425 | #endif | 436 | #endif |
426 | } | 437 | } |
427 | } | 438 | } |
428 | 439 | ||
429 | //------------------ Proxy tab ---------------------- | 440 | //------------------ Proxy tab ---------------------- |
430 | void SettingsImpl :: proxyApplyChanges() | 441 | void SettingsImpl :: proxyApplyChanges() |
431 | { | 442 | { |
432 | changed = true; | 443 | changed = true; |
433 | dataMgr->setHttpProxy( txtHttpProxy->text() ); | 444 | dataMgr->setHttpProxy( txtHttpProxy->text() ); |
434 | dataMgr->setFtpProxy( txtFtpProxy->text() ); | 445 | dataMgr->setFtpProxy( txtFtpProxy->text() ); |