handles different versions of the same package

8 files changed, 62 insertions, 47 deletions

diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp
index 4af59b0..5cef2dc 100644
--- a/noncore/unsupported/oipkg/main.cpp
+++ b/noncore/unsupported/oipkg/main.cpp
@@ -1,19 +1,22 @@
 
 #include "mainwindow.h"
 
 #include <qpe/qpeapplication.h>
 #include <qstring.h>
+#include <qmessagebox.h>
 int debugLevel;
 
 int main( int argc, char ** argv )
 {
+
   debugLevel = 2;
   if (argc > 0)
     {
       debugLevel = QString ( argv[1] ).toInt();
     }
   QPEApplication a( argc, argv );
   MainWindow mw;
+	QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!");
   a.showMainDocumentWidget( &mw );
   return a.exec();
 }
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 06828e0..4865c39 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -1,163 +1,161 @@
 // adadpted form qpe/qipkg
 
 
 #include "mainwindow.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qlistview.h>
 #include <qtextview.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
 #include "pksettingsbase.h"
 #include "utils.h"
 #include "packagelistitem.h"
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   QMainWindow( parent, name, f )
 {	
   setCaption( tr("Package Manager") );
   settings = new PackageManagerSettings(this,0,TRUE);
   listViewPackages =  new PackageListView( this,"listViewPackages",settings );
   setCentralWidget( listViewPackages );
 
 //	wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton);
 //	wait = new QMessageBox(this);
 // 	wait->setText(tr("Please wait"));
   ipkg = new PmIpkg( settings, this );
 //  settings->setIpkg( ipkg );
   packageList.setSettings( settings );
   packageListSearch.setSettings( settings );
   packageList.update();
   makeMenu();	
   makeChannel();
   //opie is hardcoded default ;)
   for (int i=0;i<section->count();i++)
   	if (section->text(i)=="opie")
    		section->setCurrentItem(i);
   sectionChanged();
 
   connect( section,    SIGNAL(activated(int)), SLOT(sectionChanged()) );
   connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) );
 
   connect( settings->removeLinksButton, SIGNAL( clicked()),
   					 SLOT(removeLinks()) );
   connect( settings->createLinksButton, SIGNAL( clicked()),
   					 SLOT(createLinks()) );
 
