added ipkgfind remote query

24 files changed, 524 insertions, 206 deletions

diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index 790766c..fc2e8a4 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -1,9 +1,14 @@
 * Settings Class
 * tr() ;)
 * Dialog to display ipkg output live
 * parse "to install" and "to remove" from status
 * install local file dialog
 * qcop
 * error handling
 * manage links
 * dependency checking
+* create dest if it does not exist
+* allow reinstalling
+* handle different versions
+* different types of filters and searches
+	i.e. name, desc, files etc
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/debug.h b/noncore/unsupported/oipkg/debug.h
index 206dea5..d20a5eb 100644
--- a/noncore/unsupported/oipkg/debug.h
+++ b/noncore/unsupported/oipkg/debug.h
@@ -1,21 +1,21 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_
 
 #include <stdio.h>
 
 extern int debugLevel;
 
 #define HACK
-
+#define PACKAGELISTLOCAL
 #define NEWLAYOUT
 
 #define pvDebug(I, S) \
 if ( debugLevel < 3 ) \
 { \
 	if ( I <= debugLevel ) qDebug(S);\
 }else{\
 	if ( I <= debugLevel ) \
 		qDebug("#%s:%i: %s \t\t(Level: %i)",__FILE__,__LINE__,QString(S).latin1(),I);\
 }
 
 #endif
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index ca1e5e8..06828e0 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -1,422 +1,493 @@
 // adadpted form qpe/qipkg
 
 
 #include "mainwindow.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.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>
 #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 )
 {	
   setCaption( tr("Package Manager") );
   settings = new PackageManagerSettings(this,0,TRUE);
   listViewPackages =  new PackageListView( this,"listViewPackages",settings );
   setCentralWidget( listViewPackages );
 
 //	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 );
   packageList.setSettings( settings );
+  packageListSearch.setSettings( settings );
   packageList.update();
   makeMenu();	
   makeChannel();
   //opie is hardcoded default ;)
   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()) );
+
+//	rootLocal = new QCheckListItem(listViewPackages,tr("local"));
+//	rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
   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 );
 
   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 );
 
   QLabel *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 ();
 
   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 );
 
-// could we use for find
-//  detailsAction = new QAction( tr( "Find" ),
-//      		Resource::loadIconSet( "find" ),
-//  		    QString::null, 0, this, 0 );
-//  connect( detailsAction, SIGNAL( activated() ),
-//               this , SLOT( showFind() ) );
-//  detailsAction->addTo( toolBar );
-
   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 );
  	addToolBar( sectionBar,  "Section", QMainWindow::Top, TRUE );
   sectionBar->setHorizontalStretchable( true );
   QLabel *label = new QLabel( tr("Section: "), sectionBar );
   label->setBackgroundColor( sectionBar->backgroundColor() );
  	sectionBar->setStretchableWidget( label );
   section = new QComboBox( false, sectionBar );
   label = new QLabel( " / ", sectionBar );
   label->setBackgroundColor( sectionBar->backgroundColor() );
   subsection = new QComboBox( false, sectionBar );
   a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) );
   a->addTo( sectionBar );
-
   setSections();
   setSubSections();
-
   sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 );
   connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) );
   sectionAction->setToggleAction( true );
   sectionAction->addTo( viewMenu );
 
+  //FIND
   findBar = new QPEToolBar(this);
-  addToolBar( findBar,  "Search", QMainWindow::Top, TRUE );
+  addToolBar( findBar,  "Filter", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Filter: "), findBar );
   label->setBackgroundColor( findBar->backgroundColor() );
   findBar->setHorizontalStretchable( TRUE );
   findEdit = new QLineEdit( findBar, "findEdit" );
   findBar->setStretchableWidget( findEdit );
   connect( findEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( displayList() ) );
-
   a = new QAction( tr( "Clear Find" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), findEdit, SLOT( clear() ) );
   a->addTo( findBar );
   a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
   a->addTo( findBar );
-  findAction = new QAction( tr( "Find" ), QString::null, 0, this, 0 );
+  findAction = new QAction( tr( "Filter" ), QString::null, 0, this, 0 );
   connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) );
   findAction->setToggleAction( true );
   findAction->addTo( viewMenu );
 
+  //SEARCH
+  searchBar = new QPEToolBar(this);
+  addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
+  label = new QLabel( tr("ipkgfind: "), searchBar );
+  label->setBackgroundColor( searchBar->backgroundColor() );
+  searchBar->setHorizontalStretchable( TRUE );
+  searchEdit = new QLineEdit( searchBar, "seachEdit" );
+  searchBar->setStretchableWidget( searchEdit );
+//  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
+//       this, SLOT( displayList() ) );
+  a = new QAction( tr( "Clear Search" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
+  connect( a, SIGNAL( activated() ), searchEdit, SLOT( clear() ) );
+  a->addTo( searchBar );
+  searchCommit  = new QAction( tr( "Do Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+  connect( searchCommit, SIGNAL( activated() ),  SLOT( remotePackageQuery() ) );
+  searchCommit->addTo( searchBar );
+  a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+  connect( a, SIGNAL( activated() ), this, SLOT( searchClose() ) );
+  a->addTo( searchBar );
+  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)),
-//  			 SLOT(activeDestinationChange(int)) );
+  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)) );
+  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 );
 
   // 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()
 {
   packageList.allPackages();
+  ipkg->loadList( packageListSearch );
   ipkg->commit( packageList );
   // ##### 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 );
 	packageList.clear();
   ipkg->update();
   packageList.update();
   t->stop();
 //	wait->hide();  	
 }
 
 void MainWindow::filterList()
 {
 //	wait->show();
  	QString f = "";
   if ( findAction->isOn() ) f = findEdit->text();
   packageList.filterPackages( f );
 //	wait->hide();
 }
 
 void MainWindow::displayList()
 {
 //	wait->hide();
 	filterList();
   listViewPackages->clear();
   Package *pack = packageList.first();
+  PackageListItem *item;
+
+	QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local"));
+	QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
   while( pack )
   {
-  	if ( pack && (pack->name() != "") )
-	  	listViewPackages->insertItem( new PackageListItem( listViewPackages, pack, settings ) );
+	 	item = new PackageListItem( rootLocal, pack, settings );				
     pack = packageList.next();
   }	
+  pack = packageListSearch.first();
+  while( pack )
+  {
+	 	item = new PackageListItem( rootSearch, pack, settings );				
+    pack = packageListSearch.next();
+  }	
 }
 
 void MainWindow::sectionChanged()
 {
   disconnect( section, SIGNAL( activated(int) ),
 	      this, SLOT( sectionChanged() ) );
   disconnect( subsection, SIGNAL(activated(int) ),
 	      this, SLOT( subSectionChanged() ) );
   subsection->clear();
   packageList.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() ) );
   disconnect( subsection, SIGNAL(activated(int) ),
 	      this, SLOT( subSectionChanged() ) );
   packageList.setSubSection( subsection->currentText() );
   connect( section, SIGNAL( activated(int) ),
 	   this, SLOT( sectionChanged() ) );
   connect( subsection, SIGNAL(activated(int) ),
 	   this, SLOT( subSectionChanged() ) );
   displayList();
 }
 
 void MainWindow::setSections()
 {
   section->clear();
   section->insertStringList( packageList.getSections() );
 }
 
 void MainWindow::setSubSections()
 {
   subsection->clear();
   subsection->insertStringList( packageList.getSubSections() );
 }
 
 
 void MainWindow::showSettings()
 {
   if ( settings->showDialog( 0 ) )
     updateList();
 }
 void MainWindow::showSettingsSrv()
 {
   if ( settings->showDialog( 1 ) )
     updateList();
 }
 void MainWindow::showSettingsDst()
 {
   if ( settings->showDialog( 2 ) )
     updateList();
 }
 
 void MainWindow::sectionShow(bool b)
 {
 	if (b) sectionBar->show();
   else sectionBar->hide();
   sectionAction->setOn( b );
 }
 
 void MainWindow::sectionClose()
 {
   sectionAction->setOn( false );
 }
 
 void MainWindow::findShow(bool b)
 {
 	if (b) findBar->show();
   else findBar->hide();
   findAction->setOn( b );
 }
 
 void MainWindow::findClose()
 {
   findAction->setOn( false );
 }
 
