handles different versions of the same package

1 files changed, 3 insertions, 2 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 06828e0..4865c39 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -42,50 +42,48 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
         //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 );
 
@@ -265,50 +263,53 @@ void MainWindow::updateList()
         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;
 
+//  if (!rootLocal)
+//  {
         QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local"));
         QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
+//  }
   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();
           }
 }
 
 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() ) );