fixes

8 files changed, 74 insertions, 77 deletions

diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index b1ae6e3..6de54ec 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -11,4 +11,5 @@
 * allow reinstalling
 * different types of filters and searches
         i.e. name, desc, files etc
-* mark packages from doclnk and ipkgfind installed if installed
\ No newline at end of file
+* mark packages from doclnk and ipkgfind installed if installed
+* show if different version is installed
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp
index bacc973..4af11df 100644
--- a/noncore/unsupported/oipkg/main.cpp
+++ b/noncore/unsupported/oipkg/main.cpp
@@ -13,10 +13,11 @@ int main( int argc, char ** argv )
   if (argc > 0)
   {
       debugLevel = QString ( argv[1] ).toInt();
+            qDebug("setting debug level to %i",debugLevel);
   }
   QPEApplication a( argc, argv );
   MainWindow mw;
-  if (debugLevel < 4)
+  if (argc > 2)
                 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 259a789..4f6e4cc 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -250,9 +250,9 @@ MainWindow::~MainWindow()
 void MainWindow::runIpkg()
 {
   packageListServers.allPackages();
-  ipkg->loadList( packageListSearch );
-  ipkg->loadList( packageListDocLnk );
-  ipkg->loadList( packageListServers );
+  ipkg->loadList( &packageListSearch );
+  ipkg->loadList( &packageListDocLnk );
+  ipkg->loadList( &packageListServers );
   ipkg->commit();
   // ##### 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".
@@ -422,7 +422,8 @@ void MainWindow::setDocument(const QString &fileName)
   QCopEnvelope e("QPE/System", "linkChanged(QString)");
   QString lf = QString::null;
   e << lf;
-  displayList();
+ // displayList();
+         exit;
 }
 
 void MainWindow::installFile(const QString &fileName)
@@ -483,5 +484,6 @@ void MainWindow::removeLinks()
 void MainWindow::remotePackageQuery()
 {
          packageListSearch.query( searchEdit->text() );
+  packageListSearch.update();
          displayList();
 }
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index f6023b0..7c93dad 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -69,7 +69,7 @@ private:
 
   PmIpkg* ipkg;
   PackageManagerSettings *settings;
-  PackageListLocal packageListServers;
+  PackageListLocal  packageListServers;
   PackageListRemote packageListSearch;
   PackageListDocLnk packageListDocLnk;
   PackageListView *listViewPackages;
diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.cpp b/noncore/unsupported/oipkg/packagelistdoclnk.cpp
index 5787fdf..1d10adf 100644
--- a/noncore/unsupported/oipkg/packagelistdoclnk.cpp
+++ b/noncore/unsupported/oipkg/packagelistdoclnk.cpp
@@ -20,6 +20,7 @@ PackageListDocLnk::PackageListDocLnk()
         Config cfg( "oipkg", Config::User );
         cfg.setGroup( "Common" );
         docLnkDir = cfg.readEntry( "docLnkDir", "/root/" );
+         pvDebug(2,"opening DocLnkSet "+docLnkDir);
         doclnkset = new DocLnkSet(docLnkDir,"application/ipkg");
 }
 
@@ -35,7 +36,7 @@ PackageListDocLnk::~PackageListDocLnk()
 void PackageListDocLnk::update()
 {
                 pvDebug(2,"PackageListDocLnk::update ");
-         QList<DocLnk> packlist = doclnkset->children();
+        QList<DocLnk> packlist = doclnkset->children();
   for (DocLnk *pack =packlist.first(); pack != 0; pack=packlist.next() )
   {
     insertPackage( new Package(pack->file(), settings) );
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp
index 3c6ede7..ee54fca 100644
--- a/noncore/unsupported/oipkg/packagelistremote.cpp
+++ b/noncore/unsupported/oipkg/packagelistremote.cpp
@@ -22,6 +22,7 @@ PackageListRemote::~PackageListRemote()
 
 void PackageListRemote::query(QString s)
 {
+        pvDebug(4,"set query "+s);
                 searchString = s;
 }
 
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index fd8279b..0ae74da 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -44,7 +44,7 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
   pvDebug(2,"PmIpkg::runIpkg "+args);
 
 #ifdef PROC
-  QStringList cmd = "/usr/bin/ipkg ";
+  QStringList cmd = "ipkg ";
 #endif
 #ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
@@ -75,8 +75,8 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
   Process *ipkg = new Process( cmd );
   out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" );
   QString description;
-  ipkg->exec("",o);
-//  out( o );
+  r = ipkg->exec("",o);
+  out( o );
 #endif
 #ifdef SYSTEM
   out( "running:<br>\n"+cmd+"<br>\n" );
@@ -177,7 +177,6 @@ void PmIpkg::processLinkDir( QString file, QString dest )
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
-    qDebug( "while %i",list->count());
     while ( (fi=it.current()) )
     {
             pvDebug(4, "processLinkDir "+fi->absFilePath());
@@ -208,9 +207,9 @@ void PmIpkg::processLinkDir( QString file, QString dest )
   }
 }
 
-void PmIpkg::loadList( PackageList pl )
+void PmIpkg::loadList( PackageList *pl )
         {   
-  for( Package *pack = pl.first();pack ; (pack = pl.next())  )
+  for( Package *pack = pl->first();pack ; (pack = pl->next())  )
   {
           if ( pack && (pack->name() != "") && pack)
                 {
@@ -225,36 +224,28 @@ void PmIpkg::loadList( PackageList pl )
 void PmIpkg::commit()
         {   
   int sizecount = 0;
-  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();
-  runwindow->progress->setTotalSteps(sizecount);
-        startDialog();
-}
-
-void PmIpkg::startDialog()
-{
   installDialog = new InstallDialog(settings,0,0,true);
-        QCheckListItem *toRemoveItem;
-        toRemoveItem= new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To remove") );
+        QCheckListItem *toRemoveItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To remove") );
+        QCheckListItem *toInstallItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To install") );
          toRemoveItem->setOpen( true );
-  for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
+        toInstallItem->setOpen( true );
+  for (uint i=0; i < to_remove.count(); i++)
   {
-    toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, it,settings) );
+          sizecount += 1;
+    toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_remove.at(i),settings) );
                 } 
-        QCheckListItem *toInstallItem;
-        toInstallItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To install") );
-         toInstallItem->setOpen( true );
-  for (Package *it=to_install.first(); it != 0; it=to_install.next() )
+  for (uint i=0; i < to_install.count(); i++)
   {
-    toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, it,settings) );
+          sizecount += to_install.at(i)->size().toInt();
+    toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) );
   }
