17 files changed, 312 insertions, 155 deletions

diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index c53ca93..744cba4 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -1,11 +1,8 @@
-* search
 * Settings Class
-* make oipkg determine dest of "to remove" apps
 * tr() ;)
 * Dialog to display ipkg output live
 * parse "to install" and "to remove" from status
 * install local file
-* install to dest with click on packet
 * qcop
 * error handling
 * manage links
diff --git a/noncore/unsupported/oipkg/debug.h b/noncore/unsupported/oipkg/debug.h
index c53e36c..e73b9b2 100644
--- a/noncore/unsupported/oipkg/debug.h
+++ b/noncore/unsupported/oipkg/debug.h
@@ -4,12 +4,13 @@
 #include <stdio.h>
 
 extern int debugLevel;
 
 #define HACK
 
+#define NEWLAYOUT
 
 #define pvDebug(I, S) \
 if ( debugLevel < 3 ) \
 { \
         if ( I <= debugLevel ) qDebug(S);\
 }else{\
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index c803ca0..25ca889 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -4,12 +4,13 @@
 #include "mainwindow.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.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>
@@ -26,37 +27,46 @@
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   QMainWindow( parent, name, f )
         {
   setCaption( tr("Package Manager") );
 
   listViewPackages =  new QListView( this,0,0 );
+  listViewPackages->setSelectionMode(QListView::NoSelection);
   setCentralWidget( listViewPackages );
 
           makeMenu();   
-
+#ifdef NEWLAYOUT
+        listViewPackages->addColumn( tr("Package") );
+         listViewPackages->setRootIsDecorated( true );
+#endif
+#ifndef NEWLAYOUT
   QFontMetrics fm = fontMetrics();
   int wlw = width()*2;
   int w0  = fm.width(tr("Package"))+30;
  // int w0  = fm.width(tr("Package"))+30;
   int w2  = fm.width("00000")+4;
-  int w1  = wlw-w2-w0-20;
+  int w1  = wlw-w2-w0-24;
         listViewPackages->addColumn( tr("Package"), w0 );
         listViewPackages->addColumn( tr("Description"), w1 );
         listViewPackages->addColumn( tr("Size"), w2 );
   listViewPackages->setColumnWidthMode(0,QListView::Manual);
   listViewPackages->setColumnWidthMode(1,QListView::Manual);
   listViewPackages->setColumnWidthMode(2,QListView::Manual);
   listViewPackages->setSelectionMode( QListView::Multi );
-
+#endif
   connect( section, SIGNAL( activated(int) ),
            this, SLOT( sectionChanged() ) );
   connect( subsection, SIGNAL(activated(int) ),
            this, SLOT( subSectionChanged() ) );
   connect( listViewPackages, SIGNAL( pressed( QListViewItem* ) ),
            this, SLOT( setCurrent( QListViewItem* ) ) );
-        
+        connect( listViewPackages, SIGNAL( clicked( QListViewItem* ) ),
+                   this, SLOT( stopTimer( QListViewItem* ) ) );
+
+        popupMenu = new QPopupMenu( this );
+
   settings = new PackageManagerSettings(this,0,TRUE);
 
   ipkg = new PmIpkg( settings, this );
   packageList.setSettings( settings );
           getList();
   setSections();
@@ -71,15 +81,16 @@ void MainWindow::makeMenu()
   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 );
 
-  popupMenu = new QPopupMenu( this );
-
-  contextMenu = new QPopupMenu( this );
+                popupMenu = new QPopupMenu( this );
+        destsMenu = new QPopupMenu( popupMenu );
+  popupTimer = new QTimer( this );
+  connect( popupTimer, SIGNAL(timeout()), this, SLOT(showPopup()) );
 
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Package" ), srvMenu );
   menuBar->insertItem( tr( "View" ), viewMenu );
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
@@ -177,33 +188,46 @@ void MainWindow::makeMenu()
   a->addTo( findBar );
   findAction = new QAction( tr( "Find" ), QString::null, 0, this, 0 );
   connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) );
   findAction->setToggleAction( true );
   findAction->setOn( true );
   findAction->addTo( viewMenu );
