Added filter menu - contains 3 filters - show uninstalled packages,

show installed packages and show upgraded packages

1 files changed, 43 insertions, 8 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 76c7a9c..d43c6ac 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -58,3 +58,8 @@ NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget
         showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
+
 #endif
+
+    showUninstalledPkgs = false;
+    showInstalledPkgs = false;
+    showUpgradedPkgs = false;
     
@@ -65,4 +70,2 @@ NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget
     updateData();
-//    progressDlg = 0;
-//    timerId = startTimer( 100 );
 }
@@ -77,7 +80,4 @@ void NetworkPackageManager :: timerEvent ( QTimerEvent * )
 
-//    showProgressDialog();
     // Add server names to listbox
     updateData();
-
-//    progressDlg->hide();
 }
@@ -225,5 +225,22 @@ void NetworkPackageManager :: serverSelected( int )
 
-		// If the local server, only display installed packages
-		if ( serverName == LOCAL_SERVER && !it->isInstalled() )
-			continue;
+        // 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;
+        }
+
+        // If the local server, only display installed packages
+        if ( serverName == LOCAL_SERVER && !it->isInstalled() )
+            continue;
+
 
@@ -771 +788,19 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
 }
+
+void NetworkPackageManager :: showOnlyUninstalledPackages( bool val )
+{
+    showUninstalledPkgs = val;
+    serverSelected( -1 );
+}
+
+void NetworkPackageManager :: showOnlyInstalledPackages( bool val )
+{
+    showInstalledPkgs = val;
+    serverSelected( -1 );
+}
+
+void NetworkPackageManager :: showUpgradedPackages( bool val )
+{
+    showUpgradedPkgs = val;
+    serverSelected( -1 );
+}