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, 17 insertions, 3 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
@@ -283,17 +283,21 @@ void NetworkPackageManager :: serverSelected( int )
                 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
@@ -301,18 +305,16 @@ void NetworkPackageManager :: serverSelected( int )
                 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" );
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
@@ -16,27 +16,39 @@
  ***************************************************************************/
 
 #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;
 }
 
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
@@ -474,17 +474,17 @@
                             <widget row="2"  column="1" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>linkToRoot</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>LinkToRoot</string>
+                                    <string>Link To Root</string>
                                 </property>
                                 <property stdset="1">
                                     <name>checked</name>
                                     <bool>true</bool>
                                 </property>
                             </widget>
                             <widget row="1"  column="1" >
                                 <class>QLineEdit</class>