4 files changed, 125 insertions, 122 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 4aa83b5..e184f6b 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -25,2 +25,3 @@ using namespace std;
 #include <qaction.h>
+#include <qlineedit.h>
 #include <qmenubar.h>
@@ -29,2 +30,3 @@ using namespace std;
 #include <qtimer.h>
+#include <qwhatsthis.h>
 #include <qwidgetstack.h>
@@ -58,2 +60,11 @@ MainWindow :: MainWindow()
 
+    // Find toolbar
+    findBar = new QPEToolBar( this );
+    addToolBar( findBar, QMainWindow::Top, true );
+    findBar->setHorizontalStretchable( true );
+    findEdit = new QLineEdit( findBar );
+    QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) );
+    findBar->setStretchableWidget( findEdit );
+    connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) );
+    
     // Packages menu
@@ -93,10 +104,12 @@ MainWindow :: MainWindow()
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to search for a specific package." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( searchForPackage() ) );
+    a->setWhatsThis( tr( "Click here to search for text in package names." ) );
+    connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) );
     a->addTo( popup );
 
-    a = new QAction( tr( "Find next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to search for the next package." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( repeatSearchForPackage() ) );
-    a->addTo( popup );
+    actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
+    actionFindNext->setEnabled( FALSE );
+    actionFindNext->setWhatsThis( tr( "Click here to search for the package name containing the text you are searching for." ) );
+    connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
+    actionFindNext->addTo( popup );
+    actionFindNext->addTo( findBar );
 
@@ -106,6 +119,7 @@ MainWindow :: MainWindow()
 
-    a = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ),  QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
-    a->addTo( popup );
+    actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ),  QString::null, 0, this, 0 );
+    actionFilter->setToggleAction( TRUE );
+    actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
+    connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
+    actionFilter->addTo( popup );
 
@@ -122,16 +136,19 @@ MainWindow :: MainWindow()
 
-    a = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) );
-    a->addTo( popup );
+    actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
+    actionUninstalled->setToggleAction( TRUE );
+    actionUninstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) );
+    connect( actionUninstalled, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) );
+    actionUninstalled->addTo( popup );
 
-    a = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) );
-    a->addTo( popup );
+    actionInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 );
+    actionInstalled->setToggleAction( TRUE );
+    actionInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) );
+    connect( actionInstalled, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) );
+    actionInstalled->addTo( popup );
 
-    a = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) );
-    a->addTo( popup );
+    actionUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 );
+    actionUpdated->setToggleAction( TRUE );
+    actionUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
+    connect( actionUpdated, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) );
+    actionUpdated->addTo( popup );
 
@@ -157,3 +174,11 @@ MainWindow :: MainWindow()
     mb->insertItem( tr( "View" ), popup );
+    
+    // Finish find toolbar creation
+    a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+    a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
+    connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
+    a->addTo( findBar );
+    findBar->hide();
 
+    
     // Create widget stack and add UI widgets
@@ -221,11 +246,23 @@ void MainWindow :: displayHelp()
 }
+    
+void MainWindow :: displayFindBar()
+{
+    findBar->show();
+    findEdit->setFocus();
+}
 
-void MainWindow :: searchForPackage()
+void MainWindow :: repeatFind()
 {
-    networkPkgWindow->searchForPackage( false );
+    networkPkgWindow->searchForPackage( findEdit->text() );
 }
 
-void MainWindow :: repeatSearchForPackage()
+void MainWindow :: findPackage( const QString &text )
 {
-    networkPkgWindow->searchForPackage( true );
+    actionFindNext->setEnabled( !text.isEmpty() );
+    networkPkgWindow->searchForPackage( text );
+}
+
+void MainWindow :: hideFindBar()
+{
+    findBar->hide();
 }
@@ -237,24 +274,7 @@ void MainWindow :: displayAbout()
 
-
 void MainWindow :: filterUninstalledPackages()
 {
-    bool val;
-    if ( filter->isItemChecked( mnuShowUninstalledPkgsId ) )
-    {
-        val = false;
-        filter->setItemChecked( mnuShowUninstalledPkgsId, false );
-    }
-    else
-    {
-        val = true;
-        filter->setItemChecked( mnuShowUninstalledPkgsId, true );
-    }
-
-    filter->setItemChecked( mnuShowInstalledPkgsId, false );
-    networkPkgWindow->showOnlyInstalledPackages( false );
-    filter->setItemChecked( mnuShowUpgradedPkgsId, false );
-    networkPkgWindow->showUpgradedPackages( false );
-
-    networkPkgWindow->showOnlyUninstalledPackages( val );
-
+    networkPkgWindow->showOnlyUninstalledPackages( actionUninstalled->isOn() );
+    actionInstalled->setOn( FALSE );
+    actionUpdated->setOn( FALSE );
 }
