added popup menu to choose inst dest (and more...)

1 files changed, 32 insertions, 14 deletions

diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 944bb83..035ec81 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -67,14 +67,14 @@ void PackageList::filterPackages( QString f )
   QDictIterator<Package> filterIter( origPackageList );
   filterIter.toFirst();
   Package *pack= filterIter.current() ;
   while ( pack )
     {	
       if (
-      			((aktSection=="All")||(pack->getSection()==aktSection)) &&
-	   				((aktSubSection=="All")||(pack->getSubSection()==aktSubSection)) &&
+      			((aktSection=="All")||(pack->section()==aktSection)) &&
+	   				((aktSubSection=="All")||(pack->subSection()==aktSubSection)) &&
         		 pack->name().contains( f )
     			)
 			{
 	  		packageList.insert( pack->name(), pack );
 			}
       ++filterIter;
@@ -123,17 +123,17 @@ void PackageList::setSubSection( QString ssec )
 {
   aktSubSection = ssec;
 }
 
 void PackageList::updateSections( Package* pack )
 {
-  QString s = pack->getSection();
+  QString s = pack->section();
   if ( s.isEmpty() || s == "") return;
   if ( sections.contains(s) )  return;
   sections += s;
-  QString ss = pack->getSubSection();
+  QString ss = pack->subSection();
   if ( ss.isEmpty() || ss == "" ) return;
   if ( !subSections[s] ) {
     subSections.insert( s, new QStringList() );
     QStringList *subsecs = subSections[s];
     *subsecs += "All";
   }
@@ -147,31 +147,34 @@ void PackageList::updateSections( Package* pack )
 
 
 /** No descriptions */
 void PackageList::parseStatus()
 {
   QStringList dests = settings->getDestinationUrls();
-  for ( QStringList::Iterator it = dests.begin(); it != dests.end(); ++it )
+  QStringList destnames = settings->getDestinationNames();
+  QStringList::Iterator name = destnames.begin();
+  for ( QStringList::Iterator dir = dests.begin(); dir != dests.end(); ++dir )
     {
-      pvDebug( 2,"Status Dir: "+*it+statusDir+"/status");
-      readFileEntries( *it+statusDir+"/status" );
+      pvDebug( 2,"Status: "+*dir+statusDir+"/status");
+      readFileEntries( *dir+statusDir+"/status", *name );
+      ++name;
     };
 }
 
 void PackageList::parseList()
 {
   QStringList srvs = settings->getActiveServers();
 	
   for ( QStringList::Iterator it = srvs.begin(); it != srvs.end(); ++it )
     {
-      pvDebug( 2, "List Dir: "+listsDir+"/"+*it);
-      readFileEntries( listsDir+"/"+*it );  	
+      pvDebug( 2, "List: "+listsDir+"/"+*it);
+      readFileEntries( listsDir+"/"+*it, "" );  	
     }
 }
 
-void PackageList::readFileEntries( QString filename )
+void PackageList::readFileEntries( QString filename, QString dest )
 { 	
   QStringList packEntry;
   QFile f( filename );
   if ( !f.open(IO_ReadOnly) ) return;
   QTextStream *statusStream = new QTextStream( &f );
   while ( !statusStream ->eof() )
@@ -179,13 +182,14 @@ void PackageList::readFileEntries( QString filename )
       QString line = statusStream->readLine();
       if ( line.find(QRegExp("[\n\t ]*")) || line == "" )
 	{
 	  //end of package
 	  if ( ! packEntry.isEmpty() )
 	    {
-	      Package *p = new Package( packEntry );
+	      Package *p = new Package( packEntry, settings );
+       	p->setDest( dest );
 	      if ( p )
 		{
 		  insertPackage( p );
 		  packEntry.clear();
 		}
 	    }
@@ -196,17 +200,17 @@ void PackageList::readFileEntries( QString filename )
   return;
 }
 
 
 void PackageList::update()
 {
-  pvDebug( 3, "parseStatus");
+  pvDebug( 2, "parseStatus");
   parseStatus();
-  pvDebug( 3, "parseList");
+  pvDebug( 2, "parseList");
   parseList();
-  pvDebug( 3, "finished parsing");
+  pvDebug( 2, "finished parsing");
 }
 
 void PackageList::setSettings( PackageManagerSettings *s )
 {
   settings = s;
 }
@@ -218,6 +222,20 @@ Package* PackageList::getByName( QString n )
 
 void PackageList::clear()
 {
 	origPackageList.clear();
 	packageList.clear();
 }
+
+void PackageList::allPackages()
+{
+	packageList.clear();
+  QDictIterator<Package> filterIter( origPackageList );
+  filterIter.toFirst();
+  Package *pack= filterIter.current() ;
+  while ( pack )
+    {	
+	  	packageList.insert( pack->name(), pack );
+      ++filterIter;
+      pack = filterIter.current();
+    }
+}