-//	rootLocal = new QCheckListItem(listViewPackages,tr("local"));
-//	rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
   displayList();
 }
 
 void MainWindow::makeMenu()
 {
 
   QPEToolBar *toolBar = new QPEToolBar( this );
   QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
   QPopupMenu *srvMenu = new QPopupMenu( menuBar );
   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
   //    QPopupMenu *sectMenu = new QPopupMenu( menuBar );
 
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Package" ), srvMenu );
   menuBar->insertItem( tr( "View" ), viewMenu );
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
   //    menuBar->insertItem( tr( "Sections" ), sectMenu );
 
   QLabel *spacer = new QLabel( "", toolBar );
   spacer->setBackgroundColor( toolBar->backgroundColor() );
   toolBar->setStretchableWidget( spacer );
 
 		
   runAction = new QAction( tr( "Apply" ),
 			   Resource::loadPixmap( "oipkg/install" ),
 			   QString::null, 0, this, 0 );
   connect( runAction, SIGNAL( activated() ),
 	   this, SLOT( runIpkg() ) );
   runAction->addTo( toolBar );
   runAction->addTo( srvMenu );
 
   srvMenu->insertSeparator ();
 
   updateAction = new QAction( tr( "Update" ),
 			      Resource::loadIconSet( "oipkg/update" ),
 			      QString::null, 0, this, 0 );
   connect( updateAction, SIGNAL( activated() ),
 	   this , SLOT( updateList() ) );
   updateAction->addTo( toolBar );
   updateAction->addTo( srvMenu );
 
   QAction *cfgact;
 
   cfgact = new QAction( tr( "Setups" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettings() ) );
   cfgact->addTo( cfgMenu );
 		
   cfgact = new QAction( tr( "Servers" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettingsSrv() ) );
   cfgact->addTo( cfgMenu );
   cfgact = new QAction( tr( "Destinations" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettingsDst() ) );
   cfgact->addTo( cfgMenu );
 
   QAction *a;
 
   // SECTIONS
 	sectionBar = new QPEToolBar( this );
  	addToolBar( sectionBar,  "Section", QMainWindow::Top, TRUE );
   sectionBar->setHorizontalStretchable( true );
   QLabel *label = new QLabel( tr("Section: "), sectionBar );
   label->setBackgroundColor( sectionBar->backgroundColor() );
  	sectionBar->setStretchableWidget( label );
   section = new QComboBox( false, sectionBar );
   label = new QLabel( " / ", sectionBar );
   label->setBackgroundColor( sectionBar->backgroundColor() );
   subsection = new QComboBox( false, sectionBar );
   a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) );
   a->addTo( sectionBar );
   setSections();
   setSubSections();
   sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 );
   connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) );
   sectionAction->setToggleAction( true );
   sectionAction->addTo( viewMenu );
 
   //FIND
   findBar = new QPEToolBar(this);
   addToolBar( findBar,  "Filter", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Filter: "), findBar );
   label->setBackgroundColor( findBar->backgroundColor() );
   findBar->setHorizontalStretchable( TRUE );
   findEdit = new QLineEdit( findBar, "findEdit" );
   findBar->setStretchableWidget( findEdit );
   connect( findEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( displayList() ) );
   a = new QAction( tr( "Clear Find" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
@@ -193,194 +191,197 @@ void MainWindow::makeMenu()
   searchAction = new QAction( tr( "Search" ), QString::null, 0, this, 0 );
   connect( searchAction, SIGNAL( toggled(bool) ), this, SLOT( searchShow(bool) ) );
   searchAction->setToggleAction( true );
   searchAction->addTo( viewMenu );
 
   //DEST
   destBar = new QPEToolBar(this);
   addToolBar( destBar,  "Destination", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Destination: "), destBar );
   label->setBackgroundColor( destBar->backgroundColor() );
   destBar->setHorizontalStretchable( TRUE );
   destination = new QComboBox( false, destBar );
   destination->insertStringList( settings->getDestinationNames() );
   setComboName(destination,settings->getDestinationName());
   connect( destination, SIGNAL(activated(int)),
   			 settings, SLOT(activeDestinationChange(int)) );
   spacer = new QLabel( " ", destBar );
   spacer->setBackgroundColor( destBar->backgroundColor() );
   CheckBoxLink = new QCheckBox( tr("Link"), destBar);
   CheckBoxLink->setBackgroundColor( destBar->backgroundColor() );
   CheckBoxLink->setChecked( settings->createLinks() );
   connect( CheckBoxLink, SIGNAL(toggled(bool)),
      				 settings, SLOT(linkEnabled(bool)) );
   destAction = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 );
   connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) );
   a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), SLOT( destClose() ) );
   a->addTo( destBar );
   destBar->setStretchableWidget( CheckBoxLink );
   destAction->setToggleAction( true );
  // destAction->addTo( viewMenu );
 
   // configure the menus
   Config cfg( "oipkg", Config::User );
   cfg.setGroup( "gui" );
 
   findShow( cfg.readBoolEntry( "findBar", true ) );
   searchShow( cfg.readBoolEntry( "searchBar", true ) );
   sectionShow( cfg.readBoolEntry( "sectionBar", true ) );
   destShow( cfg.readBoolEntry( "destBar", false ) );
 }
 
 MainWindow::~MainWindow()
 {
   Config cfg( "oipkg", Config::User );
   cfg.setGroup( "gui" );
   cfg.writeEntry( "findBar", !findBar->isHidden() );
   cfg.writeEntry( "searchBar", !searchBar->isHidden() );
   cfg.writeEntry( "sectionBar", !sectionBar->isHidden() );
   cfg.writeEntry( "destBar", !destBar->isHidden() );
 	
 }
 
 void MainWindow::runIpkg()
 {
   packageList.allPackages();
   ipkg->loadList( packageListSearch );
   ipkg->commit( packageList );
   // ##### If we looked in the list of files, we could send out accurate
   // ##### messages. But we don't bother yet, and just do an "all".
   QCopEnvelope e("QPE/System", "linkChanged(QString)");
   QString lf = QString::null;
   e << lf;
   displayList();
 }
 
 void MainWindow::updateList()
 {
 //	wait->show();
 	QTimer *t = new QTimer( this );
   connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
   t->start( 0, false );
 	packageList.clear();
   ipkg->update();
   packageList.update();
   t->stop();
 //	wait->hide();  	
 }
 
 void MainWindow::filterList()
 {
 //	wait->show();
  	QString f = "";
   if ( findAction->isOn() ) f = findEdit->text();
   packageList.filterPackages( f );
 //	wait->hide();
 }
 
 void MainWindow::displayList()
 {
 //	wait->hide();
 	filterList();
   listViewPackages->clear();
   Package *pack = packageList.first();
   PackageListItem *item;
 
+//  if (!rootLocal)
+//  {
 	QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local"));
 	QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
+//  }
   while( pack )
   {
 	 	item = new PackageListItem( rootLocal, pack, settings );				
     pack = packageList.next();
   }	
   pack = packageListSearch.first();
   while( pack )
   {
 	 	item = new PackageListItem( rootSearch, pack, settings );				
     pack = packageListSearch.next();
   }	
 }
 
 void MainWindow::sectionChanged()
 {
   disconnect( section, SIGNAL( activated(int) ),
 	      this, SLOT( sectionChanged() ) );
   disconnect( subsection, SIGNAL(activated(int) ),
 	      this, SLOT( subSectionChanged() ) );
   subsection->clear();
   packageList.setSection( section->currentText() );
   setSubSections();
   connect( section, SIGNAL( activated(int) ),
 	   this, SLOT( sectionChanged() ) );
   connect( subsection, SIGNAL(activated(int) ),
 	   this, SLOT( subSectionChanged() ) );
   displayList();
 }
 
 void MainWindow::subSectionChanged()
 {
   disconnect( section, SIGNAL( activated(int) ),
 	      this, SLOT( sectionChanged() ) );
   disconnect( subsection, SIGNAL(activated(int) ),
 	      this, SLOT( subSectionChanged() ) );
   packageList.setSubSection( subsection->currentText() );
   connect( section, SIGNAL( activated(int) ),
 	   this, SLOT( sectionChanged() ) );
   connect( subsection, SIGNAL(activated(int) ),
 	   this, SLOT( subSectionChanged() ) );
   displayList();
 }
 
 void MainWindow::setSections()
 {
   section->clear();
   section->insertStringList( packageList.getSections() );
 }
 
 void MainWindow::setSubSections()
 {
   subsection->clear();
   subsection->insertStringList( packageList.getSubSections() );
 }
 
 
 void MainWindow::showSettings()
 {
   if ( settings->showDialog( 0 ) )
     updateList();
 }
 void MainWindow::showSettingsSrv()
 {
   if ( settings->showDialog( 1 ) )
     updateList();
 }
 void MainWindow::showSettingsDst()
 {
   if ( settings->showDialog( 2 ) )
     updateList();
 }
 
 void MainWindow::sectionShow(bool b)
 {
 	if (b) sectionBar->show();
   else sectionBar->hide();
   sectionAction->setOn( b );
 }
 
 void MainWindow::sectionClose()
 {
   sectionAction->setOn( false );
 }
 
 void MainWindow::findShow(bool b)
 {
 	if (b) findBar->show();
   else findBar->hide();
   findAction->setOn( b );
 }
 
 void MainWindow::findClose()
 {
   findAction->setOn( false );
 }
 
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 6bb53a9..0787ece 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -1,251 +1,257 @@
 #include "package.h"
 
 #include <qpe/process.h>
 #include <qpe/stringutil.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "debug.h"
 
 //Package::~Package()
 //{
 //}
 
 Package::Package( PackageManagerSettings *s )
 {
 	init(s);
 }
 
 void Package::init( PackageManagerSettings *s )
 {
 	settings = s;
   _size = "";
   _section = "";
   _subsection = "";
   _shortDesc = "";
   _desc = "";
   _name = "";
   _toProcess = false;
   _useFileName = false;
   _status = "";
   _dest = settings->getDestinationName();
   _link = settings->createLinks();
 }
 
 Package::Package( QStringList pack, PackageManagerSettings *s  )
 {	
   init(s);
   parsePackage( pack );
 }
 
 Package::Package( QString n, PackageManagerSettings *s )
 {	
   init(s);
  	if ( !QFile::exists( n ) )
   {
 	  _name = QString( n );
   }else{
    	parseIpkgFile( n );
     _toProcess = true;
     _useFileName = true;
     _fileName = QString( n );
   }
 }
 
 Package::Package( Package *pi )
 {
   init(pi->settings);
   copyValues( pi );
 }
 
 
 void Package::setValue( QString n, QString t )
 {
   if ( n == "Package" )
   {
       _name = QString( t );
   }else if ( n == "Installed-Size" )
   {
       _size = t;
-  }else if ( n == "Priority")
-  {
+//  }else if ( n == "Priority")
+//  {
 
   }else if ( n == "Section")
   {
       setSection( t );
-  }else if ( n == "Maintainer")
-  {
-
-  }else if ( n == "Architecture")
-  {
+//  }else if ( n == "Maintainer")
+//  {
+//
+//  }else if ( n == "Architecture")
+//  {
 
   }else if ( n == "Version")
   {
-
-  }else if ( n == "Pre-Depends")
-  {
-
-  }else if ( n == "Depends")
-  {
+     _version = t;
+//  }else if ( n == "Pre-Depends")
+//  {
+//
+//  }else if ( n == "Depends")
+//  {
 
   }else if ( n == "Filename")
   {
     _fileName = t;
-  }else if ( n == "Size")
- 	{
-  	
-	}else if ( n == "MD5Sum")
-	{
+//  }else if ( n == "Size")
+// 	{
+//  	
+//	}else if ( n == "MD5Sum")
+//	{
 
-	}
-  if ( n == "Description")
+	}else if ( n == "Description")
   {
       setDesc( t );
-  }
-  if ( n == "Status")
+  }else if ( n == "Status")
   {
       if ( installed() ) return;
       _status = t;
-  }
-  if ( t == "Essential")
-  {
+//  }else if ( n == "Essential")
+//  {
 
+  }else{
+  	_values.insert(n,new QString(t));
   }
