6 files changed, 116 insertions, 53 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 76d0a80..896e370 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -46,13 +46,13 @@
 #include "global.h"
 
 enum {
 	MAXLINES = 100,
 };
 
-InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title )
+InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
     init( TRUE );
     
     pIpkg = 0;
@@ -98,42 +98,41 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
 	QString install = tr( "Install\n" );
 	QString upgrade = tr( "Upgrade\n" );
 	for ( ; it.current(); ++it )
 	{
 		InstallData *item = it.current();
 		InstallData *newitem = new InstallData();
-        
-        newitem->option = item->option;
-        newitem->packageName = item->packageName;
-        newitem->destination = item->destination;
-        newitem->recreateLinks = item->recreateLinks;
-        
-        if ( item->option == "I" )
+
+		newitem->option = item->option;
+		newitem->packageName = item->packageName;
+		newitem->destination = item->destination;
+		newitem->recreateLinks = item->recreateLinks;
+		packages.append( newitem );
+
+		if ( item->option == "I" )
 		{
-			installList.append( newitem );
 			install.append( QString( "   %1\n" ).arg( item->packageName ) );
 		}
 		else if ( item->option == "D" )
 		{
-			removeList.append( newitem );
 			remove.append( QString( "   %1\n" ).arg( item->packageName ) );
 		}
 		else if ( item->option == "U" || item->option == "R" )
 		{
-            updateList.append( newitem );
-            QString type;
-            if ( item->option == "R" )
-                type = tr( "(ReInstall)" );
-            else
-                type = tr( "(Upgrade)" );
-            upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
-        }
-    }
-    output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
+			QString type;
+			if ( item->option == "R" )
+				type = tr( "(ReInstall)" );
+			else
+				type = tr( "(Upgrade)" );
+			upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
+		}
+	}
 
-    displayAvailableSpace( destination->currentText() );
+	output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
+
+	displayAvailableSpace( destination->currentText() );
 }
 
 InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
@@ -265,12 +264,13 @@ void InstallDlgImpl :: installSelected()
     btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
 
     if ( pIpkg )
     {
         output->setText( "" );
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
+        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
         pIpkg->runIpkg();
     }
     else
     {
         output->setText( "" );
         Destination *d = dataMgr->getDestination( destination->currentText() );
@@ -286,15 +286,20 @@ void InstallDlgImpl :: installSelected()
         cfg.setGroup( "settings" );
         cfg.writeEntry( "dest", dest );
 #endif
 
         pIpkg = new Ipkg;
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
+        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
+
+		firstPackage = TRUE;
+		ipkgFinished();
 
         // First run through the remove list, then the install list then the upgrade list
-        pIpkg->setOption( "remove" );
+/*        
+		pIpkg->setOption( "remove" );
         QListIterator<InstallData> it( removeList );
         InstallData *idata;
         for ( ; it.current(); ++it )
         {
             idata = it.current();
             pIpkg->setDestination( idata->destination->getDestinationName() );
@@ -339,24 +344,14 @@ void InstallDlgImpl :: installSelected()
             pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
 
         delete pIpkg;
         pIpkg = 0;
+*/
     }
-
-    btnOptions->setEnabled( true );
-//    btnInstall->setEnabled( true );
-    btnInstall->setText( tr( "Close" ) );
-    btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
-    
-    btnOptions->setText( tr( "Save output" ) );
-    btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
-
-    if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
-        displayAvailableSpace( destination->currentText() );
 }
 
 
 void InstallDlgImpl :: displayText(const QString &text )
 {
     QString newtext = QString( "%1\n%2" ).arg( output->text() ).arg( text );
@@ -397,6 +392,75 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
         space = tr( "Unknown" );
         
     if ( txtAvailableSpace )
         txtAvailableSpace->setText( space );
 }
 