+
+  #ifdef NEW
+  Config cfg( "oipkg", Config::User );
+  cfg.setGroup( "Setting_" + QString::number( setting ) );
+  CheckBoxLink->setChecked( cfg.readBoolEntry( "link", false ) );
+  findShow(bool b)
+  sectionShow(bool b)
+  #endif
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 void MainWindow::runIpkg()
 {
   ipkg->commit( packageList );
-//  updateList(); //to remove
+  // ##### 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()
 {
         QTimer *t = new QTimer( this );
   connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
   t->start( 0, false );
         packageList.clear();
   ipkg->update();
   getList();
-  t->stop();
+          t->stop(); 
 }
 
 void MainWindow::getList()
 {
   packageList.update();
   displayList();
@@ -221,13 +245,13 @@ void MainWindow::displayList()
         filterList();
   listViewPackages->clear();
   Package *pack = packageList.first();
   while( pack )
   {
           if ( pack && (pack->name() != "") )
-                  listViewPackages->insertItem( new PackageListItem( listViewPackages, pack ) );
+                  listViewPackages->insertItem( new PackageListItem( listViewPackages, pack, settings ) );
     pack = packageList.next();
           }
 }
 
 void MainWindow::sectionChanged()
 {
@@ -288,41 +312,46 @@ void MainWindow::showSettingsDst()
     updateList();
 }
 
 
 void MainWindow::showDetails()
 {
-  if ( activePackage ) return;
   if ( details )
-    {
-      details = new PackageDetails( this );
-      connect( details->install, SIGNAL(clicked()), SLOT( toggleActivePackage() ) );
-      connect( details->remove,  SIGNAL(clicked()), SLOT( toggleActivePackage() ) );
-      connect( details->ignore,  SIGNAL(clicked()), details, SLOT(close()));
-      details->description->setTextFormat(RichText);
-    }
-
-  details->setCaption("Package: " + activePackage->name());
-  details->description->setText(activePackage->details() );
-  details->install->setEnabled(!activePackage->installed());
-  details->remove->setEnabled(activePackage->installed());
+  {
+     details = new PackageDetails( this );
+     connect( details->install, SIGNAL(clicked()), SLOT( toggleActivePackage() ) );
+           connect( details->remove,  SIGNAL(clicked()), SLOT( toggleActivePackage() ) );
+     connect( details->ignore,  SIGNAL(clicked()), details, SLOT(close()));
+     details->description->setTextFormat(RichText);
+  }
+  if ( !activePackage )
+  {
+   details->description->setText(tr("no package selected"));
+   details->description->setText(tr("errmm...<br>...not working?"));
+  }else{
+          details->setCaption("Package: " + activePackage->name());
+          details->description->setText(activePackage->details() );
+          details->install->setEnabled(!activePackage->installed());
+          details->remove->setEnabled(activePackage->installed());
+  }
   details->showMaximized();
 }
 
 void MainWindow::toggleActivePackage()
 {
   activePackage->toggleProcess();
   if ( details ) details->close();
 }
 
 void MainWindow::setCurrent( QListViewItem* p )
 {
-  pvDebug(2, "MainWindow::setCurrent ");
-  return;
-  pvDebug(2, "name "+((Package*)p)->name());
-  activePackage = (Package*)p;
+  if ( !p ) return;
+  activePackageListItem = (PackageListItem*)p;
+  activePackage = activePackageListItem->getPackage();
+  pvDebug(5, "start timer");
+  popupTimer->start( 750, true );
 }
 
 void MainWindow::sectionShow(bool b)
 {
         if (b) sectionBar->show();
   else sectionBar->hide();
@@ -352,6 +381,38 @@ void MainWindow::rotateUpdateIcon()
  if ( updateIcon )
         updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) );
  else
         updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) );
  updateIcon = !updateIcon;
 }
+
+void MainWindow::showPopup()
+{
+  popupMenu->clear();
+  destsMenu->clear();
+                
+         QAction *popupAction;
+  popupMenu->insertItem( tr("Install to"), destsMenu );
+  QStringList dests = settings->getDestinationNames();
+  for (uint i = 0; i < dests.count(); i++ )
+          {     
+          popupAction = new QAction( dests[i], QString::null, 0, this, 0 );
+          popupAction->addTo( destsMenu );
+  }
+  connect( destsMenu, SIGNAL( activated( int ) ),
+           this, SLOT( changePackageDest( int ) ) );
+  popupMenu->popup( QCursor::pos() );
+}
+
+void MainWindow::changePackageDest( int i )
+{
+         activePackage->setDest( destsMenu->text(i) );
+  activePackage->setOn();
+  activePackage->setLink( settings->createLinks() );
+  activePackageListItem->displayDetails();
+}
+
+void MainWindow::stopTimer( QListViewItem* )
+{
+        pvDebug( 5, "stop timer" );
+        popupTimer->stop();
+}
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 892d5e8..adc5e78 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -12,13 +12,13 @@
 #include "pkdesc.h"
 
 class QComboBox;
 class QPEToolBar;
 class QLineEdit;
 class QListView;
-
+class PackageListItem;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 
@@ -43,36 +43,41 @@ public slots:
   void setCurrent( QListViewItem* );
   void sectionClose();
   void sectionShow(bool);
   void findClose();
   void findShow(bool);
   void filterList();