-};
+}
 
 QString Package::name()
 {
-  return _name;
+	if (_displayName.isEmpty() ) return _name;
+ 	else return _displayName;
 }
 
 
 QString Package::installName()
 {
 	if (_useFileName) return _fileName;
   else return _name;
 }
 
 bool Package::installed()
 {
   return _status.contains("installed");
 }
 
 void Package::setDesc( QString s )
 {
   _desc = s;
   _shortDesc = s.left( s.find("\n") );
 }
 
 QString Package::desc()
 {
   return _desc;
 }
 
 QString Package::shortDesc()
 {
   return _shortDesc;
 }
 
 QString Package::size()
 {
   return _size;
 }
 
+
+QString Package::version()
+{
+  return _version;
+}
+
 QString Package::sizeUnits()
 {
 	int i = _size.toInt();
  	int c = 0;
   QString ret;
  	QStringList unit;
   unit << "B" << "KB" << "MB" << "GB" << "TB"; //prepair for the future ;)
 	while (i > 1)
  	{
   	ret=QString::number(i)+" "+unit[c];
    	c++;
    	i /= 1024;
   }
   return ret;
 }
 
 bool Package::toProcess()
 {
   return _toProcess;
 }
 
 bool Package::toRemove()
 {
   if ( _toProcess && installed() ) return true;
   else return false;
 }
 
 bool Package::toInstall()
 {
   if ( _toProcess && !installed() ) return true;
   else return false;
 }
 
 void Package::toggleProcess()
 {
   _toProcess = ! _toProcess;
 }
 
 
 
 void Package::copyValues( Package* pack )
 {
   if (_size.isEmpty()      && !pack->_size.isEmpty()) _size = QString( pack->_size );
   if (_section.isEmpty()   && !pack->_section.isEmpty()) _section = QString( pack->_section );
   if (_subsection.isEmpty()&& !pack->_subsection.isEmpty()) _subsection = QString( pack->_subsection );
   if (_shortDesc.isEmpty() && !pack->_shortDesc.isEmpty()) _shortDesc = QString( pack->_shortDesc );
   if (_desc.isEmpty()      && !pack->_desc.isEmpty()) _desc = QString( pack->_desc );
   if (_name.isEmpty()      && !pack->_name.isEmpty()) _name = QString( pack->_name );
   if (!installed() && _status.isEmpty()    && !pack->_status.isEmpty()) _status = QString( pack->_status );
 }
 
 QString Package::section()
 {
   return _section;
 }
 
 void Package::setSection( QString s)
 {
   int i = s.find("/");
   if ( i > 0 )
     {
       _section    = s.left(i);
       _subsection = s.mid(i+1);
     }else{
       _section    = s;
       _subsection = "";
     }
 }
 
 QString Package::subSection()
 {
   return _subsection;
 }
 
 void Package::parsePackage( QStringList pack )
 {
   if ( pack.isEmpty() ) return;
   int count = pack.count();
   for( int i = 0; i < count; i++ )
     {
       QString line = pack[i];
       int sep = line.find( QRegExp(":[\t ]+") );
       if ( sep >= 0 )
 			{
 	  		QString tag = line.left(sep);
 	  		QString value = line.mid(sep+2).simplifyWhiteSpace();
 	  		setValue( tag, value );
   		}else{
    		}
     }
   return;
 }
 
 QString Package::details()
 {
   QString status;
@@ -257,96 +263,101 @@ QString Package::details()
       for (QStringList::Iterator it = lines.begin(); it!=lines.end(); ++it) {
 	QString line = *it;
 	if ( line == " ." )
 	  {
 	    description.append("<p>");
 	  } else
 	    if ( line[0] == ' ' || line[0] == '\t' )
 	      {
 		// continuation
 		description.append(" ");
 		description.append(Qtopia::escapeString(line));
 	      } else {
 		int sep = line.find(QRegExp(":[\t ]+"));
 		if ( sep >= 0 )
 		  {
 		    QString tag = line.left(sep);
 		    description.append("<br>");
 		    description.append("<b>");
 		    description.append(Qtopia::escapeString(tag));
 		    description.append(":</b> ");
 		    description.append(Qtopia::escapeString(line.mid(sep+2)));
 		  } else {
 		    description.append(" ");
 		    description.append(Qtopia::escapeString(line));
 		  }
 	      }
       }
     }
   return description;
 }
 
 void Package::processed()
 {
 	_toProcess = false;
  //hack, but we're not writing status anyway...
 	if ( installed() ) _status = "install";
  	else _status = "installed";
 }
 
 QString Package::dest()
 {
 	if ( installed()||(!installed() && _toProcess) )
 		return _dest!=""?_dest:settings->getDestinationName();
   else return "";
 }
 
 void Package::setDest( QString d )
 {
 	_dest = d;
 }
 
 void Package::setOn()
 {
 	_toProcess = true;	
 }
 
 bool Package::link()
 {
 	if ( _dest == "root" || (!installed() && !_toProcess) ) return false;
 	return _link;
 }
 
 void Package::setLink(bool b)
 {
 	_link = b;
 }
 
 void Package::parseIpkgFile( QString file)
 {
 	system("tar xzf "+file+" -C /tmp");
  	system("tar xzf /tmp/control.tar.gz -C /tmp");
   QFile f("/tmp/control");
   if ( f.open(IO_ReadOnly) )
   {
   	QTextStream t( &f );
 		QStringList pack;
 		while ( !t.eof() )
   	{
 			pack << t.readLine();
    	}
     f.close();
   	parsePackage( pack );
   }
 	
 }
 
 //QString Package::getPackageName()
 //{
 //	if ( _packageName.isEmpty() ) return _name;
 //	else return _packageName;
 //}
 
 void Package::instalFromFile(bool iff)
 {
 	_useFileName = iff;
 }