+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)
 {
   installFile(fileName);
   // ##### 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::installFile(const QString &fileName)
 {
 	pvDebug(3, "MainWindow::installFile "+fileName);
  	if ( !QFile::exists( fileName ) ) return;
 	ipkg->installFile( fileName );
   // ##### 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::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)" )
  	{
   	ipkg->installFile( QString(arg) );
 	}else if( msg == "removeFile(QString)" )
  	{
   	ipkg->removeFile( QString(arg) );
 	}else if( msg == "createLinks(QString)" )
  	{
   	ipkg->createLinks( QString(arg) );
 	}else if( msg == "removeLinks(QString)" )
  	{
   	ipkg->removeLinks( QString(arg) );
 	}else{
     	pvDebug(2,"Huh what do ya want")
  	}
 }
+
+
+void MainWindow::createLinks()
+{
+	pvDebug(2,"creating links...");
+	ipkg->createLinks( settings->destinationurl->text() );
+}
+
+void MainWindow::removeLinks()
+{
+	pvDebug(2,"removing links...");
+	ipkg->removeLinks( settings->destinationurl->text() );
+}
+
+void MainWindow::remotePackageQuery()
+{
+ 	packageListSearch.query( searchEdit->text() );
+ 	displayList();
+}
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 7615b09..4a73b78 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -1,84 +1,98 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 #include "packagelist.h"
+#include "packagelistremote.h"
+#include "packagelistlocal.h"
 #include "pmipkg.h"
 #include "pksettings.h"
 #include "packagelistview.h"
 
 class QComboBox;
 class QPEToolBar;
 class QLineEdit;
 class PackageListItem;
 class QCopChannel;
 class QMessageBox;
 class QCheckBox;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 
 public:
   MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~MainWindow();
   void makeChannel();
 
 	QCopChannel *channel;
 
 protected slots:
   void runIpkg();
   void updateList();
   void displayList();
   void subSectionChanged();
   void sectionChanged();
   void showSettings();
   void showSettingsSrv();
   void showSettingsDst();
 
 public slots:
   void sectionClose();
   void sectionShow(bool);
   void findClose();
   void findShow(bool);
+  void searchClose();
+  void searchShow(bool);
   void destClose();
   void destShow(bool);
   void filterList();
+  void createLinks();
+  void removeLinks();
 	void receive (const QCString &, const QByteArray &);
 	void setDocument (const QString &);
+  void remotePackageQuery();
 
 private:
   void makeMenu();
   void setSections();
   void setSubSections();
 	void installFile(const QString &);
   bool updateIcon;
 
   PmIpkg* ipkg;
   PackageManagerSettings *settings;
-  PackageList packageList;
+  PackageListLocal packageList;
+  PackageListRemote packageListSearch;
+  PackageListView *listViewPackages;
+//  QCheckListItem* rootSearch;
+//  QCheckListItem* rootLocal;
   QAction *runAction;
   QAction *updateAction;
   QAction *findAction;
-  QAction *sectionAction;
-  QAction *destAction;
-  PackageListView *listViewPackages;
   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/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
index c5d3b3d..98f92c8 100644
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/noncore/unsupported/oipkg/oipkg.pro
@@ -1,28 +1,32 @@
 DESTDIR		= $(OPIEDIR)/bin
 TEMPLATE	= app
 #CONFIG		= qt warn_on release
 CONFIG		= qt warn_on debug
 HEADERS		= mainwindow.h \
 		pksettings.h \
 		pmipkg.h \
 		utils.h \
 		packagelistitem.h \
+		packagelistremote.h \
 		packagelist.h \
+		packagelistlocal.h \
 		packagelistview.h \
 		package.h
 SOURCES		= main.cpp \
 		mainwindow.cpp \
 		utils.cpp \
 		packagelistview.cpp \
+		packagelistremote.cpp \
+		packagelistlocal.cpp \
 		pksettings.cpp \
 		pmipkg.cpp \
 		packagelistitem.cpp \
 		packagelist.cpp \
 		package.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/ioclude
 LIBS            += -lqpe 
 INTERFACES	= runwindow.ui \
 		pksettingsbase.ui
 TARGET		= oipkg
 
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 0499e19..6bb53a9 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -1,216 +1,225 @@
 #include "package.h"
 
 #include <qpe/process.h>
 #include <qpe/stringutil.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "debug.h"
 
 //Package::~Package()
 //{
 //}
 
 Package::Package( PackageManagerSettings *s )
 {
 	init(s);
 }
 
 void Package::init( PackageManagerSettings *s )
 {
 	settings = s;
   _size = "";
   _section = "";
   _subsection = "";
   _shortDesc = "";
   _desc = "";
   _name = "";
   _toProcess = false;
+  _useFileName = false;
   _status = "";
   _dest = settings->getDestinationName();
   _link = settings->createLinks();
 }
 
 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{
    	parseIpkgFile( n );
     _toProcess = true;
-    _packageName = QString( 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")
   {
 
   }else if ( n == "Section")
   {
       setSection( t );
   }else if ( n == "Maintainer")
   {
 
   }else if ( n == "Architecture")
   {
 
   }else if ( n == "Version")
   {
 
   }else if ( n == "Pre-Depends")
   {
 
   }else if ( n == "Depends")
   {
 
   }else if ( n == "Filename")
   {
-
+    _fileName = t;
   }else if ( n == "Size")
  	{
   	
 	}else if ( n == "MD5Sum")
 	{
 
 	}
   if ( n == "Description")
   {
       setDesc( t );
   }
   if ( n == "Status")
   {
       if ( installed() ) return;
       _status = t;
   }
   if ( t == "Essential")
   {
 
   }
 };
 
 QString Package::name()
 {
   return _name;
 }
 
+
+QString Package::installName()
+{
+	if (_useFileName) return _fileName;
+  else return _name;
+}
+
 bool Package::installed()
 {
   return _status.contains("installed");
 }
 
 void Package::setDesc( QString s )
 {
   _desc = s;
   _shortDesc = s.left( s.find("\n") );
 }
 
 QString Package::desc()
 {
   return _desc;
 }
 
 QString Package::shortDesc()
 {
   return _shortDesc;
 }
 
 QString Package::size()
 {
   return _size;
 }
 
 QString Package::sizeUnits()
 {
 	int i = _size.toInt();
  	int c = 0;
   QString ret;
  	QStringList unit;
   unit << "B" << "KB" << "MB" << "GB" << "TB"; //prepair for the future ;)
 	while (i > 1)
  	{
   	ret=QString::number(i)+" "+unit[c];
    	c++;
    	i /= 1024;
   }
   return ret;
 }
 
 bool Package::toProcess()
 {
   return _toProcess;
 }
 
 bool Package::toRemove()
 {
   if ( _toProcess && installed() ) return true;
   else return false;
 }
 
 bool Package::toInstall()
 {
   if ( _toProcess && !installed() ) return true;
   else return false;
 }
 
 void Package::toggleProcess()
 {
   _toProcess = ! _toProcess;
 }
 
 
 
 void Package::copyValues( Package* pack )
 {
   if (_size.isEmpty()      && !pack->_size.isEmpty()) _size = QString( pack->_size );
   if (_section.isEmpty()   && !pack->_section.isEmpty()) _section = QString( pack->_section );
   if (_subsection.isEmpty()&& !pack->_subsection.isEmpty()) _subsection = QString( pack->_subsection );
   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::section()
 {
   return _section;
 }
 
 void Package::setSection( QString s)
 {
   int i = s.find("/");
   if ( i > 0 )
     {
       _section    = s.left(i);
       _subsection = s.mid(i+1);
     }else{
       _section    = s;
       _subsection = "";
     }
 }
 
 QString Package::subSection()
@@ -238,101 +247,106 @@ void Package::parsePackage( QStringList pack )
 }
 
 QString Package::details()
 {
   QString status;
   Process ipkg_status(QStringList() << "ipkg" << "info" << name() );
   QString description;
   if ( ipkg_status.exec("",status) )
     {
       QStringList lines = QStringList::split('\n',status,TRUE);
       for (QStringList::Iterator it = lines.begin(); it!=lines.end(); ++it) {
 	QString line = *it;
 	if ( line == " ." )
 	  {
 	    description.append("<p>");
 	  } else
 	    if ( line[0] == ' ' || line[0] == '\t' )
 	      {
 		// continuation
 		description.append(" ");
 		description.append(Qtopia::escapeString(line));
 	      } else {
 		int sep = line.find(QRegExp(":[\t ]+"));
 		if ( sep >= 0 )
 		  {
 		    QString tag = line.left(sep);
 		    description.append("<br>");
 		    description.append("<b>");
 		    description.append(Qtopia::escapeString(tag));
 		    description.append(":</b> ");
 		    description.append(Qtopia::escapeString(line.mid(sep+2)));
 		  } else {
 		    description.append(" ");
 		    description.append(Qtopia::escapeString(line));
 		  }
 	      }
       }
     }
   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;
 }
 
 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) )
   {
   	QTextStream t( &f );
 		QStringList pack;
 		while ( !t.eof() )
   	{
 			pack << t.readLine();
    	}
     f.close();
   	parsePackage( pack );
   }
 	
 }
 
-QString Package::getPackageName()
+//QString Package::getPackageName()
+//{
+//	if ( _packageName.isEmpty() ) return _name;
+//	else return _packageName;
+//}
+
+void Package::instalFromFile(bool iff)
 {
-	if ( _packageName.isEmpty() ) return _name;
-	else return _packageName;
+	_useFileName = iff;
 }
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h
index 49bb3bf..4618c3a 100644
--- a/noncore/unsupported/oipkg/package.h
+++ b/noncore/unsupported/oipkg/package.h
@@ -1,70 +1,74 @@
 #ifndef PK_ITEM_H
 #define PK_ITEM_H
 
 #include <qstring.h>
 #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(PackageManagerSettings *);
  // ~Package();
   Package( QStringList, PackageManagerSettings * );
   Package( QString, PackageManagerSettings * );
   Package( Package* );
  	
   void    setValue( QString, QString );
   void    copyValues( Package* );
 
   QString name() ;
