-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 86 |
1 files changed, 54 insertions, 32 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index d4f751c..b92a245 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp @@ -36,4 +36,5 @@ InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataM : InstallDlg( parent, name, modal, fl ) { + upgradePackages = false; dataMgr = dataManager; vector<Destination>::iterator dit; @@ -100,4 +101,13 @@ InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataM } +InstallDlgImpl::InstallDlgImpl( QWidget *parent, const char *name, bool modal, WFlags fl ) + : InstallDlg( parent, name, modal, fl ) +{ + upgradePackages = true; + output->setText( "Upgrading installed packages" ); + connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); +} + + InstallDlgImpl::~InstallDlgImpl() { @@ -147,41 +157,53 @@ void InstallDlgImpl :: installSelected() btnInstall->setEnabled( false ); - output->setText( "" ); - Destination *d = dataMgr->getDestination( destination->currentText() ); - QString dest = d->getDestinationName(); - QString destDir = d->getDestinationPath(); - -#ifdef QWS - // Save settings - Config cfg( "aqpkg" ); - cfg.setGroup( "settings" ); - cfg.writeEntry( "dest", dest ); -#endif - - // First run through the remove list, then the install list then the upgrade list - vector<QString>::iterator it; - ipkg.setOption( "remove" ); - ipkg.setDestination( dest ); - ipkg.setDestinationDir( destDir ); - ipkg.setFlags( flags ); - for ( it = removeList.begin() ; it != removeList.end() ; ++it ) + if ( upgradePackages ) { - ipkg.setPackage( *it ); + output->setText( "" ); + + Ipkg ipkg; + connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); + ipkg.setOption( "upgrade" ); ipkg.runIpkg(); } - - ipkg.setOption( "install" ); - for ( it = installList.begin() ; it != installList.end() ; ++it ) + else { - ipkg.setPackage( *it ); - ipkg.runIpkg(); - } + output->setText( "" ); + Destination *d = dataMgr->getDestination( destination->currentText() ); + QString dest = d->getDestinationName(); + QString destDir = d->getDestinationPath(); - flags |= FORCE_REINSTALL; - ipkg.setFlags( flags ); - for ( it = updateList.begin() ; it != updateList.end() ; ++it ) - { - ipkg.setPackage( *it ); - ipkg.runIpkg(); +#ifdef QWS + // Save settings + Config cfg( "aqpkg" ); + cfg.setGroup( "settings" ); + cfg.writeEntry( "dest", dest ); +#endif + + // First run through the remove list, then the install list then the upgrade list + vector<QString>::iterator it; + ipkg.setOption( "remove" ); + ipkg.setDestination( dest ); + ipkg.setDestinationDir( destDir ); + ipkg.setFlags( flags ); + for ( it = removeList.begin() ; it != removeList.end() ; ++it ) + { + ipkg.setPackage( *it ); + ipkg.runIpkg(); + } + + ipkg.setOption( "install" ); + for ( it = installList.begin() ; it != installList.end() ; ++it ) + { + ipkg.setPackage( *it ); + ipkg.runIpkg(); + } + + flags |= FORCE_REINSTALL; + ipkg.setFlags( flags ); + for ( it = updateList.begin() ; it != updateList.end() ; ++it ) + { + ipkg.setPackage( *it ); + ipkg.runIpkg(); + } } |