+void InstallDlgImpl :: ipkgFinished()
+{
+	InstallData *item;
+	if ( firstPackage )
+		item = packages.first();
+	else
+	{
+		// Create symlinks if necessary before moving on to next package
+		pIpkg->createSymLinks();
+
+		item = packages.next();
+	}
+
+	firstPackage = FALSE;
+	if ( item )
+	{
+		pIpkg->setPackage( item->packageName );
+		int tmpFlags = flags;
+
+		if ( item->option == "I" )
+		{
+			pIpkg->setOption( "install" );
+			Destination *d = dataMgr->getDestination( destination->currentText() );
+			pIpkg->setDestination( d->getDestinationName() );
+			pIpkg->setDestinationDir( d->getDestinationPath() );
+		
+			if ( d->linkToRoot() )
+				tmpFlags |= MAKE_LINKS;
+		}
+		else if ( item->option == "D" )
+		{
+			pIpkg->setOption( "remove" );
+			pIpkg->setDestination( item->destination->getDestinationName() );
+			pIpkg->setDestinationDir( item->destination->getDestinationPath() );
+
+			if ( item->destination->linkToRoot() )
+				tmpFlags |= MAKE_LINKS;
+		}
+		else
+		{
+			if ( item->option == "R" )
+				pIpkg->setOption( "reinstall" );
+			else
+				pIpkg->setOption( "upgrade" );
+			
+			pIpkg->setDestination( item->destination->getDestinationName() );
+			pIpkg->setDestinationDir( item->destination->getDestinationPath() );
+			pIpkg->setPackage( item->packageName );
+
+			tmpFlags |= FORCE_REINSTALL;
+			if ( item->destination->linkToRoot() && item->recreateLinks )
+				tmpFlags |= MAKE_LINKS;
+		}
+		pIpkg->setFlags( tmpFlags, infoLevel );
+		pIpkg->runIpkg();
+	}
+	else
+	{
+		btnOptions->setEnabled( true );
+		btnInstall->setText( tr( "Close" ) );
+		btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+
+		btnOptions->setText( tr( "Save output" ) );
+		btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+
+		if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
+			displayAvailableSpace( destination->currentText() );
+	}
+}
\ No newline at end of file
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 15cf427..9a7dbff 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -42,25 +42,24 @@ public:
 };
 
 class InstallDlgImpl : public QWidget
 {
     Q_OBJECT
 public:
-    InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
+    InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
     InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 );
     ~InstallDlgImpl();
 
 	bool upgradeServer( QString &server );
 
 protected:
 
 private:
     DataManager *dataMgr;
-    QList<InstallData> installList;
-    QList<InstallData> removeList;
-    QList<InstallData> updateList;
+    QList<InstallData> packages;
+	bool firstPackage;
     int flags;
     int infoLevel;
     Ipkg *pIpkg;
     bool upgradePackages;
     
     QComboBox      *destination;
@@ -78,9 +77,10 @@ signals:
         
 public slots:
     void optionsSelected();
     void installSelected();
     void displayText(const QString &text );
     void displayAvailableSpace( const QString &text);
+	void ipkgFinished();
 };
 
 #endif
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index e906653..34999ad 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -52,16 +52,15 @@ Ipkg :: ~Ipkg()
 // packageName is the package name - (for a network package this will be the same as
 //    package parameter)
 // dest is the destination alias (from ipk.conf)
 // destDir is the dir that the destination alias points to (used to link to root)
 // flags is the ipkg options flags
 // dir is the directory to run ipkg in (defaults to "")
-bool Ipkg :: runIpkg( )
+void Ipkg :: runIpkg()
 {
     error = false;
-    bool ret = false;
     QStringList commands;
 
     QDir::setCurrent( "/tmp" );
 
     if ( runtimeDir != "" )
     {
@@ -134,17 +133,18 @@ bool Ipkg :: runIpkg( )
     }
     
     // Execute command
     dependantPackages = new QList<QString>;
     dependantPackages->setAutoDelete( true );
 
-    ret = executeIpkgCommand( commands, option );
+    executeIpkgCommand( commands, option );
 
-    if ( aborted )
-        return false;
+}
 
