| author | andyq <andyq> | 2002-11-21 18:57:01 (UTC) |
|---|---|---|
| committer | andyq <andyq> | 2002-11-21 18:57:01 (UTC) |
| commit | e6cb9bb71d4849263ada2f5549c85740c96b065a (patch) (side-by-side diff) | |
| tree | d44c457f77722342ccb5a0c7b99dcfcae6f17a94 | |
| parent | 1efe11a03d5cd3c0b81c5fee7d0e88dca2e06da8 (diff) | |
| download | opie-e6cb9bb71d4849263ada2f5549c85740c96b065a.zip opie-e6cb9bb71d4849263ada2f5549c85740c96b065a.tar.gz opie-e6cb9bb71d4849263ada2f5549c85740c96b065a.tar.bz2 | |
Package sections default to N/A unless they are set (description, etc), changed LinkToRoot to Link To Root, and couple of other small fixes
| -rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 6 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/package.cpp | 12 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/settings.ui | 2 |
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 @@ -285,13 +285,17 @@ void NetworkPackageManager :: serverSelected( int ) } 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() ); @@ -303,14 +307,12 @@ void NetworkPackageManager :: serverSelected( int ) { 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 ) { 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 @@ -18,23 +18,35 @@ #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 @@ -476,13 +476,13 @@ <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> |