+  QString installName() ;
   bool    installed();
 
   void    setDesc( QString );
   QString shortDesc();
   QString desc();
   QString size();
   QString sizeUnits();
   void    setSection( QString );
   QString section();
   QString subSection();
   QString details();
   bool    toProcess();
   bool    toInstall();
   bool    toRemove();
   void processed();
   QString dest();
   void setDest( QString d );
   void setOn();
   bool link();
   void setLink(bool);
-  void parseIpkgFile( QString );;
+  void parseIpkgFile( QString );
+  void instalFromFile(bool iff=true);
 public slots:
-  QString getPackageName();
+//  QString getPackageName();
   void toggleProcess();
 
 private:
   PackageManagerSettings *settings;
-  QString _packageName;
+//  QString _packageName;
   QString _name;
+  QString _fileName;
   bool    _toProcess;
   bool    _link;
   QString _status;
   QString _size;
   QString _section;
   QString _subsection;
   QString _shortDesc;
   QString _desc;
   QString _dest;
+  bool _useFileName;
   void parsePackage( QStringList );
   void init(PackageManagerSettings *);
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 035ec81..b892b30 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -1,241 +1,192 @@
 #include "packagelist.h"
 
 #include <assert.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-#include <qpe/config.h>
 
 #include "debug.h"
 
 PackageList::PackageList()
   : packageIter( packageList )
 {
   empty=true;
-  {
-    Config cfg( "oipkg", Config::User );
-    cfg.setGroup( "Common" );
-    statusDir = cfg.readEntry( "statusDir", "" );
-    listsDir  = cfg.readEntry( "listsDir", "" );
-    if ( statusDir=="" || ! QFileInfo(statusDir+"/status").isFile() )
-      {
-	statusDir="/usr/lib/ipkg/";
-	listsDir="/usr/lib/ipkg/lists/";
-	cfg.writeEntry( "statusDir", statusDir );
-	cfg.writeEntry( "listsDir", listsDir );
-      }
-  }
   sections << "All";
   subSections.insert("All", new QStringList() );
   QStringList *ss = subSections["All"];
   *ss << "All";
   aktSection = "All";
   aktSubSection = "All";
 }
 
 PackageList::PackageList( PackageManagerSettings* s)
   : packageIter( packageList )
 {
   settings = s;
   PackageList();
 }
 
 PackageList::~PackageList()
 {
 }
 
 /** Inserts a package into the list */
 void PackageList::insertPackage( Package* pack )
 {
   Package* p = packageList.find( pack->name() );
   if ( p )
     {
       p->copyValues( pack );
       delete pack;
       pack = p;
     }else{
       packageList.insert( pack->name(), pack );
       origPackageList.insert( pack->name(), pack );
       empty=false;
     };
   updateSections( pack );
 }
 
 void PackageList::filterPackages( QString f )
 {	
   packageList.clear();
   QDictIterator<Package> filterIter( origPackageList );
   filterIter.toFirst();
   Package *pack= filterIter.current() ;
   while ( pack )
     {	
       if (
       			((aktSection=="All")||(pack->section()==aktSection)) &&
 	   				((aktSubSection=="All")||(pack->subSection()==aktSubSection)) &&
         		 pack->name().contains( f )
     			)
 			{
 	  		packageList.insert( pack->name(), pack );
 			}
       ++filterIter;
       pack = filterIter.current();
     }
 }
 
 Package* PackageList::find( QString n )
 {
   return packageList.find( n );
 }
 
 Package* PackageList::first()
 { 	
   packageIter.toFirst();
   return packageIter.current();	
 }
 
 Package* PackageList::next()
 {
   ++packageIter;
   return packageIter.current();
 }
 
 QStringList PackageList::getSections()
 {
   sections.sort();
   return sections;
 }
 
 QStringList PackageList::getSubSections()
 {
   QStringList ss;
   if ( !subSections[aktSection] ) return ss;
   ss = *subSections[aktSection];
   ss.sort();
   return ss;
 }
 
 void PackageList::setSection( QString sec )
 {
   aktSection = sec;
 }
 
 void PackageList::setSubSection( QString ssec )
 {
   aktSubSection = ssec;
 }
 
 void PackageList::updateSections( Package* pack )
 {
   QString s = pack->section();
   if ( s.isEmpty() || s == "") return;
   if ( sections.contains(s) )  return;
   sections += s;
   QString ss = pack->subSection();
   if ( ss.isEmpty() || ss == "" ) return;
   if ( !subSections[s] ) {
     subSections.insert( s, new QStringList() );
     QStringList *subsecs = subSections[s];
     *subsecs += "All";
   }
   QStringList *subsecs = subSections[s];
   *subsecs += ss;
   if ( !subSections["All"] ) subSections.insert( "All", new QStringList() );
   subsecs = subSections["All"];
   *subsecs += ss;
 }
 
 
-
-/** No descriptions */
-void PackageList::parseStatus()
-{
-  QStringList dests = settings->getDestinationUrls();
-  QStringList destnames = settings->getDestinationNames();
-  QStringList::Iterator name = destnames.begin();
-  for ( QStringList::Iterator dir = dests.begin(); dir != dests.end(); ++dir )
-    {
-      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: "+listsDir+"/"+*it);
-      readFileEntries( listsDir+"/"+*it, "" );  	
-    }
-}
-
 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 )
 		{
 		  insertPackage( p );
 		  packEntry.clear();
 		}
 	    }
 	}else{
 	  packEntry << line;
 	};
     }
   return;
 }
 
