Package sections default to N/A unless they are set (description, etc), changed LinkToRoot to Link To Root, and couple of other small fixes

3 files changed, 16 insertions, 2 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index e8e2982..d9e62b6 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -163,276 +163,278 @@ void NetworkPackageManager :: initGui()
         char text[2];
         text[1] = '\0';
         for ( int i = 0 ; i < 26 ; ++i )
         {
                 text[0] = 'A' + i;
                 LetterPushButton *b = new LetterPushButton( text, this );
                 connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
                 if ( i < 13 )
                 hbox3->addWidget( b );
                 else
                 hbox4->addWidget( b );
         }
     }
 
     vbox->addWidget( packagesList );
     packagesList->addColumn( "Packages" );
 
     QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1, "HBox2" );
     hbox2->addWidget( update );
     hbox2->addWidget( download );
     hbox2->addWidget( upgrade );
     hbox2->addWidget( apply );
 }
 
 void NetworkPackageManager :: setupConnections()
 {
     connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int )));
     connect( apply, SIGNAL(released()), this, SLOT(applyChanges()) );
     connect( download, SIGNAL(released()), this, SLOT(downloadPackage()) );
     connect( upgrade, SIGNAL( released()), this, SLOT(upgradePackages()) );
     connect( update, SIGNAL(released()), this, SLOT(updateServer()) );
 }
 
 void NetworkPackageManager :: showProgressDialog( char *initialText )
 {
     if ( !progressDlg )
         progressDlg = new ProgressDlg( this, "Progress", false );
     progressDlg->setText( initialText );
     progressDlg->show();
 }
 
 
 void NetworkPackageManager :: serverSelected( int )
 {
     packagesList->clear();
 
     // display packages
     QString serverName = serversList->currentText();
     currentlySelectedServer = serverName;
 
 #ifdef QWS
         // read download directory from config file
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         cfg.writeEntry( "selectedServer", currentlySelectedServer );
 #endif
 
     Server *s = dataMgr->getServer( serverName );
 
     vector<Package> &list = s->getPackageList();
     vector<Package>::iterator it;
     for ( it = list.begin() ; it != list.end() ; ++it )
     {
 
         QString text = "";
 
         // Apply show only uninstalled packages filter
         if ( showUninstalledPkgs && it->isInstalled() )
             continue;
 
         // Apply show only installed packages filter
         if ( showInstalledPkgs && !it->isInstalled() )
             continue;
 
         // Apply show only new installed packages filter
         if ( showUpgradedPkgs )
         {
             if ( !it->isInstalled() ||
                  compareVersions( it->getInstalledVersion(), it->getVersion() ) != 1 )
                 continue;
         }
 
         // Apply the section filter
         if ( categoryFilterEnabled && categoryFilter != "" )
         {
             if ( it->getSection() == "" || categoryFilter.find( it->getSection().lower() ) == -1 )
                 continue;
         }
 
         // If the local server, only display installed packages
         if ( serverName == LOCAL_SERVER && !it->isInstalled() )
             continue;
 
 
         text += it->getPackageName();
         if ( it->isInstalled() )
         {
             text += " (installed)";
 
             // If a different version of package is available, postfix it with an *
             if ( it->getVersion() != it->getInstalledVersion() )
             {
 
                 if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 )
                     text += "*";
             }
         }
 
         QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox );
 
         if ( it->isInstalled() )
         {
             QString destName = "";
             if ( it->getLocalPackage() )
             {
                 if ( it->getLocalPackage()->getInstalledTo() )
                     destName = it->getLocalPackage()->getInstalledTo()->getDestinationName();
             }
             else
             {
                 if ( it->getInstalledTo() )
                     destName = it->getInstalledTo()->getDestinationName();
             }
             if ( destName != "" )
                 new QCheckListItem( item, QString( "Installed To - " ) + destName );
         }
         
         if ( !it->isPackageStoredLocally() )
+        {
             new QCheckListItem( item, QString( "Description - " ) + it->getDescription() );
+            new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );
+            new QCheckListItem( item, QString( "Section - " ) + it->getSection() );
+        }
         else
             new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() );
         
 		if ( serverName == LOCAL_SERVER )
 		{
         	new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );
 		}
 		else
 		{
         	new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
         	if ( it->getLocalPackage() )
         	{
 				if ( it->isInstalled() )
 	            	new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
 			}
 		}
 
