4 files changed, 44 insertions, 2 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 9f19dfa..0b5a5eb 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -35,27 +35,31 @@ MainWindow :: MainWindow( QWidget *p, char *name )
 #endif

 

     setCaption( "AQPkg - Package Manager" );

 

     // Create our menu

         QPopupMenu *help = new QPopupMenu( this );

         help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_H );

         help->insertItem( "&About", this, SLOT(displayAbout()), Qt::CTRL+Qt::Key_A );

 

     QPopupMenu *settings = new QPopupMenu( this );

         settings->insertItem( "&Settings", this, SLOT(displaySettings()), Qt::CTRL+Qt::Key_S );

 

+    QPopupMenu *edit = new QPopupMenu( this );

+        edit->insertItem( "&Search", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_F );

+

         // Create the main menu

         QMenuBar *menu = menuBar();  //new QMenuBar( this );

         menu->insertItem( "&Settings", settings );

+        menu->insertItem( "&Edit", edit );

         menu->insertItem( "&Help", help );

 

     mgr = new DataManager();

     mgr->loadServers();

 

         stack = new QWidgetStack( this );

 

         networkPkgWindow = new NetworkPackageManager( mgr, stack );

         stack->addWidget( networkPkgWindow, 1 );

 

         setCentralWidget( stack );

         stack->raiseWidget( networkPkgWindow );

@@ -80,16 +84,21 @@ void MainWindow :: displaySettings()
     if ( dlg->showDlg( 0 ) )

             networkPkgWindow->updateData();

     delete dlg;

 }

 

 void MainWindow :: displayHelp()

 {

     HelpWindow *dlg = new HelpWindow( this );

     dlg->exec();

     delete dlg;    

 }

 

+void MainWindow :: searchForPackage()

+{

+    networkPkgWindow->searchForPackage();

+}

+

 void MainWindow :: displayAbout()

 {

     QMessageBox::about( this, "About AQPkg", VERSION_TEXT );

 }

diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index a9e290c..9fa0eca 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -33,16 +33,17 @@ public:
         MainWindow( QWidget *p = 0, char *name = 0 );

         ~MainWindow();

 

 private:

     DataManager *mgr;

 

         QWidgetStack *stack;

         NetworkPackageManager *networkPkgWindow;

 

 public slots:

     void setDocument( const QString &doc );

     void displayHelp();

+    void searchForPackage();

     void displayAbout();

     void displaySettings();

 };

 #endif

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index ccce401..78d3df5 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -461,25 +461,25 @@ void NetworkPackageManager :: downloadPackage()
 
 
 void NetworkPackageManager :: applyChanges()
 {
     stickyOption = "";
     
     // First, write out ipkg_conf file so that ipkg can use it
     dataMgr->writeOutIpkgConf();
 
     // Now for each selected item
     // deal with it
 
-        vector<InstallData> workingPackages;
+    vector<InstallData> workingPackages;
     for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
           item != 0 ;
           item = (QCheckListItem *)item->nextSibling() )
     {
         if ( item->isOn() )
         {
             InstallData data = dealWithItem( item );
             workingPackages.push_back( data );
                 }
     }
 
     if ( workingPackages.size() == 0 )
@@ -664,12 +664,44 @@ void NetworkPackageManager :: letterPushed( QString t )
         if ( item->text().lower().startsWith( t.lower() ) )
         {
             packagesList->setSelected( item, true );
             packagesList->ensureItemVisible( item );
             break;
                 }
 
         item = (QCheckListItem *)item->nextSibling();
         if ( !item )
             item = (QCheckListItem *)packagesList->firstChild();        
     } while ( item != start);
 }
+
+
+void NetworkPackageManager :: searchForPackage()
+{
+    bool ok = FALSE;
+    QString searchText = InputDialog::getText( "Search for package", "Enter package to search for", QString::null, &ok, this ).lower();
+    if ( ok && !searchText.isEmpty() )
+    {
+        cout << "searching for " << searchText << endl;
+        // look through package list for text startng at current position
+        vector<InstallData> workingPackages;
+        QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
+        if ( start != 0 )
+            start = (QCheckListItem *)start->nextSibling();
+        
+        if ( start == 0 )
+            start = (QCheckListItem *)packagesList->firstChild();
+        
+        for ( QCheckListItem *item = start; item != 0 ;
+              item = (QCheckListItem *)item->nextSibling() )
+        {
+            cout << "checking " << item->text().lower() << endl;
+            if ( item->text().lower().find( searchText ) != -1 )
+            {
+                cout << "matched " << item->text() << endl;
+                packagesList->ensureItemVisible( item );
+                packagesList->setCurrentItem( item );
+                break;
+            }
+        }   
+    }
+}
\ No newline at end of file
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index 3c437b4..3a111ff 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -31,25 +31,25 @@ class InstallData;
 /** NetworkPackageManager is the base class of the project */
 class NetworkPackageManager : public QWidget
 {
   Q_OBJECT
 public:
     /** construtor */
     NetworkPackageManager( DataManager *dataManager, QWidget* parent=0, const char *name=0);
     /** destructor */
     ~NetworkPackageManager();
 
     void selectLocalPackage( const QString &pkg );
     void updateData();
-
+    void searchForPackage();
 private:
     DataManager *dataMgr;
 
     QComboBox *serversList;
     QListView *packagesList;
     QPushButton *update;
     QPushButton *upgrade;
     QPushButton *download;
     QPushButton *apply;
 
     ProgressDlg *progressDlg;
     QString currentlySelectedServer;