Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 82 |
1 files changed, 56 insertions, 26 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 79a380e..cae0d8f 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp @@ -37,88 +37,92 @@ using namespace std; #include "datamgr.h" #include "networkpkgmgr.h" #include "installdlgimpl.h" #include "ipkg.h" #include "inputdlg.h" #include "letterpushbutton.h" #include "categoryfilterimpl.h" #include "global.h" extern int compareVersions( const char *v1, const char *v2 ); -NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget *parent, const char *name) +NetworkPackageManager::NetworkPackageManager( QWidget *parent, const char *name ) : QWidget(parent, name) { - dataMgr = dataManager; #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(); + //updateData(); } NetworkPackageManager::~NetworkPackageManager() { } -void NetworkPackageManager :: timerEvent ( QTimerEvent * ) +void NetworkPackageManager :: setDataManager( DataManager *dm ) { - killTimer( timerId ); - - // Add server names to listbox - updateData(); + 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 ) { + serverName = it->getServerName(); + emit progressSetMessage( tr( "Building server list:\n\t%1" ).arg( serverName ) ); + emit progressUpdate( i ); + qApp->processEvents(); + // cout << "Adding " << it->getServerName() << " to combobox" << endl; if ( !it->isServerActive() ) { - cout << it->getServerName() << " is not active" << endl; + cout << serverName << " is not active" << endl; i--; continue; } - serversList->insertItem( it->getServerName() ); - if ( it->getServerName() == currentlySelectedServer ) + + serversList->insertItem( serverName ); + if ( serverName == currentlySelectedServer ) activeItem = i; } // set selected server to be active server if ( activeItem != -1 ) serversList->setCurrentItem( activeItem ); - serverSelected( 0 ); + serverSelected( 0, FALSE ); } void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) { // First select local server for ( int i = 0 ; i < serversList->count() ; ++i ) { if ( serversList->text( i ) == LOCAL_IPKGS ) { serversList->setCurrentItem( i ); break; } @@ -184,54 +188,74 @@ void NetworkPackageManager :: initGui() 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()) ); } -void NetworkPackageManager :: showProgressDialog( char *initialText ) +void NetworkPackageManager :: serverSelected( int index ) { - if ( !progressDlg ) - progressDlg = new ProgressDlg( this, "Progress", false ); - progressDlg->setText( initialText ); - progressDlg->show(); + serverSelected( index, TRUE ); } - -void NetworkPackageManager :: serverSelected( int ) +void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) { - packagesList->clear(); - // 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 ) + { + emit appRaiseProgressWidget(); + } + emit progressSetSteps( list.size() ); + emit progressSetMessage( tr( "Building package list for:\n\t%1" ).arg( serverName ) ); + } + + packagesList->clear(); + #ifdef QWS // read download directory from config file Config cfg( "aqpkg" ); cfg.setGroup( "settings" ); cfg.writeEntry( "selectedServer", currentlySelectedServer ); #endif - vector<Server>::iterator s = dataMgr->getServer( serverName ); - - vector<Package> &list = s->getPackageList(); - vector<Package>::iterator it; + int i = 0; for ( it = list.begin() ; it != list.end() ; ++it ) { + // Update progress after every 100th package (arbitrary value, seems to give good balance) + i++; + if ( ( i % 100 ) == 0 ) + { + if ( doProgress ) + { + emit progressUpdate( i ); + } + qApp->processEvents(); + } QString text = ""; // Apply show only uninstalled packages filter if ( showUninstalledPkgs && it->isInstalled() ) continue; // Apply show only installed packages filter if ( showInstalledPkgs && !it->isInstalled() ) continue; // Apply show only new installed packages filter @@ -323,24 +347,30 @@ void NetworkPackageManager :: serverSelected( int ) else if ( serverName == LOCAL_IPKGS ) { upgrade->setEnabled( false ); download->setEnabled( true ); download->setText( "Remove" ); } else { upgrade->setEnabled( true ); download->setEnabled( true ); download->setText( "Download" ); } + + // 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 |