6 files changed, 8 insertions, 32 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 1c56aae..9c4c752 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -20,53 +20,49 @@
 #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 );
-        //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 );
   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()) );
@@ -248,75 +244,66 @@ MainWindow::~MainWindow()
   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()
 {
-        //wait->show();
-        QTimer *t = new QTimer( this );
-  connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
-  t->start( 0, false );
         packageListServers.clear();
         packageListSearch.clear();
   packageListDocLnk.clear();
   ipkg->update();
   packageListServers.update();
   packageListSearch.update();
   packageListDocLnk.update();
-  t->stop();
-        //      wait->hide();  
 }
 
 void MainWindow::filterList()
 {
-        //wait->show();
          QString f = "";
   if ( findAction->isOn() ) f = findEdit->text();
   packageListServers.filterPackages( f );
-        //wait->hide();
 }
 
 void MainWindow::displayList()
 {
-        //wait->hide();
         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() ) );
@@ -387,59 +374,48 @@ 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::rotateUpdateIcon()
-{
-        pvDebug(2, "MainWindow::rotateUpdateIcon");
- if ( updateIcon )
-        updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) );
- else
-        updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) );
- updateIcon = !updateIcon;
-}
-
-
 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)" )
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index ce3e761..4a5e8bf 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -68,30 +68,27 @@ private:
 
   PmIpkg* ipkg;
   PackageManagerSettings *settings;
   PackageListLocal  packageListServers;
   PackageListRemote packageListSearch;
   PackageListDocLnk packageListDocLnk;
   PackageListView *listViewPackages;
   QAction *runAction;
   QAction *updateAction;
   QAction *findAction;
   QPEToolBar *findBar;
   QLineEdit *findEdit;
   QAction *searchAction;
   QAction *searchCommit;
   QPEToolBar *searchBar;
   QLineEdit *searchEdit;
   QAction *sectionAction;
   QPEToolBar *sectionBar;
   QComboBox *section;
   QComboBox *subsection;
   QAction *destAction;
   QPEToolBar *destBar;
   QComboBox *destination;
   QCheckBox* CheckBoxLink;
-//  QMessageBox *wait;
-private slots:
-  void rotateUpdateIcon();
 };
 
 #endif
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 4542e42..8c5f0ea 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -29,48 +29,49 @@ void Package::init( PackageManagerSettings *s )
   _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);
            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")
 //  {
 
@@ -321,49 +322,50 @@ QString Package::details()
                   }
               }
       }
     }
   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;
+        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) )
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 8f835b7..1b572e0 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -154,51 +154,51 @@ void PackageList::updateSections( Package* pack )
   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() )
           { 
      QString line = statusStream->readLine();
      if ( line.find(QRegExp("[\n\t ]*")) || line == "" )
                         {
                           //end of package
                         if ( ! packEntry.isEmpty() )
                     {
                       Package *p = new Package( packEntry, settings );
-                   p->setDest( dest );
                       if ( p )
                                         {
+                              p->setDest( dest );
                                         insertPackage( p );
                                           packEntry.clear();
                                         }
                          }
                         }else{
                         packEntry << line;
                         };
     }
          delete statusStream;
   return;
 }
 
 void PackageList::setSettings( PackageManagerSettings *s )
 {
   settings = s;
 }
 
 Package* PackageList::getByName( QString n )
 {
         origPackageList[n];
 }
 
 void PackageList::clear()
 {
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index c743a49..55047d5 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -12,54 +12,55 @@ static QPixmap *pm_installed_old=0;
 static QPixmap *pm_uninstall=0;
 static QPixmap *pm_install=0;
 static QPixmap *pm_uninstalled_old_installed_new=0;
 static QPixmap *pm_uninstalled_installed_old=0;
 
 PackageListItem::PackageListItem(QListView* lv, Package *pi, PackageManagerSettings *s)
           :QCheckListItem(lv,pi->name(),CheckBox)
 {
          init(pi,s);
 }
 
 PackageListItem::PackageListItem(QListViewItem *lvi, Package *pi, PackageManagerSettings *s)
           :QCheckListItem(lvi,pi->name(),CheckBox)
 {
          init(pi,s);
 }
 
 void PackageListItem::init( Package *pi, PackageManagerSettings *s)
 {
   package = pi;
   settings = s;
   setExpandable( true );
         QCheckListItem *item;
         nameItem = new QCheckListItem( this, "" );
-        item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
+        item = new QCheckListItem( this, QObject::tr("Description: ")+pi->desc() );
+         item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
         destItem = new QCheckListItem( this, "" );
         linkItem = new QCheckListItem( this, "" );
         statusItem = new QCheckListItem( this, "" );
          QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") );
-        item = new QCheckListItem( otherItem, QObject::tr("Description: ")+pi->desc() );
+        item = new QCheckListItem( otherItem, QObject::tr("Install Name: ")+pi->installName() );
   QDict<QString> *fields = pi->getFields();
   QDictIterator<QString> it( *fields );
         while ( it.current() ) {
            item = new QCheckListItem( otherItem, QString(it.currentKey()+": "+*it.current()) );
                 ++it;
          }
   displayDetails();
 
   if (!pm_uninstalled)
   {
     pm_uninstalled = new QPixmap(Resource::loadPixmap("oipkg/uninstalled"));
     pm_uninstalled_old = new QPixmap(Resource::loadPixmap("oipkg/uninstalledOld"));
     pm_uninstalled_old_installed_new = new QPixmap(Resource::loadPixmap("oipkg/uninstalledOldinstalledNew"));
     pm_uninstalled_installed_old = new QPixmap(Resource::loadPixmap("oipkg/uninstalledInstalledOld"));
     pm_installed = new QPixmap(Resource::loadPixmap("oipkg/installed"));
     pm_installed_old = new QPixmap(Resource::loadPixmap("oipkg/installedOld"));
     pm_install = new QPixmap(Resource::loadPixmap("oipkg/install"));
     pm_uninstall = new QPixmap(Resource::loadPixmap("oipkg/uninstall"));
   }
 }
 
 void PackageListItem::paintCell( QPainter *p,  const QColorGroup & cg,
                                  int column, int width, int alignment )
 {
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp
index e37f256..bb29e80 100644
--- a/noncore/unsupported/oipkg/packagelistremote.cpp
+++ b/noncore/unsupported/oipkg/packagelistremote.cpp
@@ -24,26 +24,26 @@ void PackageListRemote::query(QString s)
 {
         pvDebug(4,"set query "+s);
                 searchString = s;
 }
 
 void PackageListRemote::update()
 {
                 pvDebug(2,"PackageListRemote::update");
          if (searchString.isEmpty()) return;
          int r=0;
   QString cmd = "wget";
   QString redirect = "/tmp/oipkg.query";
 
   // use file for output
   cmd += " --output-document="+redirect;
 //http://ipkgfind.handhelds.org/packages.phtml?format=pda&query=ipkg&searchtype=package&section=
                 QString server="http://ipkgfind.handhelds.org/"; 
   cmd += " \""+server+"/packages.phtml";
   cmd += "?format=pda&searchtype=package&section=";
           cmd += "&query="+searchString;           
   cmd += "\"";
 
   pvDebug(4,"search :"+cmd);
   r = system(cmd.latin1());
-  readFileEntries( redirect );
+  readFileEntries( redirect, "remote" );
 }