-        new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );
-        new QCheckListItem( item, QString( "Section - " ) + it->getSection() );
         packagesList->insertItem( item );
     }
 
     // If the local server or the local ipkgs server disable the download button
     if ( serverName == LOCAL_SERVER )
     {
         upgrade->setEnabled( false );
         download->setText( "Download" );
         download->setEnabled( true );
     }
     else if ( serverName == LOCAL_IPKGS )
     {
         upgrade->setEnabled( false );
         download->setEnabled( true );
         download->setText( "Remove" );
     }
     else
     {
         upgrade->setEnabled( true );
         download->setEnabled( true );
         download->setText( "Download" );
     }
 }
 
 void NetworkPackageManager :: updateServer()
 {
     QString serverName = serversList->currentText();
 
     // Update the current server
     // Display dialog
 
     // Disable buttons to stop silly people clicking lots on them :)
 
     // First, write out ipkg_conf file so that ipkg can use it
     dataMgr->writeOutIpkgConf();
 
     Ipkg ipkg;
     ipkg.setOption( "update" );
 
     InstallDlgImpl dlg( &ipkg, "Refreshing server package lists", this, "Upgrade", true );
     dlg.showDlg();
 
     // Reload data
     dataMgr->reloadServerData();
     serverSelected(-1);
 //  delete progDlg;
 }
 
 void NetworkPackageManager :: upgradePackages()
 {
     // We're gonna do an upgrade of all packages
     // First warn user that this isn't recommended
     QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n";
     QMessageBox warn("Warning", text, QMessageBox::Warning,
                         QMessageBox::Yes,
                         QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
                         0, this );
     warn.adjustSize();
                         
     if ( warn.exec() == QMessageBox::Yes )
     {
         // First, write out ipkg_conf file so that ipkg can use it
         dataMgr->writeOutIpkgConf();
 
         // Now run upgrade
         Ipkg ipkg;
         ipkg.setOption( "upgrade" );
         
         InstallDlgImpl dlg( &ipkg, "Upgrading installed packages", this, "Upgrade", true );
         dlg.showDlg();
 
         // Reload data
         dataMgr->reloadServerData();
         serverSelected(-1);
     }
 }
 
 
 void NetworkPackageManager :: downloadPackage()
 {
     bool doUpdate = true;
     if ( download->text() == "Download" )
     {
         // See if any packages are selected
         bool found = false;
         if ( serversList->currentText() != LOCAL_SERVER )
         {
             for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
                   item != 0 && !found;
                   item = (QCheckListItem *)item->nextSibling() )
             {
                 if ( item->isOn() )
                     found = true;
             }
         }
         
         // If user selected some packages then download the and store the locally
         // otherwise, display dialog asking user what package to download from an http server
         // and whether to install it
         if ( found )
             downloadSelectedPackages();
         else
             downloadRemotePackage();
         
     }
     else if ( download->text() == "Remove" )
     {
         doUpdate = false;
         for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
               item != 0 ;
               item = (QCheckListItem *)item->nextSibling() )
         {
             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 );
                
                 Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name );
 
                 QString msgtext;
                 msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );
                 if ( QMessageBox::information( this, "Are you sure?",
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index 526de5e..db3e927 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -1,124 +1,136 @@
 /***************************************************************************
                           package.cpp  -  description
                              -------------------
     begin                : Mon Aug 26 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 "package.h"
 #include "global.h"
 
 Package::Package( QString &name )
 {
     packageName = name;
+
+    version = "N/A";
+    description = "N/A";
+    packageSize = "N/A";
+    section = "N/A";
+    
     localPackage = 0;
     installed = false;
     packageStoredLocally = false;
     installedToRoot = false;
     installed = false;
     installedTo = 0;
 }
 
 Package::Package( char *name )
 {
     packageName = name;
+
+    version = "N/A";
+    description = "N/A";
+    packageSize = "N/A";
+    section = "N/A";
+    
     localPackage = 0;
     installed = false;
     packageStoredLocally = false;
     installedToRoot = false;
     installed = false;
     installedTo = 0;
 }
 
 Package::~Package()
 {
 }
 
 QString Package :: toString()
 {
     QString ret = "Package - " + getPackageName() +
            "\n              version - " + getVersion();
 
     if ( localPackage )
         ret += "\n              inst version - " + localPackage->getVersion();
 
 
     return ret;
 }
 
 void Package :: setStatus( const QString &s )
 {
     status = s;
 
     if ( status.find( "installed" ) != -1 )
         installed = true;
 }
 
 void Package :: setLocalPackage( Package *p )
 {
     localPackage = p;
 
     if ( localPackage )
         if ( localPackage->getVersion() != getVersion() )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
 }
 
 void Package :: setVersion( const QString &v )
 {
     version = v;
 
     if ( localPackage )
         if ( localPackage->getVersion() != getVersion() )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
 }
 
 void Package :: setPackageName( const QString &name )
 {
     packageName = name;
 }
 
 void Package :: setDescription( const QString &d )
 {
     description = d;
 }
 
 void Package :: setFilename( const QString &f )
 {
 	filename = f;
 }
 
 
 QString Package :: getInstalledVersion()
 {
     if ( localPackage )
         return localPackage->getVersion();
     else
         return getVersion();
 }
 
 QString Package :: getInstalledPackageName()
 {
     if ( localPackage )
         return localPackage->getPackageName();
     else
         return getPackageName();
 }
 
 bool Package :: isInstalled()
 {
     return installed || ( localPackage && localPackage->isInstalled() );
 }
diff --git a/noncore/settings/aqpkg/settings.ui b/noncore/settings/aqpkg/settings.ui
index c2db861..44e8fd9 100644
--- a/noncore/settings/aqpkg/settings.ui
+++ b/noncore/settings/aqpkg/settings.ui