+void Ipkg :: createSymLinks()
+{
     if ( option == "install" || option == "reinstall" || option == "upgrade" )
     {
         // If we are not removing packages and make links option is selected
         // create the links
         createLinks = true;
         if ( flags & MAKE_LINKS )
@@ -168,13 +168,12 @@ bool Ipkg :: runIpkg( )
     }
 
     delete dependantPackages;
 
     emit outputText( "Finished" );
     emit outputText( "" );
-    return ret;
 }
 
 void Ipkg :: removeStatusEntry()
 {
     QString statusFile = destDir;
     if ( statusFile.right( 1 ) != "/" )
@@ -292,16 +291,12 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
     // Start the process going
     finished = false;
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
     {
         emit outputText( QString( "Couldn't start ipkg process" ) );
     }
-
-    // Now wait for it to finish
-    while ( !finished )
-        qApp->processEvents();
 }
 
 void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
@@ -351,12 +346,14 @@ void Ipkg::processFinished()
     if ( !error && option == "remove" )
         removeStatusEntry();
     
     delete proc;
     proc = 0;
     finished = true;
+
+	emit ipkgFinished();
 }
 
 
 void Ipkg :: abort()
 {
     if ( proc )
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 531bfc0..a0d38e3 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -40,23 +40,25 @@ class OProcess;
 class Ipkg : public QObject
 {
     Q_OBJECT
 public:
     Ipkg();
     ~Ipkg();
-    bool runIpkg( );
+	void runIpkg();
+	void createSymLinks();
 
     void setOption( const char *opt )               { option = opt; }
     void setPackage( const char *pkg )              { package = pkg; }
     void setDestination( const char *dest )         { destination = dest; }
     void setDestinationDir( const char *dir )       { destDir = dir; }
     void setFlags( int fl, int il )                 { flags = fl; infoLevel = il; }
     void setRuntimeDirectory( const char *dir )     { runtimeDir = dir; }
 
 signals:
     void outputText( const QString &text );
+	void ipkgFinished();
 
 public slots:
     void commandStdout(OProcess*, char *buffer, int buflen);
     void commandStderr(OProcess*, char *buffer, int buflen);
     void processFinished();
     void abort();
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 1aec6a8..58f6feb 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -294,13 +294,13 @@ void MainWindow :: init()
     categoryFilterEnabled = false;
 
     updateData();
 
     stack->raiseWidget( networkPkgWindow );
 }
-/*
+
 void MainWindow :: setDocument( const QString &doc )
 {
     // Remove path from package
     QString package = Utils::getPackageNameFromIpkFilename( doc );
 //    std::cout << "Selecting package " << package << std::endl;
 
@@ -324,13 +324,13 @@ void MainWindow :: setDocument( const QString &doc )
         {
             item->setOn( true );
             break;
         }
     }
 }
-*/
+
 void MainWindow :: displaySettings()
 {
     SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
     if ( dlg->showDlg() )
     {
         stack->raiseWidget( progressWindow );
@@ -989,20 +989,20 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         name = p->getFilename();
 
     QString option;
     QString dest = "root";
     if ( !p->isInstalled() )
     {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
         newitem->option = "I";
         newitem->packageName = name;
         return newitem;
     }
     else
     {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
         newitem->option = "D";
         if ( !p->isPackageStoredLocally() )
             newitem->packageName = p->getInstalledPackageName();
         else
             newitem->packageName = name;
 
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 0295519..c4548b1 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -103,13 +103,13 @@ private:
     QLabel       *m_status;
     QProgressBar *m_progress;
     
     void initProgressWidget();
     
 public slots:
-//    void setDocument( const QString &doc );
+    void setDocument( const QString &doc );
     void displayFindBar();
     void displayJumpBar();
     void repeatFind();
     void findPackage( const QString & );
     void hideFindBar();
     void hideJumpBar();