1 files changed, 44 insertions, 23 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index b92a245..bbb0be75 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -34,3 +34,3 @@
 
-InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
+InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
     : InstallDlg( parent, name, modal, fl )
@@ -48,3 +48,4 @@ InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataM
     // Grab flags - Turn MAKE_LINKS on by default (if no flags found)
-    flags = cfg.readNumEntry( "installFlags", MAKE_LINKS );
+//    flags = cfg.readNumEntry( "installFlags", MAKE_LINKS );
+    flags = 0;
 #else
@@ -72,3 +73,3 @@ InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataM
 
-        vector<QString>::iterator it;
+        vector<InstallData>::iterator it;
         // setup package data
@@ -79,17 +80,17 @@ InstallDlgImpl::InstallDlgImpl( vector<QString> &packageList, DataManager *dataM
         {
-                QString name = *it;
-                if ( name.startsWith( "I" ) )
+                InstallData item = *it;
+                if ( item.option == "I" )
                 {
-                        installList.push_back( name.mid(1) );
-                        install += "   " + name.mid(1) + "\n";
+                        installList.push_back( item );
+                        install += "   " + item.packageName + "\n";
                 }
-                else if ( name.startsWith( "D" ) )
+                else if ( item.option == "D" )
                 {
-                        removeList.push_back( name.mid(1) );
-                        remove += "   " + name.mid(1) + "\n";
+                        removeList.push_back( item );
+                        remove += "   " + item.packageName + "\n";
                 }
-                else if ( name.startsWith( "U" ) )
+                else if ( item.option == "U" )
                 {
-                        updateList.push_back( name.mid(1) );
-                        upgrade += "   " + name.mid(1) + "\n";
+                        updateList.push_back( item );
+                        upgrade += "   " + item.packageName + "\n";
                 }
@@ -138,4 +139,2 @@ void InstallDlgImpl :: optionsSelected()
         flags |= FORCE_OVERWRITE;
-    if ( opt.makeLinks->isChecked() )
-        flags |= MAKE_LINKS;
 
@@ -173,2 +172,5 @@ void InstallDlgImpl :: installSelected()
         QString destDir = d->getDestinationPath();
+        int instFlags = 0;
+        if ( d->linkToRoot() )
+            instFlags = MAKE_LINKS;
     
@@ -182,10 +184,17 @@ void InstallDlgImpl :: installSelected()
         // First run through the remove list, then the install list then the upgrade list
-            vector<QString>::iterator it;
+            vector<InstallData>::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.setDestination( it->destination->getDestinationName() );
+            ipkg.setDestinationDir( it->destination->getDestinationPath() );
+            ipkg.setPackage( it->packageName );
+
+            int tmpFlags = flags;
+            if ( it->destination->linkToRoot() )
+                tmpFlags |= MAKE_LINKS;
+            else
+                tmpFlags ^= MAKE_LINKS;
+            
+            ipkg.setFlags( tmpFlags );
             ipkg.runIpkg();
@@ -194,5 +203,8 @@ void InstallDlgImpl :: installSelected()
         ipkg.setOption( "install" );
+        ipkg.setDestination( dest );
+        ipkg.setDestinationDir( destDir );
+        ipkg.setFlags( instFlags );
         for ( it = installList.begin() ; it != installList.end() ; ++it )
         {
-            ipkg.setPackage( *it );
+            ipkg.setPackage( it->packageName );
             ipkg.runIpkg();
@@ -201,6 +213,15 @@ void InstallDlgImpl :: installSelected()
         flags |= FORCE_REINSTALL;
-        ipkg.setFlags( flags );
+        ipkg.setOption( "reinstall" );
         for ( it = updateList.begin() ; it != updateList.end() ; ++it )
         {
-            ipkg.setPackage( *it );
+            ipkg.setDestination( it->destination->getDestinationName() );
+            ipkg.setDestinationDir( it->destination->getDestinationPath() );
+            ipkg.setPackage( it->packageName );
+
+            int tmpFlags = flags;
+            if ( it->destination->linkToRoot() && it->recreateLinks )
+                tmpFlags |= MAKE_LINKS;
+            else
+                tmpFlags ^= MAKE_LINKS;
+            ipkg.setFlags( tmpFlags );
             ipkg.runIpkg();