-
-void PackageList::update()
-{
-  pvDebug( 2, "parseStatus");
-  parseStatus();
-  pvDebug( 2, "parseList");
-  parseList();
-  pvDebug( 2, "finished parsing");
-}
-
 void PackageList::setSettings( PackageManagerSettings *s )
 {
   settings = s;
 }
 
 Package* PackageList::getByName( QString n )
 {
 	origPackageList[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 7c326ca..acea3b9 100644
--- a/noncore/unsupported/oipkg/packagelist.h
+++ b/noncore/unsupported/oipkg/packagelist.h
@@ -1,70 +1,58 @@
 #ifndef PACKAGELIST_H
 #define PACKAGELIST_H
 
 #include <qdict.h>
 #include "package.h"
 #include "pksettings.h"
 #include "debug.h"
 
-#define HACK
-#ifdef HACK
-  static QString listsDir="/usr/lib/ipkg/";
-  static QString statusDir="/usr/lib/ipkg/";
-#endif
-
 class PackageList //:QObject
 {
 //  	Q_OBJECT
 public:
 //	static QString all = QObject::tr("All");
 
   PackageList();
   PackageList( PackageManagerSettings* );
-  ~PackageList();
+ 	virtual ~PackageList();
   void insertPackage( Package* );
   Package* find( QString );
   Package* next();
   Package* first();
 
   QStringList getSections();
   QStringList getSubSections();
   void setSettings( PackageManagerSettings* );
   void filterPackages( QString );
   Package* getByName( QString );
   void clear();
   void allPackages();
 
 public slots:
   void setSection(QString);
   void setSubSection(QString);
-  void update();
+ // virtual void update();
 
-private:
+protected:
   int currentPackage;
   int packageCount;
 
   PackageManagerSettings     *settings;
   QDict<Package>         packageList;
   QDict<Package>         origPackageList;
   QDictIterator<Package> packageIter;
 
   bool empty;
-#ifndef HACK
-  QString listsDir;
-  QString statusDir;
-#endif
   QString            aktSection;
   QString            aktSubSection;
   QStringList        sections;
   QDict<QStringList> subSections;
   QDict<bool> sectionsDict;
 
 
   void updateSections( Package* );
-  void parseStatus();
-  void parseList();
-  void readFileEntries( QString file, QString dest );
+  void readFileEntries( QString file, QString dest="" );
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index 0c7c928..b7af9a6 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -1,111 +1,122 @@
 #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, 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("Description: ")+pi->desc() );
 	item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
 	destItem = new QCheckListItem( this, "" );
 	linkItem = new QCheckListItem( this, "" );
   displayDetails();
 
   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"));
   }
 }
 
 void PackageListItem::paintCell( QPainter *p,  const QColorGroup & cg,
 				 int column, int width, int alignment )
 {
   if ( !p )
     return;
 
   p->fillRect( 0, 0, width, height(),
 	       isSelected()? cg.highlight() : cg.base() );
 
   if ( column != 0 ) {
     // The rest is text
     QListViewItem::paintCell( p, cg, column, width, alignment );
     return;
   }
 
   QListView *lv = listView();
   if ( !lv )
     return;
   int marg = lv->itemMargin();
   int r = marg;
 
   QPixmap pm = statePixmap();
   p->drawPixmap(marg,(height()-pm.height())/2,pm);
   r += pm.width()+1;
 
   p->translate( r, 0 );
   QListViewItem::paintCell( p, cg, column, width - r, alignment );
 }
 
 
 void PackageListItem::paintFocus( QPainter *p, const QColorGroup & cg,
 				  const QRect & r )
 {
   // Skip QCheckListItem
   // (makes you wonder what we're getting from QCheckListItem)
   QListViewItem::paintFocus(p,cg,r);
 }
 
 QPixmap PackageListItem::statePixmap() const
 {
   bool installed = package->installed();
   if ( !package->toProcess() ) {
     if ( !installed )
       return *pm_uninstalled;
     else
       return *pm_installed;
   } else {
     if ( !installed )
       return *pm_install;
     else
       return *pm_uninstall;
   }
 }
 
 QString PackageListItem::key( int column, bool ascending ) const
 {
   if ( column == 2 ) {
     QString t = text(2);
     double bytes=t.toDouble();
     if ( t.contains('M') ) bytes*=1024*1024;
     else if ( t.contains('K') || t.contains('k') ) bytes*=1024;
     if ( !ascending ) bytes=999999999-bytes;
     return QString().sprintf("%09d",(int)bytes);
   } else {
     return QListViewItem::key(column,ascending);
   }
 }
 
 void PackageListItem::setOn( bool b )
 {
   QCheckListItem::setOn( b );
   package->toggleProcess();
   package->setLink( settings->createLinks() );
   displayDetails();
 }
 
diff --git a/noncore/unsupported/oipkg/packagelistitem.h b/noncore/unsupported/oipkg/packagelistitem.h
index 54d9f9e..b128f0d 100644
--- a/noncore/unsupported/oipkg/packagelistitem.h
+++ b/noncore/unsupported/oipkg/packagelistitem.h
@@ -1,38 +1,40 @@
 #ifndef PK_LISTITEM_H
 #define PK_LISTITEM_H
 
 #include "package.h"
 
 #include <qstring.h>
 #include <qlistview.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qdict.h>
 
 #include "pksettings.h"
 
 class PackageListItem
 : public QCheckListItem
 {
 public:
+  PackageListItem(QListViewItem*, Package*, PackageManagerSettings*);
   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:
+  void init(Package*, PackageManagerSettings*);
 	QCheckListItem *nameItem;
 	QCheckListItem *destItem;
 	QCheckListItem *linkItem;
   PackageManagerSettings *settings;
   Package *package;
 };
 
 
 #endif
diff --git a/noncore/unsupported/oipkg/packagelistlocal.cpp b/noncore/unsupported/oipkg/packagelistlocal.cpp
new file mode 100644
index 0000000..6d931c8
--- a/dev/null
+++ b/noncore/unsupported/oipkg/packagelistlocal.cpp
@@ -0,0 +1,66 @@
+#include <qpe/config.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+#include <qtextstream.h>
+#include <qstringlist.h>
+#include "packagelistlocal.h"
+
+PackageListLocal::PackageListLocal()
+	: PackageList()
+{
+	Config cfg( "oipkg", Config::User );
+	cfg.setGroup( "Common" );
+	statusDir = cfg.readEntry( "statusDir", "" );
+	listsDir  = cfg.readEntry( "listsDir", "" );
+  if ( statusDir=="" || ! QFileInfo(statusDir+"/status").isFile() )
+  {
+		statusDir="/usr/lib/ipkg/";
+		listsDir="/usr/lib/ipkg/lists/";
+		cfg.writeEntry( "statusDir", statusDir );
+		cfg.writeEntry( "listsDir", listsDir );
+  }
+}
+
+PackageListLocal::PackageListLocal(PackageManagerSettings* s)
+	: PackageList(s)
+{
+	PackageListLocal();
+}
+
+PackageListLocal::~PackageListLocal()
+{
+}
+
+void PackageListLocal::parseStatus()
+{
+  QStringList dests = settings->getDestinationUrls();
+  QStringList destnames = settings->getDestinationNames();
+  QStringList::Iterator name = destnames.begin();
+  for ( QStringList::Iterator dir = dests.begin(); dir != dests.end(); ++dir )
+    {
+      pvDebug( 2,"Status: "+*dir+statusDir+"/status");
+      readFileEntries( *dir+statusDir+"/status", *name );
+      ++name;
+    };
+}
+
+void PackageListLocal::parseList()
+{
+  QStringList srvs = settings->getActiveServers();
+	
+  for ( QStringList::Iterator it = srvs.begin(); it != srvs.end(); ++it )
+    {
+      pvDebug( 2, "List: "+listsDir+"/"+*it);
+      readFileEntries( listsDir+"/"+*it );  	
+    }
+}
+
+
+void PackageListLocal::update()
+{
+  pvDebug( 2, "parseStatus");
+  parseStatus();
+  pvDebug( 2, "parseList");
+  parseList();
+  pvDebug( 2, "finished parsing");
+}
diff --git a/noncore/unsupported/oipkg/packagelistlocal.h b/noncore/unsupported/oipkg/packagelistlocal.h
new file mode 100644
index 0000000..887126b
--- a/dev/null
+++ b/noncore/unsupported/oipkg/packagelistlocal.h
@@ -0,0 +1,30 @@
+#ifndef PACKAGELISTLOCAL_H
+#define PACKAGELISTLOCAL_H
+
+#include "packagelist.h"
+
+
+#define HACK
+#ifdef HACK
+  static QString listsDir="/usr/lib/ipkg/";
+  static QString statusDir="/usr/lib/ipkg/";
+#endif
+
+class PackageListLocal : public PackageList  {
+public:
+	PackageListLocal();
+	PackageListLocal( PackageManagerSettings* );
+	virtual ~PackageListLocal();
+
+public slots:
+  void update();
+private:
+#ifndef HACK
+  QString listsDir;
+  QString statusDir;
+#endif
+  void parseStatus();
+  void parseList();
+};
+
+#endif
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp
new file mode 100644
index 0000000..721d4a6
--- a/dev/null
+++ b/noncore/unsupported/oipkg/packagelistremote.cpp
@@ -0,0 +1,47 @@
+
+#include "packagelistremote.h"
+
+#include <qstring.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+PackageListRemote::PackageListRemote(PackageManagerSettings* s)
+	: PackageList(s)
+{
+	PackageListRemote();
+}
+
+PackageListRemote::PackageListRemote()
+	: PackageList()
+{
+}
+
+PackageListRemote::~PackageListRemote()
+{
+}
+
+void PackageListRemote::query(QString s)
+{
+ 	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="+s;           	
+  cmd += "\"";
+
+  pvDebug(2,"search :"+cmd);
+  r = system(cmd.latin1());
+  readFileEntries( redirect );
+ 	
+}
+
+void PackageListRemote::update()
+{
+	pvDebug(2,"PackageListRemote::update\ndoing nothing ");	
+}
diff --git a/noncore/unsupported/oipkg/packagelistremote.h b/noncore/unsupported/oipkg/packagelistremote.h
new file mode 100644
index 0000000..147da1e
--- a/dev/null
+++ b/noncore/unsupported/oipkg/packagelistremote.h
@@ -0,0 +1,19 @@
+#ifndef PACKAGELISTREMOTE_H
+#define PACKAGELISTREMOTE_H
+
+#include "packagelist.h"
+#include "package.h"
+#include "pksettings.h"
+#include "debug.h"
+
+class PackageListRemote : public PackageList  {
+public:
+	PackageListRemote();
+	PackageListRemote( PackageManagerSettings* s);
+	virtual ~PackageListRemote();
+  void query(QString);
+public slots:
+  void update();
+};
+
+#endif
diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp
index 2915ac6..610a0e1 100644
--- a/noncore/unsupported/oipkg/packagelistview.cpp
+++ b/noncore/unsupported/oipkg/packagelistview.cpp
@@ -1,107 +1,90 @@
-/***************************************************************************
-                          packagelistview.cpp  -  description
-                             -------------------
-    begin                : Sat Apr 27 2002
-    copyright            : (C) 2002 by tille
-    email                : tille@handhelds.org
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #include "packagelistview.h"
 
 #include <qpopupmenu.h>
 #include <qaction.h>
 
 #include "packagelistitem.h"
 #include "pksettings.h"
 
 PackageListView::PackageListView(QWidget *p, const char* n, PackageManagerSettings *s)
 	: QListView(p,n)
 {
 	settings = s;
 	popupMenu = new QPopupMenu( this );	
 	destsMenu = new QPopupMenu( popupMenu );
   popupTimer = new QTimer( this );
   setSelectionMode(QListView::NoSelection);
 	addColumn( tr("Package") );
  	setRootIsDecorated( true );
 
   connect( popupTimer, SIGNAL(timeout()),
   		this, SLOT(showPopup()) );
   connect( this, SIGNAL( pressed( QListViewItem* ) ),
 	    this, SLOT( setCurrent( QListViewItem* ) ) );
 	connect( this, SIGNAL( clicked( QListViewItem* ) ),
 	   this, SLOT( stopTimer( QListViewItem* ) ) );	
 
 }
 
 //PackageListView::~PackageListView()
 //{
 //}
 
 void PackageListView::setCurrent( QListViewItem* p )
 {
   if ( !p ) return;
   activePackageListItem = (PackageListItem*)p;
   activePackage = activePackageListItem->getPackage();
   if (!activePackage) return;
   popupTimer->start( 750, true );
 }
 
 
 void PackageListView::showPopup()
 {
   popupMenu->clear();
   destsMenu->clear();
  		
  	QAction *popupAction;
   if ( !activePackage->installed() )
   {
 	  popupMenu->insertItem( QObject::tr("Install to"), destsMenu );
   	QStringList dests = settings->getDestinationNames();
    	QString ad = settings->getDestinationName();
 	  for (uint i = 0; i < dests.count(); i++ )
   	{		
 	  	popupAction = new QAction( dests[i], QString::null, 0, this, 0 );
 		  popupAction->addTo( destsMenu );
     	if ( dests[i] == ad && activePackage->toInstall() )
      	{
         popupAction->setToggleAction( true );
 			  popupAction->setOn(true);
   		};
   	}
 	  connect( destsMenu, SIGNAL( activated( int ) ),
 		   this, SLOT( changePackageDest( int ) ) );
    }else{
 //   	popupActcat setOn( activePackage->toProcess() );
    }
   popupMenu->popup( QCursor::pos() );
 }
 
 void PackageListView::stopTimer( QListViewItem* )
 {
 	popupTimer->stop();
 }
 
 
 void PackageListView::changePackageDest( int i )
 {
  	activePackage->setDest( destsMenu->text(i) );
   activePackage->setOn();
   activePackage->setLink( settings->createLinks() );
   activePackageListItem->displayDetails();
 }
 
 void PackageListView::toggleProcess()
 {
   activePackage->toggleProcess() ;
   activePackageListItem->displayDetails();
 }
diff --git a/noncore/unsupported/oipkg/packagelistview.h b/noncore/unsupported/oipkg/packagelistview.h
index a3db0d0..d371a34 100644
--- a/noncore/unsupported/oipkg/packagelistview.h
+++ b/noncore/unsupported/oipkg/packagelistview.h
@@ -1,55 +1,54 @@
 /***************************************************************************
                           packagelistview.h  -  description
                              -------------------
     begin                : Sat Apr 27 2002
     copyright            : (C) 2002 by tille
     email                : tille@handhelds.org
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef PACKAGELISTVIEW_H
 #define PACKAGELISTVIEW_H
 
 #include <qlistview.h>
 #include <qaction.h>
 #include <qtimer.h>
 #include <qwidget.h>
 #include <qpopupmenu.h>
 #include "debug.h"
 
 class PackageListItem;
 class Package;
 class PackageManagerSettings;
 
 class PackageListView : public QListView
 {
     Q_OBJECT
 
 public:
 	PackageListView(QWidget*, const char*, PackageManagerSettings*);
 //	~PackageListView();
   QTimer *popupTimer;
 private:
 	PackageManagerSettings *settings;
   Package *activePackage;
   PackageListItem *activePackageListItem;
   QPopupMenu *popupMenu;
   QPopupMenu *destsMenu;
 public slots:
   void showPopup();
   void changePackageDest( int );
   void setCurrent( QListViewItem* );
   void stopTimer( QListViewItem* );
-  /** No descriptions */
   void toggleProcess();
 };
 
 #endif
