3 files changed, 5 insertions, 4 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 9c4c752..27c9f4c 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -1,456 +1,456 @@
 // 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 );
   listViewPackages->addList( tr("feeds"), &packageListServers );
   listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
   listViewPackages->addList( tr("documents"), &packageListDocLnk );
   ipkg = new PmIpkg( settings, this );
   packageListServers.setSettings( settings );
   packageListSearch.setSettings( settings );
   packageListDocLnk.setSettings( settings );
         pvDebug(9,"packageListServers.update");
   packageListServers.update();
         pvDebug(9,"packageListDocLnk.update");
   packageListDocLnk.update();
         pvDebug(9,"makeMenu");
           makeMenu();
   makeChannel();
   //opie is hardcoded default ;)
         //pvDebug(9,"section->setCurrentItem");
 //  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()) );
 
         pvDebug(9,"displayList");
   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;
 //  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 );
+         sectionBar->setStretchableWidget( section );
 
   //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 );
   connect( a, SIGNAL( activated() ), findEdit, SLOT( clear() ) );
   a->addTo( findBar );
   a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
   a->addTo( findBar );
   findAction = new QAction( tr( "Filter" ), QString::null, 0, this, 0 );
   connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) );
   findAction->setToggleAction( true );
   findAction->addTo( viewMenu );
 
   //SEARCH
   searchBar = new QPEToolBar(this);
   addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
   label = new QLabel( tr("ipkgfind: "), searchBar );
   label->setBackgroundColor( searchBar->backgroundColor() );
   searchBar->setHorizontalStretchable( TRUE );
   searchEdit = new QLineEdit( searchBar, "seachEdit" );
   searchBar->setStretchableWidget( searchEdit );
 //  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
 //       this, SLOT( displayList() ) );
   a = new QAction( tr( "Clear Search" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), searchEdit, SLOT( clear() ) );
   a->addTo( searchBar );
   searchCommit  = new QAction( tr( "Do Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
   connect( searchCommit, SIGNAL( activated() ),  SLOT( remotePackageQuery() ) );
   searchCommit->addTo( searchBar );
   a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( searchClose() ) );
   a->addTo( searchBar );
   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()
 {
   packageListServers.allPackages();
   ipkg->loadList( &packageListSearch );
   ipkg->loadList( &packageListDocLnk );
   ipkg->loadList( &packageListServers );
   ipkg->commit();
   ipkg->clearLists();
   // ##### 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()
 {
         packageListServers.clear();
         packageListSearch.clear();
   packageListDocLnk.clear();
   ipkg->update();
   packageListServers.update();
   packageListSearch.update();
   packageListDocLnk.update();
 }
 
 void MainWindow::filterList()
 {
          QString f = "";
   if ( findAction->isOn() ) f = findEdit->text();
   packageListServers.filterPackages( f );
 }
 
 void MainWindow::displayList()
 {
         filterList();
   listViewPackages->display();
 }
 
 void MainWindow::sectionChanged()
 {
   disconnect( section, SIGNAL( activated(int) ),
               this, SLOT( sectionChanged() ) );
   disconnect( subsection, SIGNAL(activated(int) ),
               this, SLOT( subSectionChanged() ) );
   subsection->clear();
   packageListServers.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() ) );
   packageListServers.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( packageListServers.getSections() );
 }
 
 void MainWindow::setSubSections()
 {
   subsection->clear();
   subsection->insertStringList( packageListServers.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 );
 }
 
 void MainWindow::searchShow(bool b)
 {
         if (b) searchBar->show();
   else searchBar->hide();
   searchAction->setOn( b );
 }
 
 void MainWindow::searchClose()
 {
   searchAction->setOn( false );
 }
 
 
 void MainWindow::destShow(bool b)
 {
         if (b) destBar->show();
   else destBar->hide();
   destAction->setOn( b );
 }
 
 void MainWindow::destClose()
 {
   destAction->setOn( false );
 }
 
 void MainWindow::setDocument(const QString &fileName)
 {
          if ( !QFile::exists( fileName ) ) return;
         ipkg->installFile( fileName );
   QCopEnvelope e("QPE/System", "linkChanged(QString)");
   QString lf = QString::null;
   e << lf;
          exit;
 }
 
 
 void MainWindow::makeChannel()
         {   
         channel = new QCopChannel( "QPE/Application/oipkg", this );
         connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
                 this, SLOT(receive(const QCString&, const QByteArray&)) );
 }
 
 
 
 void MainWindow::receive(const QCString &msg, const QByteArray &arg)
 {
         pvDebug(3, "QCop "+msg+" "+QCString(arg));
         if ( msg == "installFile(QString)" )
          {
           ipkg->installFile( QString(arg) );
         }else if( msg == "removeFile(QString)" )
          {
           ipkg->removeFile( QString(arg) );
         }else if( msg == "createLinks(QString)" )
          {
           ipkg->createLinks( QString(arg) );
         }else if( msg == "removeLinks(QString)" )
          {
           ipkg->removeLinks( QString(arg) );
         }else{
             pvDebug(2,"Huh what do ya want")
          }
 }
 
 
 void MainWindow::createLinks()
 {
         pvDebug(2,"creating links...");
         ipkg->createLinks( settings->destinationurl->text() );
 }
 
 void MainWindow::removeLinks()
 {
         pvDebug(2,"removing links...");
         ipkg->removeLinks( settings->destinationurl->text() );
 }
 
 void MainWindow::remotePackageQuery()
 {
          packageListSearch.query( searchEdit->text() );
   packageListSearch.update();
          displayList();
 }
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 8c5f0ea..bfb48b3 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -1,436 +1,436 @@
 #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;
   _old = false;
   _status = "";
   _dest = settings->getDestinationName();
   _link = settings->createLinks();
   _versions=0;
   _version="";
 }
 
 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{
-    pvDebug(2,"remote file: "+n);
+    pvDebug(4,"remote file: "+n);
            parseIpkgFile( n );
     _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 == "Section")
   {
       setSection( t );
 //  }else if ( n == "Maintainer")
 //  {
 //
 //  }else if ( n == "Architecture")
 //  {
 
   }else if ( n == "Version")
   {
      _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 == "Description")
   {
       setDesc( t );
   }else if ( n == "Status")
   {
       if ( installed() ) return;
       _status = t;
 //  }else if ( n == "Essential")
 //  {
 
   }else{
           _values.insert(n,new QString(t));
   }
 }
 
 QString Package::name()
 {
         if (_displayName.isEmpty() ) return _name;
          else return _displayName;
 }
 
 
 QString Package::installName()
 {
         if (_useFileName) return _fileName;
   else return _name;
 }
 
 bool Package::installed()
 {
   if (_status.contains("installed")) return true;
   else
         if (_versions)
   {
           QDictIterator<Package> other( *_versions );
                 while ( other.current() )
     {
              if (other.current()->status().contains("installed")
                  && other.current()->version() == version())
                  return true;
              ++other;
                 }
   }
   return false;
 }
 
 bool Package::otherInstalled()
 {
         if (_versions)
   {
           QDictIterator<Package> other( *_versions );
                 while ( other.current() )
     {
              if (other.current()->installed()) return true;
              ++other;
                 }
   }
   return false;
 }
 
 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 (_dest.isEmpty()      && !pack->_dest.isEmpty()) _dest= QString( pack->_dest );
   if (_displayName.isEmpty()&& !pack->_displayName.isEmpty()) _displayName = QString( pack->_displayName );
   if (_fileName.isEmpty()  && !pack->_fileName.isEmpty()) _fileName = QString( pack->_fileName );
   if (_version.isEmpty()      && !pack->_version.isEmpty()) _version = QString( pack->_version );
   if (_values.isEmpty()      && !pack->_values.isEmpty())_values = QDict<QString>( pack->_values );
   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;
   Process ipkg_status(QStringList() << "ipkg" << "info" << name() );
   QString description;
   if ( ipkg_status.exec("",status) )
     {
       QStringList lines = QStringList::split('\n',status,TRUE);
       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 )
 {
         if ( d == "remote") _useFileName = true;
         else _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;
 }
 
 QDict<QString>* Package::getFields()
 {
                 return &_values;
 }
 
 QString Package::status()
 {
         return _status;
 }
 
 bool Package::isOld()
 {
         if (!_versions) return false;
         QDictIterator<Package> other( *_versions );
         while ( other.current() ) {
      if (other.current()->version() > version() ) return true;
      ++other;
          }
   return false;
 }
 
 bool Package::hasVersions()
 {
         if (!_versions) return false;
          else return true;
 }
 
 QDict<Package>* Package::getOtherVersions()
 {
         return _versions;
 }
 
 void Package::setOtherVersions(QDict<Package> *v)
 {
         _versions=v;
 }
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 30777c2..0fa4c61 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -1,397 +1,398 @@
 #include "pmipkg.h"
 #include "pksettings.h"
 #include "package.h"
 #include "packagelistitem.h"
 
 #include <qpe/process.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
 #include <qpe/qpeapplication.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qgroupbox.h>
 #include <qmultilineedit.h>
 #include <qstring.h>
 #include <qcheckbox.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 
 #include <qprogressbar.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "mainwindow.h"
 
 
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
           : QObject ( p )
 {
   settings = s;
          runwindow = new RunWindow( p, name, true, f );
 }
 
 PmIpkg::~PmIpkg()
 {
 }
 
 bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 {
         bool ret=false;
   QDir::setCurrent("/tmp");
   QString cmd = "/usr/bin/ipkg ";
         pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
         if ( dest == "" )
           cmd += " -dest "+settings->getDestinationName();
   else
           cmd += " -dest "+ dest;
 
          cmd += " -force-defaults ";
 
   if (installDialog && installDialog->_force_depends)
   {
           if (installDialog->_force_depends->isChecked())
                  cmd += " -force-depends ";
           if (installDialog->_force_reinstall->isChecked())
                  cmd += " -force-reinstall ";
           if (installDialog->_force_remove->isChecked())
                  cmd += " -force-removal-of-essential-packages ";
   }
 
   out( "Starting to "+ args+"\n");
   cmd += args;
   out( "running:\n"+cmd+"\n" );
   pvDebug(2,"running:"+cmd);
   qApp->processEvents();
   FILE *fp;
   char line[130];
   QString lineStr, lineStrOld;
   sleep(1);
   cmd +=" 2>&1";
   fp = popen(  (const char *) cmd, "r");
   if ( !fp ) {
      qDebug("Could not execute '" + cmd + "'! err=%d", fp);
      pclose(fp);
      out("\nError while executing "+ cmd+"\n\n");
      return false;
   } else {
      while ( fgets( line, sizeof line, fp)) {
         lineStr = line;
         lineStr=lineStr.left(lineStr.length()-1);
         //Configuring opie-oipkg...Done
         if (lineStr.contains("Done"))
           ret = true;
         if (lineStr!=lineStrOld)
                 out(lineStr);
         lineStrOld = lineStr;
                           qApp->processEvents();
      }
      pclose(fp);
   }
   //out( "Finished!");
   pvDebug(2,QString(ret?"success\n":"failure\n"));
   return ret;
 }
 
 void PmIpkg::makeLinks(Package *pack)
 {
         pvDebug( 2, "PmIpkg::makeLinks "+ pack->name());
   linkPackage( pack->name(), pack->dest() );
 }
 
 QStringList* PmIpkg::getList( QString packFileName, QString d )
 {
         QString dest = settings->getDestinationUrlByName( d );
          dest = dest==""?d:dest;
   if (dest == "/" ) return 0;
         {
     Config cfg( "oipkg", Config::User );
     cfg.setGroup( "Common" );
     QString statusDir = cfg.readEntry( "statusDir", "" );
         }
          packFileName = dest+"/"+statusDir+"/info/"+packFileName+".list";
          QFile f( packFileName );
          if ( ! f.open(IO_ReadOnly) )
   {
            pvDebug(1," Panik!  Could not open");
           out( "Panik!\n Could not open:\n"+packFileName );
            return (QStringList*)0;
   }
   QStringList *fileList = new QStringList();
   QTextStream t( &f );
   while ( !t.eof() )
     {
       *fileList += t.readLine();
             }
   return fileList;
 }
 
 void PmIpkg::linkPackage( QString packFileName, QString dest )
 {
         QStringList *fileList = getList( packFileName, dest );
          processFileList( fileList, dest );
   delete fileList;
 }
 
 void PmIpkg::processFileList( QStringList *fileList, QString d )
 {
         if (!fileList) return;
   for (uint i=0; i < fileList->count(); i++)
     {
       QString dest = settings->getDestinationUrlByName( d );
                          dest = dest==""?d:dest;
       processLinkDir( (*fileList)[i], dest );
             }
 }
 
 
 void PmIpkg::processLinkDir( QString file, QString dest )
 {
         pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest);
          if (linkOpp==createLink) pvDebug( 4,"opp: createLink");
          if (linkOpp==removeLink) pvDebug( 4,"opp: removeLink");
         if ( dest == "???" || dest == "" ) return;
   QString destFile = file;
         file = dest+"/"+file;
          if (file == dest) return;
 //  if (linkOpp==createLink) out( "\ncreating links\n" );
         //  if (linkOpp==removeLink) out( "\nremoving links\n" );                       
   QFileInfo fileInfo( file );
   if ( fileInfo.isDir() )
   {
     pvDebug(4, "process dir "+file);
           QDir destDir( destFile );
     if (linkOpp==createLink) destDir.mkdir( destFile, true );
     QDir d( file );
 //    d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
             pvDebug(4, "processLinkDir "+fi->absFilePath());
                         processLinkDir( fi->absFilePath(), dest );                      
                         ++it;
     }
   } else
   if ( fileInfo.isFile() )
   {
     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 )
     {
       QFileInfo toRemoveLink( destFile );
             if ( !QFile::exists( file ) && toRemoveLink.isSymLink() )
              {
               pvDebug(4,"removing "+destFile+" no "+file);
                         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()
         {   
   int sizecount = 0;
           installDialog = new InstallDialog(settings,0,0,true); 
   installDialog->toRemoveItem->setOpen( true );
         installDialog->toInstallItem->setOpen( true );
   for (uint i=0; i < to_remove.count(); i++)
   {
           sizecount += 1;
     installDialog->toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_remove.at(i),settings) );
                 } 
   for (uint i=0; i < to_install.count(); i++)
   {
           sizecount += to_install.at(i)->size().toInt();
     installDialog->toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) );
   }
   runwindow->progress->setTotalSteps(sizecount);
   qDebug("Install size %i",sizecount);
   installDialog->showMaximized();
   installDialog->show();
   if ( installDialog->exec() )
   {
           doIt();
           runwindow->showMaximized();
           runwindow->show();
   }
          installDialog->close();
   delete installDialog;
   out(tr("\nAll done."));
 }
 
 void PmIpkg::doIt()
 {
         runwindow->progress->setProgress(0);
         show();
          remove();
   install();
 }
 
 
 void PmIpkg::remove()
 {
          if ( to_remove.count() == 0 ) return;
 
         out(tr("Removing")+"\n"+tr("please wait")+"\n\n");
 
         QStringList *fileList;
   for (uint i=0; i < to_remove.count(); i++)
   {
                         if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );     
     if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() ))
     {
       runwindow->progress->setProgress( 1 );
              linkOpp = removeLink;
             to_remove.at(i)->processed();
              pvDebug(3,"link "+QString::number(i));
                   if ( to_remove.at(i)->link() )
                 processFileList( fileList, to_remove.at(i)->dest() );
              //pvDebug(3,"take "+QString::number(i)+" of "+QString::number(to_remove.count()));
              //if ( to_remove.at(i) ) to_remove.take( i );
                   
       out("\n");
                 }else{
              out(tr("Error while removing ")+to_remove.at(i)->name()+"\n");
                   if ( to_remove.at(i)->link() )
                 processFileList( fileList, to_remove.at(i)->dest() );
     }
           if ( to_remove.at(i)->link() )
                 processFileList( fileList, to_remove.at(i)->dest() );
           if ( to_remove.at(i)->link() )delete fileList;
   }
   to_remove.clear();
   out("\n");
 }
 
 
 void PmIpkg::install()
 {
          if ( to_install.count() == 0 ) return;
                 out(tr("Installing")+"\n"+tr("please wait")+"\n"); 
   for (uint i=0; i < to_install.count(); i++)
   {
           qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug
           if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))
                         {    
             runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
              to_install.at(i)->processed();
             linkOpp = createLink;
                   if ( to_install.at(i)->link() )
                   makeLinks( to_install.at(i) );
    //   to_install.take( i );
       out("\n");
           }else{
              out(tr("Error while installing")+to_install.at(i)->name()+"\n");
             linkOpp = createLink;
                   if ( to_install.at(i)->link() )
                   makeLinks( to_install.at(i) );
     }
    }
    out("\n");
    to_install.clear();
 }
 
 void PmIpkg::createLinks( const QString &dest )
 {
         pvDebug(2,"PmIpkg::createLinks "+dest);
         linkOpp=createLink;
          QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
         processLinkDir( "/opt", url );
         processLinkDir( "/usr", url );
 }
 
 void PmIpkg::removeLinks( const QString &dest )
 {
         pvDebug(2,"PmIpkg::removeLinks "+dest);
         linkOpp=removeLink;
          QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
         processLinkDir( "/opt", url );
         processLinkDir( "/usr", url );
 }
 
 void PmIpkg::update()
 {
         show();
-        runIpkg( "update" );
-         runwindow->close();
+        if ( runIpkg( "update" ) )
+                 runwindow->close();
+         else out("An error occurred!\nPlease check the log.");
 }
 
 void PmIpkg::out( QString o )
 {
                 runwindow->outPut->append(o);
          runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
 }
 
 
 
 
 void PmIpkg::show()
 {
         if (!runwindow->isVisible())
          {
           runwindow->showMaximized();
           runwindow->show();
   }
   runwindow->outPut->setText("");
 }
 
 void PmIpkg::installFile(const QString &fileName, const QString &dest)
 {
 
         to_install.clear();
   to_remove.clear();
         pvDebug( 2,"PmIpkg::installFile "+ fileName);
          Package *p = new Package(fileName,settings);
   if ( dest!="") p->setDest( dest );
         to_install.append( p );
         commit();
          delete p;
 }
 
 void PmIpkg::removeFile(const QString &fileName, const QString &dest)
 {
 
         to_install.clear();
   to_remove.clear();
         pvDebug( 2,"PmIpkg::removeFile "+ fileName);
          Package *p = new Package(fileName,settings);
   if ( dest!="") p->setDest( dest );
         to_remove.append( p );
         commit();
          delete p;
 }
 
 
 void PmIpkg::clearLists()
 {
         to_remove.clear();
          to_install.clear();
 }