1 files changed, 20 insertions, 31 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 0422d65..b668660 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -39,6 +39,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   listViewPackages =  new PackageListView( this,"listViewPackages",settings );
   setCentralWidget( listViewPackages );
-  listViewPackages->addList( tr("local"), &packageList );
+  listViewPackages->addList( tr("feeds"), &packageListServers );
   listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
+  listViewPackages->addList( tr("documents"), &packageListDocLnk );
         //wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton);
         //wait = new QMessageBox(this);
@@ -46,7 +47,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   ipkg = new PmIpkg( settings, this );
 //  settings->setIpkg( ipkg );
-  packageList.setSettings( settings );
+  packageListServers.setSettings( settings );
   packageListSearch.setSettings( settings );
-  packageList.update();
+  packageListDocLnk.setSettings( settings );
+  packageListServers.update();
+  packageListDocLnk.update();
           makeMenu();
   makeChannel();
@@ -245,7 +248,8 @@ MainWindow::~MainWindow()
 void MainWindow::runIpkg()
 {
-  packageList.allPackages();
+  packageListServers.allPackages();
   ipkg->loadList( packageListSearch );
-  ipkg->commit( packageList );
+  ipkg->loadList( packageListDocLnk );
+  ipkg->commit( packageListServers );
   // ##### 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".
@@ -262,7 +266,11 @@ void MainWindow::updateList()
   connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
   t->start( 0, false );
-        packageList.clear();
+        packageListServers.clear();
+        packageListSearch.clear();
+  packageListDocLnk.clear();
   ipkg->update();
-  packageList.update();
+  packageListServers.update();
+  packageListSearch.update();
+  packageListDocLnk.update();
   t->stop();
         //      wait->hide();  
@@ -274,5 +282,5 @@ void MainWindow::filterList()
          QString f = "";
   if ( findAction->isOn() ) f = findEdit->text();
-  packageList.filterPackages( f );
+  packageListServers.filterPackages( f );
         //wait->hide();
 }
@@ -283,23 +291,4 @@ void MainWindow::displayList()
         filterList();
   listViewPackages->display();
-////  if (!rootLocal)
-////  {
-        //QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local"));
-        //QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
-////  }
-//  listViewPackages->clear();
-//  Package *pack = packageList.first();
-//  PackageListItem *item;
-//  while( pack )
-//  {
-        //              item = new PackageListItem( rootLocal, pack, settings );                        
-//    pack = packageList.next();
-        //  }
-//  pack = packageListSearch.first();
-//  while( pack )
-//  {
-        //              item = new PackageListItem( rootSearch, pack, settings );                       
-//    pack = packageListSearch.next();
-        //  }
 }
 
@@ -311,5 +300,5 @@ void MainWindow::sectionChanged()
               this, SLOT( subSectionChanged() ) );
   subsection->clear();
-  packageList.setSection( section->currentText() );
+  packageListServers.setSection( section->currentText() );
   setSubSections();
   connect( section, SIGNAL( activated(int) ),
@@ -326,5 +315,5 @@ void MainWindow::subSectionChanged()
   disconnect( subsection, SIGNAL(activated(int) ),
               this, SLOT( subSectionChanged() ) );
-  packageList.setSubSection( subsection->currentText() );
+  packageListServers.setSubSection( subsection->currentText() );
   connect( section, SIGNAL( activated(int) ),
            this, SLOT( sectionChanged() ) );
@@ -337,5 +326,5 @@ void MainWindow::setSections()
 {
   section->clear();
-  section->insertStringList( packageList.getSections() );
+  section->insertStringList( packageListServers.getSections() );
 }
 
@@ -343,5 +332,5 @@ void MainWindow::setSubSections()
 {
   subsection->clear();
-  subsection->insertStringList( packageList.getSubSections() );
+  subsection->insertStringList( packageListServers.getSubSections() );
 }