1 files changed, 13 insertions, 33 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index ee37157..91afe02 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -44,51 +44,48 @@ using namespace std;
 
 #include "global.h"
 
 extern int compareVersions( const char *v1, const char *v2 );
 
 NetworkPackageManager::NetworkPackageManager( QWidget *parent, const char *name )
   : QWidget(parent, name)
 {
 
 #ifdef QWS
         // read download directory from config file
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
         showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
 
 #endif
 
     showUninstalledPkgs = false;
     showInstalledPkgs = false;
     showUpgradedPkgs = false;
     categoryFilterEnabled = false;
 
     initGui();
-    setupConnections();
-
-    //updateData();
 }
 
 NetworkPackageManager::~NetworkPackageManager()
 {
 }
 
 void NetworkPackageManager :: setDataManager( DataManager *dm )
 {
     dataMgr = dm;
 }
 
 void NetworkPackageManager :: updateData()
 {
     emit progressSetSteps( dataMgr->getServerList().size() );
     
     serversList->clear();
     packagesList->clear();
 
     vector<Server>::iterator it;
     int activeItem = -1;
     int i;
     QString serverName;
     for ( i = 0, it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it, ++i )
     {
@@ -126,96 +123,81 @@ void NetworkPackageManager :: selectLocalPackage( const QString &pkg )
             serversList->setCurrentItem( i );
             break;
         }
     }
     serverSelected( 0 );
 
     // Now set the check box of the selected package
     for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
           item != 0 ;
           item = (QCheckListItem *)item->nextSibling() )
     {
         if ( item->text().startsWith( pkg ) )
         {
             item->setOn( true );
             break;
         }
     }
 }
 
 
 void NetworkPackageManager :: initGui()
 {
     QLabel *l = new QLabel( tr( "Servers" ), this );
     serversList = new QComboBox( this );
+    connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int )));
+    
     packagesList = new QListView( this );
-    update = new QPushButton( tr( "Refresh Lists" ), this );
-    download = new QPushButton( tr( "Download" ), this );
-    upgrade = new QPushButton( tr( "Upgrade" ), this );
-    apply = new QPushButton( tr( "Apply" ), this );
 
     QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 );
     QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
     hbox1->addWidget( l );
     hbox1->addWidget( serversList );
 
     QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
     QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
 
 
     if ( showJumpTo )
     {    
         char text[2];
         text[1] = '\0';
         for ( int i = 0 ; i < 26 ; ++i )
         {
                 text[0] = 'A' + i;
                 LetterPushButton *b = new LetterPushButton( text, this );
                 connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
                 if ( i < 13 )
                 hbox3->addWidget( b );
                 else
                 hbox4->addWidget( b );
         }
     }
 
     vbox->addWidget( packagesList );
     packagesList->addColumn( tr( "Packages" ) );