+
+void Package::setName(QString n)
+{
+	_displayName = n;
+}
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h
index 4618c3a..2ca966d 100644
--- a/noncore/unsupported/oipkg/package.h
+++ b/noncore/unsupported/oipkg/package.h
@@ -1,74 +1,77 @@
 #ifndef PK_ITEM_H
 #define PK_ITEM_H
 
 #include <qstring.h>
 #include <qlistview.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qdict.h>
 #include <qobject.h>
 
 #include "pksettings.h"
 
 class Package //: public QObject
 {
 //  	Q_OBJECT
  public:
   Package(PackageManagerSettings *);
  // ~Package();
   Package( QStringList, PackageManagerSettings * );
   Package( QString, PackageManagerSettings * );
   Package( Package* );
  	
   void    setValue( QString, QString );
   void    copyValues( Package* );
 
   QString name() ;
   QString installName() ;
   bool    installed();
 
   void    setDesc( QString );
   QString shortDesc();
   QString desc();
   QString size();
   QString sizeUnits();
+  QString version();
   void    setSection( QString );
   QString section();
   QString subSection();
   QString details();
   bool    toProcess();
   bool    toInstall();
   bool    toRemove();
   void processed();
   QString dest();
   void setDest( QString d );
   void setOn();
   bool link();
   void setLink(bool);
   void parseIpkgFile( QString );
   void instalFromFile(bool iff=true);
+  void setName(QString);
 public slots:
-//  QString getPackageName();
   void toggleProcess();
 
 private:
   PackageManagerSettings *settings;
-//  QString _packageName;
+  QString _displayName;
   QString _name;
   QString _fileName;
   bool    _toProcess;
   bool    _link;
   QString _status;
   QString _size;
   QString _section;
   QString _subsection;
   QString _shortDesc;
   QString _desc;
+  QString _version;
   QString _dest;
+  QDict<QString> _values;
   bool _useFileName;
   void parsePackage( QStringList );
   void init(PackageManagerSettings *);
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index b892b30..be20c71 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -1,142 +1,151 @@
 #include "packagelist.h"
 
 #include <assert.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 
 #include "debug.h"
 
 PackageList::PackageList()
   : packageIter( packageList )
 {
   empty=true;
   sections << "All";
   subSections.insert("All", new QStringList() );
   QStringList *ss = subSections["All"];
   *ss << "All";
   aktSection = "All";
   aktSubSection = "All";
 }
 
 PackageList::PackageList( PackageManagerSettings* s)
   : packageIter( packageList )
 {
   settings = s;
   PackageList();
 }
 
 PackageList::~PackageList()
 {
 }
 
 /** Inserts a package into the list */
 void PackageList::insertPackage( Package* pack )
 {
+	if (!pack) return;
   Package* p = packageList.find( pack->name() );
   if ( p )
     {
-      p->copyValues( pack );
-      delete pack;
-      pack = p;
+      if ( p->version() == pack->version() )
+      {
+	      p->copyValues( pack );
+  	    delete pack;
+    	  pack = p;
+      } else {
+       	p->setName( pack->name()+"["+p->version()+"]" );
+       	pack->setName( pack->name()+"["+pack->version()+"]" );
+				packageList.insert( pack->name(), pack );
+      	origPackageList.insert( pack->name(), pack );
+      }
     }else{
       packageList.insert( pack->name(), pack );
       origPackageList.insert( pack->name(), pack );
-      empty=false;
     };
+  empty=false;
   updateSections( pack );
 }
 
 void PackageList::filterPackages( QString f )
 {	
   packageList.clear();
   QDictIterator<Package> filterIter( origPackageList );
   filterIter.toFirst();
   Package *pack= filterIter.current() ;
   while ( pack )
     {	
       if (
       			((aktSection=="All")||(pack->section()==aktSection)) &&
 	   				((aktSubSection=="All")||(pack->subSection()==aktSubSection)) &&
         		 pack->name().contains( f )
     			)
 			{
 	  		packageList.insert( pack->name(), pack );
 			}
       ++filterIter;
       pack = filterIter.current();
     }
 }
 
 Package* PackageList::find( QString n )
 {
   return packageList.find( n );
 }
 
 Package* PackageList::first()
 { 	
   packageIter.toFirst();
   return packageIter.current();	
 }
 
 Package* PackageList::next()
 {
   ++packageIter;
   return packageIter.current();
 }
 
 QStringList PackageList::getSections()
 {
   sections.sort();
   return sections;
 }
 
 QStringList PackageList::getSubSections()
 {
   QStringList ss;
   if ( !subSections[aktSection] ) return ss;
   ss = *subSections[aktSection];
   ss.sort();
   return ss;
 }
 
 void PackageList::setSection( QString sec )
 {
   aktSection = sec;
 }
 
 void PackageList::setSubSection( QString ssec )
 {
   aktSubSection = ssec;
 }
 
 void PackageList::updateSections( Package* pack )
 {
   QString s = pack->section();
   if ( s.isEmpty() || s == "") return;
   if ( sections.contains(s) )  return;
   sections += s;
   QString ss = pack->subSection();
   if ( ss.isEmpty() || ss == "" ) return;
   if ( !subSections[s] ) {
     subSections.insert( s, new QStringList() );
     QStringList *subsecs = subSections[s];
     *subsecs += "All";
   }
   QStringList *subsecs = subSections[s];
   *subsecs += ss;
   if ( !subSections["All"] ) subSections.insert( "All", new QStringList() );
   subsecs = subSections["All"];
   *subsecs += ss;
 }
 
 
 void PackageList::readFileEntries( QString filename, QString dest )
 { 	
 	pvDebug(5,"PackageList::readFileEntries "+filename+" dest "+dest);
   QStringList packEntry;
   QFile f( filename );
   if ( !f.open(IO_ReadOnly) ) return;
   QTextStream *statusStream = new QTextStream( &f );
   while ( !statusStream ->eof() )
   { 	
diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp
index 610a0e1..36d081b 100644
--- a/noncore/unsupported/oipkg/packagelistview.cpp
+++ b/noncore/unsupported/oipkg/packagelistview.cpp
@@ -1,90 +1,89 @@
 #include "packagelistview.h"
 
 #include <qpopupmenu.h>
 #include <qaction.h>
 
 #include "packagelistitem.h"
 #include "pksettings.h"
 
 PackageListView::PackageListView(QWidget *p, const char* n, PackageManagerSettings *s)
 	: QListView(p,n)
 {
 	settings = s;
 	popupMenu = new QPopupMenu( this );	
 	destsMenu = new QPopupMenu( popupMenu );
   popupTimer = new QTimer( this );
   setSelectionMode(QListView::NoSelection);
 	addColumn( tr("Package") );
  	setRootIsDecorated( true );
 
   connect( popupTimer, SIGNAL(timeout()),
   		this, SLOT(showPopup()) );
   connect( this, SIGNAL( pressed( QListViewItem* ) ),
 	    this, SLOT( setCurrent( QListViewItem* ) ) );
 	connect( this, SIGNAL( clicked( QListViewItem* ) ),
 	   this, SLOT( stopTimer( QListViewItem* ) ) );	
 
 }
 
 //PackageListView::~PackageListView()
 //{
 //}
 
 void PackageListView::setCurrent( QListViewItem* p )
 {
   if ( !p ) return;
   activePackageListItem = (PackageListItem*)p;
   activePackage = activePackageListItem->getPackage();
   if (!activePackage) return;
   popupTimer->start( 750, true );
 }
 
 
 void PackageListView::showPopup()
 {
   popupMenu->clear();
   destsMenu->clear();
  		
  	QAction *popupAction;
   if ( !activePackage->installed() )
   {
 	  popupMenu->insertItem( QObject::tr("Install to"), destsMenu );
   	QStringList dests = settings->getDestinationNames();
    	QString ad = settings->getDestinationName();
 	  for (uint i = 0; i < dests.count(); i++ )
   	{		
 	  	popupAction = new QAction( dests[i], QString::null, 0, this, 0 );
 		  popupAction->addTo( destsMenu );
     	if ( dests[i] == ad && activePackage->toInstall() )
      	{
         popupAction->setToggleAction( true );
 			  popupAction->setOn(true);
   		};
   	}
 	  connect( destsMenu, SIGNAL( activated( int ) ),
 		   this, SLOT( changePackageDest( int ) ) );
    }else{
-//   	popupActcat setOn( activePackage->toProcess() );
    }
   popupMenu->popup( QCursor::pos() );
 }
 
 void PackageListView::stopTimer( QListViewItem* )
 {
 	popupTimer->stop();
 }
 
 
 void PackageListView::changePackageDest( int i )
 {
  	activePackage->setDest( destsMenu->text(i) );
   activePackage->setOn();
   activePackage->setLink( settings->createLinks() );
   activePackageListItem->displayDetails();
 }
 
 void PackageListView::toggleProcess()
 {
   activePackage->toggleProcess() ;
   activePackageListItem->displayDetails();
 }
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index fe200f5..1798c80 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -193,242 +193,232 @@ void PmIpkg::processLinkDir( QString file, QString dest )
   {
     const char *instFile = strdup( (file).ascii() );
     const char *linkFile = strdup(  (destFile).ascii());
     if( linkOpp==createLink )
 		{
     	pvDebug(4, "linking: "+file+" -> "+destFile );
     	symlink( instFile, linkFile );
   	}
   }  else  {
     const char *linkFile = strdup(  (destFile).ascii());
     if( linkOpp==removeLink )
     {
       pvDebug(4,"removing "+destFile+" no "+file);
       QFileInfo toRemoveLink( destFile );
     	if ( !QFile::exists( file ) && toRemoveLink.isSymLink() )
      		unlink( linkFile ); 	
     }
   }
 }
 
 void PmIpkg::loadList( PackageList pl )
 {   	
   for( Package *pack = pl.first();pack ; (pack = pl.next())  )
   {
   	if ( pack && (pack->name() != "") && pack)
 		{
 		  if ( pack->toInstall() )
 	      to_install.append( pack );
 		  if ( pack->toRemove() )
 	      to_remove.append( pack );
 		}
   }
 }
 
 void PmIpkg::commit( PackageList pl )
 {   	
   sizecount = 0;
   QString rem="<b>"+tr("To remove:")+"</b><br>\n";
   QString inst="<b>"+tr("To install:")+"</b><br>\n";
   loadList(pl);
   for (uint i=0; i < to_remove.count(); i++)
        	sizecount += 1;
   for (uint i=0; i < to_install.count(); i++)
        	sizecount += to_install.at(i)->size().toInt();
 	startDialog();
 }
 
 void PmIpkg::startDialog()
 {
   installDialog = new QDialog(0,0,true);
   QGridLayout *RunWindowLayout = new QGridLayout( installDialog );
   RunWindowLayout->setSpacing( 2 );
   RunWindowLayout->setMargin( 2 );
 
     PackageListView *plv = new PackageListView(installDialog, "install",settings);
     plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) );
     RunWindowLayout->addWidget( plv, 1, 0 );
 		QCheckListItem *toRemoveItem;
 		toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") );
   	toRemoveItem->setOpen( true );
     for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
 	  {
       toRemoveItem->insertItem( new PackageListItem(plv, it,settings) );
    	} 	
 		QCheckListItem *toInstallItem;
 		toInstallItem = new QCheckListItem( plv, QObject::tr("To install") );
   	toInstallItem->setOpen( true );
     for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
       toInstallItem->insertItem( new PackageListItem(plv, it,settings) );
     }
 
     QGroupBox *GroupBox1 = new QGroupBox( installDialog, "Ipkg" );
     GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().mayShrinkVertically() ) );
     GroupBox1->setTitle( tr( "Ipkg options" ) );
     GroupBox1->setColumnLayout(0, Qt::Vertical );
     GroupBox1->layout()->setSpacing( 0 );
     GroupBox1->layout()->setMargin( 0 );
     QGridLayout *GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
     GroupBox1Layout->setAlignment( Qt::AlignTop );
     GroupBox1Layout->setSpacing( 3 );
     GroupBox1Layout->setMargin( 3 );
     _force_depends = new QCheckBox( GroupBox1, "_force_depends" );
     _force_depends->setText( tr( "-force-depends" ) );
     _force_depends->setAutoResize( TRUE );
     _force_depends->setChecked(true);
     GroupBox1Layout->addWidget( _force_depends, 0, 0 );
     _force_reinstall = new QCheckBox( GroupBox1, "_force_reinstall" );
     _force_reinstall->setText( tr( "-force-reinstall" ) );
     _force_reinstall->setAutoResize( TRUE );
     GroupBox1Layout->addWidget( _force_reinstall, 1, 0 );
     _force_remove = new QCheckBox( GroupBox1, "_force_remove" );
     _force_remove->setText( tr( "-force-removal-of-essential-packages" ) );
     _force_remove->setAutoResize( TRUE );
     GroupBox1Layout->addWidget( _force_remove, 1, 0 );
     RunWindowLayout->addWidget( GroupBox1 , 3, 0 );