diff --git a/noncore/unsupported/oipkg/pkfind.ui b/noncore/unsupported/oipkg/pkfind.ui
deleted file mode 100644
index 7a24c00..0000000
--- a/noncore/unsupported/oipkg/pkfind.ui
+++ b/dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>Search</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>Form5</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>196</width>
-            <height>55</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Search Packages</string>
-    </property>
-    <hbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel4</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Find:</string>
-            </property>
-        </widget>
-        <widget>
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>pattern</cstring>
-            </property>
-        </widget>
-    </hbox>
-</widget>
-</UI>
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index 6c8dc2a..7e2ef10 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -41,192 +41,194 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent,  const char* na
   connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
   connect( newdestination, SIGNAL(clicked()), this, SLOT(newDestination()) );
   connect( removedestination, SIGNAL(clicked()), this, SLOT(removeDestination()) );
   connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
   //   connect( CheckBoxLink, SIGNAL(toggled(bool)),
   //    				 activeLinkDestination, SLOT(setEnabled(bool)) );
 
   connect( settingName, SIGNAL(activated(int)), this, SLOT(installationSettingChange(int)) );
   connect( settingName, SIGNAL(textChanged(const QString &)), this, SLOT(installationSettingSetName(const QString &)) );
   connect( newsetting, SIGNAL(clicked()), this, SLOT(newInstallationSetting()) );
   connect( renamesetting, SIGNAL(clicked()), this, SLOT(renameInstallationSetting()) );
   connect( removesetting, SIGNAL(clicked()), this, SLOT(removeInstallationSetting()) );
   servername->setEnabled(FALSE);
   serverurl->setEnabled(FALSE);
   serverurlDic.setAutoDelete(TRUE);
   destinationname->setEnabled(FALSE);
   destinationurl->setEnabled(FALSE);
   destinationurlDic.setAutoDelete(TRUE);
   readSettings();
 	activeLinkDestination->hide();
 }
 
 PackageManagerSettings::~PackageManagerSettings()
 {
 }
 
 
 void PackageManagerSettings::newServer()
 {
   int i = servers->count();
   if ( servername->isEnabled() || serverurl->text().isEmpty() ) {
     serverurlDic.insert(i,new QString("http://"));
     servers->insertItem(tr("New"));
     activeServers->insertItem(tr("New"));
   } else {
     // allows one-level undo
     serverurlDic.insert(i,new QString(serverurl->text()));
     servers->insertItem(servername->text());
     activeServers->insertItem(servername->text());
   }
   changed = true;
   servers->setSelected(i,TRUE);
   editServer(i);
   changed = true;
 }
 
 void PackageManagerSettings::newDestination()
 {
   int i = destinations->count();
   if ( destinationname->isEnabled() || destinationurl->text().isEmpty() ) {
     destinationurlDic.insert(i,new QString("/"));
     destinations->insertItem(tr("New"));
     activeDestination->insertItem(tr("New"));
     activeLinkDestination->insertItem(tr("New"));
   } else {
     // allows one-level undo
     destinationurlDic.insert(i,new QString(destinationurl->text()));
     destinations->insertItem(destinationname->text());
     activeDestination->insertItem(destinationname->text());
     activeLinkDestination->insertItem(destinationname->text());
   }
   destinations->setSelected(i,TRUE);
   editDestination(i);
   changed = true;
 }
 
 
 void PackageManagerSettings::editServer(int i)
 {
   if ( servername->isEnabled() ) {
     disconnect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) );
     disconnect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) );
   } else {
     servername->setEnabled(TRUE);
     serverurl->setEnabled(TRUE);
   }
 
   servername->setText( servers->text(i) );
   serverurl->setText( *serverurlDic[i] );
 
   editedserver = i;
 
   connect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) );
   connect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) );
   changed = true;
 }
 
 
 void PackageManagerSettings::editDestination(int i)
 {
   if ( destinationname->isEnabled() ) {
     disconnect( destinationname, SIGNAL(textChanged(const QString&)), this, SLOT(destNameChanged(const QString&)) );
     disconnect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) );
   } else {
     destinationname->setEnabled(TRUE);
     destinationurl->setEnabled(TRUE);
+    createLinksButton->setEnabled(TRUE);
+    removeLinksButton->setEnabled(TRUE);
   }
 
   destinationname->setText( destinations->text(i) );
   destinationurl->setText( *destinationurlDic[i] );
 
   editeddestination = i;
 
   connect( destinationname, SIGNAL(textChanged(const QString&)), this, SLOT(destNameChanged(const QString&)) );
   connect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) );
   changed = true;
 }
 
 void PackageManagerSettings::removeServer()
 {
   disconnect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) );
   disconnect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) );
   servername->setText(servers->text(editedserver));
   serverurl->setText(*serverurlDic[editedserver]);
   disconnect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
   servers->removeItem(editedserver);
   activeServers->removeItem(editedserver);
   connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
   servername->setEnabled(FALSE);
   serverurl->setEnabled(FALSE);
   changed = true;
 }
 
 void PackageManagerSettings::removeDestination()
 {
   disconnect( destinationname, SIGNAL(textChanged(const QString&)), this, SLOT(destNameChanged(const QString&)) );
   disconnect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) );
   destinationname->setText(destinations->text(editedserver));
   destinationurl->setText(*destinationurlDic[editedserver]);
   disconnect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
   destinations->removeItem(editeddestination);
   activeDestination->removeItem(editeddestination);
   activeLinkDestination->removeItem(editeddestination);
   connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
   destinationname->setEnabled(FALSE);
   destinationurl->setEnabled(FALSE);
   changed = true;
 }
 
 void PackageManagerSettings::serverNameChanged(const QString& t)
 {
   disconnect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
   servers->changeItem( t, editedserver );
   activeServers->changeItem( t, editedserver );
   changed = true;
   connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
   changed = true;
 }
 
 void PackageManagerSettings::destNameChanged(const QString& t)
 {
   disconnect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
   destinations->changeItem( t, editeddestination );
   activeDestination->changeItem( t, editeddestination );
   activeLinkDestination->changeItem( t, editeddestination );
   connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
   changed = true;
 }
 
 void PackageManagerSettings::serverUrlChanged(const QString& t)
 {
   serverurlDic.replace(editedserver, new QString(t));
   changed = true;
 }
 
 void PackageManagerSettings::destUrlChanged(const QString& t)
 {
   destinationurlDic.replace(editeddestination, new QString(t));
   changed = true;
 }
 
 void PackageManagerSettings::writeIpkgConfig(const QString& conffile)
 {
   QFile conf(conffile);
   if ( ! conf.open(IO_WriteOnly) ) return;
   QTextStream s(&conf);
   s << "# Written by qpie Package Manager\n";
   for (int i=0; i<(int)activeServers->count(); i++)
     {
       QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???");
       if ( !activeServers->isSelected(i) )
 	s << "#";
       s << "src " << activeServers->text(i) << " " << url << "\n";
     }
   for (int i=0; i<(int)destinations->count(); i++)
     {
       QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???");
       s << "dest " << destinations->text(i) << " " << url << "\n";
     }
   conf.close();
 }
 