+  runwindow->progress->setTotalSteps(sizecount);
+  qDebug("Install size %i",sizecount);
   installDialog->showMaximized();
   if ( installDialog->exec() ) doIt();
          installDialog->close();
+  runwindow->showMaximized();
   out(tr("<b>All done.</b>"));
-  to_install.clear();
 }
 
 void PmIpkg::doIt()
@@ -272,57 +263,57 @@ void PmIpkg::remove()
         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() )
+  for (uint i=0; i < to_remove.count(); i++)
   {
-                                if ( it->link() )fileList = getList( it->name(), it->dest() );     
-      if ( runIpkg("remove " + it->name(), it->dest() ) == 0)
-      {
-        runwindow->progress->setProgress( 1 + runwindow->progress->progress() );
-               linkOpp = removeLink;
-                    if ( it->link() )
-              {
+                        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)->name(), to_remove.at(i)->dest() ) == 0)
+    {
+      runwindow->progress->setProgress( 1 );
+             linkOpp = removeLink;
+                   if ( to_remove.at(i)->link() )
+             {
                                         out( "<br>removing links<br>" );
-                                out( "for package "+it->name()+" in "+it->dest()+"<br>" );
-                processFileList( fileList, it->dest() );
-        }
-                it->processed();
-        //              to_install.take( it );       
-        out("<br><hr>");
-                }else{
-              out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
+                                out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"<br>" );
+                processFileList( fileList, to_remove.at(i)->dest() );
       }
-          if ( it->link() )delete fileList;
+            to_remove.at(i)->processed();
+                to_remove.take( i );       
+      out("<br><hr>");
+                }else{
+             out("<b>"+tr("Error while removing")+"</b><hr>"+to_remove.at(i)->name());
     }
-    out("<br>");
+          if ( to_remove.at(i)->link() )delete fileList;
+  }
+  to_remove.clear();
+  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();
-        //       to_install.take( it->name() );
-        out("<br><hr>");
-                }else{
-              out("<b>"+tr("Error while installing")+"</b><hr>"+it->name());
-      }
+                out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); 
+  for (uint i=0; i < to_install.count(); i++)
+  {
+          if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ) == 0 )
+                        {    
+            runwindow->progress->setProgress( to_install.at(i)->size().toInt() );
+      linkOpp = createLink;
+            if ( to_install.at(i)->link() )
+      {
+                                out( "<br>creating links<br>" );
+                        out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"<br>" );
+                                makeLinks( to_install.at(i) );
+             }
+             to_install.at(i)->processed();
+      to_install.take( i );
+      out("<br><hr>");
+          }else{
+             out("<b>"+tr("Error while installing")+"</b><hr>"+to_install.at(i)->name());
     }
-    out("<br>");
-    to_install.clear();
+   }
+   out("<br>");
+   to_install.clear();
 }
 
 void PmIpkg::createLinks( const QString &dest )
@@ -398,7 +389,7 @@ void PmIpkg::installFile(const QString &fileName, const QString &dest)
          Package *p = new Package(fileName,settings);
   if ( dest!="") p->setDest( dest );
         to_install.append( p );
-        startDialog();
+        commit();
          delete p;
 }
 
@@ -411,7 +402,7 @@ void PmIpkg::removeFile(const QString &fileName, const QString &dest)
          Package *p = new Package(fileName,settings);
   if ( dest!="") p->setDest( dest );
         to_remove.append( p );
-        startDialog();
+        commit();
          delete p;
 }
 
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index d2490e8..7bc62f1 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -24,7 +24,7 @@ public:
   ~PmIpkg();
 
   int linkOpp;
-  void loadList( PackageList );
+  void loadList( PackageList* );
   void commit();
   void update();
   void showButtons(bool b=true);