1 files changed, 28 insertions, 63 deletions

diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp
index 0d6fa80..3c7435d 100644
--- a/noncore/unsupported/oipkg/packagelistview.cpp
+++ b/noncore/unsupported/oipkg/packagelistview.cpp
@@ -14,2 +14,3 @@
 
+#include "listviewitemoipkg.h"
 #include "packagelistitem.h"
@@ -21,4 +22,2 @@ PackageListView::PackageListView(QWidget *p, const char* n, PackageManagerSettin
         settings = s;
-                popupMenu = new QPopupMenu( this );
-        destsMenu = new QPopupMenu( popupMenu );
   popupTimer = new QTimer( this );
@@ -43,18 +42,24 @@ void PackageListView::setCurrent( QListViewItem* p )
 {
-  if ( !p ) return;
-  activePackageListItem = (PackageListItem*)p;
-  activePackage = activePackageListItem->getPackage();
-  if (!activePackage)
-  {
-        //      QDictIterator<QCheckListItem> it( rootItems );
-        //      while ( it.current() )
+  qDebug("PackageListView::setCurrent ");
+  activeItem = (ListViewItemOipkg*)p;
+
+  if ( activeItem != 0 ) popupTimer->start( 750, true );
+  
+//  if ( activeItem->getType() != ListViewItemOipkg::Package ){
+//    qDebug("PackageListView::setCurrent !p ");
+//    activePackage = 0;
+        //  activePackageListItem = 0;
+//    qDebug("PackageListView::setCurrent returning ");
+//    return;
+//  };
+//  activePackageListItem = (PackageListItem*)p;
+//  activePackage = activePackageListItem->getPackage();
+//  if (activePackage == 0 )
 //    {
-        //              if ( it.current()==p )
-        //              pvDebug(2,"current item");
-        //              ++it;
+//      qDebug("PackageListView::setCurrent  if (!activePackage)");
+//      return;
         //      }
 
-                return;
-  }
-  popupTimer->start( 750, true );
+
+  qDebug("PackageListView::setCurrent popupTimer->start");
 }
@@ -64,33 +69,7 @@ void PackageListView::showPopup()
 {
-  popupMenu->clear();
-  destsMenu->clear();
-                
-         QAction *popupAction;
-  if ( !activePackage->installed() )
-  {
-          popupMenu->insertItem( 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{
-           popupAction = new QAction( tr("Remove"),QString::null,  0, this, 0 );
-                popupAction->addTo( popupMenu );
-          connect( popupAction, SIGNAL( activated() ),
-                   this , SLOT( toggleProcess() ) );
-           popupAction = new QAction( tr("Reinstall"),QString::null,  0, this, 0 );
-                popupAction->addTo( popupMenu );
-          popupAction->setEnabled( false );
-   }
-  popupMenu->popup( QCursor::pos() );
+  qDebug("PackageListView::showPopup");
+  QPopupMenu *popup = activeItem->getPopupMenu();
+  if (popup == 0) return;
+  popup->popup( QCursor::pos() );
+  qDebug("PackageListView::showPopup");
 }
@@ -103,16 +82,2 @@ void PackageListView::stopTimer( QListViewItem* )
 
-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();
-}
-
 void PackageListView::display()
@@ -121,5 +86,5 @@ void PackageListView::display()
         PackageList *packlist;
-        Package *pack;
+  OipkgPackage *pack;
   PackageListItem *item;
-  QCheckListItem *rootItem;
+  ListViewItemOipkg *rootItem;
   QListViewItem* it;
@@ -150,3 +115,3 @@ void PackageListView::addList( QString n, PackageList* pl)
         PackageLists.insert(n, pl);
-         QCheckListItem *item = new QCheckListItem(this,n);
+  ListViewItemOipkg *item = new ListViewItemOipkg(this,n,ListViewItemOipkg::Feed);
          rootItems.insert(n, item);