1 files changed, 19 insertions, 3 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 3ce7960..6f528a1 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -303,206 +303,222 @@ void NetworkPackageManager :: upgradePackages()
         serverSelected(-1);
     }
 }
 
 
 void NetworkPackageManager :: downloadPackage()
 {
     if ( download->text() == "Download" )
     {
         // First, write out ipkg_conf file so that ipkg can use it
         dataMgr->writeOutIpkgConf();
         
         // Display dialog to user asking where to download the files to
         bool ok = FALSE;
         QString dir = "";
 #ifdef QWS
         // read download directory from config file
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         dir = cfg.readEntry( "downloadDir", "/home/root/Documents/application/ipkg" );
 #endif
 
         QString text = InputDialog::getText( tr( "Download to where" ), tr( "Enter path to download to" ), dir, &ok, this );
         if ( ok && !text.isEmpty() )
             dir = text;   // user entered something and pressed ok
         else
             return; // user entered nothing or pressed cancel
 
 #ifdef QWS
         // Store download directory in config file
         cfg.writeEntry( "downloadDir", dir );
 #endif
 
         // Get starting directory
         char initDir[PATH_MAX];
         getcwd( initDir, PATH_MAX );
 
         // Download each package
         Ipkg ipkg;
         connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
 
         ipkg.setOption( "download" );
         ipkg.setRuntimeDirectory( dir );
         for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
               item != 0 ;
               item = (QCheckListItem *)item->nextSibling() )
         {
             if ( item->isOn() )
             {
                 QString name = item->text();
                 int pos = name.find( "*" );
                 name.truncate( pos );
 
                 // if (there is a (installed), remove it
                 pos = name.find( "(installed)" );
                 if ( pos > 0 )
                     name.truncate( pos - 1 );
 
                 ipkg.setPackage( name );
                 ipkg.runIpkg( );
             }
         }
     }
     else if ( download->text() == "Remove" )
     {
         for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
               item != 0 ;
               item = (QCheckListItem *)item->nextSibling() )
         {
             if ( item->isOn() )
             {
                 QString name = item->text();
                 int pos = name.find( "*" );
                 name.truncate( pos );
 
                 // if (there is a (installed), remove it
                 pos = name.find( "(installed)" );
                 if ( pos > 0 )
                     name.truncate( pos - 1 );
                
                 Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name );
                 QFile f( p->getFilename() );
                 f.remove();
             }
         }
     }
 
     dataMgr->reloadServerData( LOCAL_IPKGS );
     serverSelected( -1 );
 }
 
 
 void NetworkPackageManager :: applyChanges()
 {
     // Disable buttons to stop silly people clicking lots on them :)
     
     // First, write out ipkg_conf file so that ipkg can use it
     dataMgr->writeOutIpkgConf();
 
     // Now for each selected item
     // deal with it
 
 	vector<QString> workingPackages;
     for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
           item != 0 ;
           item = (QCheckListItem *)item->nextSibling() )
     {
         if ( item->isOn() )
         {
             QString p = dealWithItem( item );
             workingPackages.push_back( p );
 		}
     }
 
     // do the stuff
     InstallDlgImpl dlg( workingPackages, dataMgr, this, "Install", true );
     dlg.showDlg();
 
     // Reload data
     dataMgr->reloadServerData( LOCAL_SERVER );
 
     dataMgr->reloadServerData( serversList->currentText() );
     serverSelected(-1);
 
 #ifdef QWS
     // Finally let the main system update itself
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     QString lf = QString::null;
     e << lf;
 #endif
 }
 
 // decide what to do - either remove, upgrade or install
 // Current rules:
 //    If not installed - install
 //    If installed and different version available - upgrade
 //    If installed and version up to date - remove
 QString NetworkPackageManager :: dealWithItem( QCheckListItem *item )
 {
     QString name = item->text();
     int pos = name.find( "*" );
     name.truncate( pos );
 
     // if (there is a (installed), remove it
     pos = name.find( "(installed)" );
     if ( pos > 0 )
         name.truncate( pos - 1 );
 
     // Get package
     Server *s = dataMgr->getServer( serversList->currentText() );
     Package *p = s->getPackage( name );
 
 	// If the package has a filename then it is a local file
 	if ( p->isPackageStoredLocally() )
 		name = p->getFilename();
     QString option;
     QString dest = "root";
     if ( !p->isInstalled() )
     	return QString( "I" ) + name;
     else
     {
         if ( p->getVersion() == p->getInstalledVersion() )
         {
             QString msgtext;
             msgtext.sprintf( "Do you wish to remove or reinstall\n%s?", (const char *)name );
             switch( QMessageBox::information( this, "Remove or ReInstall",
                                 msgtext, "Remove", "ReInstall" ) )
             {
                 case 0: // Try again or Enter
                     return QString( "D" ) + name;
                     break;
                 case 1: // Quit or Escape
                     return QString( "U" ) + name;
                     break;
             }
 
             // User hit cancel (on dlg - assume remove)
             return QString( "D" ) + name;
         }
         else
         	return QString( "U" ) + name;
     }
 }
 
 void NetworkPackageManager :: displayText( const QString &t )
 {
     cout << t << endl;
 }
 
 
 void NetworkPackageManager :: letterPushed( QString t )
 {
-    QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
+    QCheckListItem *top = (QCheckListItem *)packagesList->firstChild();
+    QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
+    if ( packagesList->firstChild() == 0 )
+        return;
+
+    QCheckListItem *item;
+    if ( start == 0 )
+    {
+        item = (QCheckListItem *)packagesList->firstChild();
+        start = top;
+    }
+    else
+        item = (QCheckListItem *)start->nextSibling();
+
+    if ( item == 0 )
+        item = (QCheckListItem *)packagesList->firstChild();
     do
     {
         if ( item->text().lower().startsWith( t.lower() ) )
         {
-            cout << "Found - item->text()" << endl;
             packagesList->setSelected( item, true );
             packagesList->ensureItemVisible( item );
             break;
 		}
 
         item = (QCheckListItem *)item->nextSibling();
-    } while ( item );
+        if ( !item )
+            item = (QCheckListItem *)packagesList->firstChild();        
+    } while ( item != start);
 }