+  void showPopup();
+  void changePackageDest( int );
+  void stopTimer( QListViewItem* );
 
 private:
   void makeMenu();
   void setSections();
   void setSubSections();
 
   PmIpkg* ipkg;
   PackageManagerSettings *settings;
   PackageDetails* details;
   PackageList packageList;
   Package *activePackage;
+  PackageListItem *activePackageListItem;
   QAction *runAction;
   QAction *detailsAction;
   QAction *updateAction;
   QAction *findAction;
   QAction *sectionAction;
   QListView *listViewPackages;
-  QPopupMenu *contextMenu;
   QPEToolBar *findBar;
   QLineEdit *findEdit;
   QPEToolBar *sectionBar;
   QComboBox *section;
   QComboBox *subsection;
+  QTimer *popupTimer;
   QPopupMenu *popupMenu;
+  QPopupMenu *destsMenu;
   bool updateIcon;
 private slots:
   void rotateUpdateIcon();
 };
 
 #endif
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 89cc0b4..2ffec71 100644
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/noncore/unsupported/oipkg/opie-oipkg.control
@@ -1,9 +1,9 @@
 Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@almana.ch>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION), ipkg (>0.9)
 Description: Package Manager 
  A GUI front-end to ipkg for the Opie environment.
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 1705f78..9f602b5 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -6,41 +6,48 @@
 #include "debug.h"
 
 Package::~Package()
 {
 }
 
-Package::Package()
+Package::Package( PackageManagerSettings *s )
 {
+        init(s);
+}
+
+void Package::init( PackageManagerSettings *s )
+{
+        settings = s;
   _size = "";
   _section = "";
   _subsection = "";
   _shortDesc = "";
   _desc = "";
   _name = "";
   _toProcess = false;
   _status = "";
+  _dest = "";
 }
 
-Package::Package( QStringList pack )
+Package::Package( QStringList pack, PackageManagerSettings *s  )
         {
-  Package();
+  init(s);
   parsePackage( pack );
   _toProcess = false;
 }
 
-Package::Package( QString n )
+Package::Package( QString n, PackageManagerSettings *s )
         {
-  Package();
+  init(s);
   _name = QString( n );
   _toProcess = false;
 }
 
 Package::Package( Package *pi )
 {
-  Package();
+  init(pi->settings);
   copyValues( pi );
   _toProcess = false;
 }
 
 
 void Package::setValue( QString n, QString t )
@@ -169,13 +176,13 @@ void Package::copyValues( Package* pack )
   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 (!installed() && _status.isEmpty()    && !pack->_status.isEmpty()) _status = QString( pack->_status );
 }
 
-QString Package::getSection()
+QString Package::section()
 {
   return _section;
 }
 
 void Package::setSection( QString s)
 {
@@ -187,13 +194,13 @@ void Package::setSection( QString s)
     }else{
       _section    = s;
       _subsection = "";
     }
 }
 
-QString Package::getSubSection()
+QString Package::subSection()
 {
   return _subsection;
 }
 
 void Package::parsePackage( QStringList pack )
 {
@@ -250,14 +257,41 @@ QString Package::details()
               }
       }
     }
   return description;
 }
 
-/** No descriptions */
 void Package::processed()
 {
         _toProcess = false;
- //hack, but we're mot writing status anyway...
+ //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;
+}
+
+void Package::setOn()
+{
+                _toProcess = true;
+}
+
+bool Package::link()
+{
+        if ( _dest == "root" || (!installed() && !_toProcess) ) return false;
+        return _link;
+}
+
+void Package::setLink(bool b)
+{
+        _link = b;
+}
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h
index cf2af75..6c292ed 100644
--- a/noncore/unsupported/oipkg/package.h
+++ b/noncore/unsupported/oipkg/package.h
@@ -5,20 +5,22 @@
 #include <qlistview.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qdict.h>
 #include <qobject.h>
 
