summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 25052f8..886430f 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -498,97 +498,96 @@ void OIpkgConfigDlg::slotServerDelete()
498 // Delete server 498 // Delete server
499 if ( server ) 499 if ( server )
500 { 500 {
501 m_configs->removeRef( server ); 501 m_configs->removeRef( server );
502 m_serverList->removeItem( m_serverCurrent ); 502 m_serverList->removeItem( m_serverCurrent );
503 } 503 }
504} 504}
505 505
506void OIpkgConfigDlg::slotServerUpdate() 506void OIpkgConfigDlg::slotServerUpdate()
507{ 507{
508 QString newName = m_serverName->text(); 508 QString newName = m_serverName->text();
509 509
510 // Convert any spaces to underscores 510 // Convert any spaces to underscores
511 newName.replace( QRegExp( " " ), "_" ); 511 newName.replace( QRegExp( " " ), "_" );
512 512
513 if ( !m_serverNew ) 513 if ( !m_serverNew )
514 { 514 {
515 // Find selected server in list 515 // Find selected server in list
516 OConfItem *server = findConfItem( OConfItem::Source, m_serverCurrName ); 516 OConfItem *server = findConfItem( OConfItem::Source, m_serverCurrName );
517 517
518 // Delete server 518 // Delete server
519 if ( server ) 519 if ( server )
520 { 520 {
521 // Update url 521 // Update url
522 server->setValue( m_serverLocation->text() ); 522 server->setValue( m_serverLocation->text() );
523 server->setActive( m_serverActive->isChecked() ); 523 server->setActive( m_serverActive->isChecked() );
524 524
525 // Check if server name has changed, if it has then we need to replace the key in the map 525 // Check if server name has changed, if it has then we need to replace the key in the map
526 if ( m_serverCurrName != newName ) 526 if ( m_serverCurrName != newName )
527 { 527 {
528 // Update server name 528 // Update server name
529 server->setName( newName ); 529 server->setName( newName );
530 530
531 // Update list box 531 // Update list box
532 m_serverList->changeItem( newName, m_serverCurrent ); 532 m_serverList->changeItem( newName, m_serverCurrent );
533 } 533 }
534 } 534 }
535 } 535 }
536 else 536 else
537 { 537 {
538 // Add new destination to configuration list 538 // Add new destination to configuration list
539 m_configs->append( new OConfItem( OConfItem::Source, newName, 539 m_configs->append( new OConfItem( OConfItem::Source, newName,
540 m_serverLocation->text(), m_serverActive->isChecked() ) ); 540 m_serverLocation->text(), m_serverActive->isChecked() ) );
541 m_configs->sort(); 541 m_configs->sort();
542 542
543 m_serverList->insertItem( newName ); 543 m_serverList->insertItem( newName );
544 m_serverList->setCurrentItem( m_serverList->count() ); 544 m_serverList->setCurrentItem( m_serverList->count() );
545 m_serverNew = false; 545 m_serverNew = false;
546// m_serverList->insertItem( newName );
547 } 546 }
548} 547}
549 548
550void OIpkgConfigDlg::slotDestEdit( int index ) 549void OIpkgConfigDlg::slotDestEdit( int index )
551{ 550{
552 m_destNew = false; 551 m_destNew = false;
553 m_destCurrent = index; 552 m_destCurrent = index;
554 553
555 // Find selected destination in list 554 // Find selected destination in list
556 OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() ); 555 OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() );
557 556
558 // Display destination details 557 // Display destination details
559 if ( destination ) 558 if ( destination )
560 { 559 {
561 m_destCurrName = destination->name(); 560 m_destCurrName = destination->name();
562 m_destName->setText( destination->name() ); 561 m_destName->setText( destination->name() );
563 m_destLocation->setText( destination->value() ); 562 m_destLocation->setText( destination->value() );
564 m_destActive->setChecked( destination->active() ); 563 m_destActive->setChecked( destination->active() );
565 m_destName->setFocus(); 564 m_destName->setFocus();
566 } 565 }
567} 566}
568 567
569void OIpkgConfigDlg::slotDestNew() 568void OIpkgConfigDlg::slotDestNew()
570{ 569{
571 m_destNew = true; 570 m_destNew = true;
572 571
573 m_destName->setText( QString::null ); 572 m_destName->setText( QString::null );
574 m_destLocation->setText( QString::null ); 573 m_destLocation->setText( QString::null );
575 m_destActive->setChecked( true ); 574 m_destActive->setChecked( true );
576 m_destName->setFocus(); 575 m_destName->setFocus();
577} 576}
578 577
579void OIpkgConfigDlg::slotDestDelete() 578void OIpkgConfigDlg::slotDestDelete()
580{ 579{
581 // Find selected destination in list 580 // Find selected destination in list
582 OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() ); 581 OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() );
583 582
584 // Delete destination 583 // Delete destination
585 if ( destination ) 584 if ( destination )
586 { 585 {
587 m_configs->removeRef( destination ); 586 m_configs->removeRef( destination );
588 m_destList->removeItem( m_destCurrent ); 587 m_destList->removeItem( m_destCurrent );
589 } 588 }
590} 589}
591 590
592void OIpkgConfigDlg::slotDestSelectPath() 591void OIpkgConfigDlg::slotDestSelectPath()
593{ 592{
594 QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_destLocation->text() ); 593 QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_destLocation->text() );