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
@@ -15,81 +15,90 @@
  *                                                                         *

  ***************************************************************************/

 

 #include <qmenubar.h>

 #include <qpopupmenu.h>

 #include <qmessagebox.h>

 

 #include "mainwin.h"

 #include "datamgr.h"

 #include "networkpkgmgr.h"

 #include "settingsimpl.h"

 #include "helpwindow.h"

 #include "utils.h"

 #include "global.h"

 

 MainWindow :: MainWindow( QWidget *p, char *name )

 	:	QMainWindow( p, name )

 {

 #ifdef QWS

     showMaximized();

 #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 );

 }

 

 MainWindow :: ~MainWindow()

 {

 	delete networkPkgWindow;

 }

 

 void MainWindow :: setDocument( const QString &doc )

 {

     // Remove path from package

     QString package = Utils::getPackageNameFromIpkFilename( doc );

     cout << "Selecting package " << package << endl;

     networkPkgWindow->selectLocalPackage( package );

 }

 

 void MainWindow :: displaySettings()

 {

     SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );

     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
@@ -13,36 +13,37 @@
  *   the Free Software Foundation; either version 2 of the License, or     *

  *   (at your option) any later version.                                   *

  *                                                                         *

  ***************************************************************************/

 

 #ifndef MAINWIN_H

 #define MAINWIN_H

 

 #include <qmainwindow.h>

 #include <qwidgetstack.h>

 

 

 class NetworkPackageManager;

 class DataManager;

 

 class MainWindow :public  QMainWindow

 {

 	Q_OBJECT

 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
@@ -441,65 +441,65 @@ void NetworkPackageManager :: downloadPackage()
 
                 QString msgtext;
                 msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );
                 if ( QMessageBox::information( this, "Are you sure?",
                                     msgtext, "No", "Yes" ) == 1 )
                 {
                     doUpdate = true;
                     QFile f( p->getFilename() );
                     f.remove();
                 }
             }
         }
     }
 
     if ( doUpdate )
     {
         dataMgr->reloadServerData();
         serverSelected( -1 );
     }
 }
 
 
 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 )
     {
         // Nothing to do
         QMessageBox::information( this, "Nothing to do",
                              "No packages selected", "OK" );
         
         return;
     }
     
     // do the stuff
     InstallDlgImpl dlg( workingPackages, dataMgr, this, "Install", true );
     dlg.showDlg();
 
     // Reload data
     dataMgr->reloadServerData();
     serverSelected(-1);
 
 #ifdef QWS
     // Finally let the main system update itself
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     QString lf = QString::null;
@@ -644,32 +644,64 @@ void NetworkPackageManager :: displayText( const QString &t )
 void NetworkPackageManager :: letterPushed( QString t )
 {
     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() ) )
         {
             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
@@ -11,65 +11,65 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef NETWORKPKGMGR_H
 #define NETWORKPKGMGR_H
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qwidget.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 
 #include "datamgr.h"
 #include "progressdlg.h"
 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;
 
     bool showJumpTo;
     int timerId;
 
     void timerEvent ( QTimerEvent * );
 
     void initGui();
     void setupConnections();
     void showProgressDialog( char *initialText );
     InstallData dealWithItem( QCheckListItem *item );
     QString stickyOption;
 
 public slots:
     void serverSelected( int index );
     void applyChanges();
     void upgradePackages();
     void downloadPackage();
     void updateServer();
     void displayText( const QString &t );
     void letterPushed( QString t );