+#include "pksettings.h"
+
 class Package //: public QObject
 {
           //Q_OBJECT
  public:
-  Package();
+  Package(PackageManagerSettings *);
   ~Package();
-  Package( QStringList );
-  Package( QString );
+  Package( QStringList, PackageManagerSettings * );
+  Package( QString, PackageManagerSettings * );
   Package( Package* );
          
   void    setValue( QString, QString );
   void    copyValues( Package* );
 
   QString name() ;
@@ -26,31 +28,39 @@ class Package //: public QObject
 
   void    setDesc( QString );
   QString shortDesc();
   QString desc();
   QString size();
   void    setSection( QString );
-  QString getSection();
-  QString getSubSection();
+  QString section();
+  QString subSection();
   QString details();
   bool    toProcess();
   bool    toInstall();
   bool    toRemove();
-  /** No descriptions */
   void processed();
+  QString dest();
+  void setDest( QString d );
+  void setOn();
+  bool link();
+  void setLink(bool);
 public slots:
   void toggleProcess();
 
 private:
+  PackageManagerSettings *settings;
   QString _name;
   bool    _toProcess;
+  bool    _link;
   QString _status;
   QString _size;
   QString _section;
   QString _subsection;
   QString _shortDesc;
   QString _desc;
+  QString _dest;
   void parsePackage( QStringList );
+  void init(PackageManagerSettings *);
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 944bb83..035ec81 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -67,14 +67,14 @@ void PackageList::filterPackages( QString f )
   QDictIterator<Package> filterIter( origPackageList );
   filterIter.toFirst();
   Package *pack= filterIter.current() ;
   while ( pack )
             {
       if (
-                        ((aktSection=="All")||(pack->getSection()==aktSection)) &&
-                                        ((aktSubSection=="All")||(pack->getSubSection()==aktSubSection)) &&
+                        ((aktSection=="All")||(pack->section()==aktSection)) &&
+                                        ((aktSubSection=="All")||(pack->subSection()==aktSubSection)) &&
                          pack->name().contains( f )
                         )
                         {
                         packageList.insert( pack->name(), pack );
                         }
       ++filterIter;
@@ -123,17 +123,17 @@ void PackageList::setSubSection( QString ssec )
 {
   aktSubSection = ssec;
 }
 
 void PackageList::updateSections( Package* pack )
 {
-  QString s = pack->getSection();
+  QString s = pack->section();
   if ( s.isEmpty() || s == "") return;
   if ( sections.contains(s) )  return;
   sections += s;
-  QString ss = pack->getSubSection();
+  QString ss = pack->subSection();
   if ( ss.isEmpty() || ss == "" ) return;
   if ( !subSections[s] ) {
     subSections.insert( s, new QStringList() );
     QStringList *subsecs = subSections[s];
     *subsecs += "All";
   }
@@ -147,31 +147,34 @@ void PackageList::updateSections( Package* pack )
 
 
 /** No descriptions */
 void PackageList::parseStatus()
 {
   QStringList dests = settings->getDestinationUrls();
-  for ( QStringList::Iterator it = dests.begin(); it != dests.end(); ++it )
+  QStringList destnames = settings->getDestinationNames();
+  QStringList::Iterator name = destnames.begin();
+  for ( QStringList::Iterator dir = dests.begin(); dir != dests.end(); ++dir )
     {
-      pvDebug( 2,"Status Dir: "+*it+statusDir+"/status");
-      readFileEntries( *it+statusDir+"/status" );
+      pvDebug( 2,"Status: "+*dir+statusDir+"/status");
+      readFileEntries( *dir+statusDir+"/status", *name );
+      ++name;
     };
 }
 
 void PackageList::parseList()
 {
   QStringList srvs = settings->getActiveServers();
         
   for ( QStringList::Iterator it = srvs.begin(); it != srvs.end(); ++it )
     {
-      pvDebug( 2, "List Dir: "+listsDir+"/"+*it);
-              readFileEntries( listsDir+"/"+*it );  
+      pvDebug( 2, "List: "+listsDir+"/"+*it);
+              readFileEntries( listsDir+"/"+*it, "" );  
     }
 }
 
-void PackageList::readFileEntries( QString filename )
+void PackageList::readFileEntries( QString filename, QString dest )
         { 
   QStringList packEntry;
   QFile f( filename );
   if ( !f.open(IO_ReadOnly) ) return;
   QTextStream *statusStream = new QTextStream( &f );
   while ( !statusStream ->eof() )
@@ -179,13 +182,14 @@ void PackageList::readFileEntries( QString filename )
       QString line = statusStream->readLine();
       if ( line.find(QRegExp("[\n\t ]*")) || line == "" )
         {
           //end of package
           if ( ! packEntry.isEmpty() )
             {
-              Package *p = new Package( packEntry );
+              Package *p = new Package( packEntry, settings );
+               p->setDest( dest );
               if ( p )
                 {
                   insertPackage( p );
                   packEntry.clear();
                 }
             }
@@ -196,17 +200,17 @@ void PackageList::readFileEntries( QString filename )
   return;
 }
 
 
 void PackageList::update()
 {
-  pvDebug( 3, "parseStatus");
+  pvDebug( 2, "parseStatus");
   parseStatus();
-  pvDebug( 3, "parseList");
+  pvDebug( 2, "parseList");
   parseList();
-  pvDebug( 3, "finished parsing");
+  pvDebug( 2, "finished parsing");
 }
 
 void PackageList::setSettings( PackageManagerSettings *s )
 {
   settings = s;
 }
@@ -218,6 +222,20 @@ Package* PackageList::getByName( QString n )
 
 void PackageList::clear()
 {
         origPackageList.clear();
         packageList.clear();
 }
+
+void PackageList::allPackages()
+{
+        packageList.clear();
+  QDictIterator<Package> filterIter( origPackageList );
+  filterIter.toFirst();
+  Package *pack= filterIter.current() ;
+  while ( pack )
+            {
+                  packageList.insert( pack->name(), pack );
+      ++filterIter;
+      pack = filterIter.current();
+    }
+}
diff --git a/noncore/unsupported/oipkg/packagelist.h b/noncore/unsupported/oipkg/packagelist.h
index 4ce97af..7c326ca 100644
--- a/noncore/unsupported/oipkg/packagelist.h
+++ b/noncore/unsupported/oipkg/packagelist.h
@@ -9,13 +9,15 @@
 #define HACK
 #ifdef HACK
   static QString listsDir="/usr/lib/ipkg/";
   static QString statusDir="/usr/lib/ipkg/";
 #endif
 
-class PackageList {
+class PackageList //:QObject
+{
+        //  Q_OBJECT
 public:
         //static QString all = QObject::tr("All");
 
   PackageList();
   PackageList( PackageManagerSettings* );
   ~PackageList();
@@ -26,14 +28,14 @@ public:
 
   QStringList getSections();
   QStringList getSubSections();
   void setSettings( PackageManagerSettings* );
   void filterPackages( QString );
   Package* getByName( QString );
-  /** No descriptions */
   void clear();
+  void allPackages();
 
 public slots:
   void setSection(QString);
   void setSubSection(QString);
   void update();
 
@@ -58,11 +60,11 @@ private:
   QDict<bool> sectionsDict;
 
 
   void updateSections( Package* );
   void parseStatus();
   void parseList();
-  void readFileEntries( QString );
+  void readFileEntries( QString file, QString dest );
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index 5d08bb1..149ba35 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -1,27 +1,54 @@
 #include "packagelistitem.h"
 
 #include <qpe/resource.h>
+#include <qobject.h>
+
+#include "debug.h"
 
 static QPixmap *pm_uninstalled=0;
 static QPixmap *pm_installed=0;
 static QPixmap *pm_uninstall=0;
 static QPixmap *pm_install=0;
 
-PackageListItem::PackageListItem(QListView* lv, Package *pi)
+PackageListItem::PackageListItem(QListView* lv, Package *pi, PackageManagerSettings *s)
           :QCheckListItem(lv,pi->name(),CheckBox)
 {
   package = pi;
+  settings = s;
+  setExpandable( true );
+        QCheckListItem *item;
+#ifndef NEWLAYOUT
+        item = new QCheckListItem( this, QObject::tr("Name") );
+  item->setText(1,pi->name());
+        item = new QCheckListItem( this, QObject::tr("Description") );
+  item->setText(1,pi->desc()+"\ntest multi\nline");
+        item = new QCheckListItem( this, QObject::tr("Size") );
+  item->setText(1,pi->size());
+        item = new QCheckListItem( this, QObject::tr("Destination") );
+  item->setText(1,pi->getDest());
+#endif
+#ifdef NEWLAYOUT
+        item = new QCheckListItem( this, QObject::tr("Name: ")+pi->name() );
+        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, "" );
+  displayDetails();
+#endif
+
   if (!pm_uninstalled) {
     pm_uninstalled = new QPixmap(Resource::loadPixmap("oipkg/uninstalled"));
     pm_installed = new QPixmap(Resource::loadPixmap("oipkg/installed"));
     pm_install = new QPixmap(Resource::loadPixmap("oipkg/install"));
     pm_uninstall = new QPixmap(Resource::loadPixmap("oipkg/uninstall"));
   }
+#ifndef NEWLAYOUT
   setText(1, package->shortDesc() );
   setText(2, package->size() );
+#endif
 }
 
 void PackageListItem::paintCell( QPainter *p,  const QColorGroup & cg,
                                  int column, int width, int alignment )
 {
   if ( !p )
@@ -90,8 +117,23 @@ QString PackageListItem::key( int column, bool ascending ) const
 }
 
 void PackageListItem::setOn( bool b )
 {
   QCheckListItem::setOn( b );
   package->toggleProcess();
+//  if ( b )
+//  {
+//    if ((package->dest()).isEmpty)
+        //        package->setDest( settings->getDestinationName() );
+//  }else{
+//    package->setDest( QObject::tr("not installed"));
+//  }
+  package->setLink( settings->createLinks() );
+  displayDetails();
+}
+
+void PackageListItem::displayDetails()
+{
+        linkItem->setText( 0, QObject::tr("Link: ")+QString(package->link()?QObject::tr("Yes"):QObject::tr("No")) );
+  destItem->setText( 0, QObject::tr("Destination: ")+package->dest() );
   repaint();
 }
diff --git a/noncore/unsupported/oipkg/packagelistitem.h b/noncore/unsupported/oipkg/packagelistitem.h
index 6983e58..f695432 100644
--- a/noncore/unsupported/oipkg/packagelistitem.h
+++ b/noncore/unsupported/oipkg/packagelistitem.h
@@ -6,26 +6,32 @@
 #include <qstring.h>
 #include <qlistview.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qdict.h>
 
+#include "pksettings.h"
+
 class PackageListItem
 : public QCheckListItem
 {
 public:
-  PackageListItem(QListView*, Package* );
+  PackageListItem(QListView*, Package*, PackageManagerSettings*);
   void paintCell( QPainter*, const QColorGroup&, int, int, int );
   void paintFocus( QPainter*, const QColorGroup&, const QRect&  );
   QPixmap statePixmap() const;
   QString key( int, bool ) const;
   Package* getPackage() { return package; } ;
   QString getName() { return package->name(); } ;
   bool isInstalled(){ return package->installed(); };
   virtual void setOn ( bool );
+  void displayDetails();
 
 private:
+        QCheckListItem *destItem;
+        QCheckListItem *linkItem;
+  PackageManagerSettings *settings;
   Package *package;
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index 32224b5..f84a9c4 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -466,22 +466,46 @@ QStringList PackageManagerSettings::getActiveServers()
     {
       if ( activeServers->isSelected(i) )
         sl += activeServers->text(i);
     }
   return sl;
 }
+
 /** returns the destination listed in ipkg.conf */
 QStringList PackageManagerSettings::getDestinationUrls()
 {
           QStringList sl;
   for (int i=0; i<(int)destinations->count(); i++)
             {   
       sl += *destinationurlDic[i];
     }
   return sl;
 }
 
+/** returns the destination listed in ipkg.conf */
+QString PackageManagerSettings::getDestinationUrlByName(QString n)
+{
+          QStringList sl;
+  for (int i=0; i<(int)destinations->count(); i++)
+            {   
+      if ( n ==  destinations->text(i)) return*destinationurlDic[i];
+    }
+  return "";
+}
+
+/** returns the destination listed in ipkg.conf */
+QStringList PackageManagerSettings::getDestinationNames()
+{
+          QStringList sl;
+  for (int i=0; i<(int)destinations->count(); i++)
+            {   
+      sl += destinations->text(i);
+    }
+  return sl;
+}
+
+
 void PackageManagerSettings::linkEnabled( bool b )
 {
   changed = true;
   activeLinkDestination->setEnabled( b );
 }
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index 2982f1c..11ba55c 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -16,12 +16,15 @@ public:
   QString getDestinationUrl();
   QString getDestinationName();
   QString getLinkDestinationName();
   bool createLinks();
   QStringList getActiveServers();
   QStringList getDestinationUrls();
+  QStringList getDestinationNames();
+  QString getDestinationUrlByName(QString);
+
 private:
   QIntDict<QString> serverurlDic;
   QIntDict<QString> destinationurlDic;
   int ipkg_old;
   int editedserver;
   int editeddestination;
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index eae73ad..3b31b4d 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -5,13 +5,12 @@
 #include "packagelistitem.h"
 
 #include <qpe/process.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qmultilineedit.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qtextview.h>
@@ -37,85 +36,89 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlag
 PmIpkg::~PmIpkg()
 {
 }
 
 //#define PROC
 #define SYSTEM
-int PmIpkg::runIpkg(const QString& args)
+int PmIpkg::runIpkg(const QString& args, const QString& dest )
 {
   pvDebug(2,"PmIpkg::runIpkg "+args);
 
-  //to make script ipkg happy
-  pvDebug(2, "cd "+settings->getDestinationUrl()+"/tmp/ipkg");
-  if (!QDir::setCurrent(settings->getDestinationUrl()+"/tmp/ipkg"))
-  {
-          QDir instDir = QDir(settings->getDestinationUrl()+"/tmp/ipkg");
-           instDir.mkdir(settings->getDestinationUrl()+"/tmp/ipkg");
-  }
 #ifdef PROC
   QStringList cmd = "/usr/bin/ipkg ";
 #endif
 #ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
 #endif
-  cmd += " -dest "+settings->getDestinationName();
+        pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
+        if ( dest == "" )
+          cmd += " -dest "+settings->getDestinationName();
+  else
+          cmd += " -dest "+ dest;
+
          cmd += " -force-defaults ";
 
   out( "<hr><br>Starting to "+ args+"<br>\n");
   cmd += args;
-  out( "running:<br>\n"+cmd+"<br>\n" );
   int r = 0;
 #ifdef PROC
         QString o = "start";
-  Process ipkg( cmd );
+  Process *ipkg = new Process( "ls");//cmd );
+  out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" );
   QString description;
-  ipkg.exec("",o);
-  out( o );
+  ipkg->exec("",o);
+//  out( o );
 #endif
 #ifdef SYSTEM
+  out( "running:<br>\n"+cmd+"<br>\n" );
   QString redirect = "/tmp/oipkg.pipe";
   cmd += " | tee "+redirect+" 2>&1";
   pvDebug(2, "running >"+cmd+"<");
         r = system(cmd.latin1());
   QFile f( redirect );
   QString line;
   QString oldLine;
   while ( ! f.open(IO_ReadOnly) ) {};
-  {
+ // {
     QTextStream t( &f );
  //   QString fp;
     while ( !t.eof() )
     {
       line = t.readLine();
-                        if ( line != oldLine ) out( line +"<br>" );
-            oldLine = line;
+                        if ( line != oldLine )
+                 {
+              out( line +"<br>" );
+                                oldLine = line;
+            }
     }
-  }
+//  }
   f.close();
   out( "Finished!<br>");
 #endif
 
   return r;
 }
 
-void PmIpkg::makeLinks(QString pack)
+void PmIpkg::makeLinks(Package *pack)
 {
-        pvDebug( 2, "PmIpkg::makeLinks "+ pack);
+        pvDebug( 2, "PmIpkg::makeLinks "+ pack->name());
+  QString dest = settings->getDestinationUrlByName( pack->dest() );
+  if (dest == "/" ) return;
   out( "<br>creating links<br>" );
-  QString dest = settings->getDestinationUrl();
-  out("for package "+pack+" in "+dest+"<br>");
+  out("for package "+pack->name()+" in "+dest+"<br>");
         {
     Config cfg( "oipkg", Config::User );
     cfg.setGroup( "Common" );
     QString statusDir = cfg.readEntry( "statusDir", "" );
         }
-         QString fn = dest+"/"+statusDir+"/info/"+pack+".list";
+         QString fn = dest+"/"+statusDir+"/info/"+pack->name()+".list";
   QFile f( fn );
   if ( ! f.open(IO_ReadOnly) )
   {
           out( "<b>Panik!</b> Could not open:<br>"+fn );
+           return;
   };
   QTextStream t( &f );
   QString fp;
   while ( !t.eof() )
     {
       fp = t.readLine();
@@ -123,14 +126,16 @@ void PmIpkg::makeLinks(QString pack)
             }
   f.close();
 }
 
 void PmIpkg::processLinkDir( QString file, QString dest )
 {
+        if ( dest == "???" ) return;
   QString destFile = file;
         file = dest+"/"+file;
+         if (file == dest) return;
   QFileInfo fileInfo( file );
   if ( fileInfo.isDir() )
   {
           QDir destDir( destFile );
     destDir.mkdir( destFile, true );
     QDir d( file );
@@ -163,36 +168,27 @@ void PmIpkg::commit( PackageList pl )
 
   to_install.clear();
   to_remove.clear();
   int sizecount = 0;
   QString rem="<b>To remove:</b><br>\n";
   QString inst="<b>To install:</b><br>\n";;
+  pl.allPackages();
   for( Package *pack = pl.first();pack ; (pack = pl.next())  )
     {
       if ( pack && (pack->name() != "") && pack)
         {
           if ( pack->toInstall() )
             {
- #ifndef NEWLIST
-              to_install.append( pack->name() );
- #endif
- #ifdef NEWLIST
               to_install.append( pack );
                sizecount += pack->size().toInt();
- #endif
-              inst += pack->name()+"<br>";
+              inst += pack->name()+"\t(on "+pack->dest()+")<br>";
             }
           if ( pack->toRemove() )
             {
- #ifndef NEWLIST
-              to_remove.append( pack->name() );
- #endif
- #ifdef NEWLIST
               to_remove.append( pack );
                sizecount += 1;
- #endif
               rem += pack->name()+"<br>";
             }
         }
     }
 
   out("<p>"+inst+"</p>"+"<p>"+rem+"</p><hl>");
@@ -208,17 +204,12 @@ void PmIpkg::commit( PackageList pl )
   connect( runwindow->removeButton, SIGNAL( clicked() ),
                                         this, SLOT( remove() ) );
   connect( runwindow->cancelButton, SIGNAL( clicked() ),
                                         runwindow, SLOT( close() ) );
 
         runwindow->exec();
-  // ##### 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;
   return;
 }
 
 void PmIpkg::doIt()
 {
          remove();
@@ -230,74 +221,47 @@ void PmIpkg::remove()
 {
          if ( to_remove.count() == 0 ) return;
         show( true );
 
         out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>");
 
- #ifndef NEWLIST
-   for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it)
-   {
-      if ( runIpkg("remove " + *it) == 0)
-      {
-
-                }else{
-              out("<b>"+tr("Error while removing")+"</b>"+*it);
-      }
-    }
-#endif
- #ifdef NEWLIST
    for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
    {
       if ( runIpkg("remove " + it->name()) == 0)
       {
               runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
         it->processed();
         runwindow->progress->setProgress( 1 );
                 }else{
               out("<b>"+tr("Error while removing")+"</b>"+it->name());
       }
     }
-#endif
 }
 
 
 void PmIpkg::install()
 {
          if ( to_install.count() == 0 ) return;
         show( true );
         out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
- #ifndef NEWLIST
-    for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it)
-    {
-      if ( runIpkg("install " + *it) == 0 )
-                  {
-                    if ( settings->createLinks() )
-                                        makeLinks( *it );
-                }else{
-              out("<b>"+tr("Error while installing")+"</b>"+*it);
-      }
-    }
-#endif
- #ifdef NEWLIST
-           for (Package *it=to_install.first(); it != 0; it=to_install.next() )
+         for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
-      if ( runIpkg("install " + it->name()) == 0 )
+
+      if ( runIpkg("install " + it->name(), it->dest() ) == 0 )
                           {    
               runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
-                    if ( settings->createLinks() )
-                                        makeLinks( it->name() );
+                    if ( it->link() )
+                                        makeLinks( it );
                 it->processed();
                 }else{
               out("<b>"+tr("Error while installing")+"</b>"+it->name());
       }
     }
-#endif
 }
 
 void PmIpkg::linkDestination( const QString msg, const QByteArray dest )
-// add 3rd package parameter
 {
                 qDebug("msg="+msg+" -- "+QString(dest) );
 //  QDir d( src );
 //  d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
 ////  if (! d.exists() ) return;
 //  const QFileInfoList *list = d.entryInfoList();
@@ -342,11 +306,11 @@ void PmIpkg::showButtons(bool b)
 
 void PmIpkg::show(bool b)
 {
         if (!runwindow->isVisible())
           runwindow->showMaximized();
         showButtons(b);
-        //if ( b )
+        if ( b )
                 runwindow->progress->hide();
-//  else
-        //      runwindow->progress->show();
+  else
+                runwindow->progress->show();
 }
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 2692017..c57adb7 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -8,13 +8,12 @@
 #include <qwidget.h>
 #include "pksettings.h"
 #include "runwindow.h"
 #include "packagelist.h"
 #include "debug.h"
 
-//#define NEWLIST
 class Package;
 class PmIpkg : public QObject
 {
   Q_OBJECT
 public:
   PmIpkg( PackageManagerSettings* , QWidget* p=0,  const char * name=0, WFlags f=0 );
@@ -26,26 +25,19 @@ public:
   void showButtons(bool b=true);
   void show( bool buttons=true );
 
 private:
   PackageManagerSettings* settings;
   RunWindow *runwindow;
-#ifndef NEWLIST
-  QStringList to_remove;
-  QStringList to_install;
-#endif
-#ifdef NEWLIST
   QList<Package> to_remove;
   QList<Package> to_install;
-#endif
   bool runwindowopen;
 
-  void makeLinks(QString);
+  void makeLinks(Package*);
   void processLinkDir( QString, QString );
-
-  int runIpkg(const QString& args);
+  int  runIpkg(const QString& args, const QString& dest="" );
   void out( QString );
 
 public slots:
         void doIt();
          void install();
   void remove();
diff --git a/noncore/unsupported/oipkg/runwindow.ui b/noncore/unsupported/oipkg/runwindow.ui
index 5359fe2..52da408 100644
--- a/noncore/unsupported/oipkg/runwindow.ui
+++ b/noncore/unsupported/oipkg/runwindow.ui
@@ -39,13 +39,13 @@
             <property stdset="1">
                 <name>name</name>
                 <cstring>progress</cstring>
             </property>
             <property stdset="1">
                 <name>progress</name>
-                <number>42</number>
+                <number>0</number>
             </property>
         </widget>
         <widget row="1"  column="0" >
             <class>QTextView</class>
             <property stdset="1">
                 <name>name</name>
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h
index 5df522b..cf6e614 100644
--- a/noncore/unsupported/oipkg/settings.h
+++ b/noncore/unsupported/oipkg/settings.h
@@ -17,14 +17,12 @@ public:
   QString getDestinationUrl();
   QString getDestinationName();
   QString getLinkDestinationName();
   bool createLinks();
   QStringList getActiveServers();
   QStringList getDestinationUrls();
-  /** No descriptions */
-  QComboBox getActiveDestinationCombo();
 
 private:
   QIntDict<QString> serverurlDic;
   QIntDict<QString> destinationurlDic;
   int ipkg_old;
   int editedserver;