@@ -435,108 +437,128 @@ void PackageManagerSettings::readSettings()
   readInstallationSettings();
 }
 
 void PackageManagerSettings::writeSettings()
 {
   if ( changed ) writeIpkgConfig("/etc/ipkg.conf");
   writeInstallationSettings();
 }
 /** shows the setting dialog */
 bool PackageManagerSettings::showDialog( int i )
 {
   TabWidget->setCurrentPage( i );
   showMaximized();
   bool ret = exec();
   if ( ret ) writeSettings();
   else readSettings();
   return (changed && ret);
 }
 /** Returns the installation destination */
 QString PackageManagerSettings::getDestinationName()
 {
   return activeDestination->currentText();
 }
 /** Returns the link destination */
 QString PackageManagerSettings::getLinkDestinationName()
 {
   return activeLinkDestination->currentText();
 }
 /** Returns the URL of the active destination */
 QString PackageManagerSettings::getDestinationUrl()
 {
   int dnr = activeDestination->currentItem();
   return *destinationurlDic.find(dnr);
 }
 /** Should oipkg create links form install destination to link destination */
 bool PackageManagerSettings::createLinks()
 {
   return CheckBoxLink->isChecked();
 }
 /** get the servers that are active */
 QStringList PackageManagerSettings::getActiveServers()
 {
   QStringList sl;	
   for (int i=0; i<(int)activeServers->count(); i++)
     {
       if ( activeServers->isSelected(i) )
 	sl += activeServers->text(i);
     }
   return sl;
 }
  QStringList PackageManagerSettings::getServers()
 {
   QStringList sl;	
   for (int i=0; i<(int)activeServers->count(); 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 )
 {
+	pvDebug(2,"PackageManagerSettings::linkEnabled "+QString(b?"yes":"no"));
   activeLinkDestination->setEnabled( b );
 }
 
 void PackageManagerSettings::activeServerChanged()
 {
 	changed = true;
 }
 
 QComboBox* PackageManagerSettings::getDestCombo()
 {
 	return new QComboBox(activeDestination);
 }
+
+void PackageManagerSettings::createLinksToDest()
+{
+	pvDebug(2,"creating links...");
+// 	emit doCreateLinks( destinationurl->text() );
+//	ipkg->createLinks( destinationurl );
+}
+
+void PackageManagerSettings::removeLinksToDest()
+{
+	pvDebug(2,"removing links...");
+// 	emit doRemoveLinks( destinationurl->text() );
+//	ipkg->removeLinks( destinationurl );
+}
+
+//void PackageManagerSettings::setIpkg( PmIpkg* i )
+//{
+//	ipkg = i;
+//}
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index fbb3b99..1632d4a 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -1,68 +1,74 @@
 #ifndef PACKAGEMANAGERSETTINGS_H
 #define PACKAGEMANAGERSETTINGS_H
 
 #include "pksettingsbase.h"
+//#include "pmipkg.h"
 #include <qintdict.h>
+#include <qobject.h>
 
 
-class PackageManagerSettings : private PackageManagerSettingsBase
+class PackageManagerSettings : public PackageManagerSettingsBase
 {
 //	 Q_OBJECT
 public: 
   PackageManagerSettings( QWidget* ,  const char* , WFlags  );
   ~PackageManagerSettings();
 
   bool showDialog( int ) ;
   QString getDestinationUrl();
   QString getDestinationName();
   QString getLinkDestinationName();
   bool createLinks();
   QStringList getServers();
   QStringList getActiveServers();
   QStringList getDestinationUrls();
   QStringList getDestinationNames();
   QString getDestinationUrlByName(QString);
-  /** No descriptions */
   QComboBox* getDestCombo();
-
-private:
-  QIntDict<QString> serverurlDic;
-  QIntDict<QString> destinationurlDic;
-  int ipkg_old;
-  int editedserver;
-  int editeddestination;
-  int currentSetting;
-  int installationSettingsCount;
-  bool changed;
-
-  bool readIpkgConfig(const QString&);
-  void writeIpkgConfig(const QString&);
-  void writeSettings();
-  void readSettings();
+//  void setIpkg( PmIpkg* );
 
 public slots:
   void writeInstallationSettings();
   void readInstallationSettings();
   void writeCurrentInstallationSetting();
   void readInstallationSetting(int);
   void installationSettingSetName(const QString &);
-
+	void removeLinksToDest();
+	void createLinksToDest();
   void newServer();
   void editServer(int);
   void removeDestination();
   void newDestination();
   void editDestination(int);
   void linkEnabled(bool);
   void removeServer();
   void serverNameChanged(const QString&);
   void serverUrlChanged(const QString&);
   void destNameChanged(const QString&);
   void destUrlChanged(const QString&);
   void installationSettingChange(int);
   void newInstallationSetting();
   void removeInstallationSetting();
   void renameInstallationSetting();
   void activeServerChanged();
+signals:
+//  void doCreateLinks( QString dest );
+//  void doRemoveLinks( QString dest );
+
+private:
+  QIntDict<QString> serverurlDic;
+  QIntDict<QString> destinationurlDic;
+  int ipkg_old;
+  int editedserver;
+  int editeddestination;
+  int currentSetting;
+  int installationSettingsCount;
+  bool changed;
+
+  bool readIpkgConfig(const QString&);
+  void writeIpkgConfig(const QString&);
+  void writeSettings();
+  void readSettings();
 };
 
 #endif
diff --git a/noncore/unsupported/oipkg/pksettingsbase.ui b/noncore/unsupported/oipkg/pksettingsbase.ui
index fd6d208..5b83248 100644
--- a/noncore/unsupported/oipkg/pksettingsbase.ui
+++ b/noncore/unsupported/oipkg/pksettingsbase.ui
@@ -1,110 +1,110 @@
 <!DOCTYPE UI><UI>
 <class>PackageManagerSettingsBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>Form4</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>345</width>
+            <width>337</width>
             <height>454</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Package Servers</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>3</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>3</number>
         </property>
         <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TabWidget</cstring>
             </property>
             <property stdset="1">
                 <name>enabled</name>
                 <bool>true</bool>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Settings</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>3</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout3_2</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Settings</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Installation Setups</string>
                                 </property>
                             </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
                                     <cstring>Spacer2_2_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
                                     <enum>Horizontal</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
                                     <enum>Expanding</enum>
                                 </property>
@@ -439,319 +439,448 @@
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Servers</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Servers</string>
                                 </property>
                             </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
                                     <cstring>Spacer2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
                                     <enum>Horizontal</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
                                     <enum>Expanding</enum>
                                 </property>
                                 <property>
                                     <name>sizeHint</name>
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
                         </hbox>
                     </widget>
                     <widget row="1"  column="0"  rowspan="1"  colspan="2" >
                         <class>QListBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>servers</cstring>
                         </property>
                         <property stdset="1">
                             <name>selectionMode</name>
                             <enum>Extended</enum>
                         </property>
                     </widget>
                     <widget row="2"  column="1" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>removeserver</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>true</bool>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Remove</string>
                         </property>
                         <property stdset="1">
                             <name>autoDefault</name>
                             <bool>false</bool>
                         </property>
                     </widget>
                     <widget row="2"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>newserver</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>true</bool>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>New</string>
                         </property>
                         <property stdset="1">
                             <name>autoDefault</name>
                             <bool>false</bool>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Destinations</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>3</number>
+                        <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>3</number>
+                        <number>2</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout3</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Destinations</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Destinations</string>
                                 </property>
                             </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
                                     <cstring>Spacer2_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
                                     <enum>Horizontal</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
                                     <enum>Expanding</enum>
                                 </property>
                                 <property>
                                     <name>sizeHint</name>
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
                         </hbox>
                     </widget>
                     <widget row="1"  column="0" >
                         <class>QListBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>destinations</cstring>
                         </property>
                         <property stdset="1">
                             <name>selectionMode</name>
                             <enum>Single</enum>
                         </property>
                     </widget>
                     <widget row="2"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout5</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>newdestination</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>true</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>New</string>
                                 </property>
                                 <property stdset="1">
                                     <name>autoDefault</name>
                                     <bool>false</bool>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>removedestination</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>true</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Remove</string>
                                 </property>
                                 <property stdset="1">
                                     <name>autoDefault</name>
                                     <bool>false</bool>
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
                     <widget row="3"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Layout11</cstring>
                         </property>
                         <property>
                             <name>layoutMargin</name>
                         </property>
                         <property>
                             <name>layoutSpacing</name>
                         </property>
                         <grid>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>3</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>3</number>
                             </property>
                             <widget row="1"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1_3_2_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>URL:</string>
                                 </property>
                             </widget>
                             <widget row="0"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>destinationname</cstring>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>destinationurl</cstring>
                                 </property>
                             </widget>
                             <widget row="0"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel1_3_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Name:</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
+                    <widget row="4"  column="0" >
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout11</cstring>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>createLinksButton</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>link to /</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>removeLinksButton</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Remove links</string>
+                                </property>
+                            </widget>
+                        </hbox>
+                    </widget>
+                    <widget row="5"  column="0" >
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox1</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string></string>
+                        </property>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget row="0"  column="0" >
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout12</cstring>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget>
+                                        <class>QCheckBox</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>CheckBoxvolatile</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>enabled</name>
+                                            <bool>false</bool>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>volatile</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QCheckBox</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>removeable</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>enabled</name>
+                                            <bool>false</bool>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>removeable</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                        </grid>
+                    </widget>
                 </grid>
             </widget>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
         <sender>activeServers</sender>
         <signal>pressed(QListBoxItem*)</signal>
         <receiver>Form4</receiver>
         <slot>activeServerChanged()</slot>
     </connection>
     <connection>
         <sender>activeServers</sender>
         <signal>selectionChanged(QListBoxItem*)</signal>
         <receiver>Form4</receiver>
         <slot>activeServerChanged()</slot>
     </connection>
     <connection>
         <sender>activeServers</sender>
         <signal>pressed(QListBoxItem*)</signal>
         <receiver>Form4</receiver>
         <slot>activeServerChanged()</slot>
     </connection>
+    <connection>
+        <sender>createLinksButton</sender>
+        <signal>clicked()</signal>
+        <receiver>Form4</receiver>
+        <slot>createLinksToDest()</slot>
+    </connection>
+    <connection>
+        <sender>removeLinksButton</sender>
+        <signal>clicked()</signal>
+        <receiver>Form4</receiver>
+        <slot>removeLinksToDest()</slot>
+    </connection>
+    <slot access="public">activeServerChanged()</slot>
+    <slot access="public">createLinksToDest()</slot>
     <slot access="public">destNameChanged(const QString&amp;)</slot>
     <slot access="public">destUrlChanged(const QString&amp;)</slot>
     <slot access="public">editDestination(int)</slot>
     <slot access="public">editServer(int)</slot>
     <slot access="public">installationSettingChange(int)</slot>
     <slot access="public">installationSettingSetName(const QString &amp;)</slot>
     <slot access="public">linkEnabled(bool)</slot>
     <slot access="public">newDestination()</slot>
     <slot access="public">newInstallationSetting()</slot>
     <slot access="public">newServer()</slot>
-    <slot access="public">activeServerChanged()</slot>
     <slot access="public">removeDestination()</slot>
     <slot access="public">removeInstallationSetting()</slot>
+    <slot access="public">removeLinksToDest()</slot>
     <slot access="public">removeServer()</slot>
     <slot access="public">renameInstallationSetting()</slot>
     <slot access="public">serverNameChanged(const QString&amp;)</slot>
     <slot access="public">serverUrlChanged(const QString&amp;)</slot>
 </connections>
 </UI>
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 9f6429a..fe200f5 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -117,334 +117,332 @@ 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( "<b>Panik!</b> Could not open:<br>"+packFileName );
    	return (QStringList*)0;
   }
   QStringList *fileList = new QStringList();
   QTextStream t( &f );
   while ( !t.eof() )
     {
       *fileList += t.readLine();
     }	
   return fileList;
 }
 
 void PmIpkg::linkPackage( QString packFileName, QString dest )
 {
 	QStringList *fileList = getList( packFileName, dest );
  	processFileList( fileList, dest );
   delete fileList;
 }
 
 void PmIpkg::processFileList( QStringList *fileList, QString d )
 {
 	if (!fileList) return;
   for (uint i=0; i < fileList->count(); i++)
     {
       QString dest = settings->getDestinationUrlByName( d );
 		 	dest = dest==""?d:dest;
       processLinkDir( (*fileList)[i], dest );
     }	
 }
 
 
 void PmIpkg::processLinkDir( QString file, QString dest )
 {
 	pvDebug( 7,"PmIpkg::processLinkDir "+file+" to "+ dest);
  	if (linkOpp==createLink) pvDebug( 2,"opp: createLink");
  	if (linkOpp==removeLink) pvDebug( 2,"opp:removeLink");
 	if ( dest == "???" || dest == "" ) return;
   QString destFile = file;
 	file = dest+"/"+file;
  	if (file == dest) return;
   QFileInfo fileInfo( file );
   if ( fileInfo.isDir() )
   {
   	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, "process dir "+fi->absFilePath());
   		processLinkDir( fi->absFilePath(), dest );      			
 			++it;
     }
 //    if (linkOpp==removeLink)
 //    {
 //    	pvDebug(2,"remove  destDir "+ destFile );
 //    	destDir.remove( destFile, true );
 //    }
   } else
   if ( fileInfo.isFile() )
   {
     const char *instFile = strdup( (file).ascii() );
     const char *linkFile = strdup(  (destFile).ascii());
     if( linkOpp==createLink )
 		{
     	pvDebug(4, "linking: "+file+" -> "+destFile );
     	symlink( instFile, linkFile );
   	}
   }  else  {
     const char *linkFile = strdup(  (destFile).ascii());
     if( linkOpp==removeLink )
     {
       pvDebug(4,"removing "+destFile+" no "+file);
       QFileInfo toRemoveLink( destFile );
     	if ( !QFile::exists( file ) && toRemoveLink.isSymLink() )
      		unlink( linkFile ); 	
     }
   }
 }
 