-
-//  connect( doItButton, SIGNAL( clicked() ),
-//  					this, SLOT( doIt() ) );
-//  connect( installButton, SIGNAL( clicked() ),
-//  					this, SLOT( install() ) );
-//  connect( removeButton, SIGNAL( clicked() ),
-//  					this, SLOT( remove() ) );
-//  connect( cancelButton, SIGNAL( clicked() ),
-//  					installDialog, SLOT( close() ) );
   installDialog->showMaximized();
   if ( installDialog->exec() ) doIt();
  	installDialog->close();
   out(tr("<b>All done.</b>"));
 }
 
 void PmIpkg::doIt()
 {
 	show( true );
  	remove();
   install();
 }
 
 
 void PmIpkg::remove()
 {
  	if ( to_remove.count() == 0 ) return;
 
 	out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>");
 
 	QStringList *fileList;
   for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
   {
 			if ( it->link() )fileList = getList( it->name(), it->dest() );     	
       if ( runIpkg("remove " + it->name()) == 0)
       {
         runwindow->progress->setProgress( 1 + runwindow->progress->progress() );
        	linkOpp = removeLink;
 	    	if ( it->link() )
       	{
 					out( "<br>removing links<br>" );
   				out( "for package "+it->name()+" in "+it->dest()+"<br>" );
       		processFileList( fileList, it->dest() );
         }
      		it->processed();
        	
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
       }
-     	pvDebug(2,"delete File List");
 	  if ( it->link() )delete fileList;
     }
     out("<br>");
 }
 
 
 void PmIpkg::install()
 {
  	if ( to_install.count() == 0 ) return;
 	out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
  	for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
 
       if ( runIpkg("install " + it->installName(), it->dest() ) == 0 )
 		  {    	
       	runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
        	linkOpp = createLink;
 	    	if ( it->link() )
       	{
 					out( "<br>creating links<br>" );
   				out( "for package "+it->name()+" in "+it->dest()+"<br>" );
 					makeLinks( it );
      		}
      		it->processed();
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while installing")+"</b><hr>"+it->name());
       }
     }
     out("<br>");
 }
 
 void PmIpkg::createLinks( const QString &dest )
 {
 	pvDebug(2,"PmIpkg::createLinks "+dest);
 	linkOpp=createLink;
  	QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
 	processLinkDir( "/", url );
 }
 
 void PmIpkg::removeLinks( const QString &dest )
 {
 	pvDebug(2,"PmIpkg::removeLinks "+dest);
 	linkOpp=removeLink;
  	QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
 	processLinkDir( "/", url );
 }
 
 void PmIpkg::update()
 {
 	show( false );
 	runIpkg( "update" );
  	runwindow->close();
 }
 
 void PmIpkg::out( QString o )
 {
 	runwindow->outPut->append(o);	
  	//runwindow->outPut->setCursorPosition(0, runwindow->outPut->contentsHeight());
 //	runwindow->outPut->setText( runwindow->outPut->text()+o );
   runwindow->outPut->setContentsPos(0, runwindow->outPut->contentsHeight());
 }
 
 
 void PmIpkg::showButtons(bool b)
 {
 	if ( b )
  	{
 		runwindow->cancelButton->hide();
  		runwindow->doItButton->hide();
 	  runwindow->removeButton->hide();
   	runwindow->installButton->hide();
   }else{
 		runwindow->cancelButton->show();
  		runwindow->doItButton->show();
 	  runwindow->removeButton->show();
   	runwindow->installButton->show();
 
   }
 }
 
 void PmIpkg::show(bool b)
 {
 	if (!runwindow->isVisible())
 	  runwindow->showMaximized();
 	showButtons(b);
 	if ( !b )
  		runwindow->progress->hide();
   else
  		runwindow->progress->show();
 }
 
 void PmIpkg::installFile(const QString &fileName, const QString &dest)
 {
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 2b89023..fa00048 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -1,66 +1,65 @@
 #ifndef PMIPKG_H
 #define PMIPKG_H
 
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 #include "pksettings.h"
 #include "runwindow.h"
 #include "packagelist.h"
 #include "debug.h"
 
 #define createLink 0
 #define removeLink 1
 
 class Package;
 class PmIpkg : public QObject
 {
   Q_OBJECT
 public:
   PmIpkg( PackageManagerSettings* , QWidget* p=0,  const char * name=0, WFlags f=0 );
   ~PmIpkg();
 
   int linkOpp;
   void loadList( PackageList );
   void commit( PackageList );
   void update();
- // PackageList* getPackageList();
   void showButtons(bool b=true);
   void show( bool buttons=true );
 
 public slots:
 	void doIt();
  	void install();
   void remove();
   void installFile(const QString &fileName, const QString &dest="");
   void removeFile(const QString &fileName, const QString &dest="");
   void createLinks( const QString &dest );
   void removeLinks( const QString &dest );
 
 private:
 	int sizecount;
   PackageManagerSettings* settings;
   RunWindow *runwindow;
   QDialog *installDialog;
   QList<Package> to_remove;
   QList<Package> to_install;
   bool runwindowopen;
   QString fileNameToInstall;
   QCheckBox *_force_reinstall;
   QCheckBox *_force_remove;
   QCheckBox *_force_depends;
   void startDialog();
   void makeLinks(Package*);
   void linkPackage( QString, QString );
   void processLinkDir( QString , QString );
   int  runIpkg(const QString& args, const QString& dest="" );
   void out( QString );
 	QStringList* getList( QString, QString );
 	void processFileList( QStringList*, QString );
  	
 
 };
 
 #endif