Added search for package feature

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
@@ -45,7 +45,11 @@ MainWindow :: MainWindow( QWidget *p, char *name )
 	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 );

 

@@ -90,4 +94,9 @@ void MainWindow :: displayHelp()
 }

 

+void MainWindow :: searchForPackage()

+{

+    networkPkgWindow->searchForPackage();

+}

+

 void MainWindow :: displayAbout()

 {

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
@@ -43,4 +43,5 @@ public slots:
     void setDocument( const QString &doc );

     void displayHelp();

+    void searchForPackage();

     void displayAbout();

     void displaySettings();

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
@@ -471,5 +471,5 @@ void NetworkPackageManager :: applyChanges()
     // deal with it
 
-	vector<InstallData> workingPackages;
+    vector<InstallData> workingPackages;
     for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
           item != 0 ;
@@ -674,2 +674,34 @@ void NetworkPackageManager :: letterPushed( QString t )
     } 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
@@ -41,5 +41,5 @@ public:
     void selectLocalPackage( const QString &pkg );
     void updateData();
-
+    void searchForPackage();
 private:
     DataManager *dataMgr;