Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 02e4e73..b5d7352 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp @@ -217,3 +217,2 @@ void NetworkPackageManager :: serverSelected( int ) Server *s = dataMgr->getServer( serverName ); -// dataMgr->setActiveServer( serverName ); @@ -223,2 +222,3 @@ void NetworkPackageManager :: serverSelected( int ) { + QString text = ""; @@ -237,2 +237,3 @@ void NetworkPackageManager :: serverSelected( int ) { + if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 ) @@ -266,7 +267,14 @@ 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() ); + 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() ); + } } @@ -319,3 +327,3 @@ void NetworkPackageManager :: updateServer() // Reload data - dataMgr->reloadServerData( serversList->currentText() ); + dataMgr->reloadServerData(); serverSelected(-1); @@ -348,5 +356,3 @@ void NetworkPackageManager :: upgradePackages() // Reload data - dataMgr->reloadServerData( LOCAL_SERVER ); - - dataMgr->reloadServerData( serversList->currentText() ); + dataMgr->reloadServerData(); serverSelected(-1); @@ -438,3 +444,3 @@ void NetworkPackageManager :: downloadPackage() - dataMgr->reloadServerData( LOCAL_IPKGS ); + dataMgr->reloadServerData(); serverSelected( -1 ); @@ -479,5 +485,3 @@ void NetworkPackageManager :: applyChanges() // Reload data - dataMgr->reloadServerData( LOCAL_SERVER ); - - dataMgr->reloadServerData( serversList->currentText() ); + dataMgr->reloadServerData(); serverSelected(-1); |