fixes

2 files changed, 72 insertions, 20 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 233eae6..7df1d6b 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -43,7 +43,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   setCentralWidget( listViewPackages );
   listViewPackages->addList( tr("feeds"), &packageListServers );
   listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
-  listViewPackages->addList( tr("documents"), &packageListDocLnk );
+//listViewPackages->addList( tr("documents"), &packageListDocLnk );
   ipkg = new PmIpkg( settings, this );
   packageListServers.setSettings( settings );
   packageListSearch.setSettings( settings );
@@ -51,7 +51,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
 	pvDebug(9,"packageListServers.update");
   packageListServers.update();
 	pvDebug(9,"packageListDocLnk.update");
-  packageListDocLnk.update();
+ 	pvDebug(0,"no UPDATE of DocLnk");
+//  packageListDocLnk.update();
 	pvDebug(9,"makeMenu");
   makeMenu();	
   makeChannel();
@@ -82,14 +83,14 @@ void MainWindow::makeMenu()
   QPopupMenu *srvMenu = new QPopupMenu( menuBar );
   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
-  //    QPopupMenu *sectMenu = new QPopupMenu( menuBar );
+  QPopupMenu *helpMenu = 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 );
+  menuBar->insertItem( tr( "Help" ), helpMenu );
 
   QLabel *spacer;
 //  spacer = new QLabel( "", toolBar );
@@ -105,7 +106,7 @@ void MainWindow::makeMenu()
   runAction->addTo( toolBar );
   runAction->addTo( srvMenu );
 
-  srvMenu->insertSeparator ();
+  srvMenu->insertSeparator();
 
   updateAction = new QAction( tr( "Update" ),
 			      Resource::loadIconSet( "oipkg/update" ),
@@ -229,6 +230,43 @@ void MainWindow::makeMenu()
   destAction->setToggleAction( true );
  // destAction->addTo( viewMenu );
 
+//   helpMenu
+  helpMenu->insertSeparator();
+	a = new QAction( tr( "Package Actions" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+  helpMenu->insertSeparator();
+	a = new QAction( tr( "Install" ),
+ 						Resource::loadPixmap( "oipkg/install" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+	a = new QAction( tr( "Remove" ),
+ 						Resource::loadPixmap( "oipkg/uninstall" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+  helpMenu->insertSeparator();
+	a = new QAction( tr( "Package Status" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+  helpMenu->insertSeparator();
+	a = new QAction( tr( "New version, installed" ),
+ 						Resource::loadPixmap( "oipkg/installed" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+	a = new QAction( tr( "New version, not installed" ),
+ 						Resource::loadPixmap( "oipkg/uninstalled" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+	a = new QAction( tr( "Old version, installed" ),
+ 						Resource::loadPixmap( "oipkg/installedOld" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+	a = new QAction( tr( "Old version, not installed" ),
+ 						Resource::loadPixmap( "oipkg/uninstalledOld" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+	a = new QAction( tr( "Old version, new version installed" ),
+ 						Resource::loadPixmap( "oipkg/uninstalledOldinstalledNew" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+	a = new QAction( tr( "New version, old version installed" ),
+ 						Resource::loadPixmap( "oipkg/uninstalledInstalledOld" ), QString::null, 0, this, 0 );
+ 	a->addTo( helpMenu );
+//	a = new QAction( tr( "" ),
+// 						Resource::loadPixmap( "oipkg/" ), QString::null, 0, this, 0 );
+// 	a->addTo( helpMenu );
+
   // configure the menus
   Config cfg( "oipkg", Config::User );
   cfg.setGroup( "gui" );
@@ -254,7 +292,7 @@ void MainWindow::runIpkg()
 {
   packageListServers.allPackages();
   ipkg->loadList( &packageListSearch );
-  ipkg->loadList( &packageListDocLnk );
+//ipkg->loadList( &packageListDocLnk );
   ipkg->loadList( &packageListServers );
   ipkg->commit();
   ipkg->clearLists();
@@ -270,11 +308,12 @@ void MainWindow::updateList()
 {
 	packageListServers.clear();
 	packageListSearch.clear();
-  packageListDocLnk.clear();
+
+//  packageListDocLnk.clear();
   ipkg->update();
   packageListServers.update();
   packageListSearch.update();
-  packageListDocLnk.update();
+//  packageListDocLnk.update();
 }
 
 void MainWindow::filterList()
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 0817247..7d0e246 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -3,9 +3,7 @@
 #include "package.h"
 #include "packagelistitem.h"
 
-//#infdef OPROCESS
 #include <opie/oprocess.h>
-//#endif
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
@@ -29,6 +27,8 @@
 #include "mainwindow.h"
 
 
+//#define OPROCESS
+
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
   	: QObject ( p )
 {
@@ -126,25 +126,24 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
   sleep(1);
   cmd +=" 2>&1";
   fp = popen(  (const char *) cmd, "r");
-  if ( !fp ) {
+  if ( fp == NULL ) {
      qDebug("Could not execute '" + cmd + "'! err=%d", fp);
-     pclose(fp);
      out("\nError while executing "+ cmd+"\n\n");
-     return false;
+     ret = false;
   } else {
-     while ( fgets( line, sizeof line, fp)) {
+     while ( fgets( line, sizeof line, fp) != NULL)
+     {
         lineStr = line;
         lineStr=lineStr.left(lineStr.length()-1);
         //Configuring opie-oipkg...Done
-        if (lineStr.contains("Done"))
-          ret = true;
+        if (lineStr.contains("Done")) ret = true;
         if (lineStr!=lineStrOld)
 	        out(lineStr);
         lineStrOld = lineStr;
 			  qApp->processEvents();
      }
-     pclose(fp);
   }
+  pclose(fp);
 #endif
   //out( "Finished!");
   pvDebug(2,QString(ret?"success\n":"failure\n"));
@@ -234,15 +233,15 @@ void PmIpkg::processLinkDir( QString file, QString dest )
   } else
   if ( fileInfo.isFile() )
   {
-    const char *instFile = strdup( (file).ascii() );
-    const char *linkFile = strdup(  (destFile).ascii());
+    const char *instFile = strdup( (file).latin1() );
+    const char *linkFile = strdup(  (destFile).latin1());
     if( linkOpp==createLink )
 		{
     	pvDebug(4, "linking: "+file+" -> "+destFile );
     	symlink( instFile, linkFile );
   	}
   }  else  {
-    const char *linkFile = strdup(  (destFile).ascii());
+    const char *linkFile = strdup(  (destFile).latin1());
     if( linkOpp==removeLink )
     {
       QFileInfo toRemoveLink( destFile );
@@ -353,6 +352,20 @@ void PmIpkg::install()
   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 (to_install.at(i)->link())
+  	{
+  		// hack to have package.list
+	   	// in "dest"/usr/lib/ipkg/info/
+  	  QString rds = settings->getDestinationUrlByName("root");
+  	  QString lds = settings->getDestinationUrlByName(to_install.at(i)->dest());
+    	QString listFile = "usr/lib/ipkg/lists/"+to_install.at(i)->name()+".list";
+     	rds += listFile;
+	  	lds += listFile;
+	  	const char *rd = rds.latin1();
+  		const char *ld = lds.latin1();
+   		pvDebug(4, "linking: "+rds+" -> "+lds );
+	   	symlink( rd, ld );
+  	}
 	  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());