5 files changed, 43 insertions, 54 deletions

diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 5fc323a..b69bae4 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -1,4 +1,4 @@
         TEMPLATE= app
-        CONFIG  = qt warn_on debug
+        CONFIG  = qt warn_on release
         HEADERS         = global.h \
                   mainwin.h \
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp
index 53c392e..15ef9d6 100644
--- a/noncore/settings/aqpkg/main.cpp
+++ b/noncore/settings/aqpkg/main.cpp
@@ -16,7 +16,4 @@
  ***************************************************************************/
 
-#include <iostream>
-using namespace std;
-
 #ifdef QWS
 #include <qpe/qpeapplication.h>
@@ -36,5 +33,5 @@ using namespace std;
 int main(int argc, char *argv[])
 {
-  cout << "Root dir = " << ROOT << endl;
+//  cout << "Root dir = " << ROOT << endl;
 #ifdef QWS
   QPEApplication a( argc, argv );
@@ -45,5 +42,5 @@ int main(int argc, char *argv[])
 #ifdef QWS
   // Disable suspend mode
-  cout << "Disabling suspend mode" << endl;
+//  cout << "Disabling suspend mode" << endl;
   QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
@@ -57,5 +54,5 @@ int main(int argc, char *argv[])
 #ifdef QWS
   // Reenable suspend mode
-  cout << "Enabling suspend mode" << endl;
+//  cout << "Enabling suspend mode" << endl;
   QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 #endif
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 1a2ac37..d79673f 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -16,7 +16,4 @@
  ***************************************************************************/
 
-#include <iostream>
-using namespace std;
-
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -225,5 +222,5 @@ void MainWindow :: setDocument( const QString &doc )
     // Remove path from package
     QString package = Utils::getPackageNameFromIpkFilename( doc );
-    std::cout << "Selecting package " << package << std::endl;
+//    std::cout << "Selecting package " << package << std::endl;
     networkPkgWindow->selectLocalPackage( package );
 }
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index c209589..b4b6475 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -16,11 +16,5 @@
  ***************************************************************************/
 
-#include <fstream>
-#include <iostream>
-using namespace std;
-
 #include <unistd.h>
-#include <stdlib.h>
-#include <linux/limits.h>
 
 #ifdef QWS
@@ -28,4 +22,5 @@ using namespace std;
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
+#include <qpe/resource.h>
 #else
 #include <qapplication.h>
@@ -34,4 +29,5 @@ using namespace std;
 #include <qfile.h>
 #include <qmessagebox.h>
+#include <qwhatsthis.h>
 
 #include "datamgr.h"
@@ -98,5 +94,5 @@ void NetworkPackageManager :: updateData()
         if ( !it->isServerActive() )
         {
-            cout << serverName << " is not active" << endl;
+//            cout << serverName << " is not active" << endl;
             i--;
             continue;
@@ -146,6 +142,12 @@ void NetworkPackageManager :: initGui()
     serversList = new QComboBox( this );
     connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int )));
+    QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) );
+    
+    installedIcon = Resource::loadPixmap( "aqpkg/installed" );
+    updatedIcon = Resource::loadPixmap( "aqpkg/updated" );
     
     packagesList = new QListView( this );
+    packagesList->addColumn( tr( "Packages" ), 225 );
+    QWhatsThis::add( packagesList, tr( "This is a listing of all packages for the server feed selected above.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nClick inside the box at the left to select a package." ) );
 
     QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 );
@@ -175,5 +177,4 @@ void NetworkPackageManager :: initGui()
 
     vbox->addWidget( packagesList );
-    packagesList->addColumn( tr( "Packages" ) );
     
     downloadEnabled = TRUE;
@@ -187,4 +188,7 @@ void NetworkPackageManager :: serverSelected( int index )
 void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
 {
+    QPixmap nullIcon( installedIcon.size() );
+    nullIcon.fill( colorGroup().base() );
+    
     // display packages
     QString serverName = serversList->currentText();
@@ -261,22 +265,21 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
 
 
-        text.append( it->getPackageName() );
+        QCheckListItem *item = new QCheckListItem( packagesList, it->getPackageName(), QCheckListItem::CheckBox );
+        
         if ( it->isInstalled() )
         {
-            text.append( " (installed)" );
-
-            // If a different version of package is available, postfix it with an *
-            if ( it->getVersion() != it->getInstalledVersion() )
+            // If a different version of package is available, show update available icon
+            // Otherwise, show installed icon
+            if ( it->getVersion() != it->getInstalledVersion() &&
+                 compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1)
             {
 
-                if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 )
-                    text.append( "*" );
+                item->setPixmap( 0, updatedIcon );
             }
+            else
+            {
+                item->setPixmap( 0, installedIcon );
         }
 
-        QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox );
-
-        if ( it->isInstalled() )
-        {
             QString destName = "";
             if ( it->getLocalPackage() )
@@ -293,4 +296,8 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
                 new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) );
         }
+        else
+        {
+            item->setPixmap( 0, nullIcon );
+        }
         
         if ( !it->isPackageStoredLocally() )
@@ -509,14 +516,5 @@ void NetworkPackageManager :: downloadSelectedPackages()
         if ( item->isOn() )
         {
-            QString name = item->text();
-            int pos = name.find( "*" );
-            name.truncate( pos );
-
-            // if (there is a (installed), remove it
-            pos = name.find( "(installed)" );
-            if ( pos > 0 )
-                name.truncate( pos - 1 );
-
-            ipkg.setPackage( name );
+            ipkg.setPackage( item->text() );
             ipkg.runIpkg( );
         }
@@ -615,11 +613,4 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
 {
     QString name = item->text();
-    int pos = name.find( "*" );
-    name.truncate( pos );
-
-    // if (there is a (installed), remove it
-    pos = name.find( "(installed)" );
-    if ( pos > 0 )
-        name.truncate( pos - 1 );
 
     // Get package
@@ -652,6 +643,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
         {
             item.destination = p->getInstalledTo();
-            cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
-            cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl;
+//            cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
+//            cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl;
         }
         else
@@ -735,7 +726,7 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
 }
 
-void NetworkPackageManager :: displayText( const QString &t )
+void NetworkPackageManager :: displayText( const QString &/*t*/ )
 {
-    cout << t << endl;
+//    cout << t << endl;
 }
 
@@ -779,5 +770,5 @@ void NetworkPackageManager :: searchForPackage( const QString &text )
     if ( !text.isEmpty() )
     {
-        cout << "searching for " << text << endl;
+//        cout << "searching for " << text << endl;
         // look through package list for text startng at current position
         vector<InstallData> workingPackages;
@@ -792,8 +783,8 @@ void NetworkPackageManager :: searchForPackage( const QString &text )
               item = (QCheckListItem *)item->nextSibling() )
         {
-            cout << "checking " << item->text().lower() << endl;
+//            cout << "checking " << item->text().lower() << endl;
             if ( item->text().lower().find( text ) != -1 )
             {
-                cout << "matched " << item->text() << endl;
+//                cout << "matched " << item->text() << endl;
                 packagesList->ensureItemVisible( item );
                 packagesList->setCurrentItem( item );
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index bd005e2..99eff2e 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -20,4 +20,5 @@
 
 #include <qlayout.h>
+#include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qwidget.h>
@@ -55,4 +56,7 @@ private:
     QListView *packagesList;
 
+    QPixmap installedIcon;
+    QPixmap updatedIcon;
+
     QString currentlySelectedServer;
     QString categoryFilter;