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
@@ -14,127 +14,128 @@
 #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 )
 //  packageListServers( QObject(parent), name ),
 //  packageListSearch( parent, name ),
 //  packageListDocLnk( parent, name )
         {
   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 );
+//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(0,"no UPDATE of DocLnk");
+//  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 );
+  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 );
 //  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 ();
+  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 );
@@ -200,110 +201,148 @@ 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 );
 
+//   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" );
 
   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( &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();
+
+//  packageListDocLnk.clear();
   ipkg->update();
   packageListServers.update();
   packageListSearch.update();
-  packageListDocLnk.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()
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
@@ -1,63 +1,63 @@
 #include "pmipkg.h"
 #include "pksettings.h"
 #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>
 #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"
 
 
+//#define OPROCESS
+
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
           : QObject ( p )
 {
   settings = s;
          runwindow = new RunWindow( p, name, true, f );
 #ifdef OPROCESS
   ipkgProcess = new OProcess();
   connect ( ipkgProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
                                         this, SLOT(getIpkgOutput(OProcess*,char*,int)));
 
   connect ( ipkgProcess, SIGNAL(receivedStderr(OProcess*,char*,int)),
                                         this, SLOT(getIpkgOutput(OProcess*,char*,int)));
   installDialog = 0;
 #endif
 }
 
 PmIpkg::~PmIpkg()
 {
 #ifdef OPROCESS
  delete ipkgProcess;
 #endif
 }
 
 bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 {
         bool ret=false;
   QDir::setCurrent("/tmp");
   QString cmd = "/usr/bin/ipkg ";
 #ifdef OPROCESS
   ipkgProcess->clearArguments();
   *ipkgProcess << "/usr/bin/ipkg ";
   QString cmd = "";
@@ -97,83 +97,82 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
   QValueList<QCString>::Iterator it;
   for( it = a.begin(); it != a.end(); ++it )
   {
           out( *it );
            cmd += *it;
   }
 
   pvDebug(2,"running:"+cmd);
   qApp->processEvents();
 //  sleep(1);
   ret = ipkgProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      pvDebug(2,"Could not execute '" + cmd);
      out("\nError while executing "+ cmd+"\n\n");
      out("\nError while executing\n\n");
  //    return false;
   }
 
   while ( ipkgProcess->isRunning() )
   {
            out(".");
    pvDebug(7,"wait for oprocess to terminate");
    qApp->processEvents();
   };
 #else
   qApp->processEvents();
   FILE *fp;
   char line[130];
   QString lineStr, lineStrOld;
   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"));
   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 );
@@ -205,73 +204,73 @@ void PmIpkg::processFileList( QStringList *fileList, QString d )
 
 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());
+    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 );
             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 );
@@ -324,64 +323,78 @@ void PmIpkg::remove()
     {
       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 (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());
              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 )
 {