summaryrefslogtreecommitdiff
path: root/noncore/settings/aqpkg/networkpkgmgr.cpp
Unidiff
Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp22
1 files changed, 13 insertions, 9 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
@@ -216,5 +216,4 @@ void NetworkPackageManager :: serverSelected( int )
216 216
217 Server *s = dataMgr->getServer( serverName ); 217 Server *s = dataMgr->getServer( serverName );
218// dataMgr->setActiveServer( serverName );
219 218
220 vector<Package> &list = s->getPackageList(); 219 vector<Package> &list = s->getPackageList();
@@ -222,4 +221,5 @@ void NetworkPackageManager :: serverSelected( int )
222 for ( it = list.begin() ; it != list.end() ; ++it ) 221 for ( it = list.begin() ; it != list.end() ; ++it )
223 { 222 {
223
224 QString text = ""; 224 QString text = "";
225 225
@@ -236,4 +236,5 @@ void NetworkPackageManager :: serverSelected( int )
236 if ( it->getVersion() != it->getInstalledVersion() ) 236 if ( it->getVersion() != it->getInstalledVersion() )
237 { 237 {
238
238 if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 ) 239 if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 )
239 text += "*"; 240 text += "*";
@@ -265,4 +266,10 @@ void NetworkPackageManager :: serverSelected( int )
265 new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() ); 266 new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() );
266 267
268 if ( serverName == LOCAL_SERVER )
269 {
270 new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );
271 }
272 else
273 {
267 new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() ); 274 new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
268 if ( it->getLocalPackage() ) 275 if ( it->getLocalPackage() )
@@ -271,4 +278,5 @@ void NetworkPackageManager :: serverSelected( int )
271 new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() ); 278 new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
272 } 279 }
280 }
273 packagesList->insertItem( item ); 281 packagesList->insertItem( item );
274 } 282 }
@@ -318,5 +326,5 @@ void NetworkPackageManager :: updateServer()
318 326
319 // Reload data 327 // Reload data
320 dataMgr->reloadServerData( serversList->currentText() ); 328 dataMgr->reloadServerData();
321 serverSelected(-1); 329 serverSelected(-1);
322// delete progDlg; 330// delete progDlg;
@@ -347,7 +355,5 @@ void NetworkPackageManager :: upgradePackages()
347 355
348 // Reload data 356 // Reload data
349 dataMgr->reloadServerData( LOCAL_SERVER ); 357 dataMgr->reloadServerData();
350
351 dataMgr->reloadServerData( serversList->currentText() );
352 serverSelected(-1); 358 serverSelected(-1);
353 } 359 }
@@ -437,5 +443,5 @@ void NetworkPackageManager :: downloadPackage()
437 } 443 }
438 444
439 dataMgr->reloadServerData( LOCAL_IPKGS ); 445 dataMgr->reloadServerData();
440 serverSelected( -1 ); 446 serverSelected( -1 );
441} 447}
@@ -478,7 +484,5 @@ void NetworkPackageManager :: applyChanges()
478 484
479 // Reload data 485 // Reload data
480 dataMgr->reloadServerData( LOCAL_SERVER ); 486 dataMgr->reloadServerData();
481
482 dataMgr->reloadServerData( serversList->currentText() );
483 serverSelected(-1); 487 serverSelected(-1);
484 488