-void PmIpkg::commit( PackageList pl )
+void PmIpkg::loadList( PackageList pl )
 {   	
-  int sizecount = 0;  	
-  to_install.clear();
-  to_remove.clear();
-  QString rem="<b>"+tr("To remove:")+"</b><br>\n";
-  QString inst="<b>"+tr("To install:")+"</b><br>\n";
   for( Package *pack = pl.first();pack ; (pack = pl.next())  )
     {
       if ( pack && (pack->name() != "") && pack)
 	{
 	  if ( pack->toInstall() )
-	    {
 	      to_install.append( pack );
-       	sizecount += pack->size().toInt();
-	      inst += pack->name()+"\t("+tr("on ")+pack->dest()+")<br>";
-	    }
 	  if ( pack->toRemove() )
-	    {
 	      to_remove.append( pack );
-       	sizecount += 1;
-	      rem += pack->name()+"<br>";
 	    }
 	}
     }
 
+void PmIpkg::commit( PackageList pl )
+{   	
+  sizecount = 0;
+  QString rem="<b>"+tr("To remove:")+"</b><br>\n";
+  QString inst="<b>"+tr("To install:")+"</b><br>\n";
+  loadList(pl);
+  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();
 	startDialog();
-
 }
 
 void PmIpkg::startDialog()
 {
   installDialog = new QDialog(0,0,true);
   QGridLayout *RunWindowLayout = new QGridLayout( installDialog );
   RunWindowLayout->setSpacing( 2 );
   RunWindowLayout->setMargin( 2 );
 
     PackageListView *plv = new PackageListView(installDialog, "install",settings);
     plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) );
     RunWindowLayout->addWidget( plv, 1, 0 );
 		QCheckListItem *toRemoveItem;
 		toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") );
   	toRemoveItem->setOpen( true );
     for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
 	  {
       toRemoveItem->insertItem( new PackageListItem(plv, it,settings) );
    	} 	
 		QCheckListItem *toInstallItem;
 		toInstallItem = new QCheckListItem( plv, QObject::tr("To install") );
   	toInstallItem->setOpen( true );
     for (Package *it=to_install.first(); it != 0; it=to_install.next() )
     {
       toInstallItem->insertItem( new PackageListItem(plv, it,settings) );
     }
 
     QGroupBox *GroupBox1 = new QGroupBox( installDialog, "Ipkg" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().hasHeightForWidth() ) );