@@ -263,20 +283,5 @@ void MainWindow :: filterInstalledPackages()
 {
-    bool val;
-    if ( filter->isItemChecked( mnuShowInstalledPkgsId ) )
-    {
-        val = false;
-        filter->setItemChecked( mnuShowInstalledPkgsId, false );
-    }
-    else
-    {
-        val = true;
-        filter->setItemChecked( mnuShowInstalledPkgsId, true );
-    }
-
-    filter->setItemChecked( mnuShowUninstalledPkgsId, false );
-    networkPkgWindow->showOnlyUninstalledPackages( false );
-    filter->setItemChecked( mnuShowUpgradedPkgsId, false );
-    networkPkgWindow->showUpgradedPackages( false );
-
-    networkPkgWindow->showOnlyInstalledPackages( val );
+    actionUninstalled->setOn( FALSE );
+    networkPkgWindow->showOnlyInstalledPackages( actionInstalled->isOn() );
+    actionUpdated->setOn( FALSE );
 }
@@ -285,20 +290,5 @@ void MainWindow :: filterUpgradedPackages()
 {
-    bool val;
-    if ( filter->isItemChecked( mnuShowUpgradedPkgsId ) )
-    {
-        val = false;
-        filter->setItemChecked( mnuShowUpgradedPkgsId, false );
-    }
-    else
-    {
-        val = true;
-        filter->setItemChecked( mnuShowUpgradedPkgsId, true );
-    }
-
-    filter->setItemChecked( mnuShowUninstalledPkgsId, false );
-    networkPkgWindow->showOnlyUninstalledPackages( false );
-    filter->setItemChecked( mnuShowInstalledPkgsId, false );
-    networkPkgWindow->showOnlyInstalledPackages( false );
-
-    networkPkgWindow->showUpgradedPackages( val );
+    actionUninstalled->setOn( FALSE );
+    actionInstalled->setOn( FALSE );
+    networkPkgWindow->showUpgradedPackages( actionUpdated->isOn() );
 }
@@ -307,4 +297,4 @@ void MainWindow :: setFilterCategory()
 {
-    if ( networkPkgWindow->setFilterCategory( ) )
-        filter->setItemChecked( mnuFilterByCategory, true );
+    if ( networkPkgWindow->setFilterCategory() )
+        actionFilter->setOn( TRUE );
 }
@@ -313,6 +303,5 @@ void MainWindow :: filterCategory()
 {
-    if ( filter->isItemChecked( mnuFilterByCategory ) )
+    if ( !actionFilter->isOn() )
     {
-        networkPkgWindow->filterByCategory( false );
-        filter->setItemChecked( mnuFilterByCategory, false );
+        networkPkgWindow->filterByCategory( FALSE );
     }
@@ -320,4 +309,3 @@ void MainWindow :: filterCategory()
     {
-        if ( networkPkgWindow->filterByCategory( true ) )
-            filter->setItemChecked( mnuFilterByCategory, true );
+        actionFilter->setOn( networkPkgWindow->filterByCategory( TRUE ) );
     }
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 028ef5b..ef67cc9 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -22,3 +22,2 @@
 #include <qpixmap.h>
-//#include <qwidgetstack.h>
 
@@ -26,2 +25,3 @@ class QWidgetStack;
 class QPEToolBar;
+class QLineEdit;
 class QAction;
@@ -42,10 +42,14 @@ private:
 
-    QMenuBar *menu;
-    QPopupMenu *help;
-    QPopupMenu *settings;
-    QPopupMenu *edit;
-    QPopupMenu *filter;
     QWidgetStack *stack;
-    QAction *actionUpgrade;
-    QAction *actionDownload;
+    
+    QPEToolBar *findBar;
+    QLineEdit  *findEdit;
+    QAction    *actionFindNext;
+    QAction    *actionFilter;
+    QAction    *actionUpgrade;
+    QAction    *actionDownload;
+    QAction    *actionUninstalled;
+    QAction    *actionInstalled;
+    QAction    *actionUpdated;
+    
     QPixmap iconDownload;
@@ -65,4 +69,6 @@ public slots:
     void displayHelp();
-    void searchForPackage();
-    void repeatSearchForPackage();
+    void displayFindBar();
+    void repeatFind();
+    void findPackage( const QString & );
+    void hideFindBar();
     void displayAbout();
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 91afe02..c209589 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -262,6 +262,6 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
 
-        text += it->getPackageName();
+        text.append( it->getPackageName() );
         if ( it->isInstalled() )
         {
-            text += " (installed)";
+            text.append( " (installed)" );
 
@@ -272,3 +272,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                 if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 )
-                    text += "*";
+                    text.append( "*" );
             }
