1 files changed, 17 insertions, 9 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index b485a03..cb2b4cd 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -30,63 +30,70 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   makeMenu();		
 
   QFontMetrics fm = fontMetrics();
   int w0 = fm.width(tr("Package"))+30;
   int w2 = fm.width("00000")+4;
   table->ListViewPackages->setColumnWidth(0,w0);
   table->ListViewPackages->setColumnWidth(1,228-w2-w0); // ### screen-biased
   table->ListViewPackages->setColumnWidth(2,w2);
   table->ListViewPackages->setColumnWidthMode(0,QListView::Manual);
   table->ListViewPackages->setColumnWidthMode(1,QListView::Manual);
   table->ListViewPackages->setColumnWidthMode(2,QListView::Manual);
   table->ListViewPackages->setSelectionMode( QListView::Multi );
 
   connect( table->section, SIGNAL( activated(int) ),
 	   this, SLOT( sectionChanged() ) );
   connect( table->subsection, SIGNAL(activated(int) ),
 	   this, SLOT( subSectionChanged() ) );
   connect( table->ListViewPackages, SIGNAL( clicked( QListViewItem* ) ),
 	   this, SLOT( setCurrent( QListViewItem* ) ) );
 	
   settings = new PackageManagerSettings(this,0,TRUE);
 
   ipkg = new PmIpkg( settings, this );
   packageList.setSettings( settings );
-  newList();	
+  getList();	
   setSections();
   setSubSections();
   displayList();
 }
 
 void MainWindow::makeMenu()
 {
 
   QPEToolBar *toolBar = new QPEToolBar( this );
   QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
   QPopupMenu *srvMenu = new QPopupMenu( menuBar );
   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
   //    QPopupMenu *sectMenu = new QPopupMenu( menuBar );
 
+//#define TOOLBAR
+#ifdef TOOLBAR
+	QPEToolBar *secBar = new QPEToolBar( this );
+  QComboBox *sections = new QComboBox( false, this );
+ 	secBar->addTo( sections );
+#endif
+
   contextMenu = new QPopupMenu( this );
 
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Package" ), srvMenu );
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
   //    menuBar->insertItem( tr( "Sections" ), sectMenu );
 
   toolBar->setStretchableWidget (srvMenu);
 
 		
   runAction = new QAction( tr( "Run" ),
 			   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/repeat" ),
 			      QString::null, 0, this, 0 );
@@ -113,61 +120,62 @@ void MainWindow::makeMenu()
   cfgact->addTo( cfgMenu );
 		
   cfgact = new QAction( tr( "Servers" ),
 			Resource::loadIconSet( "" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettingsSrv() ) );
   cfgact->addTo( cfgMenu );
   cfgact = new QAction( tr( "Destinations" ),
 			Resource::loadIconSet( "" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettingsDst() ) );
   cfgact->addTo( cfgMenu );
 	
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 void MainWindow::runIpkg()
 {
   ipkg->commit( packageList );
-  ipkg->runIpkg("update");
-  packageList.update();
+  updateList();
 }
 
 void MainWindow::updateList()
 {
-  ipkg->runIpkg("update");
-  packageList.update();
+ // todo: packageList.clear();
+  ipkg->update();
+  getList();
 }
 
-void MainWindow::newList()
+void MainWindow::getList()
 {
   packageList.update();
+  displayList();
 }
 
 void MainWindow::filterList()
 {
   packageList.filterPackages();
 }
 
 void MainWindow::displayList()
 {
   table->ListViewPackages->clear();
   Package *pack = packageList.first();
   while( pack )
     {
       if ( pack && (pack->name() != "") )
 	{
 	  table->ListViewPackages->insertItem(
 					      new PackageListItem( table->ListViewPackages, pack ) );
 	}
       pack = packageList.next();
     }	
 }
 
 void MainWindow::sectionChanged()
 {
@@ -196,59 +204,59 @@ void MainWindow::subSectionChanged()
   filterList();
   connect( table->section, SIGNAL( activated(int) ),
 	   this, SLOT( sectionChanged() ) );
   connect( table->subsection, SIGNAL(activated(int) ),
 	   this, SLOT( subSectionChanged() ) );
   displayList();
 }
 
 void MainWindow::setSections()
 {
   table->section->clear();
   table->section->insertStringList( packageList.getSections() );
 }
 
 void MainWindow::setSubSections()
 {
   table->subsection->clear();
   table->subsection->insertStringList( packageList.getSubSections() );
 }
 
 
 void MainWindow::showSettings()
 {
   if ( settings->showDialog( 0 ) )
-    newList();
+    getList();
 }
 void MainWindow::showSettingsSrv()
 {
   if ( settings->showDialog( 1 ) )
-    newList();
+    getList();
 }
 void MainWindow::showSettingsDst()
 {
   if ( settings->showDialog( 2 ) )
-    newList();
+    getList();
 }
 
 
 void MainWindow::showDetails()
 {
   if ( activePackage ) return;
   if ( details )
     {
       details = new PackageDetails( this );
       connect( details->install, SIGNAL(clicked()), SLOT( toggleActivePackage() ) );
       connect( details->remove,  SIGNAL(clicked()), SLOT( toggleActivePackage() ) );
       connect( details->ignore,  SIGNAL(clicked()), details, SLOT(close()));
       details->description->setTextFormat(RichText);
     }
 
   details->setCaption("Package: " + activePackage->name());
   details->description->setText(activePackage->details() );
   details->install->setEnabled(!activePackage->installed());
   details->remove->setEnabled(activePackage->installed());
   details->showMaximized();
 }
 
 void MainWindow::toggleActivePackage()
 {