Added find next facility

4 files changed, 22 insertions, 9 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 0b5a5eb..3c72f2b 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1,104 +1,111 @@
 /***************************************************************************

                           mainwin.cpp  -  description

                              -------------------

     begin                : Mon Aug 26 13:32:30 BST 2002

     copyright            : (C) 2002 by Andy Qua

     email                : andy.qua@blueyonder.co.uk

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

 

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

  *                                                                         *

  *   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.                                   *

  *                                                                         *

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

 

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

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

+        edit->insertItem( "&Find Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_R );

 

         // 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();

+    networkPkgWindow->searchForPackage( false );

+}

+

+void MainWindow :: repeatSearchForPackage()

+{

+    networkPkgWindow->searchForPackage( true );

 }

 

 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 9fa0eca..267233f 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -1,49 +1,50 @@
 /***************************************************************************

                           mainwin.h  -  description

                              -------------------

     begin                : Mon Aug 26 13:32:30 BST 2002

     copyright            : (C) 2002 by Andy Qua

     email                : andy.qua@blueyonder.co.uk

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

 

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

  *                                                                         *

  *   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 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 repeatSearchForPackage();

     void displayAbout();

     void displaySettings();

 };

 #endif

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 78d3df5..a058285 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -550,158 +550,162 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
             item.packageName = name;
         
         if ( p->getInstalledTo() )
         {
             item.destination = p->getInstalledTo();
             cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
             cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl;
         }
         else
         {
             item.destination = p->getLocalPackage()->getInstalledTo();
         }
 
         // Now see if version is newer or not
         int val = compareVersions( p->getInstalledVersion(), p->getVersion() );
 
         // If the version requested is older and user selected a local ipk file, then reinstall the file
         if ( p->isPackageStoredLocally() && val == -1 )
             val = 0;
             
         if ( val == -2 )
         {
             // Error - should handle
         }
         else if ( val == -1 )
         {
             // Version available is older - remove only
             item.option = "D";
         }
         else
         {
             QString caption;
             QString text;
             QString secondButton;
             QString secondOption;
             if ( val == 0 )
             {
                 // Version available is the same - option to remove or reinstall
                 caption = "Do you wish to remove or reinstall\n%s?";
                 text = "Remove or ReInstall";
                 secondButton = "ReInstall";
                 secondOption = "R";
             }
             else if ( val == 1 )
             {
                 // Version available is newer - option to remove or upgrade
                 caption = "Do you wish to remove or upgrade\n%s?";
                 text = "Remove or Upgrade";
                 secondButton = "Upgrade";
                 secondOption = "U";
             }
 
             // Sticky option not implemented yet, but will eventually allow
             // the user to say something like 'remove all'
             if ( stickyOption == "" )
             {
                 QString msgtext;
                 msgtext.sprintf( caption, (const char *)name );
                 switch( QMessageBox::information( this, text,
                                     msgtext, "Remove", secondButton ) )
                 {
                     case 0: // Try again or Enter
                                                 // option 0 = Remove
                         item.option = "D";
                         break;
                     case 1: // Quit or Escape
                         item.option = secondOption;
                         break;
                 }
             }
             else
             {
 //                item.option = stickyOption;
             }
         }
 
         
         // Check if we are reinstalling the same version
         if ( item.option != "R" )
            item.recreateLinks = true;
         else
            item.recreateLinks = false;
 
         // User hit cancel (on dlg - assume remove)
         return item;
     }
 }
 
 void NetworkPackageManager :: displayText( const QString &t )
 {
     cout << t << endl;
 }
 
 
 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()
+void NetworkPackageManager :: searchForPackage( bool findNext )
 {
-    bool ok = FALSE;
-    QString searchText = InputDialog::getText( "Search for package", "Enter package to search for", QString::null, &ok, this ).lower();
-    if ( ok && !searchText.isEmpty() )
+    bool ok = false;
+    if ( !findNext || lastSearchText.isEmpty() )
+        lastSearchText = InputDialog::getText( "Search for package", "Enter package to search for", lastSearchText, &ok, this ).lower();
+    else
+        ok = true;
+        
+    if ( ok && !lastSearchText.isEmpty() )
     {
-        cout << "searching for " << searchText << endl;
+        cout << "searching for " << lastSearchText << 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 )
+            if ( item->text().lower().find( lastSearchText ) != -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 3a111ff..20f6e2d 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -1,78 +1,79 @@
 /***************************************************************************
                           networkpkgmgr.h  -  description
                              -------------------
     begin                : Mon Aug 26 13:32:30 BST 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   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();
+    void searchForPackage( bool findNext );
 private:
     DataManager *dataMgr;
 
     QComboBox *serversList;
     QListView *packagesList;
     QPushButton *update;
     QPushButton *upgrade;
     QPushButton *download;
     QPushButton *apply;
 
     ProgressDlg *progressDlg;
     QString currentlySelectedServer;
+    QString lastSearchText;
 
     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 );
 };
 
 #endif