@@ -292,3 +292,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
             if ( destName != "" )
-                new QCheckListItem( item, QString( tr( "Installed To - " ) ) + destName );
+                new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) );
         }
@@ -297,8 +297,8 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
         {
-            new QCheckListItem( item, QString( tr( "Description - " ) ) + it->getDescription() );
-            new QCheckListItem( item, QString( tr( "Size - " ) ) + it->getPackageSize() );
-            new QCheckListItem( item, QString( tr( "Section - " ) ) + it->getSection() );
+            new QCheckListItem( item, QString( tr( "Description - %1" ).arg( it->getDescription() ) ) );
+            new QCheckListItem( item, QString( tr( "Size - %1" ).arg( it->getPackageSize() ) ) );
+            new QCheckListItem( item, QString( tr( "Section - %1" ).arg( it->getSection() ) ) );
         }
         else
-            new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() );
+            new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( it->getFilename() ) ) );
         
@@ -306,3 +306,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                 {
-                new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() );
+                new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( it->getVersion() ) ) );
                 }
@@ -310,3 +310,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                 {
-                new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() );
+                new QCheckListItem( item, QString( tr( "V. Available - %1" ).arg( it->getVersion() ) ) );
                 if ( it->getLocalPackage() )
@@ -314,3 +314,3 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                                 if ( it->isInstalled() )
-                            new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() );
+                            new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( it->getInstalledVersion() ) ) );
                         }
@@ -374,2 +374,3 @@ void NetworkPackageManager :: upgradePackages()
     // First warn user that this isn't recommended
+    // TODO - ODevice????
     QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" );
@@ -775,13 +776,7 @@ void NetworkPackageManager :: letterPushed( QString t )
 
-void NetworkPackageManager :: searchForPackage( bool findNext )
+void NetworkPackageManager :: searchForPackage( const QString &text )
 {
-    bool ok = false;
-    if ( !findNext || lastSearchText.isEmpty() )
-        lastSearchText = InputDialog::getText( tr( "Search for package" ), tr( "Enter package to search for" ), lastSearchText, &ok, this ).lower();
-    else
-        ok = true;
-        
-    if ( ok && !lastSearchText.isEmpty() )
+    if ( !text.isEmpty() )
     {
-        cout << "searching for " << lastSearchText << endl;
+        cout << "searching for " << text << endl;
         // look through package list for text startng at current position
@@ -799,3 +794,3 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
             cout << "checking " << item->text().lower() << endl;
-            if ( item->text().lower().find( lastSearchText ) != -1 )
+            if ( item->text().lower().find( text ) != -1 )
             {
@@ -813,2 +808,7 @@ void NetworkPackageManager :: showOnlyUninstalledPackages( bool val )
     showUninstalledPkgs = val;
+    if ( val )
+    {
+        showInstalledPkgs = FALSE;
+        showUpgradedPkgs = FALSE;
+    }
     serverSelected( -1 );
@@ -819,2 +819,7 @@ void NetworkPackageManager :: showOnlyInstalledPackages( bool val )
     showInstalledPkgs = val;
+    if ( val )
+    {
+        showUninstalledPkgs = FALSE;
+        showUpgradedPkgs = FALSE;
+    }
     serverSelected( -1 );
@@ -825,2 +830,7 @@ void NetworkPackageManager :: showUpgradedPackages( bool val )
     showUpgradedPkgs = val;
+    if ( val )
+    {
+        showUninstalledPkgs = FALSE;
+        showInstalledPkgs = FALSE;
+    }
     serverSelected( -1 );
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index efef898..bd005e2 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -43,3 +43,3 @@ public:
     void updateData();
-    void searchForPackage( bool findNext );
+    void searchForPackage( const QString & );
     void showOnlyUninstalledPackages( bool val );
@@ -57,3 +57,2 @@ private:
     QString currentlySelectedServer;
-    QString lastSearchText;
     QString categoryFilter;