-
-    QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1 );
-    hbox2->addWidget( update );
-    hbox2->addWidget( download );
-    hbox2->addWidget( upgrade );
-    hbox2->addWidget( apply );
-}
-
-void NetworkPackageManager :: setupConnections()
-{
-    connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int )));
-    connect( apply, SIGNAL(released()), this, SLOT(applyChanges()) );
-    connect( download, SIGNAL(released()), this, SLOT(downloadPackage()) );
-    connect( upgrade, SIGNAL( released()), this, SLOT(upgradePackages()) );
-    connect( update, SIGNAL(released()), this, SLOT(updateServer()) );
+    
+    downloadEnabled = TRUE;
 }
 
 void NetworkPackageManager :: serverSelected( int index )
 {
     serverSelected( index, TRUE );
 }
 
 void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
 {
     // display packages
     QString serverName = serversList->currentText();
     currentlySelectedServer = serverName;
 
     vector<Server>::iterator s = dataMgr->getServer( serverName );
 
     vector<Package> &list = s->getPackageList();
     vector<Package>::iterator it;
     
     // Display progress widget while loading list
     bool doProgress = ( list.size() > 200 );
     if ( doProgress )
     {
         if ( raiseProgress )
         {
@@ -319,64 +301,62 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
         }
         else
             new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() );
         
                 if ( serverName == LOCAL_SERVER )
                 {
                 new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() );
                 }
                 else
                 {
                 new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() );
                 if ( it->getLocalPackage() )
                 {
                                 if ( it->isInstalled() )
                             new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() );
                         }
                 }
 
         packagesList->insertItem( item );
     }
 
     // If the local server or the local ipkgs server disable the download button
     if ( serverName == LOCAL_SERVER )
     {
-        upgrade->setEnabled( false );
-        download->setText( tr( "Download" ) );
-        download->setEnabled( true );
+        downloadEnabled = TRUE;
+        emit appEnableUpgrade( FALSE );
     }
     else if ( serverName == LOCAL_IPKGS )
     {
-        upgrade->setEnabled( false );
-        download->setEnabled( true );
-        download->setText( tr( "Remove" ) );
+        downloadEnabled = FALSE;
+        emit appEnableUpgrade( FALSE );
     }
     else
     {
-        upgrade->setEnabled( true );
-        download->setEnabled( true );
-        download->setText( tr( "Download" ) );
+        downloadEnabled = TRUE;
+        emit appEnableUpgrade( TRUE );
     }
+    emit appEnableDownload( downloadEnabled );
 
     // Display this widget once everything is done
     if ( doProgress && raiseProgress )
     {
         emit appRaiseMainWidget();
     }
 }
 
 void NetworkPackageManager :: updateServer()
 {
     QString serverName = serversList->currentText();
 
     // Update the current server
     // Display dialog
 
     // Disable buttons to stop silly people clicking lots on them :)
 
     // First, write out ipkg_conf file so that ipkg can use it
     dataMgr->writeOutIpkgConf();
 
     Ipkg ipkg;
     ipkg.setOption( "update" );
 
     InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true );
@@ -400,73 +380,73 @@ void NetworkPackageManager :: upgradePackages()
     warn.adjustSize();
                         
     if ( warn.exec() == QMessageBox::Yes )
     {
         // First, write out ipkg_conf file so that ipkg can use it
         dataMgr->writeOutIpkgConf();
 
         // Now run upgrade
         Ipkg ipkg;
         ipkg.setOption( "upgrade" );
         
         InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true );
         dlg.showDlg();
 
         // Reload data
         dataMgr->reloadServerData();
         serverSelected(-1);
     }
 }
 
 
 void NetworkPackageManager :: downloadPackage()
 {
     bool doUpdate = true;
-    if ( download->text() == tr( "Download" ) )
+    if ( downloadEnabled )
     {
         // See if any packages are selected
         bool found = false;
         if ( serversList->currentText() != LOCAL_SERVER )
         {
             for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
                   item != 0 && !found;
                   item = (QCheckListItem *)item->nextSibling() )
             {
                 if ( item->isOn() )
                     found = true;
             }
         }
         
         // If user selected some packages then download the and store the locally
         // otherwise, display dialog asking user what package to download from an http server
         // and whether to install it
         if ( found )
             downloadSelectedPackages();
         else
             downloadRemotePackage();
         
     }
-    else if ( download->text() == tr( "Remove" ) )
+    else
     {
         doUpdate = false;
         for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
               item != 0 ;
               item = (QCheckListItem *)item->nextSibling() )
         {
             if ( item->isOn() )
             {
                 QString name = item->text();
                 int pos = name.find( "*" );
                 name.truncate( pos );
 
                 // if (there is a (installed), remove it
                 pos = name.find( "(installed)" );
                 if ( pos > 0 )
                     name.truncate( pos - 1 );
                
                 Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name );
 
                 QString msgtext;
                 msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
                 if ( QMessageBox::information( this, tr( "Are you sure?" ),
                                     msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
                 {