+    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().mayShrinkVertically() ) );
     GroupBox1->setTitle( tr( "Ipkg options" ) );
     GroupBox1->setColumnLayout(0, Qt::Vertical );
     GroupBox1->layout()->setSpacing( 0 );
     GroupBox1->layout()->setMargin( 0 );
     QGridLayout *GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
     GroupBox1Layout->setAlignment( Qt::AlignTop );
     GroupBox1Layout->setSpacing( 3 );
     GroupBox1Layout->setMargin( 3 );
-
     _force_depends = new QCheckBox( GroupBox1, "_force_depends" );
     _force_depends->setText( tr( "-force-depends" ) );
     _force_depends->setAutoResize( TRUE );
+    _force_depends->setChecked(true);
     GroupBox1Layout->addWidget( _force_depends, 0, 0 );
     _force_reinstall = new QCheckBox( GroupBox1, "_force_reinstall" );
     _force_reinstall->setText( tr( "-force-reinstall" ) );
     _force_reinstall->setAutoResize( TRUE );
     GroupBox1Layout->addWidget( _force_reinstall, 1, 0 );
     _force_remove = new QCheckBox( GroupBox1, "_force_remove" );
     _force_remove->setText( tr( "-force-removal-of-essential-packages" ) );
     _force_remove->setAutoResize( TRUE );
     GroupBox1Layout->addWidget( _force_remove, 1, 0 );
     RunWindowLayout->addWidget( GroupBox1 , 3, 0 );
 
 //  connect( doItButton, SIGNAL( clicked() ),
 //  					this, SLOT( doIt() ) );
 //  connect( installButton, SIGNAL( clicked() ),
 //  					this, SLOT( install() ) );
 //  connect( removeButton, SIGNAL( clicked() ),
 //  					this, SLOT( remove() ) );
 //  connect( cancelButton, SIGNAL( clicked() ),
 //  					installDialog, SLOT( close() ) );
   installDialog->showMaximized();
   if ( installDialog->exec() ) doIt();
  	installDialog->close();
   out(tr("<b>All done.</b>"));
 }
 
 void PmIpkg::doIt()
 {
 	show( true );
  	remove();
   install();
 }
 
 
 void PmIpkg::remove()
 {
  	if ( to_remove.count() == 0 ) return;
 
 	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() )
    {
 			if ( it->link() )fileList = getList( it->name(), it->dest() );     	
       if ( runIpkg("remove " + it->name()) == 0)
       {
         runwindow->progress->setProgress( 1 + runwindow->progress->progress() );
        	linkOpp = removeLink;
 	    	if ( it->link() )
       	{
 					out( "<br>removing links<br>" );
   				out( "for package "+it->name()+" in "+it->dest()+"<br>" );
       		processFileList( fileList, it->dest() );
         }
      		it->processed();
+       	
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
       }
      	pvDebug(2,"delete File List");
 	  if ( it->link() )delete fileList;
     }
     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->getPackageName(), it->dest() ) == 0 )
+      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();
         out("<br><hr>");
   		}else{
       	out("<b>"+tr("Error while installing")+"</b><hr>"+it->name());
       }
     }
     out("<br>");
 }
 
 void PmIpkg::createLinks( const QString &dest )
 {
 	pvDebug(2,"PmIpkg::createLinks "+dest);
 	linkOpp=createLink;
  	QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
 	processLinkDir( "/", url );
 }
 
 void PmIpkg::removeLinks( const QString &dest )
 {
 	pvDebug(2,"PmIpkg::removeLinks "+dest);
 	linkOpp=removeLink;
  	QString url = settings->getDestinationUrlByName( dest );
   url = url==""?dest:url;
 	processLinkDir( "/", url );
 }
 
 void PmIpkg::update()
 {
 	show( false );
 	runIpkg( "update" );
  	runwindow->close();
 }
 
 void PmIpkg::out( QString o )
 {
 	runwindow->outPut->append(o);	
  	//runwindow->outPut->setCursorPosition(0, runwindow->outPut->contentsHeight());
 //	runwindow->outPut->setText( runwindow->outPut->text()+o );
   runwindow->outPut->setContentsPos(0, runwindow->outPut->contentsHeight());
 }
 
 
 void PmIpkg::showButtons(bool b)
 {
 	if ( b )
  	{
 		runwindow->cancelButton->hide();
  		runwindow->doItButton->hide();
 	  runwindow->removeButton->hide();
   	runwindow->installButton->hide();
   }else{
 		runwindow->cancelButton->show();
  		runwindow->doItButton->show();
 	  runwindow->removeButton->show();
   	runwindow->installButton->show();
 
   }
 }
 
 void PmIpkg::show(bool b)
 {
 	if (!runwindow->isVisible())
 	  runwindow->showMaximized();
 	showButtons(b);
 	if ( !b )
  		runwindow->progress->hide();
   else
  		runwindow->progress->show();
 }
 
 void PmIpkg::installFile(const QString &fileName, const QString &dest)
 {
 
 	to_install.clear();
   to_remove.clear();
 	pvDebug( 2,"PmIpkg::installFile "+ fileName);
  	Package *p = new Package(fileName,settings);
   if ( dest!="") p->setDest( dest );
 	to_install.append( p );
 	startDialog();
  	delete p;
 }
 
 void PmIpkg::removeFile(const QString &fileName, const QString &dest)
 {
 
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 0625032..2b89023 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -1,64 +1,66 @@
 #ifndef PMIPKG_H
 #define PMIPKG_H
 
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 #include "pksettings.h"
 #include "runwindow.h"
 #include "packagelist.h"
 #include "debug.h"
 
 #define createLink 0
 #define removeLink 1
 
 class Package;
 class PmIpkg : public QObject
 {
   Q_OBJECT
 public:
   PmIpkg( PackageManagerSettings* , QWidget* p=0,  const char * name=0, WFlags f=0 );
   ~PmIpkg();
 
   int linkOpp;
+  void loadList( PackageList );
   void commit( PackageList );
   void update();
  // PackageList* getPackageList();
   void showButtons(bool b=true);
   void show( bool buttons=true );
 
 public slots:
 	void doIt();
  	void install();
   void remove();
   void installFile(const QString &fileName, const QString &dest="");
   void removeFile(const QString &fileName, const QString &dest="");
   void createLinks( const QString &dest );
   void removeLinks( const QString &dest );
 
 private:
+	int sizecount;
   PackageManagerSettings* settings;
   RunWindow *runwindow;
   QDialog *installDialog;
   QList<Package> to_remove;
   QList<Package> to_install;
   bool runwindowopen;
   QString fileNameToInstall;
   QCheckBox *_force_reinstall;
   QCheckBox *_force_remove;
   QCheckBox *_force_depends;
   void startDialog();
   void makeLinks(Package*);
   void linkPackage( QString, QString );
   void processLinkDir( QString , QString );
   int  runIpkg(const QString& args, const QString& dest="" );
   void out( QString );
 	QStringList* getList( QString, QString );
 	void processFileList( QStringList*, QString );
  	
 
 };
 
 #endif
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h
index e2072f1..3be4334 100644
--- a/noncore/unsupported/oipkg/settings.h
+++ b/noncore/unsupported/oipkg/settings.h
@@ -1,63 +1,67 @@
 #ifndef PACKAGEMANAGERSETTINGS_H
 #define PACKAGEMANAGERSETTINGS_H
 
 #include "pksettingsbase.h"
 #include <qintdict.h>
 
 
 class PackageManagerSettings : public PackageManagerSettingsBase
 //class PackageManagerSettings : private PackageManagerSettingsBase
 {
   //	 Q_OBJECT
 public: 
   PackageManagerSettings( QWidget* ,  const char* , WFlags  );
   ~PackageManagerSettings();
 
   bool showDialog( int ) ;
   QString getDestinationUrl();
   QString getDestinationName();
   QString getLinkDestinationName();
   bool createLinks();
   QStringList getActiveServers();
   QStringList getDestinationUrls();
 
 public slots:
 	void writeInstallationSettings();
   void readInstallationSettings();
   void writeCurrentInstallationSetting();
   void readInstallationSetting(int);
   void installationSettingSetName(const QString &);
   void activeDestinationChange(int)
   void newServer();
   void editServer(int);
   void removeDestination();
   void newDestination();
   void editDestination(int);
   void linkEnabled(bool);
   void removeServer();
   void serverNameChanged(const QString&);
   void serverUrlChanged(const QString&);
   void destNameChanged(const QString&);
   void destUrlChanged(const QString&);
   void installationSettingChange(int);
   void newInstallationSetting();
   void removeInstallationSetting();
   void renameInstallationSetting();
 
 private:
   QIntDict<QString> serverurlDic;
   QIntDict<QString> destinationurlDic;
   int ipkg_old;
   int editedserver;
   int editeddestination;
   int currentSetting;
   int installationSettingsCount;
   bool changed;
 
   bool readIpkgConfig(const QString&);
   void writeIpkgConfig(const QString&);
   void writeSettings();
   void readSettings();
 };
 
 #endif
+                                                                                                                                                                                                  /** No descriptions */
+  void createLinks();
+  /** No descriptions */
+  void removeLinks();